Port kdesvn to TQt4

This enables compilation under both Qt3 and Qt4


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

1 files changed, 102 insertions, 102 deletions

diff --git a/src/kiosvn/kiosvn.cpp b/src/kiosvn/kiosvn.cpp
index 667d456..b71a1d8 100644
--- a/src/kiosvn/kiosvn.cpp
+++ b/src/kiosvn/kiosvn.cpp
@@ -50,10 +50,10 @@
 #include <ktempdir.h>
 #include <ksock.h>
 #include <dcopclient.h>
-#include <qcstring.h>
+#include <tqcstring.h>
 #include <kmimetype.h>
 #include <krun.h>
-#include <qtextstream.h>
+#include <tqtextstream.h>
 
 #include <stdlib.h>
 #include <math.h>
@@ -118,27 +118,27 @@ KioSvnData::~KioSvnData()
 
 svn::Revision KioSvnData::urlToRev(const KURL&url)
 {
-    QMap<QString,QString> q = url.queryItems();
+    TQMap<TQString,TQString> q = url.queryItems();
 
     /* we try to check if it is ssh and try to get a password for it */
-    QString proto = url.protocol();
+    TQString proto = url.protocol();
 
-    if (proto.find("ssh")!=-1) {
+    if (proto.tqfind("ssh")!=-1) {
         SshAgent ag;
         ag.addSshIdentities();
     }
 
     svn::Revision rev,tmp;
     rev = svn::Revision::UNDEFINED;
-    if (q.find("rev")!=q.end()) {
-        QString v = q["rev"];
+    if (q.tqfind("rev")!=q.end()) {
+        TQString v = q["rev"];
         m_Svnclient->url2Revision(v,rev,tmp);
     }
     return rev;
 }
 
 
-kio_svnProtocol::kio_svnProtocol(const QCString &pool_socket, const QCString &app_socket)
+kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket)
     : SlaveBase("kio_ksvn", pool_socket, app_socket),StreamWrittenCb()
 {
     m_pData=new KioSvnData(this);
@@ -163,8 +163,8 @@ int kdemain(int argc, char **argv)
     kdDebug()<<"kdemain" << endl;
     KInstance instance( "kio_ksvn" );
    // start the kdesvnd DCOP service
-    QString error;
-    QCString appId;
+    TQString error;
+    TQCString appId;
 
     kdDebug(7101) << "*** Starting kio_ksvn " << endl;
 
@@ -197,7 +197,7 @@ void kio_svnProtocol::listDir(const KURL&url)
     try {
         dlist = m_pData->m_Svnclient->list(makeSvnUrl(url),rev,rev,svn::DepthImmediates,false);
     } catch (const svn::ClientException&e) {
-        QString ex = e.msg();
+        TQString ex = e.msg();
         kdDebug()<<ex<<endl;
         error(KIO::ERR_CANNOT_ENTER_DIRECTORY,ex);
         return;
@@ -208,7 +208,7 @@ void kio_svnProtocol::listDir(const KURL&url)
         if (!dlist[i] || dlist[i]->name().isEmpty()) {
             continue;
         }
-        QDateTime dt = svn::DateTime(dlist[i]->time());
+        TQDateTime dt = svn::DateTime(dlist[i]->time());
         if (createUDSEntry(dlist[i]->name(),
             dlist[i]->lastAuthor(),
             dlist[i]->size(),
@@ -236,7 +236,7 @@ void kio_svnProtocol::stat(const KURL& url)
     try {
          e = m_pData->m_Svnclient->info(makeSvnUrl(url),svn::DepthEmpty,rev,peg);
     } catch  (const svn::ClientException&e) {
-        QString ex = e.msg();
+        TQString ex = e.msg();
         kdDebug()<<ex<<endl;
         error( KIO::ERR_SLAVE_DEFINED,ex);
         return;
@@ -249,7 +249,7 @@ void kio_svnProtocol::stat(const KURL& url)
     }
 
     KIO::UDSEntry entry;
-    QDateTime dt;
+    TQDateTime dt;
     if (dummy) {
         createUDSEntry(url.filename(),"",0,true,dt.toTime_t(),entry);
     } else {
@@ -279,14 +279,14 @@ void kio_svnProtocol::get(const KURL& url)
     try {
         m_pData->m_Svnclient->cat(dstream,makeSvnUrl(url),rev,rev);
     } catch (const svn::ClientException&e) {
-        QString ex = e.msg();
+        TQString ex = e.msg();
         kdDebug()<<ex<<endl;
         error( KIO::ERR_SLAVE_DEFINED,"Subversion error "+ex);
         finished();
         return;
     }
     totalSize(dstream.written());
-    data(QByteArray()); // empty array means we're done sending the data
+    data(TQByteArray()); // empty array means we're done sending the data
     finished();
 }
 
@@ -310,7 +310,7 @@ void kio_svnProtocol::mkdir(const KURL &url, int)
 void kio_svnProtocol::mkdir(const KURL::List &urls, int)
 {
     svn::Pathes p;
-    for ( QValueListConstIterator<KURL> it = urls.begin(); it != urls.end() ; ++it ) {
+    for ( TQValueListConstIterator<KURL> it = urls.begin(); it != urls.end() ; ++it ) {
         p.append((*it).path());
     }
     try {
@@ -325,7 +325,7 @@ void kio_svnProtocol::mkdir(const KURL::List &urls, int)
 void kio_svnProtocol::rename(const KURL&src,const KURL&target,bool force)
 {
     kdDebug()<<"kio_svn::rename "<< src << " to " << target <<  endl;
-    QString msg;
+    TQString msg;
     m_pData->m_CurrentContext->setLogMessage(getDefaultLog());
     try {
         m_pData->m_Svnclient->move(makeSvnUrl(src),makeSvnUrl(target),force);
@@ -371,7 +371,7 @@ void kio_svnProtocol::del(const KURL&src,bool isfile)
         svn::Targets target(makeSvnUrl(src));
         m_pData->m_Svnclient->remove(target,false);
     } catch (const svn::ClientException&e) {
-        QString ex = e.msg();
+        TQString ex = e.msg();
         kdDebug()<<ex<<endl;
         error( KIO::ERR_SLAVE_DEFINED,ex);
     }
@@ -379,7 +379,7 @@ void kio_svnProtocol::del(const KURL&src,bool isfile)
     finished();
 }
 
-bool kio_svnProtocol::getLogMsg(QString&t)
+bool kio_svnProtocol::getLogMsg(TQString&t)
 {
     svn::CommitItemList _items;
     return m_pData->m_Listener.contextGetLogMessage(t,_items);
@@ -403,10 +403,10 @@ bool kio_svnProtocol::checkWc(const KURL&url)
     return false;
 }
 
-QString kio_svnProtocol::makeSvnUrl(const KURL&url,bool check_Wc)
+TQString kio_svnProtocol::makeSvnUrl(const KURL&url,bool check_Wc)
 {
-    QString res;
-    QString proto = svn::Url::transformProtokoll(url.protocol());
+    TQString res;
+    TQString proto = svn::Url::transformProtokoll(url.protocol());
     if (proto=="file" && check_Wc)
     {
         if (checkWc(url))
@@ -415,22 +415,22 @@ QString kio_svnProtocol::makeSvnUrl(const KURL&url,bool check_Wc)
         }
     }
 
-    QStringList s = QStringList::split("://",res);
-    QString base = url.path();
-    QString host = url.host();
-    QString user = (url.hasUser()?url.user()+(url.hasPass()?":"+url.pass():""):"");
+    TQStringList s = TQStringList::split("://",res);
+    TQString base = url.path();
+    TQString host = url.host();
+    TQString user = (url.hasUser()?url.user()+(url.hasPass()?":"+url.pass():""):"");
     if (host.isEmpty()) {
         res=proto+"://"+base;
     } else {
         res = proto+"://"+(user.isEmpty()?"":user+"@")+host+base;
     }
     if (base.isEmpty()) {
-        throw svn::ClientException(QString("'")+res+QString("' is not a valid subversion url"));
+        throw svn::ClientException(TQString("'")+res+TQString("' is not a valid subversion url"));
     }
     return res;
 }
 
-bool kio_svnProtocol::createUDSEntry( const QString& filename, const QString& user, long long int size, bool isdir, time_t mtime, KIO::UDSEntry& entry)
+bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, KIO::UDSEntry& entry)
 {
 #if 0
         kdDebug() << "MTime : " << ( long )mtime << endl;
@@ -467,10 +467,10 @@ bool kio_svnProtocol::createUDSEntry( const QString& filename, const QString& us
         return true;
 }
 
-void kio_svnProtocol::special(const QByteArray& data)
+void kio_svnProtocol::special(const TQByteArray& data)
 {
     kdDebug()<<"kio_svnProtocol::special"<<endl;
-    QDataStream stream(data,IO_ReadOnly);
+    TQDataStream stream(data,IO_ReadOnly);
     int tmp;
     stream >> tmp;
     kdDebug() << "kio_svnProtocol::special " << tmp << endl;
@@ -479,7 +479,7 @@ void kio_svnProtocol::special(const QByteArray& data)
         {
             KURL repository, wc;
             int revnumber;
-            QString revkind;
+            TQString revkind;
             stream >> repository;
             stream >> wc;
             stream >> revnumber;
@@ -492,7 +492,7 @@ void kio_svnProtocol::special(const QByteArray& data)
         {
             KURL wc;
             int revnumber;
-            QString revkind;
+            TQString revkind;
             stream >> wc;
             stream >> revnumber;
             stream >> revkind;
@@ -516,7 +516,7 @@ void kio_svnProtocol::special(const QByteArray& data)
         {
             kdDebug(0) << "kio_svnProtocol LOG" << endl;
             int revstart, revend;
-            QString revkindstart, revkindend;
+            TQString revkindstart, revkindend;
             KURL::List targets;
             stream >> revstart;
             stream >> revkindstart;
@@ -605,7 +605,7 @@ void kio_svnProtocol::special(const QByteArray& data)
             KURL wc,url;
             bool recurse;
             int revnumber;
-            QString revkind;
+            TQString revkind;
             stream >> wc;
             stream >> url;
             stream >> recurse;
@@ -620,7 +620,7 @@ void kio_svnProtocol::special(const QByteArray& data)
             KURL url1,url2;
             int rev1, rev2;
             bool recurse;
-            QString revkind1, revkind2;
+            TQString revkind1, revkind2;
             stream >> url1;
             stream >> url2;
             stream >> rev1;
@@ -637,7 +637,7 @@ void kio_svnProtocol::special(const QByteArray& data)
     finished();
 }
 
-void kio_svnProtocol::update(const KURL&url,int revnumber,const QString&revkind)
+void kio_svnProtocol::update(const KURL&url,int revnumber,const TQString&revkind)
 {
     svn::Revision where(revnumber,revkind);
     /* update is always local - so make a path instead URI */
@@ -664,22 +664,22 @@ void kio_svnProtocol::status(const KURL&wc,bool cR,bool rec)
         error(KIO::ERR_SLAVE_DEFINED,e.msg());
         return;
     }
-    kdDebug()<<"Status got " << dlist.count() << " entries." << endl;
+    kdDebug()<<"tqStatus got " << dlist.count() << " entries." << endl;
     for (unsigned j=0;j<dlist.count();++j) {
         if (!dlist[j]) {
             continue;
         }
-        //QDataStream stream(params, IO_WriteOnly);
-        setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"path",dlist[j]->path());
-        setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"text",QString::number(dlist[j]->textStatus()));
-        setMetaData(QString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "prop",
-                    QString::number(dlist[j]->propStatus()));
-        setMetaData(QString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "reptxt",
-                    QString::number(dlist[j]->reposTextStatus()));
-        setMetaData(QString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "repprop",
-                    QString::number(dlist[j]->reposPropStatus()));
-        setMetaData(QString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "rev",
-                    QString::number(dlist[j]->entry().cmtRev()));
+        //TQDataStream stream(params, IO_WriteOnly);
+        setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"path",dlist[j]->path());
+        setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"text",TQString::number(dlist[j]->texttqStatus()));
+        setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "prop",
+                    TQString::number(dlist[j]->proptqStatus()));
+        setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "reptxt",
+                    TQString::number(dlist[j]->reposTexttqStatus()));
+        setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "repprop",
+                    TQString::number(dlist[j]->reposProptqStatus()));
+        setMetaData(TQString::number(m_pData->m_Listener.counter() ).rightJustify( 10,'0' )+ "rev",
+                    TQString::number(dlist[j]->entry().cmtRev()));
         m_pData->m_Listener.incCounter();
     }
 }
@@ -687,23 +687,23 @@ void kio_svnProtocol::status(const KURL&wc,bool cR,bool rec)
 void kio_svnProtocol::commit(const KURL::List&url)
 {
     /// @todo replace with direct call to kdesvn?
-    QByteArray reply;
-    QByteArray params;
-    QCString replyType;
-    QString msg;
+    TQByteArray reply;
+    TQByteArray params;
+    TQCString replyType;
+    TQString msg;
 
     if (!dcopClient()->call("kded","kdesvnd","get_logmsg()",params,replyType,reply)) {
         msg = "Communication with dcop failed";
         kdWarning()<<msg<<endl;
         return;
     }
-    if (replyType!="QStringList") {
+    if (replyType!=TQSTRINGLIST_OBJECT_NAME_STRING) {
         msg = "Wrong reply type";
         kdWarning()<<msg<<endl;
         return;
     }
-    QDataStream stream2(reply,IO_ReadOnly);
-    QStringList lt;
+    TQDataStream stream2(reply,IO_ReadOnly);
+    TQStringList lt;
     stream2>>lt;
     if (lt.count()!=1) {
         msg = "Wrong or missing log (may cancel pressed).";
@@ -711,7 +711,7 @@ void kio_svnProtocol::commit(const KURL::List&url)
         return;
     }
     msg = lt[0];
-    QValueList<svn::Path> targets;
+    TQValueList<svn::Path> targets;
     for (unsigned j=0; j<url.count();++j) {
         targets.push_back(svn::Path(url[j].path()));
     }
@@ -722,25 +722,25 @@ void kio_svnProtocol::commit(const KURL::List&url)
         error(KIO::ERR_SLAVE_DEFINED,e.msg());
     }
     for (unsigned j=0;j<url.count();++j) {
-        QString userstring;
+        TQString userstring;
         if (nnum!=svn::Revision::UNDEFINED) {
-            userstring = i18n( "Committed revision %1." ).arg(nnum.toString());
+            userstring = i18n( "Committed revision %1." ).tqarg(nnum.toString());
         } else {
             userstring = i18n ( "Nothing to commit." );
         }
-        setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "path", url[j].path() );
-        setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "action", "0" );
-        setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "kind", "0" );
-        setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "mime_t", "" );
-        setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "content", "0" );
-        setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "prop", "0" );
-        setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "rev" , QString::number(nnum) );
-        setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "string", userstring );
+        setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "path", url[j].path() );
+        setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "action", "0" );
+        setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "kind", "0" );
+        setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "mime_t", "" );
+        setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "content", "0" );
+        setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "prop", "0" );
+        setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "rev" , TQString::number(nnum) );
+        setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "string", userstring );
         m_pData->m_Listener.incCounter();
     }
 }
 
