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_diff.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/src/svnqt/client_diff.cpp b/src/svnqt/client_diff.cpp
index 4074fa2..c4b8282 100644
--- a/src/svnqt/client_diff.cpp
+++ b/src/svnqt/client_diff.cpp
@@ -44,14 +44,14 @@
 #include "svnqt/helper.hpp"
 #include "diff_data.hpp"
 
-#include <qfile.h>
-#include <qstringlist.h>
+#include <tqfile.h>
+#include <tqstringlist.h>
 
 #include <apr_xlate.h>
 
 namespace svn
 {
-  QByteArray
+  TQByteArray
           Client_impl::diff_peg (const Path & tmpPath, const Path & path,const Path&relativeTo,
                              const Revision & revision1, const Revision & revision2, const Revision& peg_revision,
                              Depth depth, const bool ignoreAncestry,
@@ -63,7 +63,7 @@ namespace svn
                     StringArray(),StringArray());
     }
 
-  QByteArray
+  TQByteArray
           Client_impl::diff_peg (const Path & tmpPath, const Path & path,const Path&relativeTo,
                 const Revision & revision1, const Revision & revision2, const Revision& peg_revision,
                 Depth depth, const bool ignoreAncestry,
@@ -84,7 +84,7 @@ namespace svn
                 options,
                 path.cstr(),
                 peg_revision,ddata.r1().revision(),ddata.r2().revision(),
-                relativeTo.length()>0?relativeTo.cstr():QByteArray(0),
+                relativeTo.length()>0?relativeTo.cstr():TQByteArray(0),
                 internal::DepthToSvn(depth),
                 ignoreAncestry,noDiffDeleted,ignore_contenttype,
                 APR_LOCALE_CHARSET,
@@ -115,7 +115,7 @@ namespace svn
     return ddata.content();
   }
 
-  QByteArray
+  TQByteArray
           Client_impl::diff (const Path & tmpPath, const Path & path1,const Path&path2,const Path&relativeTo,
                      const Revision & revision1, const Revision & revision2,
                      Depth depth, const bool ignoreAncestry,
@@ -127,7 +127,7 @@ namespace svn
                     StringArray(),StringArray());
     }
 
-  QByteArray
+  TQByteArray
   Client_impl::diff (const Path & tmpPath, const Path & path1,const Path&path2,const Path&relativeTo,
                 const Revision & revision1, const Revision & revision2,
                 Depth depth, const bool ignoreAncestry,
@@ -147,7 +147,7 @@ namespace svn
     error = svn_client_diff4(options,
                              path1.cstr (), ddata.r1().revision (),
                              path2.cstr (), ddata.r2().revision (),
-                             relativeTo.length()>0?relativeTo.cstr():QByteArray(0),
+                             relativeTo.length()>0?relativeTo.cstr():TQByteArray(0),
                              internal::DepthToSvn(depth), ignoreAncestry, noDiffDeleted, ignore_contenttype,
                              APR_LOCALE_CHARSET,
                              ddata.outFile(),ddata.errFile(),
-- 
cgit v1.2.1