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.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

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

diff --git a/src/svnqt/conflictdescription.cpp b/src/svnqt/conflictdescription.cpp
index bbf059a..732a566 100644
--- a/src/svnqt/conflictdescription.cpp
+++ b/src/svnqt/conflictdescription.cpp
@@ -43,13 +43,13 @@ ConflictDescription::ConflictDescription(const svn_wc_conflict_description_t*con
     if (!conflict) {
         return;
     }
-    m_baseFile=QString::FROMUTF8(conflict->base_file);
-    m_mergedFile=QString::FROMUTF8(conflict->merged_file);
-    m_mimeType=QString::FROMUTF8(conflict->mime_type);
-    m_myFile=QString::FROMUTF8(conflict->my_file);
-    m_Path=QString::FROMUTF8(conflict->path);
-    m_propertyName=QString::FROMUTF8(conflict->property_name);
-    m_theirFile=QString::FROMUTF8(conflict->their_file);
+    m_baseFile=TQString::FROMUTF8(conflict->base_file);
+    m_mergedFile=TQString::FROMUTF8(conflict->merged_file);
+    m_mimeType=TQString::FROMUTF8(conflict->mime_type);
+    m_myFile=TQString::FROMUTF8(conflict->my_file);
+    m_Path=TQString::FROMUTF8(conflict->path);
+    m_propertyName=TQString::FROMUTF8(conflict->property_name);
+    m_theirFile=TQString::FROMUTF8(conflict->their_file);
     switch(conflict->action) {
         case svn_wc_conflict_action_edit:
             m_action=ConflictEdit;
@@ -105,7 +105,7 @@ svn::ConflictDescription::ConflictAction svn::ConflictDescription::action() cons
     return m_action;
 }
 
-const QString&svn::ConflictDescription::baseFile() const
+const TQString&svn::ConflictDescription::baseFile() const
 {
     return m_baseFile;
 }
@@ -116,7 +116,7 @@ const QString&svn::ConflictDescription::baseFile() const
  */
 void svn::ConflictDescription::init()
 {
-    m_baseFile=m_Path=m_mergedFile=m_propertyName=m_theirFile=m_myFile=m_mimeType=QString::null;
+    m_baseFile=m_Path=m_mergedFile=m_propertyName=m_theirFile=m_myFile=m_mimeType=TQString();
     m_action=ConflictEdit;
     m_Type=ConflictText;
     m_reason=ReasonEdited;
@@ -131,19 +131,19 @@ bool svn::ConflictDescription::binary() const
 }
 
 
-const QString& svn::ConflictDescription::mergedFile() const
+const TQString& svn::ConflictDescription::mergedFile() const
 {
     return m_mergedFile;
 }
 
 
-const QString& svn::ConflictDescription::mimeType() const
+const TQString& svn::ConflictDescription::mimeType() const
 {
     return m_mimeType;
 }
 
 
-const QString& svn::ConflictDescription::myFile() const
+const TQString& svn::ConflictDescription::myFile() const
 {
     return m_myFile;
 }
@@ -155,13 +155,13 @@ svn_node_kind_t svn::ConflictDescription::nodeKind() const
 }
 
 
-const QString& svn::ConflictDescription::Path() const
+const TQString& svn::ConflictDescription::Path() const
 {
     return m_Path;
 }
 
 
-const QString& svn::ConflictDescription::propertyName() const
+const TQString& svn::ConflictDescription::propertyName() const
 {
     return m_propertyName;
 }
@@ -173,7 +173,7 @@ svn::ConflictDescription::ConflictReason svn::ConflictDescription::reason() cons
 }
 
 
-const QString& svn::ConflictDescription::theirFile() const
+const TQString& svn::ConflictDescription::theirFile() const
 {
     return m_theirFile;
 }
-- 
cgit v1.2.3