Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1157652 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

13 files changed, 281 insertions, 281 deletions

diff --git a/cervisia/cvsservice/cvsaskpass.cpp b/cervisia/cvsservice/cvsaskpass.cpp
index 01903f02..13660c7e 100644
--- a/cervisia/cvsservice/cvsaskpass.cpp
+++ b/cervisia/cvsservice/cvsaskpass.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include <qregexp.h>
+#include <tqregexp.h>
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
@@ -56,8 +56,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char** argv)
         return 1;
 
     // parse repository name from the passed argument
-    QString prompt = KCmdLineArgs::parsedArgs()->arg(0);
-    QRegExp rx("(.*@.*)'s password:");
+    TQString prompt = KCmdLineArgs::parsedArgs()->arg(0);
+    TQRegExp rx("(.*@.*)'s password:");
     int pos = rx.search(prompt);
 
     KPasswordDialog dlg(KPasswordDialog::Password, false, 0);
diff --git a/cervisia/cvsservice/cvsjob.cpp b/cervisia/cvsservice/cvsjob.cpp
index e73e0abc..3f4f06fe 100644
--- a/cervisia/cvsservice/cvsjob.cpp
+++ b/cervisia/cvsservice/cvsjob.cpp
@@ -20,7 +20,7 @@
 
 #include "cvsjob.h"
 
-#include <qfile.h>
+#include <tqfile.h>
 #include <kdebug.h>
 #include <kprocess.h>
 
@@ -37,26 +37,26 @@ struct CvsJob::Private
     ~Private() { delete childproc; }
 
     KProcess*   childproc;
-    QString     server;
-    QString     rsh;
-    QString     directory;
+    TQString     server;
+    TQString     rsh;
+    TQString     directory;
     bool        isRunning;
-    QStringList outputLines;
+    TQStringList outputLines;
 };
 
 
 CvsJob::CvsJob(unsigned jobNum)
-    : QObject()
+    : TQObject()
     , DCOPObject()
     , d(new Private)
 {
-    QString objId("CvsJob" + QString::number(jobNum));
+    TQString objId("CvsJob" + TQString::number(jobNum));
     setObjId(objId.local8Bit());
 }
 
 
-CvsJob::CvsJob(const QString& objId)
-    : QObject()
+CvsJob::CvsJob(const TQString& objId)
+    : TQObject()
     , DCOPObject()
     , d(new Private)
 {
@@ -76,19 +76,19 @@ void CvsJob::clearCvsCommand()
 }
 
 
-void CvsJob::setRSH(const QString& rsh)
+void CvsJob::setRSH(const TQString& rsh)
 {
     d->rsh = rsh;
 }
 
 
-void CvsJob::setServer(const QString& server)
+void CvsJob::setServer(const TQString& server)
 {
     d->server = server;
 }
 
 
-void CvsJob::setDirectory(const QString& directory)
+void CvsJob::setDirectory(const TQString& directory)
 {
     d->directory = directory;
 }
@@ -100,7 +100,7 @@ bool CvsJob::isRunning() const
 }
 
 
-CvsJob& CvsJob::operator<<(const QString& arg)
+CvsJob& CvsJob::operator<<(const TQString& arg)
 {
     *d->childproc << arg;
     return *this;
@@ -114,39 +114,39 @@ CvsJob& CvsJob::operator<<(const char* arg)
 }
 
 
-CvsJob& CvsJob::operator<<(const QCString& arg)
+CvsJob& CvsJob::operator<<(const TQCString& arg)
 {
     *d->childproc << arg;
     return *this;
 }
 
 
-CvsJob& CvsJob::operator<<(const QStringList& args)
+CvsJob& CvsJob::operator<<(const TQStringList& args)
 {
     *d->childproc << args;
     return *this;
 }
 
 
-QString CvsJob::cvsCommand() const
+TQString CvsJob::cvsCommand() const
 {
-    QString command;
+    TQString command;
 
-    const QValueList<QCString>& args(d->childproc->args());
-    for (QValueList<QCString>::const_iterator it = args.begin(), itEnd = args.end();
+    const TQValueList<TQCString>& args(d->childproc->args());
+    for (TQValueList<TQCString>::const_iterator it = args.begin(), itEnd = args.end();
          it != itEnd; ++it)
     {
         if (!command.isEmpty())
             command += ' ';
 
-        command += QFile::decodeName(*it);
+        command += TQFile::decodeName(*it);
     }
 
     return command;
 }
 
 
-QStringList CvsJob::output() const
+TQStringList CvsJob::output() const
 {
     return d->outputLines;
 }
@@ -176,12 +176,12 @@ bool CvsJob::execute()
     if( !d->directory.isEmpty() )
         d->childproc->setWorkingDirectory(d->directory);
 
-    connect(d->childproc, SIGNAL(processExited(KProcess*)),
-        SLOT(slotProcessExited()));
-    connect(d->childproc, SIGNAL(receivedStdout(KProcess*, char*, int)),
-        SLOT(slotReceivedStdout(KProcess*, char*, int)));
-    connect(d->childproc, SIGNAL(receivedStderr(KProcess*, char*, int)),
-        SLOT(slotReceivedStderr(KProcess*, char*, int)) );
+    connect(d->childproc, TQT_SIGNAL(processExited(KProcess*)),
+        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)) );
 
     kdDebug(8051) << "Execute cvs command: " << cvsCommand() << endl;
 
@@ -212,10 +212,10 @@ void CvsJob::slotReceivedStdout(KProcess* proc, char* buffer, int buflen)
 {
     Q_UNUSED(proc);
 
-    QString output = QString::fromLocal8Bit(buffer, buflen);
+    TQString output = TQString::fromLocal8Bit(buffer, buflen);
 
     // accumulate output
-    d->outputLines += QStringList::split("\n", output);
+    d->outputLines += TQStringList::split("\n", output);
 
     emit receivedStdout(output);
 }
@@ -225,10 +225,10 @@ void CvsJob::slotReceivedStderr(KProcess* proc, char* buffer, int buflen)
 {
     Q_UNUSED(proc);
 
-    QString output = QString::fromLocal8Bit(buffer, buflen);
+    TQString output = TQString::fromLocal8Bit(buffer, buflen);
 
     // accumulate output
-    d->outputLines += QStringList::split("\n", output);
+    d->outputLines += TQStringList::split("\n", output);
 
     emit receivedStderr(output);
 }
diff --git a/cervisia/cvsservice/cvsjob.h b/cervisia/cvsservice/cvsjob.h
index 85d9b1fd..88aaa9fb 100644
--- a/cervisia/cvsservice/cvsjob.h
+++ b/cervisia/cvsservice/cvsjob.h
@@ -21,33 +21,33 @@
 #ifndef CVSJOB_H
 #define CVSJOB_H
 
-#include <qobject.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <dcopobject.h>
 
 class KProcess;
 
 
