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/info_entry.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/info_entry.cpp')
-rw-r--r-- | src/svnqt/info_entry.cpp | 84 |
1 files changed, 40 insertions, 44 deletions
diff --git a/src/svnqt/info_entry.cpp b/src/svnqt/info_entry.cpp index 72d714a..6f76735 100644 --- a/src/svnqt/info_entry.cpp +++ b/src/svnqt/info_entry.cpp @@ -36,7 +36,7 @@ namespace svn init(info,path); } - InfoEntry::InfoEntry(const svn_info_t*info,const QString&path) + InfoEntry::InfoEntry(const svn_info_t*info,const TQString&path) { init(info,path); } @@ -65,47 +65,47 @@ namespace svn { return m_Lock; } - const QString&InfoEntry::cmtAuthor () const + const TQString&InfoEntry::cmtAuthor () const { return m_last_author; } - const QString&InfoEntry::Name()const + const TQString&InfoEntry::Name()const { return m_name; } - const QString& InfoEntry::checksum()const + const TQString& InfoEntry::checksum()const { return m_checksum; } - const QString& InfoEntry::conflictNew()const + const TQString& InfoEntry::conflictNew()const { return m_conflict_new; } - const QString& InfoEntry::conflictOld()const + const TQString& InfoEntry::conflictOld()const { return m_conflict_old; } - const QString& InfoEntry::conflictWrk()const + const TQString& InfoEntry::conflictWrk()const { return m_conflict_wrk; } - const QString& InfoEntry::copyfromUrl()const + const TQString& InfoEntry::copyfromUrl()const { return m_copyfrom_url; } - const QString& InfoEntry::prejfile()const + const TQString& InfoEntry::prejfile()const { return m_prejfile; } - const QString& InfoEntry::reposRoot()const + const TQString& InfoEntry::reposRoot()const { return m_repos_root; } - const QString& InfoEntry::url()const + const TQString& InfoEntry::url()const { return m_url; } - const QString& InfoEntry::uuid()const + const TQString& InfoEntry::uuid()const { return m_UUID; } @@ -129,7 +129,7 @@ namespace svn { return m_schedule; } - const QString&InfoEntry::prettyUrl()const + const TQString&InfoEntry::prettyUrl()const { return m_pUrl; } @@ -137,15 +137,15 @@ namespace svn { return kind()==svn_node_dir; } - const QByteArray&InfoEntry::changeList()const + const TQByteArray&InfoEntry::changeList()const { return m_changeList; } - QLONG InfoEntry::size()const + TQLONG InfoEntry::size()const { return m_size; } - QLONG InfoEntry::working_size()const + TQLONG InfoEntry::working_size()const { return m_working_size; } @@ -183,20 +183,20 @@ void svn::InfoEntry::init() m_revision = SVN_INVALID_REVNUM; m_schedule = svn_wc_schedule_normal; - m_size = m_working_size = SVNQT_SIZE_UNKNOWN; - m_changeList=QByteArray(); + m_size = m_working_size = SVNTQT_SIZE_UNKNOWN; + m_changeList=TQByteArray(); m_depth = DepthUnknown; } void svn::InfoEntry::init(const svn_info_t*item,const char*path) { - init(item,QString::FROMUTF8(path)); + init(item,TQString::FROMUTF8(path)); } /*! \fn svn::InfoEntry::init(const svn_info_t*) */ -void svn::InfoEntry::init(const svn_info_t*item,const QString&path) +void svn::InfoEntry::init(const svn_info_t*item,const TQString&path) { if (!item) { init(); @@ -211,17 +211,17 @@ void svn::InfoEntry::init(const svn_info_t*item,const QString&path) } else { m_Lock = LockEntry(); } - m_checksum = QString::FROMUTF8(item->checksum); - m_conflict_new = QString::FROMUTF8(item->conflict_new); - m_conflict_old = QString::FROMUTF8(item->conflict_old); - m_conflict_wrk = QString::FROMUTF8(item->conflict_wrk); - m_copyfrom_url = QString::FROMUTF8(item->copyfrom_url); - m_last_author = QString::FROMUTF8(item->last_changed_author); - m_prejfile = QString::FROMUTF8(item->prejfile); - m_repos_root = QString::FROMUTF8(item->repos_root_URL); - m_url = QString::FROMUTF8(item->URL); + m_checksum = TQString::FROMUTF8(item->checksum); + m_conflict_new = TQString::FROMUTF8(item->conflict_new); + m_conflict_old = TQString::FROMUTF8(item->conflict_old); + m_conflict_wrk = TQString::FROMUTF8(item->conflict_wrk); + m_copyfrom_url = TQString::FROMUTF8(item->copyfrom_url); + m_last_author = TQString::FROMUTF8(item->last_changed_author); + m_prejfile = TQString::FROMUTF8(item->prejfile); + m_repos_root = TQString::FROMUTF8(item->repos_root_URL); + m_url = TQString::FROMUTF8(item->URL); m_pUrl = prettyUrl(item->URL); - m_UUID = QString::FROMUTF8(item->repos_UUID); + m_UUID = TQString::FROMUTF8(item->repos_UUID); m_kind = item->kind; m_copy_from_rev = item->copyfrom_rev; m_last_changed_rev = item->last_changed_rev; @@ -230,16 +230,12 @@ void svn::InfoEntry::init(const svn_info_t*item,const QString&path) m_schedule = item->schedule; #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) - m_size = item->size!=SVN_INFO_SIZE_UNKNOWN?QLONG(item->size):SVNQT_SIZE_UNKNOWN; - m_working_size = item->working_size!=SVN_INFO_SIZE_UNKNOWN?QLONG(item->working_size):SVNQT_SIZE_UNKNOWN; + m_size = item->size!=SVN_INFO_SIZE_UNKNOWN?TQLONG(item->size):SVNTQT_SIZE_UNKNOWN; + m_working_size = item->working_size!=SVN_INFO_SIZE_UNKNOWN?TQLONG(item->working_size):SVNTQT_SIZE_UNKNOWN; if (item->changelist) { -#if QT_VERSION < 0x040000 - m_changeList = QByteArray(QCString(item->changelist,strlen(item->changelist))); -#else - m_changeList = QByteArray(item->changelist,strlen(item->changelist)); -#endif + m_changeList = TQByteArray(TQCString(item->changelist,strlen(item->changelist))); } else { - m_changeList=QByteArray(); + m_changeList=TQByteArray(); } switch (item->depth) { @@ -264,21 +260,21 @@ void svn::InfoEntry::init(const svn_info_t*item,const QString&path) break; } #else - m_size = SVNQT_SIZE_UNKNOWN; - m_working_size = SVNQT_SIZE_UNKNOWN; - m_changeList=QByteArray(); + m_size = SVNTQT_SIZE_UNKNOWN; + m_working_size = SVNTQT_SIZE_UNKNOWN; + m_changeList=TQByteArray(); m_depth = DepthUnknown; #endif } -QString svn::InfoEntry::prettyUrl(const char*_url)const +TQString svn::InfoEntry::prettyUrl(const char*_url)const { if (_url) { Pool pool; _url = svn_path_uri_decode(_url,pool); - return QString::FROMUTF8(_url); + return TQString::FROMUTF8(_url); } - return QString::FROMUTF8(""); + return TQString::FROMUTF8(""); } svn::InfoEntry::InfoEntry(const InfoEntry&other) |