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/conflictdescription.hpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/svnqt/conflictdescription.hpp')

diff --git a/src/svnqt/conflictdescription.hpp b/src/svnqt/conflictdescription.hpp
index 3f72562..8452b3a 100644
--- a/src/svnqt/conflictdescription.hpp
+++ b/src/svnqt/conflictdescription.hpp
@@ -26,7 +26,7 @@ struct svn_wc_conflict_description_t;
 #include "svnqt/svnqt_defines.hpp"
 #include <svn_types.h>
 
-#include <qstring.h>
+#include <tqstring.h>
 
 namespace svn {
 
@@ -35,7 +35,7 @@ namespace svn {
  * @since subversion 1.5
  * @author Rajko Albrecht
 */
-class SVNQT_EXPORT ConflictDescription
+class SVNTQT_EXPORT ConflictDescription
 {
 public:
     enum ConflictType {
@@ -63,13 +63,13 @@ public:
     ConflictReason reason() const;
     svn_node_kind_t nodeKind() const;
     bool binary() const;
-    const QString& baseFile() const;
-    const QString& theirFile() const;
-    const QString& propertyName() const;
-    const QString& Path() const;
-    const QString& myFile() const;
-    const QString& mimeType() const;
-    const QString& mergedFile() const;
+    const TQString& baseFile() const;
+    const TQString& theirFile() const;
+    const TQString& propertyName() const;
+    const TQString& Path() const;
+    const TQString& myFile() const;
+    const TQString& mimeType() const;
+    const TQString& mergedFile() const;
 
 protected:
     //! don't use it.
@@ -81,13 +81,13 @@ protected:
     ConflictAction m_action;
     ConflictType m_Type;
     ConflictReason m_reason;
-    QString m_baseFile;
-    QString m_mergedFile;
-    QString m_mimeType;
-    QString m_myFile;
-    QString m_Path;
-    QString m_propertyName;
-    QString m_theirFile;
+    TQString m_baseFile;
+    TQString m_mergedFile;
+    TQString m_mimeType;
+    TQString m_myFile;
+    TQString m_Path;
+    TQString m_propertyName;
+    TQString m_theirFile;
     svn_node_kind_t m_nodeKind;
 };
 
-- 
cgit v1.2.3