Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

7 files changed, 29 insertions, 29 deletions

diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp
index f572aacb..66dbf30f 100644
--- a/klinkstatus/src/global.cpp
+++ b/klinkstatus/src/global.cpp
@@ -144,20 +144,20 @@ void Global::openQuanta(TQStringList const& args)
 void Global::execCommand(TQString const& command)
 {
 
-    //We create a KProcess that executes the "ps" *nix command to get the PIDs of the
+    //We create a TDEProcess that executes the "ps" *nix command to get the PIDs of the
     //other instances of quanta actually running
-    self()->process_PS_ = new KProcess();
+    self()->process_PS_ = new TDEProcess();
     *(self()->process_PS_) << TQStringList::split(" ",command);
 
-    connect( self()->process_PS_, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
-             self(), TQT_SLOT(slotGetScriptOutput(KProcess*,char*,int)));
-    connect( self()->process_PS_, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
-             self(), TQT_SLOT(slotGetScriptError(KProcess*,char*,int)));
-    connect( self()->process_PS_, TQT_SIGNAL(processExited(KProcess*)),
-             self(), TQT_SLOT(slotProcessExited(KProcess*)));
+    connect( self()->process_PS_, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+             self(), TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int)));
+    connect( self()->process_PS_, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+             self(), TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int)));
+    connect( self()->process_PS_, TQT_SIGNAL(processExited(TDEProcess*)),
+             self(), TQT_SLOT(slotProcessExited(TDEProcess*)));
 
-    //if KProcess fails I think a message box is needed... I will fix it
-    if (!self()->process_PS_->start(KProcess::NotifyOnExit,KProcess::All))
+    //if TDEProcess fails I think a message box is needed... I will fix it
+    if (!self()->process_PS_->start(TDEProcess::NotifyOnExit,TDEProcess::All))
         kdError() << "Failed to query for running KLinkStatus instances!" << endl;
     //TODO: Replace the above error with a real messagebox after the message freeze is over
     else
@@ -173,21 +173,21 @@ void Global::execCommand(TQString const& command)
     }
 }
 
-void Global::slotGetScriptOutput(KProcess* /*process*/, char* buf, int buflen)
+void Global::slotGetScriptOutput(TDEProcess* /*process*/, char* buf, int buflen)
 {
     TQCString tmp( buf, buflen + 1 );
     script_output_ = TQString();
     script_output_ = TQString::fromLocal8Bit(tmp).remove(" ");
 }
 
-void Global::slotGetScriptError(KProcess*, char* buf, int buflen)
+void Global::slotGetScriptError(TDEProcess*, char* buf, int buflen)
 {
     //TODO: Implement some error handling?
     Q_UNUSED(buf);
     Q_UNUSED(buflen);
 }
 
-void Global::slotProcessExited(KProcess*)
+void Global::slotProcessExited(TDEProcess*)
 {
     slotProcessTimeout();
 }
diff --git a/klinkstatus/src/global.h b/klinkstatus/src/global.h
index a77bcf30..77ed23eb 100644
--- a/klinkstatus/src/global.h
+++ b/klinkstatus/src/global.h
@@ -17,7 +17,7 @@ class TQCString;
 
 class DCOPClient;
 class KURL;
