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

7 files changed, 62 insertions, 62 deletions

diff --git a/cervisia/cvsservice/cvsjob.cpp b/cervisia/cvsservice/cvsjob.cpp
index 3f4f06fe..24f42f48 100644
--- a/cervisia/cvsservice/cvsjob.cpp
+++ b/cervisia/cvsservice/cvsjob.cpp
@@ -31,12 +31,12 @@ struct CvsJob::Private
 {
     Private() : isRunning(false)
     {
-        childproc = new KProcess;
+        childproc = new TDEProcess;
         childproc->setUseShell(true, "/bin/sh");
     }
     ~Private() { delete childproc; }
 
-    KProcess*   childproc;
+    TDEProcess*   childproc;
     TQString     server;
     TQString     rsh;
     TQString     directory;
@@ -176,17 +176,17 @@ bool CvsJob::execute()
     if( !d->directory.isEmpty() )
         d->childproc->setWorkingDirectory(d->directory);
 
-    connect(d->childproc, TQT_SIGNAL(processExited(KProcess*)),
+    connect(d->childproc, TQT_SIGNAL(processExited(TDEProcess*)),
         TQT_SLOT(slotProcessExited()));
-    connect(d->childproc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
-        TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
-    connect(d->childproc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
-        TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)) );
+    connect(d->childproc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+        TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+    connect(d->childproc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+        TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) );
 
     kdDebug(8051) << "Execute cvs command: " << cvsCommand() << endl;
 
     d->isRunning = true;
-    return d->childproc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
+    return d->childproc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
 }
 
 
@@ -208,7 +208,7 @@ void CvsJob::slotProcessExited()
 }
 
 
-void CvsJob::slotReceivedStdout(KProcess* proc, char* buffer, int buflen)
+void CvsJob::slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen)
 {
     Q_UNUSED(proc);
 
@@ -221,7 +221,7 @@ void CvsJob::slotReceivedStdout(KProcess* proc, char* buffer, int buflen)
 }
 
 
-void CvsJob::slotReceivedStderr(KProcess* proc, char* buffer, int buflen)
+void CvsJob::slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen)
 {
     Q_UNUSED(proc);
 
diff --git a/cervisia/cvsservice/cvsjob.h b/cervisia/cvsservice/cvsjob.h
index d01feabc..3fde9b48 100644
--- a/cervisia/cvsservice/cvsjob.h
+++ b/cervisia/cvsservice/cvsjob.h
@@ -26,7 +26,7 @@
 #include <tqstringlist.h>
 #include <dcopobject.h>
 
-class KProcess;
+class TDEProcess;
 
 
 class KDE_EXPORT CvsJob : public TQObject, public DCOPObject
@@ -72,8 +72,8 @@ k_dcop_signals:
 
 private slots:
     void slotProcessExited();
-    void slotReceivedStdout(KProcess* proc, char* buffer, int buflen);
-    void slotReceivedStderr(KProcess* proc, char* buffer, int buflen);
+    void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen);
+    void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen);
 
 private:
     struct Private;
diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp
index aa64bb4b..ce69caf5 100644
--- a/cervisia/cvsservice/cvsservice.cpp
+++ b/cervisia/cvsservice/cvsservice.cpp
@@ -167,7 +167,7 @@ DCOPRef CvsService::annotate(const TQString& fileName, const TQString& revision)
 
     // assemble the command line
     // (cvs log [FILE] && cvs annotate [-r rev] [FILE])
-    TQString quotedName = KProcess::quote(fileName);
+    TQString quotedName = TDEProcess::quote(fileName);
     TQString cvsClient  = d->repository->cvsClient();
 
     *job << "(" << cvsClient << "log" << quotedName << "&&"
