TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


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

7 files changed, 19 insertions, 16 deletions

diff --git a/cervisia/cvsservice/DESIGN b/cervisia/cvsservice/DESIGN
index cbd414da..90ad3f18 100644
--- a/cervisia/cvsservice/DESIGN
+++ b/cervisia/cvsservice/DESIGN
@@ -16,7 +16,7 @@ The cvs DCOP service consists of the following three parts:
 
 3. CvsJob     - This class represents a cvs job. You can execute and cancel it,
                 and you can retrieve the output of the cvs client by either
-                connecting to the proper DCOP signals or by using the output()
+                connecting to the proper DCOP Q_SIGNALS or by using the output()
                 method. There are two types of jobs. First the non-concurrent
                 job which has to run alone, like cvs update or import. Second
                 the jobs which can run concurrently like cvs log or annotate.
@@ -45,7 +45,7 @@ How-to use this service in C++ applications:
     // call "cvs log" for cervisiapart.h
     DCOPRef job = cvsService.log("cervisiapart.h");
 
-    // connect to signals to get output
+    // connect to Q_SIGNALS to get output
     connectDCOPSignal(job.app(), job.obj(), "jobExited(bool, int)", [MY SLOT]);
     connectDCOPSignal(job.app(), job.obj(), "receivedStdout(QString)",
                       [MY SLOT]);
diff --git a/cervisia/cvsservice/cvsjob.h b/cervisia/cvsservice/cvsjob.h
index 88aaa9fb..f469f91c 100644
--- a/cervisia/cvsservice/cvsjob.h
+++ b/cervisia/cvsservice/cvsjob.h
@@ -32,6 +32,7 @@ class KProcess;
 class KDE_EXPORT CvsJob : public TQObject, public DCOPObject
 {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 
 public:
diff --git a/cervisia/cvsservice/cvsloginjob.cpp b/cervisia/cvsservice/cvsloginjob.cpp
index ad6f9176..0288df0e 100644
--- a/cervisia/cvsservice/cvsloginjob.cpp
+++ b/cervisia/cvsservice/cvsloginjob.cpp
@@ -97,15 +97,15 @@ bool CvsLoginJob::execute()
         kdDebug(8051) << "process output = " << line << endl;
 
         // retrieve repository from 'Logging in to'-line
-        if( line.contains(LOGIN_PHRASE) )
+        if( line.tqcontains(LOGIN_PHRASE) )
         {
-            repository = line.remove(0, line.find(":pserver:"));
+            repository = line.remove(0, line.tqfind(":pserver:"));
             continue;
         }
 
         // process asks for the password
         // search case insensitive as cvs and cvsnt use different capitalization
-        if( line.contains(PASS_PHRASE, false) )
+        if( line.tqcontains(PASS_PHRASE, false) )
         {
             kdDebug(8051) << "process waits for the password." << endl;
 
@@ -123,7 +123,7 @@ bool CvsLoginJob::execute()
                 m_Proc->writeLine(password);
 
                 // wait for the result
-                while( !line.contains(FAILURE_PHRASE) )
+                while( !line.tqcontains(FAILURE_PHRASE) )
                 {
                     line = m_Proc->readLine();
                     if( line.isNull() )
diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp
index d5f06ef4..2ac4c241 100644
--- a/cervisia/cvsservice/repository.cpp
+++ b/cervisia/cvsservice/repository.cpp
@@ -144,7 +144,7 @@ bool Repository::setWorkingCopy(const TQString& dirName)
         return false;
 
     d->workingCopy = path;
-    d->location    = TQString::null;
+    d->location    = TQString();
 
     // determine path to the repository
     TQFile rootFile(path + "/CVS/Root");
@@ -157,7 +157,7 @@ bool Repository::setWorkingCopy(const TQString& dirName)
 
     // add identities (ssh-add) to ssh-agent
     // TODO CL make sure this is called only once
-    if( d->location.contains(":ext:", false) > 0 )
+    if( d->location.tqcontains(":ext:", false) > 0 )
     {
         SshAgent ssh;
         ssh.addSshIdentities();
@@ -223,11 +223,11 @@ void Repository::Private::readConfig()
     //
     // In order to be able to read this group, we then have to manually add
     // the port number to it.
-    TQString repositoryGroup = TQString::fromLatin1("Repository-") + location;
+    TQString repositoryGroup = TQString::tqfromLatin1("Repository-") + location;
     if( !config->hasGroup(repositoryGroup) )
     {
         // find the position of the first path separator
-        const int insertPos = repositoryGroup.find('/');
+        const int insertPos = repositoryGroup.tqfind('/');
         if( insertPos > 0 )
         {
             // add port to location
diff --git a/cervisia/cvsservice/repository.h b/cervisia/cvsservice/repository.h
index 6f638949..6739c0d6 100644
--- a/cervisia/cvsservice/repository.h
+++ b/cervisia/cvsservice/repository.h
@@ -35,6 +35,7 @@ class KDE_EXPORT Repository : public TQObject, public DCOPObject
 {
     K_DCOP
     Q_OBJECT
+//    TQ_OBJECT
 
 public:
     Repository();
diff --git a/cervisia/cvsservice/sshagent.cpp b/cervisia/cvsservice/sshagent.cpp
index 4f8abd25..6c6845f6 100644
--- a/cervisia/cvsservice/sshagent.cpp
+++ b/cervisia/cvsservice/sshagent.cpp
@@ -32,12 +32,12 @@
 // initialize static member variables
 bool    SshAgent::m_isRunning  = false;
 bool    SshAgent::m_isOurAgent = false;
-TQString SshAgent::m_authSock   = TQString::null;
-TQString SshAgent::m_pid        = TQString::null;
+TQString SshAgent::m_authSock   = TQString();
+TQString SshAgent::m_pid        = TQString();
 
 
-SshAgent::SshAgent(TQObject* parent, const char* name)
-    : TQObject(parent, name)
+SshAgent::SshAgent(TQObject* tqparent, const char* name)
+    : TQObject(tqparent, name)
 {
 }
 
diff --git a/cervisia/cvsservice/sshagent.h b/cervisia/cvsservice/sshagent.h
index 3de23076..e14bc0ae 100644
--- a/cervisia/cvsservice/sshagent.h
+++ b/cervisia/cvsservice/sshagent.h
@@ -28,12 +28,13 @@
 class KProcess;
 
 
-class SshAgent : public QObject
+class SshAgent : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SshAgent(TQObject* parent = 0, const char* name = 0);
+    SshAgent(TQObject* tqparent = 0, const char* name = 0);
     ~SshAgent();
 
     bool querySshAgent();