-class KProcess;
+class TDEProcess;
 
 /**
 @author Paulo Moura Guedes
@@ -44,9 +44,9 @@ private:
     static void execCommand(TQString const& command);
 
 private slots:
-    void slotGetScriptOutput(KProcess* process, char* buffer, int buflen);
-    void slotGetScriptError(KProcess* process, char* buffer, int buflen);
-    void slotProcessExited(KProcess* process);
+    void slotGetScriptOutput(TDEProcess* process, char* buffer, int buflen);
+    void slotGetScriptError(TDEProcess* process, char* buffer, int buflen);
+    void slotProcessExited(TDEProcess* process);
     void slotProcessTimeout();
 
 private:
@@ -55,7 +55,7 @@ private:
     DCOPClient* dcop_client_;
     bool loop_started_;
     TQString script_output_;
-    KProcess* process_PS_;
+    TDEProcess* process_PS_;
 };
 
 #endif
diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp
index ec6c9c37..42d65a66 100644
--- a/klinkstatus/src/klinkstatus.cpp
+++ b/klinkstatus/src/klinkstatus.cpp
@@ -195,7 +195,7 @@ void KLinkStatus::optionsConfigureKeys()
 
 void KLinkStatus::optionsConfigureToolbars()
 {
-    saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
+    saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 
     // use the standard toolbar editor
     KEditToolbar dlg(factory());
@@ -206,7 +206,7 @@ void KLinkStatus::optionsConfigureToolbars()
 
 void KLinkStatus::applyNewToolbarConfig()
 {
-    applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
+    applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 }
 
 
diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp
index bc890f8c..b152fc0a 100644
--- a/klinkstatus/src/klinkstatus_part.cpp
+++ b/klinkstatus/src/klinkstatus_part.cpp
@@ -199,7 +199,7 @@ TDEAboutData* KLinkStatusPart::createAboutData()
     about->addCredit("Mathieu Kooiman", 0, " [email protected]");
     about->addCredit("Jens Herden", 0, "[email protected]");
 
-    KGlobal::dirs()->addResourceType("appicon", KStandardDirs::kde_default("data") + "klinkstatuspart/pics/");
+    TDEGlobal::dirs()->addResourceType("appicon", KStandardDirs::kde_default("data") + "klinkstatuspart/pics/");
 
     return about;
 }
diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp
index 1267671d..c29ae53d 100644
--- a/klinkstatus/src/ui/klshistorycombo.cpp
+++ b/klinkstatus/src/ui/klshistorycombo.cpp
@@ -71,7 +71,7 @@ void KLSHistoryCombo::loadItems()
 
     completionObject()->setItems(items);
 
-    setCompletionMode(KGlobalSettings::completionMode());
+    setCompletionMode(TDEGlobalSettings::completionMode());
 }
 
 bool KLSHistoryCombo::eventFilter( TQObject *o, TQEvent *ev )
diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp
index 1841a5c6..eed8df79 100644
--- a/klinkstatus/src/ui/resultssearchbar.cpp
+++ b/klinkstatus/src/ui/resultssearchbar.cpp
@@ -84,11 +84,11 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name)
     d->layout->addWidget(statusLabel);
 
     d->searchCombo = new KComboBox(this, "searchcombo");
-    TQPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small);
-    TQPixmap iconGood = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small);
-    TQPixmap iconBroken = KGlobal::iconLoader()->loadIcon("no", KIcon::Small);
-    TQPixmap iconMalformed = KGlobal::iconLoader()->loadIcon("bug", KIcon::Small);
-    TQPixmap iconUndetermined = KGlobal::iconLoader()->loadIcon("help", KIcon::Small);
+    TQPixmap iconAll = TDEGlobal::iconLoader()->loadIcon("exec", KIcon::Small);
+    TQPixmap iconGood = TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small);
+    TQPixmap iconBroken = TDEGlobal::iconLoader()->loadIcon("no", KIcon::Small);
+    TQPixmap iconMalformed = TDEGlobal::iconLoader()->loadIcon("bug", KIcon::Small);
+    TQPixmap iconUndetermined = TDEGlobal::iconLoader()->loadIcon("help", KIcon::Small);
 
     d->searchCombo->insertItem(iconAll, i18n("All Links"));
     d->searchCombo->insertItem(iconGood, i18n("Good Links"));
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index 43a80aa6..7c611bc0 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -104,8 +104,8 @@ void SessionWidget::init()
 
     toolButton_clear_combo->setIconSet(SmallIconSet("locationbar_erase"));
 
-    pushbutton_url->setIconSet(KGlobal::iconLoader()->loadIconSet("fileopen", KIcon::Small));
-    TQPixmap pixMap = KGlobal::iconLoader()->loadIcon("fileopen", KIcon::Small);
+    pushbutton_url->setIconSet(TDEGlobal::iconLoader()->loadIconSet("fileopen", KIcon::Small));
+    TQPixmap pixMap = TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::Small);
     pushbutton_url->setFixedSize(pixMap.width() + 8, pixMap.height() + 8);
     connect(pushbutton_url, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChooseUrlDialog()));