@@ -199,7 +199,7 @@ DCOPRef CvsService::checkout(const TQString& workingDir, const TQString& reposit
     // cd [DIRECTORY] && cvs -d [REPOSITORY] checkout [-r tag] [-P] [MODULE]
     d->singleCvsJob->clearCvsCommand();
 
-    *d->singleCvsJob << "cd" << KProcess::quote(workingDir) << "&&"
+    *d->singleCvsJob << "cd" << TDEProcess::quote(workingDir) << "&&"
                      << repo.cvsClient()
                      << "-d" << repository
                      << "checkout";
@@ -229,7 +229,7 @@ DCOPRef CvsService::checkout(const TQString& workingDir, const TQString& reposit
     // cd [DIRECTORY] && cvs -d [REPOSITORY] co [-r tag] [-P] [-d alias] [MODULE]
     d->singleCvsJob->clearCvsCommand();
 
-    *d->singleCvsJob << "cd" << KProcess::quote(workingDir) << "&&"
+    *d->singleCvsJob << "cd" << TDEProcess::quote(workingDir) << "&&"
                      << repo.cvsClient()
                      << "-d" << repository;
     if( exportOnly)
@@ -265,7 +265,7 @@ DCOPRef CvsService::checkout(const TQString& workingDir, const TQString& reposit
     // cd [DIRECTORY] && cvs -d [REPOSITORY] co [-r tag] [-P] [-d alias] [MODULE]
     d->singleCvsJob->clearCvsCommand();
 
-    *d->singleCvsJob << "cd" << KProcess::quote(workingDir) << "&&"
+    *d->singleCvsJob << "cd" << TDEProcess::quote(workingDir) << "&&"
                      << repo.cvsClient()
                      << "-d" << repository;
     if( exportOnly)
@@ -305,7 +305,7 @@ DCOPRef CvsService::commit(const TQStringList& files, const TQString& commitMess
     if( !recursive )
         *d->singleCvsJob << "-l";
 
-    *d->singleCvsJob << "-m" << KProcess::quote(commitMessage)
+    *d->singleCvsJob << "-m" << TDEProcess::quote(commitMessage)
                      << CvsServiceUtils::joinFileList(files) << REDIRECT_STDERR;
 
     return d->setupNonConcurrentJob();
@@ -321,9 +321,9 @@ DCOPRef CvsService::createRepository(const TQString& repository)
     // cvs -d [REPOSITORY] init
     d->singleCvsJob->clearCvsCommand();
     
-    *d->singleCvsJob << "mkdir -p" << KProcess::quote(repository) << "&&"
+    *d->singleCvsJob << "mkdir -p" << TDEProcess::quote(repository) << "&&"
                      << d->repository->cvsClient() 
-                     << "-d" << KProcess::quote(repository)
+                     << "-d" << TDEProcess::quote(repository)
                      << "init";
 
     return d->setupNonConcurrentJob();
@@ -348,7 +348,7 @@ DCOPRef CvsService::createTag(const TQStringList& files, const TQString& tag,
     if( force )
         *d->singleCvsJob << "-F";
 
-    *d->singleCvsJob << KProcess::quote(tag)
+    *d->singleCvsJob << TDEProcess::quote(tag)
                      << CvsServiceUtils::joinFileList(files);
 
     return d->setupNonConcurrentJob();
@@ -373,7 +373,7 @@ DCOPRef CvsService::deleteTag(const TQStringList& files, const TQString& tag,
     if( force )
         *d->singleCvsJob << "-F";
 
-    *d->singleCvsJob << KProcess::quote(tag)
+    *d->singleCvsJob << TDEProcess::quote(tag)
                      << CvsServiceUtils::joinFileList(files);
 
     return d->setupNonConcurrentJob();
@@ -392,7 +392,7 @@ DCOPRef CvsService::downloadCvsIgnoreFile(const TQString& repository,
     // cvs -d [REPOSITORY] -q checkout -p CVSROOT/cvsignore > [OUTPUTFILE]
     *job << repo.cvsClient() << "-d" << repository 
          << "-q checkout -p CVSROOT/cvsignore >" 
-         << KProcess::quote(outputFile);
+         << TDEProcess::quote(outputFile);
 
     // return a DCOP reference to the cvs job
     return DCOPRef(d->appId, job->objId());
@@ -414,9 +414,9 @@ DCOPRef CvsService::downloadRevision(const TQString& fileName,
     *job << d->repository->cvsClient() << "update -p";
 
     if( !revision.isEmpty() )
-        *job << "-r" << KProcess::quote(revision);
+        *job << "-r" << TDEProcess::quote(revision);
 
-    *job << KProcess::quote(fileName) << ">" << KProcess::quote(outputFile);
+    *job << TDEProcess::quote(fileName) << ">" << TDEProcess::quote(outputFile);
 
     // return a DCOP reference to the cvs job
     return DCOPRef(d->appId, job->objId());
@@ -439,11 +439,11 @@ DCOPRef CvsService::downloadRevision(const TQString& fileName,
     // cvs update -p -r [REVA] [FILE] > [OUTPUTFILEA] ;
     // cvs update -p -r [REVB] [FILE] > [OUTPUTFILEB]
     *job << d->repository->cvsClient() << "update -p"
-         << "-r" << KProcess::quote(revA)
-         << KProcess::quote(fileName) << ">" << KProcess::quote(outputFileA)
+         << "-r" << TDEProcess::quote(revA)
+         << TDEProcess::quote(fileName) << ">" << TDEProcess::quote(outputFileA)
          << ";" << d->repository->cvsClient() << "update -p"
-         << "-r" << KProcess::quote(revB)
-         << KProcess::quote(fileName) << ">" << KProcess::quote(outputFileB);
+         << "-r" << TDEProcess::quote(revB)
+         << TDEProcess::quote(fileName) << ">" << TDEProcess::quote(outputFileB);
 
     // return a DCOP reference to the cvs job
     return DCOPRef(d->appId, job->objId());
@@ -476,12 +476,12 @@ DCOPRef CvsService::diff(const TQString& fileName, const TQString& revA,
          << format;
 
     if( !revA.isEmpty() )
-        *job << "-r" << KProcess::quote(revA);
+        *job << "-r" << TDEProcess::quote(revA);
 
     if( !revB.isEmpty() )
-        *job << "-r" << KProcess::quote(revB);
+        *job << "-r" << TDEProcess::quote(revB);
 
-    *job << KProcess::quote(fileName);
+    *job << TDEProcess::quote(fileName);
 
     // return a DCOP reference to the cvs job
     return DCOPRef(d->appId, job->objId());
@@ -550,7 +550,7 @@ DCOPRef CvsService::import(const TQString& workingDir, const TQString& repositor
     // assemble the command line
     d->singleCvsJob->clearCvsCommand();
 
-    *d->singleCvsJob << "cd" << KProcess::quote(workingDir) << "&&"
+    *d->singleCvsJob << "cd" << TDEProcess::quote(workingDir) << "&&"
                      << repo.cvsClient()
                      << "-d" << repository
                      << "import";
@@ -560,7 +560,7 @@ DCOPRef CvsService::import(const TQString& workingDir, const TQString& repositor
         
     const TQString ignore = ignoreList.stripWhiteSpace();
     if( !ignore.isEmpty() )
-        *d->singleCvsJob << "-I" << KProcess::quote(ignore);
+        *d->singleCvsJob << "-I" << TDEProcess::quote(ignore);
 
     TQString logMessage = comment.stripWhiteSpace();
     logMessage.prepend("\"");
@@ -587,7 +587,7 @@ DCOPRef CvsService::import(const TQString& workingDir, const TQString& repositor
     // assemble the command line
     d->singleCvsJob->clearCvsCommand();
 
-    *d->singleCvsJob << "cd" << KProcess::quote(workingDir) << "&&"
+    *d->singleCvsJob << "cd" << TDEProcess::quote(workingDir) << "&&"
                      << repo.cvsClient()
                      << "-d" << repository
                      << "import";
@@ -600,7 +600,7 @@ DCOPRef CvsService::import(const TQString& workingDir, const TQString& repositor
 
     const TQString ignore = ignoreList.stripWhiteSpace();
     if( !ignore.isEmpty() )
-        *d->singleCvsJob << "-I" << KProcess::quote(ignore);
+        *d->singleCvsJob << "-I" << TDEProcess::quote(ignore);
 
     TQString logMessage = comment.stripWhiteSpace();
     logMessage.prepend("\"");
@@ -639,7 +639,7 @@ DCOPRef CvsService::log(const TQString& fileName)
 
     // assemble the command line
     // cvs log [FILE]
-    *job << d->repository->cvsClient() << "log" << KProcess::quote(fileName);
+    *job << d->repository->cvsClient() << "log" << TDEProcess::quote(fileName);
 
     // return a DCOP reference to the cvs job
     return DCOPRef(d->appId, job->objId());
diff --git a/cervisia/cvsservice/cvsserviceutils.cpp b/cervisia/cvsservice/cvsserviceutils.cpp
index 33585f49..b08c4357 100644
--- a/cervisia/cvsservice/cvsserviceutils.cpp
+++ b/cervisia/cvsservice/cvsserviceutils.cpp
@@ -34,7 +34,7 @@ TQString CvsServiceUtils::joinFileList(const TQStringList& files)
     
     for( ; it != end; ++it )
     {
-        result += KProcess::quote(*it);
+        result += TDEProcess::quote(*it);
         result += " ";
     }
     
diff --git a/cervisia/cvsservice/cvsserviceutils.h b/cervisia/cvsservice/cvsserviceutils.h
index 145746d5..7e47bf5b 100644
--- a/cervisia/cvsservice/cvsserviceutils.h
+++ b/cervisia/cvsservice/cvsserviceutils.h
@@ -30,7 +30,7 @@ namespace CvsServiceUtils
 
 /**
  * Joins a list of file names to one TQString and quotes
- * each name properly for usage with KProcess.
+ * each name properly for usage with TDEProcess.
  */
 TQString joinFileList(const TQStringList& files);
 
diff --git a/cervisia/cvsservice/sshagent.cpp b/cervisia/cvsservice/sshagent.cpp
index b620cc98..7590b757 100644
--- a/cervisia/cvsservice/sshagent.cpp
+++ b/cervisia/cvsservice/sshagent.cpp
@@ -91,7 +91,7 @@ bool SshAgent::addSshIdentities()
         return false;
 
     // add identities to ssh-agent
-    KProcess proc;
+    TDEProcess proc;
 
     proc.setEnvironment("SSH_AGENT_PID", m_pid);
     proc.setEnvironment("SSH_AUTH_SOCK", m_authSock);
@@ -99,12 +99,12 @@ bool SshAgent::addSshIdentities()
 
     proc << "ssh-add";
 
-    connect(&proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
-            TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
-    connect(&proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
-            TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)));
+    connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+            TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+    connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+            TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
 
-    proc.start(KProcess::DontCare, KProcess::AllOutput);
+    proc.start(TDEProcess::DontCare, TDEProcess::AllOutput);
 
     // wait for process to finish
     // TODO CL use timeout?
@@ -123,17 +123,17 @@ void SshAgent::killSshAgent()
     if( !m_isRunning || !m_isOurAgent )
         return;
 
-    KProcess proc;
+    TDEProcess proc;
 
     proc << "kill" << m_pid;
 
-    proc.start(KProcess::DontCare, KProcess::NoCommunication);
+    proc.start(TDEProcess::DontCare, TDEProcess::NoCommunication);
 
     kdDebug(8051) << "SshAgent::killSshAgent(): killed pid = " << m_pid << endl;
 }
 
 
-void SshAgent::slotProcessExited(KProcess*)
+void SshAgent::slotProcessExited(TDEProcess*)
 {
     kdDebug(8051) << "SshAgent::slotProcessExited(): ENTER" << endl;
 
@@ -187,7 +187,7 @@ void SshAgent::slotProcessExited(KProcess*)
 }
 
 
-void SshAgent::slotReceivedStdout(KProcess* proc, char* buffer, int buflen)
+void SshAgent::slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen)
 {
     Q_UNUSED(proc);
 
@@ -198,7 +198,7 @@ void SshAgent::slotReceivedStdout(KProcess* proc, char* buffer, int buflen)
 }
 
 
-void SshAgent::slotReceivedStderr(KProcess* proc, char* buffer, int buflen)
+void SshAgent::slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen)
 {
     Q_UNUSED(proc);
 
@@ -213,18 +213,18 @@ bool SshAgent::startSshAgent()
 {
     kdDebug(8051) << "SshAgent::startSshAgent(): ENTER" << endl;
 
-    KProcess proc;
+    TDEProcess proc;
 
     proc << "ssh-agent";
 
-    connect(&proc, TQT_SIGNAL(processExited(KProcess*)),
-            TQT_SLOT(slotProcessExited(KProcess*)));
-    connect(&proc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
-            TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
-    connect(&proc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
-            TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)) );
+    connect(&proc, TQT_SIGNAL(processExited(TDEProcess*)),
+            TQT_SLOT(slotProcessExited(TDEProcess*)));
+    connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+            TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
+    connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
+            TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) );
 
-    proc.start(KProcess::NotifyOnExit, KProcess::All);
+    proc.start(TDEProcess::NotifyOnExit, TDEProcess::All);
 
     // wait for process to finish
     // TODO CL use timeout?
diff --git a/cervisia/cvsservice/sshagent.h b/cervisia/cvsservice/sshagent.h
index 5276f827..b99b47d1 100644
--- a/cervisia/cvsservice/sshagent.h
+++ b/cervisia/cvsservice/sshagent.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-class KProcess;
+class TDEProcess;
 
 
 class SshAgent : public TQObject
@@ -46,9 +46,9 @@ public:
     TQString authSock() const { return m_authSock; }
 
 private slots:
-    void slotProcessExited(KProcess*);
-    void slotReceivedStdout(KProcess* proc, char* buffer, int buflen);
-    void slotReceivedStderr(KProcess* proc, char* buffer, int buflen);
+    void slotProcessExited(TDEProcess*);
+    void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen);
+    void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen);
 
 private:
     bool startSshAgent();