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

1 files changed, 24 insertions, 24 deletions

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());