1 files changed, 4 insertions, 4 deletions
diff --git a/src/svnqt/conflictresult.cpp b/src/svnqt/conflictresult.cpp
index 0465e33..4e8fd94 100644
--- a/src/svnqt/conflictresult.cpp
+++ b/src/svnqt/conflictresult.cpp
@@ -27,7 +27,7 @@
 namespace svn
 {
     ConflictResult::ConflictResult()
-    :m_choice(ChooseMerged),m_MergedFile(QString::null)
+    :m_choice(ChooseMerged),m_MergedFile(TQString())
     {
     }
 
@@ -62,16 +62,16 @@ namespace svn
                 break;
         }
         if (aResult->merged_file) {
-            m_MergedFile=QString::FROMUTF8(aResult->merged_file);
+            m_MergedFile=TQString::FROMUTF8(aResult->merged_file);
         } else {
-            m_MergedFile=QString::null;
+            m_MergedFile=TQString();
         }
 #else
         Q_UNUSED(aResult);
 #endif
     }
 
-    void ConflictResult::setMergedFile(const QString&aMergedfile) {
+    void ConflictResult::setMergedFile(const TQString&aMergedfile) {
         m_MergedFile=aMergedfile;
     }