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, 49 insertions, 53 deletions

diff --git a/src/svnqt/client.hpp b/src/svnqt/client.hpp
index 622c0be..93dcff6 100644
--- a/src/svnqt/client.hpp
+++ b/src/svnqt/client.hpp
@@ -46,16 +46,12 @@
 #include "svnqt/svnstream.hpp"
 
 // qt
-#include <qglobal.h>
-
-#if QT_VERSION < 0x040000
-    #include <qstring.h>
-    #include <qpair.h>
-    #include <qvaluelist.h>
-    #include <qmap.h>
-#else
-    #include <QtCore>
-#endif
+#include <tqglobal.h>
+
+#include <tqstring.h>
+#include <tqpair.h>
+#include <tqvaluelist.h>
+#include <tqmap.h>
 
 // svnqt
 #include "svnqt/context.hpp"
@@ -70,7 +66,7 @@
 #include "svnqt/diffoptions.hpp"
 #include "svnqt/conflictresult.hpp"
 
-class QStringList;
+class TQStringList;
 
 namespace svn
 {
@@ -79,7 +75,7 @@ namespace svn
    * Never use an object of this as global static! This will make problems with subversion
    * initialize.
    */
-  class SVNQT_EXPORT Client
+  class SVNTQT_EXPORT Client
   {
   public:
 
@@ -129,7 +125,7 @@ namespace svn
      * @param revision list specific revision when browsing remote, on working copies parameter will ignored
      * @param detailed_remote if on remote listing detailed item info should get if possible
      *                        that may slow so should configureable in frontends!
-     * @return vector with Status entries.
+     * @return vector with tqStatus entries.
      */
     virtual StatusEntries
     status (const Path& path,
@@ -150,10 +146,10 @@ namespace svn
      * @param path File to gather status.
      * @param update if check against repository if new updates are there (for WC only)
      * @param revision list specific revision when browsing remote, on working copies parameter will ignored
-     * @return a Status with Statis.isVersioned = FALSE
+     * @return a tqStatus with Statis.isVersioned = FALSE
      */
     virtual StatusPtr
-    singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException)=0;
+    singletqStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException)=0;
 
   /**
      * Executes a revision checkout.
@@ -180,8 +176,8 @@ namespace svn
      * @exception ClientException
      */
     virtual void
-    relocate (const Path & path, const QString &from_url,
-              const QString &to_url, bool recurse) throw (ClientException)=0;
+    relocate (const Path & path, const TQString &from_url,
+              const TQString &to_url, bool recurse) throw (ClientException)=0;
 
     /**
      * Sets a single file for deletion.
@@ -222,11 +218,11 @@ namespace svn
      * @param depth if @a path is a folder add items recursive depending on value if it.
      * @param force if true, do not error on already-versioned items.
      * @param no_ignore if false don't add files or directories that match ignore patterns. When build against svn 1.2 always false
-     * @param add_parents if true, go up to the next versioned folder and add all between path and this folder.
+     * @param add_tqparents if true, go up to the next versioned folder and add all between path and this folder.
      * @exception ClientException
      */
     virtual void
-    add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_parents = true) throw (ClientException)=0;
+    add (const Path & path, svn::Depth depth,bool force=false, bool no_ignore=false, bool add_tqparents = true) throw (ClientException)=0;
 
     /**
      * Updates the file or directory.
@@ -253,7 +249,7 @@ namespace svn
      * @param revision revision to retrieve
      * @return contents of the file
      */
-    virtual QByteArray
+    virtual TQByteArray
     cat (const Path & path,
           const Revision & revision,
           const Revision & peg_revision=svn_opt_revision_unspecified) throw (ClientException)=0;
@@ -284,7 +280,7 @@ namespace svn
      */
     virtual void
     get (const Path & path,
-          const QString  & target,
+          const TQString  & target,
           const Revision & revision,
           const Revision & peg_revision=svn_opt_revision_unspecified) throw (ClientException)=0;
 