-void kio_svnProtocol::checkout(const KURL&src,const KURL&target,const int rev, const QString&revstring)
+void kio_svnProtocol::checkout(const KURL&src,const KURL&target,const int rev, const TQString&revstring)
 {
     svn::Revision where(rev,revstring);
     svn::Revision peg = svn::Revision::UNDEFINED;
@@ -753,7 +753,7 @@ void kio_svnProtocol::checkout(const KURL&src,const KURL&target,const int rev, c
     }
 }
 
-void kio_svnProtocol::svnlog(int revstart,const QString&revstringstart,int revend, const QString&revstringend, const KURL::List&urls)
+void kio_svnProtocol::svnlog(int revstart,const TQString&revstringstart,int revend, const TQString&revstringend, const KURL::List&urls)
 {
     svn::Revision start(revstart,revstringstart);
     svn::Revision end(revend,revstringend);
@@ -768,33 +768,33 @@ void kio_svnProtocol::svnlog(int revstart,const QString&revstringstart,int reven
             break;
         }
         if (!logs) {
-            setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify(10,'0')+"path",urls[j].path());
-            setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify(10,'0')+"string",
+            setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify(10,'0')+"path",urls[j].path());
+            setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify(10,'0')+"string",
                 i18n("Empty logs"));
             m_pData->m_Listener.incCounter();
             continue;
         }
         for (unsigned int i = 0; i < logs->count();++i) {
-            setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "path",urls[j].path());
-            setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "rev",
-                QString::number( (*logs)[i].revision));
-            setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"author",
+            setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "path",urls[j].path());
+            setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "rev",
+                TQString::number( (*logs)[i].revision));
+            setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"author",
                 (*logs)[i].author);
