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/diff_data.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src/svnqt/diff_data.cpp') diff --git a/src/svnqt/diff_data.cpp b/src/svnqt/diff_data.cpp index a5f66f9..45c9452 100644 --- a/src/svnqt/diff_data.cpp +++ b/src/svnqt/diff_data.cpp @@ -21,7 +21,7 @@ #include "svnqt/svnqt_defines.hpp" #include "svnqt/exception.hpp" -#include +#include #include #include @@ -122,23 +122,18 @@ namespace svn } } - QByteArray DiffData::content() + TQByteArray DiffData::content() { if (!m_outFileName) { - return QByteArray(); + return TQByteArray(); } close(); - QFile fi(m_outFileName); -#if QT_VERSION < 0x040000 + TQFile fi(m_outFileName); if (!fi.open(IO_ReadOnly|IO_Raw)) { - throw ClientException(QString("%1 '%2'").arg(fi.errorString()).arg(m_outFileName)); -#else - if (!fi.open(QIODevice::ReadOnly)) { - throw ClientException(QString("%1 '%2'").arg(fi.errorString()).arg(m_outFileName).toLatin1().constData()); -#endif + throw ClientException(TQString("%1 '%2'").tqarg(fi.errorString()).tqarg(m_outFileName)); } - QByteArray res = fi.readAll(); + TQByteArray res = fi.readAll(); fi.close(); return res; } -- cgit v1.2.3