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/log_entry.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/svnqt/log_entry.cpp') diff --git a/src/svnqt/log_entry.cpp b/src/svnqt/log_entry.cpp index fdd28e8..fb9965c 100644 --- a/src/svnqt/log_entry.cpp +++ b/src/svnqt/log_entry.cpp @@ -45,36 +45,36 @@ namespace svn char action_, const char *copyFromPath_, const svn_revnum_t copyFromRevision_) - : path(QString::FROMUTF8(path_)), action(action_), - copyFromPath (QString::FROMUTF8(copyFromPath_)), + : path(TQString::FROMUTF8(path_)), action(action_), + copyFromPath (TQString::FROMUTF8(copyFromPath_)), copyFromRevision (copyFromRevision_) { } - LogChangePathEntry::LogChangePathEntry (const QString &path_, + LogChangePathEntry::LogChangePathEntry (const TQString &path_, char action_, - const QString ©FromPath_, + const TQString ©FromPath_, const svn_revnum_t copyFromRevision_) : path(path_), action(action_), copyFromPath(copyFromPath_), - copyToPath(QString::null), + copyToPath(TQString()), copyFromRevision(copyFromRevision_), copyToRevision(-1) { } LogChangePathEntry::LogChangePathEntry() - : path(QString::null),action(0),copyFromPath(QString::null),copyToPath(QString::null), + : path(TQString()),action(0),copyFromPath(TQString()),copyToPath(TQString()), copyFromRevision(-1),copyToRevision(-1) { } - LogChangePathEntry::LogChangePathEntry (const QString &path_, + LogChangePathEntry::LogChangePathEntry (const TQString &path_, char action_, - const QString ©FromPath_, + const TQString ©FromPath_, const svn_revnum_t copyFromRevision_, - const QString ©ToPath_, + const TQString ©ToPath_, const svn_revnum_t copyToRevision_) : path(path_),action(action_),copyFromPath(copyFromPath_),copyToPath(copyToPath_), copyFromRevision(copyFromRevision_),copyToRevision(copyToRevision_) @@ -96,8 +96,8 @@ namespace svn const char *message_; svn_compat_log_revprops_out(&author_, &date_, &message_, log_entry->revprops); - author = author_ == 0 ? QString::fromLatin1("") : QString::FROMUTF8(author_); - message = message_ == 0 ? QString::fromLatin1("") : QString::FROMUTF8(message_); + author = author_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(author_); + message = message_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(message_); setDate(date_); revision = log_entry->revision; if (log_entry->changed_paths) { @@ -125,8 +125,8 @@ namespace svn setDate(date_); revision = revision_; - author = author_ == 0 ? QString::fromLatin1("") : QString::FROMUTF8(author_); - message = message_ == 0 ? QString::fromLatin1("") : QString::FROMUTF8(message_); + author = author_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(author_); + message = message_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(message_); } void LogEntry::setDate(const char*date_) @@ -144,7 +144,7 @@ namespace svn } -SVNQT_EXPORT QDataStream& operator<<(QDataStream&s,const svn::LogEntry&r) +SVNTQT_EXPORT TQDataStream& operator<<(TQDataStream&s,const svn::LogEntry&r) { s << r.revision << r.author @@ -154,7 +154,7 @@ SVNQT_EXPORT QDataStream& operator<<(QDataStream&s,const svn::LogEntry&r) return s; } -SVNQT_EXPORT QDataStream& operator<<(QDataStream&s,const svn::LogChangePathEntry&r) +SVNTQT_EXPORT TQDataStream& operator<<(TQDataStream&s,const svn::LogChangePathEntry&r) { short ac = r.action; s << r.path @@ -166,7 +166,7 @@ SVNQT_EXPORT QDataStream& operator<<(QDataStream&s,const svn::LogChangePathEntry return s; } -SVNQT_EXPORT QDataStream& operator>>(QDataStream&s,svn::LogEntry&r) +SVNTQT_EXPORT TQDataStream& operator>>(TQDataStream&s,svn::LogEntry&r) { s >> r.revision >> r.author @@ -176,7 +176,7 @@ SVNQT_EXPORT QDataStream& operator>>(QDataStream&s,svn::LogEntry&r) return s; } -SVNQT_EXPORT QDataStream& operator>>(QDataStream&s,svn::LogChangePathEntry&r) +SVNTQT_EXPORT TQDataStream& operator>>(TQDataStream&s,svn::LogChangePathEntry&r) { short ac; s >> r.path -- cgit v1.2.1