-            setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"logmessage",
+            setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+"logmessage",
                 (*logs)[i].message);
             m_pData->m_Listener.incCounter();
             for (unsigned z = 0; z<(*logs)[i].changedPaths.count();++z) {
-                setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "rev",
-                    QString::number( (*logs)[i].revision));
-                setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "path",urls[j].path());
-                setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "loggedpath",
+                setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "rev",
+                    TQString::number( (*logs)[i].revision));
+                setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "path",urls[j].path());
+                setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "loggedpath",
                     (*logs)[i].changedPaths[z].path);
-                setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "loggedaction",
-                    QChar((*logs)[i].changedPaths[z].action));
-                setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "loggedcopyfrompath",
+                setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "loggedaction",
+                    TQChar((*logs)[i].changedPaths[z].action));
+                setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "loggedcopyfrompath",
                     (*logs)[i].changedPaths[z].copyFromPath);
-                setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "loggedcopyfromrevision",
-                    QString::number((*logs)[i].changedPaths[z].copyFromRevision));
+                setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "loggedcopyfromrevision",
+                    TQString::number((*logs)[i].changedPaths[z].copyFromRevision));
                 m_pData->m_Listener.incCounter();
             }
         }
@@ -803,7 +803,7 @@ void kio_svnProtocol::svnlog(int revstart,const QString&revstringstart,int reven
 
 void kio_svnProtocol::revert(const KURL::List&l)
 {
-    QValueList<svn::Path> list;
+    TQValueList<svn::Path> list;
     for (unsigned j=0; j<l.count();++j) {
         list.append(svn::Path(l[j].path()));
     }
@@ -815,7 +815,7 @@ void kio_svnProtocol::revert(const KURL::List&l)
     }
 }
 
