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

2 files changed, 18 insertions, 18 deletions

diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index 328a0387..4c0dfa99 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -210,7 +210,7 @@ void ProgressDialog::scanDirectories()
 bool ProgressDialog::createConfig()
 {
     // locate the common dir
-    TQString language = KGlobal::locale()->language();
+    TQString language = TDEGlobal::locale()->language();
     if (language == "C")
         language = "en";
 
@@ -263,13 +263,13 @@ void ProgressDialog::startHtdigProcess(bool initial)
 {
     kdDebug(9002) << "htdig started" << endl;
     delete proc;
-    proc = new KProcess();
+    proc = new TDEProcess();
     *proc << exe << "-c" << (indexdir + "/htdig.conf");
     if (initial) {
         *proc << "-i";
     }
-    connect(proc, TQT_SIGNAL(processExited(KProcess *)),
-            this, TQT_SLOT(htdigExited(KProcess *)));
+    connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
+            this, TQT_SLOT(htdigExited(TDEProcess *)));
 
     htdigRunning = true;
 
@@ -292,7 +292,7 @@ void ProgressDialog::startHtdigProcess(bool initial)
     f.close();
 
     // execute htdig
-    proc->start(KProcess::NotifyOnExit, KProcess::Stdout);
+    proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 }
 
 bool ProgressDialog::generateIndex()
@@ -318,7 +318,7 @@ bool ProgressDialog::generateIndex()
     return true;
 }
 
-void ProgressDialog::htdigStdout(KProcess *, char *buffer, int len)
+void ProgressDialog::htdigStdout(TDEProcess *, char *buffer, int len)
 {
     TQString line = TQString(buffer).left(len);
 
@@ -335,7 +335,7 @@ void ProgressDialog::htdigStdout(KProcess *, char *buffer, int len)
     setFilesDigged(filesDigged);
 }
 
-void ProgressDialog::htdigExited(KProcess *proc)
+void ProgressDialog::htdigExited(TDEProcess *proc)
 {
     kdDebug(9002) << "htdig terminated" << endl;
     if (!proc->normalExit())
@@ -382,20 +382,20 @@ void ProgressDialog::startHtmergeProcess()
 {
     kdDebug(9002) << "htmerge started" << endl;
     delete proc;
-    proc = new KProcess();
+    proc = new TDEProcess();
     *proc << exe << "-c" << (indexdir + "/htdig.conf");
 
     kdDebug(9002) << "Running htmerge" << endl;
 
-    connect(proc, TQT_SIGNAL(processExited(KProcess *)),
-            this, TQT_SLOT(htmergeExited(KProcess *)));
+    connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
+            this, TQT_SLOT(htmergeExited(TDEProcess *)));
 
     htmergeRunning = true;
 
-    proc->start(KProcess::NotifyOnExit, KProcess::Stdout);
+    proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 }
 
-void ProgressDialog::htmergeExited(KProcess *proc)
+void ProgressDialog::htmergeExited(TDEProcess *proc)
 {
     kdDebug(9002) << "htmerge terminated" << endl;
     htmergeRunning = false;
@@ -458,7 +458,7 @@ int main(int argc, char *argv[])
 
     TDEApplication app;
 
-    KGlobal::locale()->setMainCatalogue("tdevelop");
+    TDEGlobal::locale()->setMainCatalogue("tdevelop");
 
     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/parts/documentation/tools/htdig/htdigindex.h b/parts/documentation/tools/htdig/htdigindex.h
index 9afa4d45..5c521be1 100644
--- a/parts/documentation/tools/htdig/htdigindex.h
+++ b/parts/documentation/tools/htdig/htdigindex.h
@@ -19,7 +19,7 @@
 
 class TQTimer;
 class TQLabel;
-class KProcess;
+class TDEProcess;
 class KProgress;
 
 class ProgressDialog : public KDialogBase
@@ -36,9 +36,9 @@ public:
     bool generateIndex();
 
 private slots:
-    void htdigStdout(KProcess *proc, char *buffer, int buflen);
-    void htdigExited(KProcess *proc);
-    void htmergeExited(KProcess *proc);
+    void htdigStdout(TDEProcess *proc, char *buffer, int buflen);
+    void htdigExited(TDEProcess *proc);
+    void htmergeExited(TDEProcess *proc);
     void cancelClicked();
     void okClicked();
     void slotDelayedStart();
@@ -61,7 +61,7 @@ private:
     TQString indexdir;
     TQString exe;
     TQStringList files;
-    KProcess *proc;
+    TDEProcess *proc;
     volatile int filesToDig, filesDigged, filesScanned;
     bool htdigRunning, htmergeRunning;
 };