From d7633c195a464e4d344ada9eea61afd10110598a Mon Sep 17 00:00:00 2001 From: tpearson 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/conflictresult.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/svnqt/conflictresult.cpp') 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; } -- cgit v1.2.1