-class KDE_EXPORT CvsJob : public QObject, public DCOPObject
+class KDE_EXPORT CvsJob : public TQObject, public DCOPObject
 {
     Q_OBJECT
     K_DCOP
 
 public:
     explicit CvsJob(unsigned jobNum);
-    explicit CvsJob(const QString& objId);
+    explicit CvsJob(const TQString& objId);
     virtual ~CvsJob();
 
     void clearCvsCommand();
-    void setRSH(const QString& rsh);
-    void setServer(const QString& server);
-    void setDirectory(const QString& directory);
+    void setRSH(const TQString& rsh);
+    void setServer(const TQString& server);
+    void setDirectory(const TQString& directory);
 
-    CvsJob& operator<<(const QString& arg);
+    CvsJob& operator<<(const TQString& arg);
     CvsJob& operator<<(const char* arg);
-    CvsJob& operator<<(const QCString& arg);
-    CvsJob& operator<<(const QStringList& args);
+    CvsJob& operator<<(const TQCString& arg);
+    CvsJob& operator<<(const TQStringList& args);
 
 k_dcop:
     bool execute();
@@ -60,14 +60,14 @@ k_dcop:
      *
      * @return The current cvs command. Can be null if not set.
      */
-    QString cvsCommand() const;
+    TQString cvsCommand() const;
 
-    QStringList output() const;
+    TQStringList output() const;
 
 k_dcop_signals:
     void jobExited(bool normalExit, int status);
-    void receivedStdout(const QString& buffer);
-    void receivedStderr(const QString& buffer);
+    void receivedStdout(const TQString& buffer);
+    void receivedStderr(const TQString& buffer);
 
 private slots:
     void slotProcessExited();
diff --git a/cervisia/cvsservice/cvsloginjob.cpp b/cervisia/cvsservice/cvsloginjob.cpp
index 5ffe0d17..ad6f9176 100644
--- a/cervisia/cvsservice/cvsloginjob.cpp
+++ b/cervisia/cvsservice/cvsloginjob.cpp
@@ -36,7 +36,7 @@ CvsLoginJob::CvsLoginJob(unsigned jobNum)
     : DCOPObject()
     , m_Proc(0)
 {
-    QString objId("CvsLoginJob" + QString::number(jobNum));
+    TQString objId("CvsLoginJob" + TQString::number(jobNum));
     setObjId(objId.local8Bit());
 
     m_Proc = new PtyProcess;
@@ -49,13 +49,13 @@ CvsLoginJob::~CvsLoginJob()
 }
 
 
-void CvsLoginJob::setServer(const QString& server)
+void CvsLoginJob::setServer(const TQString& server)
 {
     m_Server = server;
 }
 
 
-void CvsLoginJob::setCvsClient(const QCString& cvsClient)
+void CvsLoginJob::setCvsClient(const TQCString& cvsClient)
 {
     m_CvsClient = cvsClient;
 
@@ -64,7 +64,7 @@ void CvsLoginJob::setCvsClient(const QCString& cvsClient)
 }
 
 
-void CvsLoginJob::setRepository(const QCString& repository)
+void CvsLoginJob::setRepository(const TQCString& repository)
 {
     m_Arguments += "-d";
     m_Arguments += repository;
@@ -74,7 +74,7 @@ void CvsLoginJob::setRepository(const QCString& repository)
 
 bool CvsLoginJob::execute()
 {
-    static QCString repository;
+    static TQCString repository;
 
     int res = m_Proc->exec(m_CvsClient, m_Arguments);
     if( res < 0 )
@@ -86,7 +86,7 @@ bool CvsLoginJob::execute()
     bool result = false;
     while( true )
     {
-        QCString line = m_Proc->readLine();
+        TQCString line = m_Proc->readLine();
         if( line.isNull() )
         {
             return result;
@@ -113,7 +113,7 @@ bool CvsLoginJob::execute()
             // TODO: We really should display the repository name. Unfortunately
             //       the dialog doesn't show part of the repository name, because
             //       it's too long. :-(
-            QCString password;
+            TQCString password;
             int res = KPasswordDialog::getPassword(password, i18n("Please type "
                         "in your password for the repository below."));
             if( res == KPasswordDialog::Accepted )
@@ -150,7 +150,7 @@ bool CvsLoginJob::execute()
 }
 
 
-QStringList CvsLoginJob::output()
+TQStringList CvsLoginJob::output()
 {
     return m_output;
 }
diff --git a/cervisia/cvsservice/cvsloginjob.h b/cervisia/cvsservice/cvsloginjob.h
index 7aae928f..71291175 100644
--- a/cervisia/cvsservice/cvsloginjob.h
+++ b/cervisia/cvsservice/cvsloginjob.h
@@ -21,8 +21,8 @@
 #ifndef CVSLOGINJOB_H
 #define CVSLOGINJOB_H
 
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <dcopobject.h>
 
 #include <kdesu/process.h>
@@ -36,22 +36,22 @@ public:
     explicit CvsLoginJob(unsigned jobNum);
     virtual ~CvsLoginJob();
 
-    void setServer(const QString& server);
+    void setServer(const TQString& server);
 
-    void setCvsClient(const QCString& cvsClient);
-    void setRepository(const QCString& repository);
+    void setCvsClient(const TQCString& cvsClient);
+    void setRepository(const TQCString& repository);
 
 k_dcop:
     bool execute();
-    QStringList output();
+    TQStringList output();
 
 private:
     PtyProcess*    m_Proc;
-    QString        m_Server;
-    QString        m_Rsh;
-    QCString       m_CvsClient;
+    TQString        m_Server;
+    TQString        m_Rsh;
+    TQCString       m_CvsClient;
     QCStringList   m_Arguments;
-    QStringList    m_output;
+    TQStringList    m_output;
 };
 
 
diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp
index 4a4c830b..aa64bb4b 100644
--- a/cervisia/cvsservice/cvsservice.cpp
+++ b/cervisia/cvsservice/cvsservice.cpp
@@ -20,8 +20,8 @@
 
 #include "cvsservice.h"
 
-#include <qintdict.h>
-#include <qstring.h>
+#include <tqintdict.h>
+#include <tqstring.h>
 
 #include <dcopref.h>
 #include <dcopclient.h>
@@ -54,11 +54,11 @@ struct CvsService::Private
 
     CvsJob*               singleCvsJob;   // non-concurrent cvs job, like update or commit
     DCOPRef               singleJobRef;   // DCOP reference to non-concurrent cvs job
-    QIntDict<CvsJob>      cvsJobs;        // concurrent cvs jobs, like diff or annotate
-    QIntDict<CvsLoginJob> loginJobs;
+    TQIntDict<CvsJob>      cvsJobs;        // concurrent cvs jobs, like diff or annotate
+    TQIntDict<CvsLoginJob> loginJobs;
     unsigned              lastJobId;
 
-    QCString              appId;          // cache the DCOP clients app id
+    TQCString              appId;          // cache the DCOP clients app id
 
     Repository*           repository;
 
@@ -111,7 +111,7 @@ CvsService::~CvsService()
 }
 
 
-DCOPRef CvsService::add(const QStringList& files, bool isBinary)
+DCOPRef CvsService::add(const TQStringList& files, bool isBinary)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
         return DCOPRef();
@@ -131,7 +131,7 @@ DCOPRef CvsService::add(const QStringList& files, bool isBinary)
 }
 
 
-DCOPRef CvsService::addWatch(const QStringList& files, int events)
+DCOPRef CvsService::addWatch(const TQStringList& files, int events)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
         return DCOPRef();
@@ -157,7 +157,7 @@ DCOPRef CvsService::addWatch(const QStringList& files, int events)
 }
 
 