-void kio_svnProtocol::wc_switch(const KURL&wc,const KURL&target,bool rec,int rev,const QString&revstring)
+void kio_svnProtocol::wc_switch(const KURL&wc,const KURL&target,bool rec,int rev,const TQString&revstring)
 {
     svn::Revision where(rev,revstring);
     svn::Path wc_path(wc.path());
@@ -826,15 +826,15 @@ void kio_svnProtocol::wc_switch(const KURL&wc,const KURL&target,bool rec,int rev
     }
 }
 
-void kio_svnProtocol::diff(const KURL&uri1,const KURL&uri2,int rnum1,const QString&rstring1,int rnum2, const QString&rstring2,bool rec)
+void kio_svnProtocol::diff(const KURL&uri1,const KURL&uri2,int rnum1,const TQString&rstring1,int rnum2, const TQString&rstring2,bool rec)
 {
-    QByteArray ex;
+    TQByteArray ex;
     /// @todo read settings for diff (ignore contentype)
     try {
         svn::Revision r1(rnum1,rstring1);
         svn::Revision r2(rnum2,rstring2);
-        QString u1 = makeSvnUrl(uri1,true);
-        QString u2 = makeSvnUrl(uri2,true);
+        TQString u1 = makeSvnUrl(uri1,true);
+        TQString u2 = makeSvnUrl(uri2,true);
         KTempDir tdir;
         kdDebug() << "kio_ksvn::diff : " << u1 << " at revision " << r1.toString() << " with "
             << u2 << " at revision " << r2.toString()
@@ -847,10 +847,10 @@ void kio_svnProtocol::diff(const KURL&uri1,const KURL&uri2,int rnum1,const QStri
         error(KIO::ERR_SLAVE_DEFINED,e.msg());
         return;
     }
-    QString out = QString::FROMUTF8(ex);
-    QTextIStream stream(&out);
+    TQString out = TQString::FROMUTF8(ex);
+    TQTextIStream stream(&out);
     while (!stream.atEnd()) {
-        setMetaData(QString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "diffresult",stream.readLine());
+        setMetaData(TQString::number(m_pData->m_Listener.counter()).rightJustify( 10,'0' )+ "diffresult",stream.readLine());
         m_pData->m_Listener.incCounter();
     }
 }
@@ -858,9 +858,9 @@ void kio_svnProtocol::diff(const KURL&uri1,const KURL&uri2,int rnum1,const QStri
 void kio_svnProtocol::import(const KURL& repos, const KURL& wc)
 {
     try {
-        QString target = makeSvnUrl(repos);
-        QString path = wc.path();
-        m_pData->m_Svnclient->import(svn::Path(path),target,QString::null,svn::DepthInfinity,false,false);
+        TQString target = makeSvnUrl(repos);
+        TQString path = wc.path();
+        m_pData->m_Svnclient->import(svn::Path(path),target,TQString(),svn::DepthInfinity,false,false);
     } catch (const svn::ClientException&e) {
         error(KIO::ERR_SLAVE_DEFINED,e.msg());
         return;
@@ -870,7 +870,7 @@ void kio_svnProtocol::import(const KURL& repos, const KURL& wc)
 
 void kio_svnProtocol::add(const KURL& wc)
 {
-    QString path = wc.path();
+    TQString path = wc.path();
     try {
                                                /* rec */
         m_pData->m_Svnclient->add(svn::Path(path),svn::DepthInfinity);
@@ -884,7 +884,7 @@ void kio_svnProtocol::add(const KURL& wc)
 void kio_svnProtocol::wc_delete(const KURL::List&l)
 {
     svn::Pathes p;
-    for ( QValueListConstIterator<KURL> it = l.begin(); it != l.end() ; ++it ) {
+    for ( TQValueListConstIterator<KURL> it = l.begin(); it != l.end() ; ++it ) {
         p.append((*it).path());
     }
     try {
@@ -920,7 +920,7 @@ void kio_svnProtocol::streamSendMime(KMimeMagicResult* mt)
     }
 }
 
-void kio_svnProtocol::streamPushData(QByteArray array)
+void kio_svnProtocol::streamPushData(TQByteArray array)
 {
     data(array);
 }
@@ -941,9 +941,9 @@ void kio_svnProtocol::streamTotalSizeNull()
 /*!
     \fn kio_svnProtocol::getDefaultLog()
  */
-QString kio_svnProtocol::getDefaultLog()
+TQString kio_svnProtocol::getDefaultLog()
 {
-    QString res = QString::null;
+    TQString res = TQString();
     Kdesvnsettings::self()->readConfig();
     if (Kdesvnsettings::kio_use_standard_logmsg()) {
         res = Kdesvnsettings::kio_standard_logmsg();