@@ -323,7 +319,7 @@ namespace svn
      */
     virtual svn::Revision
     commit (const Targets & targets,
-            const QString& message,
+            const TQString& message,
             svn::Depth depth,bool keep_locks=true,
             const svn::StringArray&contents=svn::StringArray(),
             const PropertiesMap&revProps=PropertiesMap(),
@@ -376,13 +372,13 @@ namespace svn
      * must not exist (\sa svn_client_move4)
      *
      * @param path
-     * @param message log message. if it is QString::null asks when working on repository
-     * @param makeParent create parent folders if not existant (only when build with svn 1.5 or above)
+     * @param message log message. if it is TQString() asks when working on repository
+     * @param makeParent create tqparent folders if not existant (only when build with svn 1.5 or above)
      * @exception ClientException
      */
     virtual svn::Revision
     mkdir (const Path & path,
-           const QString& message,
+           const TQString& message,
            bool makeParent=true,
            const PropertiesMap&revProps=PropertiesMap()
           ) throw (ClientException)=0;
@@ -393,13 +389,13 @@ namespace svn
      * the callback asks for a logmessage.
      *
      * @param targets encoded pathes to create
-     * @param message log message. if it is QString::null asks when working on repository
-     * @param makeParent create parent folders if not existant (only when build with svn 1.5 or above)
+     * @param message log message. if it is TQString() asks when working on repository
+     * @param makeParent create tqparent folders if not existant (only when build with svn 1.5 or above)
      * @exception ClientException
      */
     virtual svn::Revision
     mkdir (const Targets & targets,
-           const QString& message,
+           const TQString& message,
            bool makeParent=true,
            const PropertiesMap&revProps=PropertiesMap()
           ) throw (ClientException)=0;
@@ -432,7 +428,7 @@ namespace svn
      * @param native_eol Either "LF", "CR" or "CRLF" or NULL.
      * @param ignore_externals don't process externals definitions as part of this operation.
      * @param recurse if true, export recursively.<br>
-      Otherwise, export just the directory represented by from and its immediate non-directory children.
+      Otherwise, export just the directory represented by from and its immediate non-directory tqchildren.
      */
     virtual svn_revnum_t
     doExport (const Path & srcPath,
@@ -440,7 +436,7 @@ namespace svn
               const Revision & revision,
               const Revision & peg = Revision::UNDEFINED,
               bool overwrite=false,
-              const QString&native_eol=QString::null,
+              const TQString&native_eol=TQString(),
               bool ignore_externals = false,
               svn::Depth depth=svn::DepthInfinity
               ) throw (ClientException)=0;
@@ -452,7 +448,7 @@ namespace svn
      */
     virtual svn_revnum_t
     doSwitch (
-              const Path & path, const QString& url,
+              const Path & path, const TQString& url,
               const Revision & revision,
               Depth depth,
               const Revision & peg=Revision::UNDEFINED,
@@ -473,8 +469,8 @@ namespace svn
      * @exception ClientException
      */
     virtual svn::Revision
-    import (const Path & path, const QString& url,
-            const QString& message,
+    import (const Path & path, const TQString& url,
+            const TQString& message,
             svn::Depth depth,
             bool no_ignore,bool no_unknown_nodetype,
             const PropertiesMap&revProps=PropertiesMap()) throw (ClientException)=0;
@@ -615,7 +611,7 @@ namespace svn
      * @return delta between the files
      * @exception ClientException
      */
-    virtual QByteArray
+    virtual TQByteArray
             diff_peg(const Path & tmpPath, const Path & path,const Path&relativeTo,
           const Revision & revision1, const Revision & revision2, const Revision& peg_revision,
           Depth depth, bool ignoreAncestry,
@@ -627,7 +623,7 @@ namespace svn
     /**
      * Same as other diff but extra options always set to empty list.
      */
-    virtual QByteArray
+    virtual TQByteArray
             diff_peg (const Path & tmpPath, const Path & path,const Path&relativeTo,
                   const Revision & revision1, const Revision & revision2, const Revision& peg_revision,
                   Depth depth, bool ignoreAncestry,
@@ -657,7 +653,7 @@ namespace svn
      * @return delta between the files
      * @exception ClientException
      */
-    virtual QByteArray
+    virtual TQByteArray
             diff (const Path & tmpPath, const Path & path1,const Path & path2,const Path&relativeTo,
           const Revision & revision1, const Revision & revision2,
           Depth depth, bool ignoreAncestry,
@@ -669,7 +665,7 @@ namespace svn
     /**
      * Same as other diff but extra options and changelists always set to empty list.
      */
-    virtual QByteArray
+    virtual TQByteArray
             diff (const Path & tmpPath, const Path & path1,const Path & path2,const Path&relativeTo,
                   const Revision & revision1, const Revision & revision2,
                   Depth depth, bool ignoreAncestry,
@@ -725,8 +721,8 @@ namespace svn
      * @param recurse
      * @return PathPropertiesMapList and revision where the properties are taken from (svn 1.5) or undefined revision (prior 1.5)
      */
-    virtual QPair<QLONG,PathPropertiesMapList>
-    propget(const QString& propName,
+    virtual TQPair<TQLONG,PathPropertiesMapList>
+    propget(const TQString& propName,
             const Path &path,
             const Revision &revision,
             const Revision &peg,
@@ -746,8 +742,8 @@ namespace svn
      * @return PropertiesList
      */
     virtual void
-    propset(const QString& propName,
-            const QString& propValue,
+    propset(const TQString& propName,
+            const TQString& propValue,
             const Path &path,
             Depth depth=DepthEmpty,
             bool skip_checks=false,
@@ -766,7 +762,7 @@ namespace svn
      * @param recurse
      */
     virtual void
-    propdel(const QString& propName,
+    propdel(const TQString& propName,
             const Path &path,
             Depth depth=DepthEmpty,
             bool skip_check=false,
@@ -782,7 +778,7 @@ namespace svn
      * @param revision
      * @return PropertiesList
      */
-    virtual QPair<QLONG,PropertiesMap>
+    virtual TQPair<TQLONG,PropertiesMap>
     revproplist(const Path &path,
                 const Revision &revision)=0;
 
@@ -795,8 +791,8 @@ namespace svn
      * @param revision
      * @return PropertiesList
      */
-    virtual QPair<QLONG,QString>
-    revpropget(const QString& propName,
+    virtual TQPair<TQLONG,TQString>
+    revpropget(const TQString& propName,
                const Path &path,
                const Revision &revision)=0;
 
@@ -811,9 +807,9 @@ namespace svn
      * @param force
      * @return Revision
      */
-    virtual QLONG
-    revpropset(const QString& propName,
-               const QString& propValue,
+    virtual TQLONG
+    revpropset(const TQString& propName,
+               const TQString& propValue,
                const Path &path,
                const Revision &revision,
                bool force=false)=0;
@@ -828,8 +824,8 @@ namespace svn
      * @param force
      * @return Revision
      */
-    virtual QLONG
-    revpropdel(const QString& propName,
+    virtual TQLONG
+    revpropdel(const TQString& propName,
                const Path &path,
                const Revision &revision,
                bool force=false) = 0;
@@ -843,7 +839,7 @@ namespace svn
    */
    virtual void
    lock (const Targets & targets,
-        const QString& message,
+        const TQString& message,
         bool steal_lock) throw (ClientException)=0;
     /**
      * unlock files in repository or working copy
@@ -855,10 +851,10 @@ namespace svn
             bool break_lock) throw (ClientException)=0;
 
     virtual void
-    url2Revision(const QString&revstring,
+    url2Revision(const TQString&revstring,
         Revision&start,Revision&end)=0;
     virtual void
-    url2Revision(const QString&revstring,
+    url2Revision(const TQString&revstring,
             Revision&start)=0;
 
   private: