diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-04 19:54:24 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-04 19:54:24 +0000 |
commit | d7633c195a464e4d344ada9eea61afd10110598a (patch) | |
tree | 1f2da0b135f3ed84955e340cae823f00c4ce7284 /src/svnqt/diff_data.cpp | |
parent | 3fa7eb804f67b2789f128075cc2522f398640250 (diff) | |
download | tdesvn-d7633c195a464e4d344ada9eea61afd10110598a.tar.gz tdesvn-d7633c195a464e4d344ada9eea61afd10110598a.zip |
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
Diffstat (limited to 'src/svnqt/diff_data.cpp')
-rw-r--r-- | src/svnqt/diff_data.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
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 <qfile.h> +#include <tqfile.h> #include <svn_version.h> #include <svn_io.h> @@ -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; } |