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/annotate_line.hpp | |
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/annotate_line.hpp')
-rw-r--r-- | src/svnqt/annotate_line.hpp | 62 |
1 files changed, 26 insertions, 36 deletions
diff --git a/src/svnqt/annotate_line.hpp b/src/svnqt/annotate_line.hpp index c8a0a6f..2a263ce 100644 --- a/src/svnqt/annotate_line.hpp +++ b/src/svnqt/annotate_line.hpp @@ -32,8 +32,8 @@ #include "svnqt/svnqt_defines.hpp" -#include <qstring.h> -#include <qdatetime.h> +#include <tqstring.h> +#include <tqdatetime.h> namespace svn { @@ -43,36 +43,36 @@ namespace svn class AnnotateLine { public: - AnnotateLine (QLONG line_no, - QLONG revision, + AnnotateLine (TQLONG line_no, + TQLONG revision, const char *author, const char *date, const char *line) : m_line_no (line_no), m_revision (revision), - m_date( (date&&strlen(date))?QDateTime::fromString(QString::FROMUTF8(date),Qt::ISODate):QDateTime()), + m_date( (date&&strlen(date))?TQDateTime::fromString(TQString::FROMUTF8(date),Qt::ISODate):TQDateTime()), m_line(line?line:""),m_author(author?author:""), m_merge_revision(-1), - m_merge_date(QDateTime()), + m_merge_date(TQDateTime()), m_merge_author(""),m_merge_path("") { } - AnnotateLine (QLONG line_no, - QLONG revision, + AnnotateLine (TQLONG line_no, + TQLONG revision, const char *author, const char *date, const char *line, - QLONG merge_revision, + TQLONG merge_revision, const char *merge_author, const char *merge_date, const char *merge_path ) : m_line_no (line_no), m_revision (revision), - m_date( (date&&strlen(date))?QDateTime::fromString(QString::FROMUTF8(date),Qt::ISODate):QDateTime()), + m_date( (date&&strlen(date))?TQDateTime::fromString(TQString::FROMUTF8(date),Qt::ISODate):TQDateTime()), m_line(line?line:""),m_author(author?author:""), m_merge_revision(merge_revision), - m_merge_date( (merge_date&&strlen(merge_date))?QDateTime::fromString(QString::FROMUTF8(merge_date),Qt::ISODate):QDateTime()), + m_merge_date( (merge_date&&strlen(merge_date))?TQDateTime::fromString(TQString::FROMUTF8(merge_date),Qt::ISODate):TQDateTime()), m_merge_author(merge_author?merge_author:""),m_merge_path(merge_path?merge_path:"") { } @@ -95,59 +95,49 @@ namespace svn { } - QLONG + TQLONG lineNumber () const { return m_line_no; } - QLONG + TQLONG revision () const { return m_revision; } - const QByteArray & + const TQByteArray & author () const { return m_author; } - const QDateTime & + const TQDateTime & date () const { return m_date; } - const QByteArray & + const TQByteArray & line () const { return m_line; } protected: - QLONG m_line_no; - QLONG m_revision; - QDateTime m_date; -#if QT_VERSION < 0x040000 - QCString m_line; - QCString m_author; -#else - QByteArray m_line; - QByteArray m_author; -#endif - - QLONG m_merge_revision; - QDateTime m_merge_date; -#if QT_VERSION < 0x040000 - QCString m_merge_author; - QCString m_merge_path; -#else - QByteArray m_merge_author; - QByteArray m_merge_path; -#endif + TQLONG m_line_no; + TQLONG m_revision; + TQDateTime m_date; + TQCString m_line; + TQCString m_author; + + TQLONG m_merge_revision; + TQDateTime m_merge_date; + TQCString m_merge_author; + TQCString m_merge_path; }; } |