From d7633c195a464e4d344ada9eea61afd10110598a Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 4 May 2011 19:54:24 +0000
Subject: 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
---
 src/svnqt/client_modify.cpp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/svnqt/client_modify.cpp')

diff --git a/src/svnqt/client_modify.cpp b/src/svnqt/client_modify.cpp
index 352760b..c3b7c19 100644
--- a/src/svnqt/client_modify.cpp
+++ b/src/svnqt/client_modify.cpp
@@ -169,7 +169,7 @@ namespace svn
 
   void
   Client_impl::add (const Path & path,
-                    svn::Depth depth,bool force, bool no_ignore, bool add_parents) throw (ClientException)
+                    svn::Depth depth,bool force, bool no_ignore, bool add_tqparents) throw (ClientException)
   {
     Pool pool;
 #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1)
@@ -178,11 +178,11 @@ namespace svn
                              internal::DepthToSvn(depth),
                              force,
                              no_ignore,
-                             add_parents,
+                             add_tqparents,
                              *m_context,
                              pool);
 #else
-    Q_UNUSED(add_parents);
+    Q_UNUSED(add_tqparents);
     svn_error_t * error =
       svn_client_add3 (path.cstr (),
                       depth==DepthInfinity,
@@ -237,7 +237,7 @@ namespace svn
   }
 
   svn::Revision
-  Client_impl::commit (const Targets & targets, const QString& message,
+  Client_impl::commit (const Targets & targets, const TQString& message,
                        svn::Depth depth,bool keep_locks,
                        const svn::StringArray&changelist,
                        const PropertiesMap&revProps,
@@ -334,7 +334,7 @@ namespace svn
         }
 
         Path _dest;
-        QString base,dir;
+        TQString base,dir;
         for (size_t j=0;j<srcPaths.size();++j)
         {
             _dest=destPath;
@@ -447,7 +447,7 @@ namespace svn
       {
           throw ClientException("Multiple sources not allowed");
       }
-      QString base,dir;
+      TQString base,dir;
       Path _dest;
       for (size_t j=0;j<srcPaths.size();++j)
       {
@@ -464,7 +464,7 @@ namespace svn
 
   svn::Revision
   Client_impl::mkdir (const Path & path,
-                 const QString& message,
+                 const TQString& message,
                  bool makeParent,
                  const PropertiesMap&revProps
                      ) throw (ClientException)
@@ -475,7 +475,7 @@ namespace svn
 
   svn::Revision
   Client_impl::mkdir (const Targets & targets,
-                 const QString&msg,
+                 const TQString&msg,
                  bool makeParent,
                  const PropertiesMap&revProps
                      ) throw (ClientException)
@@ -504,7 +504,7 @@ namespace svn
 #endif
 
     /* important! otherwise next op on repository uses that logmessage again! */
-    m_context->setLogMessage(QString::null);
+    m_context->setLogMessage(TQString());
 
     if(error != NULL)
       throw ClientException (error);
@@ -554,14 +554,14 @@ namespace svn
               const Revision & revision,
               const Revision & peg,
               bool overwrite,
-              const QString&native_eol,
+              const TQString&native_eol,
               bool ignore_externals,
               svn::Depth depth) throw (ClientException)
   {
     Pool pool;
     svn_revnum_t revnum = 0;
     const char*_neol;
-    if (native_eol==QString::null) {
+    if (native_eol==TQString()) {
         _neol = (const char*)0;
     } else {
         _neol = native_eol.TOUTF8();
@@ -601,7 +601,7 @@ namespace svn
 
   svn_revnum_t
   Client_impl::doSwitch (
-                         const Path & path, const QString& url,
+                         const Path & path, const TQString& url,
                          const Revision & revision,
                          Depth depth,
                          const Revision & peg,
@@ -650,8 +650,8 @@ namespace svn
 
   Revision
   Client_impl::import (const Path & path,
-                  const QString& url,
-                  const QString& message,
+                  const TQString& url,
+                  const TQString& message,
                   svn::Depth depth,
                   bool no_ignore,bool no_unknown_nodetype,
                   const PropertiesMap&revProps
@@ -683,7 +683,7 @@ namespace svn
                         pool);
 #endif
     /* important! otherwise next op on repository uses that logmessage again! */
-    m_context->setLogMessage(QString::null);
+    m_context->setLogMessage(TQString());
 
     if(error != 0) {
         throw ClientException (error);
@@ -696,8 +696,8 @@ namespace svn
 
   void
   Client_impl::relocate (const Path & path,
-                    const QString& from_url,
-                    const QString& to_url,
+                    const TQString& from_url,
+                    const TQString& to_url,
                     bool recurse) throw (ClientException)
   {
     Pool pool;
-- 
cgit v1.2.3