-DCOPRef CvsService::annotate(const QString& fileName, const QString& revision)
+DCOPRef CvsService::annotate(const TQString& fileName, const TQString& revision)
 {
     if( !d->hasWorkingCopy() )
         return DCOPRef();
@@ -167,8 +167,8 @@ DCOPRef CvsService::annotate(const QString& fileName, const QString& revision)
 
     // assemble the command line
     // (cvs log [FILE] && cvs annotate [-r rev] [FILE])
-    QString quotedName = KProcess::quote(fileName);
-    QString cvsClient  = d->repository->cvsClient();
+    TQString quotedName = KProcess::quote(fileName);
+    TQString cvsClient  = d->repository->cvsClient();
 
     *job << "(" << cvsClient << "log" << quotedName << "&&"
          << cvsClient << "annotate";
@@ -186,8 +186,8 @@ DCOPRef CvsService::annotate(const QString& fileName, const QString& revision)
 }
 
 
-DCOPRef CvsService::checkout(const QString& workingDir, const QString& repository,
-                             const QString& module, const QString& tag, 
+DCOPRef CvsService::checkout(const TQString& workingDir, const TQString& repository,
+                             const TQString& module, const TQString& tag, 
                              bool pruneDirs)
 {
     if( d->hasRunningJob() )
@@ -216,9 +216,9 @@ DCOPRef CvsService::checkout(const QString& workingDir, const QString& repositor
 }
 
 
-DCOPRef CvsService::checkout(const QString& workingDir, const QString& repository,
-                             const QString& module, const QString& tag, 
-                             bool pruneDirs, const QString& alias, bool exportOnly)
+DCOPRef CvsService::checkout(const TQString& workingDir, const TQString& repository,
+                             const TQString& module, const TQString& tag, 
+                             bool pruneDirs, const TQString& alias, bool exportOnly)
 {
     if( d->hasRunningJob() )
         return DCOPRef();
@@ -251,9 +251,9 @@ DCOPRef CvsService::checkout(const QString& workingDir, const QString& repositor
     return d->setupNonConcurrentJob(&repo);
 }
 
-DCOPRef CvsService::checkout(const QString& workingDir, const QString& repository,
-                             const QString& module, const QString& tag, 
-                             bool pruneDirs, const QString& alias, bool exportOnly,
+DCOPRef CvsService::checkout(const TQString& workingDir, const TQString& repository,
+                             const TQString& module, const TQString& tag, 
+                             bool pruneDirs, const TQString& alias, bool exportOnly,
                              bool recursive)
 {
     if( d->hasRunningJob() )
@@ -290,7 +290,7 @@ DCOPRef CvsService::checkout(const QString& workingDir, const QString& repositor
     return d->setupNonConcurrentJob(&repo);
 }
 
-DCOPRef CvsService::commit(const QStringList& files, const QString& commitMessage,
+DCOPRef CvsService::commit(const TQStringList& files, const TQString& commitMessage,
                            bool recursive)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
@@ -312,7 +312,7 @@ DCOPRef CvsService::commit(const QStringList& files, const QString& commitMessag
 }
 
 
-DCOPRef CvsService::createRepository(const QString& repository)
+DCOPRef CvsService::createRepository(const TQString& repository)
 {
     if( d->hasRunningJob() )
         return DCOPRef();
@@ -330,7 +330,7 @@ DCOPRef CvsService::createRepository(const QString& repository)
 }
 
 
-DCOPRef CvsService::createTag(const QStringList& files, const QString& tag,
+DCOPRef CvsService::createTag(const TQStringList& files, const TQString& tag,
                               bool branch, bool force)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
@@ -355,7 +355,7 @@ DCOPRef CvsService::createTag(const QStringList& files, const QString& tag,
 }
 
 
-DCOPRef CvsService::deleteTag(const QStringList& files, const QString& tag,
+DCOPRef CvsService::deleteTag(const TQStringList& files, const TQString& tag,
                               bool branch, bool force)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
@@ -380,8 +380,8 @@ DCOPRef CvsService::deleteTag(const QStringList& files, const QString& tag,
 }
 
 
-DCOPRef CvsService::downloadCvsIgnoreFile(const QString& repository,
-                                          const QString& outputFile)
+DCOPRef CvsService::downloadCvsIgnoreFile(const TQString& repository,
+                                          const TQString& outputFile)
 {
     Repository repo(repository);
 
@@ -399,9 +399,9 @@ DCOPRef CvsService::downloadCvsIgnoreFile(const QString& repository,
 }
 
 
-DCOPRef CvsService::downloadRevision(const QString& fileName,
-                                     const QString& revision,
-                                     const QString& outputFile)
+DCOPRef CvsService::downloadRevision(const TQString& fileName,
+                                     const TQString& revision,
+                                     const TQString& outputFile)
 {
     if( !d->hasWorkingCopy() )
         return DCOPRef();
@@ -423,11 +423,11 @@ DCOPRef CvsService::downloadRevision(const QString& fileName,
 }
 
 
-DCOPRef CvsService::downloadRevision(const QString& fileName,
-                                     const QString& revA,
-                                     const QString& outputFileA,
-                                     const QString& revB,
-                                     const QString& outputFileB)
+DCOPRef CvsService::downloadRevision(const TQString& fileName,
+                                     const TQString& revA,
+                                     const TQString& outputFileA,
+                                     const TQString& revB,
+                                     const TQString& outputFileB)
 {
     if( !d->hasWorkingCopy() )
         return DCOPRef();
@@ -450,19 +450,19 @@ DCOPRef CvsService::downloadRevision(const QString& fileName,
 }
 
 
-DCOPRef CvsService::diff(const QString& fileName, const QString& revA,
-                         const QString& revB, const QString& diffOptions,
+DCOPRef CvsService::diff(const TQString& fileName, const TQString& revA,
+                         const TQString& revB, const TQString& diffOptions,
                          unsigned contextLines)
 {
     // cvs diff [DIFFOPTIONS] -U CONTEXTLINES [-r REVA] {-r REVB] [FILE]
-    QString format = "-U" + QString::number(contextLines);
+    TQString format = "-U" + TQString::number(contextLines);
     return diff(fileName, revA, revB, diffOptions, format);
 }
 
 
-DCOPRef CvsService::diff(const QString& fileName, const QString& revA,
-                         const QString& revB, const QString& diffOptions,
-                         const QString& format)
+DCOPRef CvsService::diff(const TQString& fileName, const TQString& revA,
+                         const TQString& revB, const TQString& diffOptions,
+                         const TQString& format)
 {
     if( !d->hasWorkingCopy() )
         return DCOPRef();
@@ -488,7 +488,7 @@ DCOPRef CvsService::diff(const QString& fileName, const QString& revA,
 }
 
 
-DCOPRef CvsService::edit(const QStringList& files)
+DCOPRef CvsService::edit(const TQStringList& files)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
         return DCOPRef();
@@ -504,7 +504,7 @@ DCOPRef CvsService::edit(const QStringList& files)
 }
 
 
-DCOPRef CvsService::editors(const QStringList& files)
+DCOPRef CvsService::editors(const TQStringList& files)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
         return DCOPRef();
@@ -537,10 +537,10 @@ DCOPRef CvsService::history()
 }
 
 
-DCOPRef CvsService::import(const QString& workingDir, const QString& repository,
-                           const QString& module, const QString& ignoreList,
-                           const QString& comment, const QString& vendorTag,
-                           const QString& releaseTag, bool importAsBinary)
+DCOPRef CvsService::import(const TQString& workingDir, const TQString& repository,
+                           const TQString& module, const TQString& ignoreList,
+                           const TQString& comment, const TQString& vendorTag,
+                           const TQString& releaseTag, bool importAsBinary)
 {
     if( d->hasRunningJob() )
         return DCOPRef();
@@ -558,11 +558,11 @@ DCOPRef CvsService::import(const QString& workingDir, const QString& repository,
     if( importAsBinary )
         *d->singleCvsJob << "-kb";
         
-    const QString ignore = ignoreList.stripWhiteSpace();
+    const TQString ignore = ignoreList.stripWhiteSpace();
     if( !ignore.isEmpty() )
         *d->singleCvsJob << "-I" << KProcess::quote(ignore);
 
-    QString logMessage = comment.stripWhiteSpace();
+    TQString logMessage = comment.stripWhiteSpace();
     logMessage.prepend("\"");
     logMessage.append("\"");
     *d->singleCvsJob << "-m" << logMessage;
@@ -573,10 +573,10 @@ DCOPRef CvsService::import(const QString& workingDir, const QString& repository,
 }
 
 
-DCOPRef CvsService::import(const QString& workingDir, const QString& repository,
-                           const QString& module, const QString& ignoreList,
-                           const QString& comment, const QString& vendorTag,
-                           const QString& releaseTag, bool importAsBinary,
+DCOPRef CvsService::import(const TQString& workingDir, const TQString& repository,
+                           const TQString& module, const TQString& ignoreList,
+                           const TQString& comment, const TQString& vendorTag,
+                           const TQString& releaseTag, bool importAsBinary,
                            bool useModificationTime)
 {
     if( d->hasRunningJob() )
@@ -598,11 +598,11 @@ DCOPRef CvsService::import(const QString& workingDir, const QString& repository,
     if( useModificationTime )
         *d->singleCvsJob << "-d";
 
-    const QString ignore = ignoreList.stripWhiteSpace();
+    const TQString ignore = ignoreList.stripWhiteSpace();
     if( !ignore.isEmpty() )
         *d->singleCvsJob << "-I" << KProcess::quote(ignore);
 
-    QString logMessage = comment.stripWhiteSpace();
+    TQString logMessage = comment.stripWhiteSpace();
     logMessage.prepend("\"");
     logMessage.append("\"");
     *d->singleCvsJob << "-m" << logMessage;
@@ -613,7 +613,7 @@ DCOPRef CvsService::import(const QString& workingDir, const QString& repository,
 }
 
 
-DCOPRef CvsService::lock(const QStringList& files)
+DCOPRef CvsService::lock(const TQStringList& files)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
         return DCOPRef();
@@ -629,7 +629,7 @@ DCOPRef CvsService::lock(const QStringList& files)
 }
 
 
-DCOPRef CvsService::log(const QString& fileName)
+DCOPRef CvsService::log(const TQString& fileName)
 {
     if( !d->hasWorkingCopy() )
         return DCOPRef();
@@ -646,7 +646,7 @@ DCOPRef CvsService::log(const QString& fileName)
 }
 
 
-DCOPRef CvsService::login(const QString& repository)
+DCOPRef CvsService::login(const TQString& repository)
 {
     if( repository.isEmpty() )
         return DCOPRef();
@@ -672,7 +672,7 @@ DCOPRef CvsService::login(const QString& repository)
 }
 
 
-DCOPRef CvsService::logout(const QString& repository)
+DCOPRef CvsService::logout(const TQString& repository)
 {
     if( repository.isEmpty() )
         return DCOPRef();
@@ -704,7 +704,7 @@ DCOPRef CvsService::makePatch()
 }
 
 
-DCOPRef CvsService::makePatch(const QString& diffOptions, const QString& format)
+DCOPRef CvsService::makePatch(const TQString& diffOptions, const TQString& format)
 {
     if( !d->hasWorkingCopy() )
         return DCOPRef();
@@ -722,7 +722,7 @@ DCOPRef CvsService::makePatch(const QString& diffOptions, const QString& format)
 }
 
 
-DCOPRef CvsService::moduleList(const QString& repository)
+DCOPRef CvsService::moduleList(const TQString& repository)
 {
     Repository repo(repository);
 
@@ -745,7 +745,7 @@ DCOPRef CvsService::moduleList(const QString& repository)
 }
 
 
-DCOPRef CvsService::remove(const QStringList& files, bool recursive)
+DCOPRef CvsService::remove(const TQStringList& files, bool recursive)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
         return DCOPRef();
@@ -765,7 +765,7 @@ DCOPRef CvsService::remove(const QStringList& files, bool recursive)
 }
 
 
-DCOPRef CvsService::removeWatch(const QStringList& files, int events)
+DCOPRef CvsService::removeWatch(const TQStringList& files, int events)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
         return DCOPRef();
@@ -791,7 +791,7 @@ DCOPRef CvsService::removeWatch(const QStringList& files, int events)
 }
 
 
-DCOPRef CvsService::rlog(const QString& repository, const QString& module, 
+DCOPRef CvsService::rlog(const TQString& repository, const TQString& module, 
                          bool recursive)
 {
     Repository repo(repository);
@@ -819,7 +819,7 @@ DCOPRef CvsService::rlog(const QString& repository, const QString& module,
 }
 
 
-DCOPRef CvsService::simulateUpdate(const QStringList& files, bool recursive,
+DCOPRef CvsService::simulateUpdate(const TQStringList& files, bool recursive,
                                    bool createDirs, bool pruneDirs)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
@@ -846,7 +846,7 @@ DCOPRef CvsService::simulateUpdate(const QStringList& files, bool recursive,
 }
 
 
-DCOPRef CvsService::status(const QStringList& files, bool recursive, bool tagInfo)
+DCOPRef CvsService::status(const TQStringList& files, bool recursive, bool tagInfo)
 {
     if( !d->hasWorkingCopy() )
         return DCOPRef();
@@ -871,7 +871,7 @@ DCOPRef CvsService::status(const QStringList& files, bool recursive, bool tagInf
 }
 
 
-DCOPRef CvsService::unedit(const QStringList& files)
+DCOPRef CvsService::unedit(const TQStringList& files)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
         return DCOPRef();
@@ -888,7 +888,7 @@ DCOPRef CvsService::unedit(const QStringList& files)
 }
 
 
-DCOPRef CvsService::unlock(const QStringList& files)
+DCOPRef CvsService::unlock(const TQStringList& files)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
         return DCOPRef();
@@ -904,8 +904,8 @@ DCOPRef CvsService::unlock(const QStringList& files)
 }
 
 
-DCOPRef CvsService::update(const QStringList& files, bool recursive,
-                           bool createDirs, bool pruneDirs, const QString& extraOpt)
+DCOPRef CvsService::update(const TQStringList& files, bool recursive,
+                           bool createDirs, bool pruneDirs, const TQString& extraOpt)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
         return DCOPRef();
@@ -932,7 +932,7 @@ DCOPRef CvsService::update(const QStringList& files, bool recursive,
 }
 
 
-DCOPRef CvsService::watchers(const QStringList& files)
+DCOPRef CvsService::watchers(const TQStringList& files)
 {
     if( !d->hasWorkingCopy() || d->hasRunningJob() )
         return DCOPRef();
diff --git a/cervisia/cvsservice/cvsservice.h b/cervisia/cvsservice/cvsservice.h
index a472ca09..1cabfe99 100644
--- a/cervisia/cvsservice/cvsservice.h
+++ b/cervisia/cvsservice/cvsservice.h
@@ -21,7 +21,7 @@
 #ifndef CVSSERVICE_H
 #define CVSSERVICE_H
 
-#include <qstringlist.h>
+#include <tqstringlist.h>
 #include <dcopref.h>
 #include <dcopobject.h>
 
@@ -47,11 +47,11 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef add(const QStringList& files, bool isBinary);
+    DCOPRef add(const TQStringList& files, bool isBinary);
 
     /**
      */
-    DCOPRef addWatch(const QStringList& files, int events);
+    DCOPRef addWatch(const TQStringList& files, int events);
 
     /**
      * Shows information on who last modified each line of a file and when.
@@ -62,7 +62,7 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef annotate(const QString& fileName, const QString& revision);
+    DCOPRef annotate(const TQString& fileName, const TQString& revision);
 
     /**
      * Checks out a module from the repository into a working copy.
@@ -76,8 +76,8 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef checkout(const QString& workingDir, const QString& repository,
-                     const QString& module, const QString& tag, bool pruneDirs);
+    DCOPRef checkout(const TQString& workingDir, const TQString& repository,
+                     const TQString& module, const TQString& tag, bool pruneDirs);
     
     /**
      * Checks out a module from the repository into a working copy.
@@ -94,9 +94,9 @@ k_dcop:
      *         null reference.
      */
     //### KDE4: merge with above checkout() method
-    DCOPRef checkout(const QString& workingDir, const QString& repository,
-                     const QString& module, const QString& tag, bool pruneDirs, 
-                     const QString& alias, bool exportOnly);
+    DCOPRef checkout(const TQString& workingDir, const TQString& repository,
+                     const TQString& module, const TQString& tag, bool pruneDirs, 
+                     const TQString& alias, bool exportOnly);
 
     /**
      * Checks out a module from the repository into a working copy.
@@ -113,9 +113,9 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef checkout(const QString& workingDir, const QString& repository,
-                     const QString& module, const QString& tag, bool pruneDirs, 
-                     const QString& alias, bool exportOnly, bool recursive);
+    DCOPRef checkout(const TQString& workingDir, const TQString& repository,
+                     const TQString& module, const TQString& tag, bool pruneDirs, 
+                     const TQString& alias, bool exportOnly, bool recursive);
 
     /**
      *
@@ -127,7 +127,7 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef commit(const QStringList& files, const QString& commitMessage,
+    DCOPRef commit(const TQStringList& files, const TQString& commitMessage,
                    bool recursive);
 
     /**
@@ -135,33 +135,33 @@ k_dcop:
      *
      * @param repository
      */
-    DCOPRef createRepository(const QString& repository);
+    DCOPRef createRepository(const TQString& repository);
     
     /**
      */
-    DCOPRef createTag(const QStringList& files, const QString& tag,
+    DCOPRef createTag(const TQStringList& files, const TQString& tag,
                       bool branch, bool force);
 
     /**
      */
-    DCOPRef deleteTag(const QStringList& files, const QString& tag,
+    DCOPRef deleteTag(const TQStringList& files, const TQString& tag,
                       bool branch, bool force);
 
     /**
      */
-    DCOPRef downloadCvsIgnoreFile(const QString& repository,
-                                  const QString& outputFile);
+    DCOPRef downloadCvsIgnoreFile(const TQString& repository,
+                                  const TQString& outputFile);
     
     /**
      */
-    DCOPRef downloadRevision(const QString& fileName, const QString& revision,
-                             const QString& outputFile);
+    DCOPRef downloadRevision(const TQString& fileName, const TQString& revision,
+                             const TQString& outputFile);
 
     /**
      */
-    DCOPRef downloadRevision(const QString& fileName, const QString& revA,
-                             const QString& outputFileA, const QString& revB,
-                             const QString& outputFileB);
+    DCOPRef downloadRevision(const TQString& fileName, const TQString& revA,
+                             const TQString& outputFileA, const TQString& revB,
+                             const TQString& outputFileB);
 
     /**
      *
@@ -174,8 +174,8 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef diff(const QString& fileName, const QString& revA,
-                 const QString& revB, const QString& diffOptions,
+    DCOPRef diff(const TQString& fileName, const TQString& revA,
+                 const TQString& revB, const TQString& diffOptions,
                  unsigned contextLines);
     
     /**
@@ -189,19 +189,19 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef diff(const QString& fileName, const QString& revA,
-                 const QString& revB, const QString& diffOptions,
-                 const QString& format);
+    DCOPRef diff(const TQString& fileName, const TQString& revA,
+                 const TQString& revB, const TQString& diffOptions,
+                 const TQString& format);
 
     /**
      * @param files
      */
-    DCOPRef edit(const QStringList& files);
+    DCOPRef edit(const TQStringList& files);
 
     /**
      * @param files
      */
-    DCOPRef editors(const QStringList& files);
+    DCOPRef editors(const TQStringList& files);
 
     /**
      * Shows a history of activity (like checkouts, commits, etc) in the
@@ -216,26 +216,26 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef import(const QString& workingDir, const QString& repository,
-                   const QString& module, const QString& ignoreList,
-                   const QString& comment, const QString& vendorTag,
-                   const QString& releaseTag, bool importAsBinary);
+    DCOPRef import(const TQString& workingDir, const TQString& repository,
+                   const TQString& module, const TQString& ignoreList,
+                   const TQString& comment, const TQString& vendorTag,
+                   const TQString& releaseTag, bool importAsBinary);
 
     /**
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
     //### KDE4: merge with above import() method
-    DCOPRef import(const QString& workingDir, const QString& repository,
-                   const QString& module, const QString& ignoreList,
-                   const QString& comment, const QString& vendorTag,
-                   const QString& releaseTag, bool importAsBinary,
+    DCOPRef import(const TQString& workingDir, const TQString& repository,
+                   const TQString& module, const TQString& ignoreList,
+                   const TQString& comment, const TQString& vendorTag,
+                   const TQString& releaseTag, bool importAsBinary,
                    bool useModificationTime);
 
     /**
      * @param files
      */
-    DCOPRef lock(const QStringList& files);
+    DCOPRef lock(const TQStringList& files);
 
     /**
      * Shows log messages for a file.
@@ -245,7 +245,7 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef log(const QString& fileName);
+    DCOPRef log(const TQString& fileName);
 
     /**
      * @param repository
@@ -253,7 +253,7 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef login(const QString& repository);
+    DCOPRef login(const TQString& repository);
 
     /**
      * @param repository
@@ -261,7 +261,7 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef logout(const QString& repository);
+    DCOPRef logout(const TQString& repository);
 
     /**
      */
@@ -270,7 +270,7 @@ k_dcop:
     /**
      */
     //### KDE4: merge with above makePatch() method
-    DCOPRef makePatch(const QString& diffOptions, const QString& format);
+    DCOPRef makePatch(const TQString& diffOptions, const TQString& format);
 
     /**
      * @param repository
@@ -278,7 +278,7 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef moduleList(const QString& repository);
+    DCOPRef moduleList(const TQString& repository);
 
     /**
      * Deletes files from the local working copy and schedules them to be
@@ -291,15 +291,15 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef remove(const QStringList& files, bool recursive);
+    DCOPRef remove(const TQStringList& files, bool recursive);
 
     /**
      */
-    DCOPRef removeWatch(const QStringList& files, int events);
+    DCOPRef removeWatch(const TQStringList& files, int events);
 
     /**
      */
-    DCOPRef rlog(const QString& repository, const QString& module, 
+    DCOPRef rlog(const TQString& repository, const TQString& module, 
                  bool recursive);
 
     /**
@@ -314,7 +314,7 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef simulateUpdate(const QStringList& files, bool recursive,
+    DCOPRef simulateUpdate(const TQStringList& files, bool recursive,
                            bool createDirs, bool pruneDirs);
 
     /**
@@ -327,17 +327,17 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef status(const QStringList& files, bool recursive, bool tagInfo);
+    DCOPRef status(const TQStringList& files, bool recursive, bool tagInfo);
 
     /**
      * @param files
      */
-    DCOPRef unedit(const QStringList& files);
+    DCOPRef unedit(const TQStringList& files);
 
     /**
      * @param files
      */
-    DCOPRef unlock(const QStringList& files);
+    DCOPRef unlock(const TQStringList& files);
 
     /**
      * Merges changes from the repository into the files of the
@@ -353,13 +353,13 @@ k_dcop:
      * @return A DCOP reference to the cvs job or in case of failure a
      *         null reference.
      */
-    DCOPRef update(const QStringList& files, bool recursive, bool createDirs,
-                   bool pruneDirs, const QString& extraOpt);
+    DCOPRef update(const TQStringList& files, bool recursive, bool createDirs,
+                   bool pruneDirs, const TQString& extraOpt);
 
     /**
      * @param files
      */
-    DCOPRef watchers(const QStringList& files);
+    DCOPRef watchers(const TQStringList& files);
 
     /**
      * Quits the DCOP service.
diff --git a/cervisia/cvsservice/cvsserviceutils.cpp b/cervisia/cvsservice/cvsserviceutils.cpp
index de2f38a7..33585f49 100644
--- a/cervisia/cvsservice/cvsserviceutils.cpp
+++ b/cervisia/cvsservice/cvsserviceutils.cpp
@@ -20,17 +20,17 @@
 
 #include "cvsserviceutils.h"
 
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 #include <kprocess.h>
 
 
-QString CvsServiceUtils::joinFileList(const QStringList& files)
+TQString CvsServiceUtils::joinFileList(const TQStringList& files)
 {
-    QString result;
+    TQString result;
     
-    QStringList::ConstIterator it  = files.begin();
-    QStringList::ConstIterator end = files.end();
+    TQStringList::ConstIterator it  = files.begin();
+    TQStringList::ConstIterator end = files.end();
     
     for( ; it != end; ++it )
     {
diff --git a/cervisia/cvsservice/cvsserviceutils.h b/cervisia/cvsservice/cvsserviceutils.h
index 26f29b5b..98feceb8 100644
--- a/cervisia/cvsservice/cvsserviceutils.h
+++ b/cervisia/cvsservice/cvsserviceutils.h
@@ -29,10 +29,10 @@ namespace CvsServiceUtils
 {
 
 /**
- * Joins a list of file names to one QString and quotes
+ * Joins a list of file names to one TQString and quotes
  * each name properly for usage with KProcess.
  */
-QString joinFileList(const QStringList& files);
+TQString joinFileList(const TQStringList& files);
 
 }
 
diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp
index 1a911140..d5f06ef4 100644
--- a/cervisia/cvsservice/repository.cpp
+++ b/cervisia/cvsservice/repository.cpp
@@ -20,9 +20,9 @@
 
 #include "repository.h"
 
-#include <qdir.h>
-#include <qfile.h>
-#include <qstring.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqstring.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
@@ -36,14 +36,14 @@ struct Repository::Private
 {
     Private() : compressionLevel(0) {}
 
-    QString     configFileName;
+    TQString     configFileName;
 
-    QString     workingCopy;
-    QString     location;
+    TQString     workingCopy;
+    TQString     location;
 
-    QString     client;
-    QString     rsh;
-    QString     server;
+    TQString     client;
+    TQString     rsh;
+    TQString     server;
     int         compressionLevel;
     bool        retrieveCvsignoreFile;
 
@@ -54,7 +54,7 @@ struct Repository::Private
 
 
 Repository::Repository()
-    : QObject()
+    : TQObject()
     , DCOPObject("CvsRepository")
     , d(new Private)
 {
@@ -64,14 +64,14 @@ Repository::Repository()
     // so we watch it for changes
     d->configFileName = locate("config", "cvsservicerc");
     KDirWatch* fileWatcher = new KDirWatch(this);
-    connect(fileWatcher, SIGNAL(dirty(const QString&)),
-            this, SLOT(slotConfigDirty(const QString&)));
+    connect(fileWatcher, TQT_SIGNAL(dirty(const TQString&)),
+            this, TQT_SLOT(slotConfigDirty(const TQString&)));
     fileWatcher->addFile(d->configFileName);
 }
 
 
-Repository::Repository(const QString& repository)
-    : QObject()
+Repository::Repository(const TQString& repository)
+    : TQObject()
     , DCOPObject()
     , d(new Private)
 {
@@ -83,8 +83,8 @@ Repository::Repository(const QString& repository)
     // so we watch it for changes
     d->configFileName = locate("config", "cvsservicerc");
     KDirWatch* fileWatcher = new KDirWatch(this);
-    connect(fileWatcher, SIGNAL(dirty(const QString&)),
-            this, SLOT(slotConfigDirty(const QString&)));
+    connect(fileWatcher, TQT_SIGNAL(dirty(const TQString&)),
+            this, TQT_SLOT(slotConfigDirty(const TQString&)));
     fileWatcher->addFile(d->configFileName);
 }
 
@@ -95,9 +95,9 @@ Repository::~Repository()
 }
 
 
-QString Repository::cvsClient() const
+TQString Repository::cvsClient() const
 {
-    QString client(d->client);
+    TQString client(d->client);
 
     // suppress reading of the '.cvsrc' file
     client += " -f";
@@ -105,52 +105,52 @@ QString Repository::cvsClient() const
     // we don't need the command line option if there is no compression level set
     if( d->compressionLevel > 0 )
     {
-        client += " -z" + QString::number(d->compressionLevel) + " ";
+        client += " -z" + TQString::number(d->compressionLevel) + " ";
     }
 
     return client;
 }
 
 
-QString Repository::clientOnly() const
+TQString Repository::clientOnly() const
 {
     return d->client;
 }
 
 
-QString Repository::rsh() const
+TQString Repository::rsh() const
 {
     return d->rsh;
 }
 
 
-QString Repository::server() const
+TQString Repository::server() const
 {
     return d->server;
 }
 
 
-bool Repository::setWorkingCopy(const QString& dirName)
+bool Repository::setWorkingCopy(const TQString& dirName)
 {
-    const QFileInfo fi(dirName);
-    const QString path = fi.absFilePath();
+    const TQFileInfo fi(dirName);
+    const TQString path = fi.absFilePath();
 
     // is this really a cvs-controlled directory?
-    const QFileInfo cvsDirInfo(path + "/CVS");
+    const TQFileInfo cvsDirInfo(path + "/CVS");
     if( !cvsDirInfo.exists() || !cvsDirInfo.isDir() ||
-        !QFile::exists( cvsDirInfo.filePath() + "/Entries" ) ||
-        !QFile::exists( cvsDirInfo.filePath() + "/Repository" ) ||
-        !QFile::exists( cvsDirInfo.filePath() + "/Root" ) )
+        !TQFile::exists( cvsDirInfo.filePath() + "/Entries" ) ||
+        !TQFile::exists( cvsDirInfo.filePath() + "/Repository" ) ||
+        !TQFile::exists( cvsDirInfo.filePath() + "/Root" ) )
         return false;
 
     d->workingCopy = path;
-    d->location    = QString::null;
+    d->location    = TQString::null;
 
     // determine path to the repository
-    QFile rootFile(path + "/CVS/Root");
+    TQFile rootFile(path + "/CVS/Root");
     if( rootFile.open(IO_ReadOnly) )
     {
-        QTextStream stream(&rootFile);
+        TQTextStream stream(&rootFile);
         d->location = stream.readLine();
     }
     rootFile.close();
@@ -163,20 +163,20 @@ bool Repository::setWorkingCopy(const QString& dirName)
         ssh.addSshIdentities();
     }
 
-    QDir::setCurrent(path);
+    TQDir::setCurrent(path);
     d->readConfig();
 
     return true;
 }
 
 
-QString Repository::workingCopy() const
+TQString Repository::workingCopy() const
 {
     return d->workingCopy;
 }
 
 
-QString Repository::location() const
+TQString Repository::location() const
 {
     return d->location;
 }
@@ -188,7 +188,7 @@ bool Repository::retrieveCvsignoreFile() const
 }
 
 
-void Repository::slotConfigDirty(const QString& fileName)
+void Repository::slotConfigDirty(const TQString& fileName)
 {
     if( fileName == d->configFileName )
     {
@@ -223,7 +223,7 @@ void Repository::Private::readConfig()
     //
     // In order to be able to read this group, we then have to manually add
     // the port number to it.
-    QString repositoryGroup = QString::fromLatin1("Repository-") + location;
+    TQString repositoryGroup = TQString::fromLatin1("Repository-") + location;
     if( !config->hasGroup(repositoryGroup) )
     {
         // find the position of the first path separator
diff --git a/cervisia/cvsservice/repository.h b/cervisia/cvsservice/repository.h
index e77754bb..0c6ed8a9 100644
--- a/cervisia/cvsservice/repository.h
+++ b/cervisia/cvsservice/repository.h
@@ -21,7 +21,7 @@
 #ifndef REPOSITORY_H
 #define REPOSITORY_H
 
-#include <qobject.h>
+#include <tqobject.h>
 #include <dcopobject.h>
 
 class QString;
@@ -31,14 +31,14 @@ class QString;
  * Represents a local or remote cvs repository with
  * its repository-specific configuration data.
  */
-class KDE_EXPORT Repository : public QObject, public DCOPObject
+class KDE_EXPORT Repository : public TQObject, public DCOPObject
 {
     K_DCOP
     Q_OBJECT
 
 public:
     Repository();
-    explicit Repository(const QString& repository);
+    explicit Repository(const TQString& repository);
     ~Repository();
 
     /**
@@ -47,11 +47,11 @@ public:
      *
      * @return A cvs command (including path).
      */
-    QString cvsClient() const;
+    TQString cvsClient() const;
 
     /**
      */
-    QString clientOnly() const;
+    TQString clientOnly() const;
     
     /**
      * Remote shell command line client which should be used to
@@ -60,7 +60,7 @@ public:
      *
      * @return The remote shell client. Can be null if not set.
      */
-    QString rsh() const;
+    TQString rsh() const;
 
     /**
      * Program to start on the server side when accessing a remote
@@ -68,7 +68,7 @@ public:
      *
      * @return The server program. Can be null if not set.
      */
-    QString server() const;
+    TQString server() const;
 
 k_dcop:
     /**
@@ -76,14 +76,14 @@ k_dcop:
      *
      * @param dirName path to the local working copy directory.
      */
-    bool setWorkingCopy(const QString& dirName);
+    bool setWorkingCopy(const TQString& dirName);
 
     /**
      * Path to the current working copy.
      *
      * @return The working copy directory. Can be null if not set.
      */
-    QString workingCopy() const;
+    TQString workingCopy() const;
 
     /**
      * Path and method to access the current cvs repository.
@@ -91,14 +91,14 @@ k_dcop:
      *
      * @return The path and method to access the cvs repository.
      */
-    QString location() const;
+    TQString location() const;
     
     /**
      */
     bool retrieveCvsignoreFile() const;
 
 private slots:
-    void slotConfigDirty(const QString& fileName);
+    void slotConfigDirty(const TQString& fileName);
 
 private:
     struct Private;
diff --git a/cervisia/cvsservice/sshagent.cpp b/cervisia/cvsservice/sshagent.cpp
index fe50dce8..4f8abd25 100644
--- a/cervisia/cvsservice/sshagent.cpp
+++ b/cervisia/cvsservice/sshagent.cpp
@@ -20,7 +20,7 @@
 
 #include "sshagent.h"
 
-#include <qregexp.h>
+#include <tqregexp.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdeversion.h>
@@ -32,12 +32,12 @@
 // initialize static member variables
 bool    SshAgent::m_isRunning  = false;
 bool    SshAgent::m_isOurAgent = false;
-QString SshAgent::m_authSock   = QString::null;
-QString SshAgent::m_pid        = QString::null;
+TQString SshAgent::m_authSock   = TQString::null;
+TQString SshAgent::m_pid        = TQString::null;
 
 
-SshAgent::SshAgent(QObject* parent, const char* name)
-    : QObject(parent, name)
+SshAgent::SshAgent(TQObject* parent, const char* name)
+    : TQObject(parent, name)
 {
 }
 
@@ -61,11 +61,11 @@ bool SshAgent::querySshAgent()
         kdDebug(8051) << "SshAgent::querySshAgent(): ssh-agent already exists"
                       << endl;
 
-        m_pid = QString::fromLocal8Bit(pid);
+        m_pid = TQString::fromLocal8Bit(pid);
 
         char* sock = ::getenv("SSH_AUTH_SOCK");
         if( sock )
-            m_authSock = QString::fromLocal8Bit(sock);
+            m_authSock = TQString::fromLocal8Bit(sock);
 
         m_isOurAgent = false;
         m_isRunning  = true;
@@ -99,10 +99,10 @@ bool SshAgent::addSshIdentities()
 
     proc << "ssh-add";
 
-    connect(&proc, SIGNAL(receivedStdout(KProcess*, char*, int)),
-            SLOT(slotReceivedStdout(KProcess*, char*, int)));
-    connect(&proc, SIGNAL(receivedStderr(KProcess*, char*, int)),
-            SLOT(slotReceivedStderr(KProcess*, char*, int)));
+    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)));
 
     proc.start(KProcess::DontCare, KProcess::AllOutput);
 
@@ -137,14 +137,14 @@ void SshAgent::slotProcessExited(KProcess*)
 {
     kdDebug(8051) << "SshAgent::slotProcessExited(): ENTER" << endl;
 
-    QRegExp cshPidRx("setenv SSH_AGENT_PID (\\d*);");
-    QRegExp cshSockRx("setenv SSH_AUTH_SOCK (.*);");
+    TQRegExp cshPidRx("setenv SSH_AGENT_PID (\\d*);");
+    TQRegExp cshSockRx("setenv SSH_AUTH_SOCK (.*);");
 
-    QRegExp bashPidRx("SSH_AGENT_PID=(\\d*).*");
-    QRegExp bashSockRx("SSH_AUTH_SOCK=(.*\\.\\d*);.*");
+    TQRegExp bashPidRx("SSH_AGENT_PID=(\\d*).*");
+    TQRegExp bashSockRx("SSH_AUTH_SOCK=(.*\\.\\d*);.*");
 
-    QStringList::Iterator it  = m_outputLines.begin();
-    QStringList::Iterator end = m_outputLines.end();
+    TQStringList::Iterator it  = m_outputLines.begin();
+    TQStringList::Iterator end = m_outputLines.end();
     for( ; it != end; ++it )
     {
         if( m_pid.isEmpty() )
@@ -191,8 +191,8 @@ void SshAgent::slotReceivedStdout(KProcess* proc, char* buffer, int buflen)
 {
     Q_UNUSED(proc);
 
-    QString output = QString::fromLocal8Bit(buffer, buflen);
-    m_outputLines += QStringList::split("\n", output);
+    TQString output = TQString::fromLocal8Bit(buffer, buflen);
+    m_outputLines += TQStringList::split("\n", output);
 
     kdDebug(8051) << "SshAgent::slotReceivedStdout(): output = " << output << endl;
 }
@@ -202,8 +202,8 @@ void SshAgent::slotReceivedStderr(KProcess* proc, char* buffer, int buflen)
 {
     Q_UNUSED(proc);
 
-    QString output = QString::fromLocal8Bit(buffer, buflen);
-    m_outputLines += QStringList::split("\n", output);
+    TQString output = TQString::fromLocal8Bit(buffer, buflen);
+    m_outputLines += TQStringList::split("\n", output);
 
     kdDebug(8051) << "SshAgent::slotReceivedStderr(): output = " << output << endl;
 }
@@ -217,12 +217,12 @@ bool SshAgent::startSshAgent()
 
     proc << "ssh-agent";
 
-    connect(&proc, SIGNAL(processExited(KProcess*)),
-            SLOT(slotProcessExited(KProcess*)));
-    connect(&proc, SIGNAL(receivedStdout(KProcess*, char*, int)),
-            SLOT(slotReceivedStdout(KProcess*, char*, int)));
-    connect(&proc, SIGNAL(receivedStderr(KProcess*, char*, int)),
-            SLOT(slotReceivedStderr(KProcess*, char*, int)) );
+    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)) );
 
     proc.start(KProcess::NotifyOnExit, KProcess::All);
 
diff --git a/cervisia/cvsservice/sshagent.h b/cervisia/cvsservice/sshagent.h
index beb0e488..3de23076 100644
--- a/cervisia/cvsservice/sshagent.h
+++ b/cervisia/cvsservice/sshagent.h
@@ -21,9 +21,9 @@
 #ifndef SSHAGENT_H
 #define SSHAGENT_H
 
-#include <qobject.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
 
 class KProcess;
 
@@ -33,7 +33,7 @@ class SshAgent : public QObject
     Q_OBJECT
 
 public:
-    SshAgent(QObject* parent = 0, const char* name = 0);
+    SshAgent(TQObject* parent = 0, const char* name = 0);
     ~SshAgent();
 
     bool querySshAgent();
@@ -41,8 +41,8 @@ public:
     void killSshAgent();
 
     bool isRunning() const { return m_isRunning; }
-    QString pid() const { return m_pid; }
-    QString authSock() const { return m_authSock; }
+    TQString pid() const { return m_pid; }
+    TQString authSock() const { return m_authSock; }
 
 private slots:
     void slotProcessExited(KProcess*);
@@ -52,12 +52,12 @@ private slots:
 private:
     bool startSshAgent();
 
-    QStringList    m_outputLines;
+    TQStringList    m_outputLines;
 
     static bool    m_isRunning;
     static bool    m_isOurAgent;
-    static QString m_authSock;
-    static QString m_pid;
+    static TQString m_authSock;
+    static TQString m_pid;
 };