From bb7be2361770a435b3e2e8ae2ac4250bf9810bb4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:34:08 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- src/svnqt/cache/DatabaseException.cpp | 2 +- src/svnqt/cache/LogCache.cpp | 2 +- src/svnqt/cache/ReposLog.cpp | 14 ++++----- src/svnqt/cache/sqlite3/qsql_sqlite3.cpp | 10 +++--- src/svnqt/cache/test/sqlite.cpp | 2 +- src/svnqt/client.hpp | 8 ++--- src/svnqt/client_impl.hpp | 8 ++--- src/svnqt/client_status.cpp | 36 ++++++++++----------- src/svnqt/diff_data.cpp | 2 +- src/svnqt/dirent.cpp | 2 +- src/svnqt/exception.cpp | 2 +- src/svnqt/log_entry.cpp | 8 ++--- src/svnqt/path.cpp | 2 +- src/svnqt/revision.hpp | 2 +- src/svnqt/status.cpp | 54 ++++++++++++++++---------------- src/svnqt/status.hpp | 30 +++++++++--------- src/svnqt/svnqttypes.hpp | 4 +-- src/svnqt/tests/lsdir.cpp | 4 +-- src/svnqt/url.cpp | 8 ++--- src/svnqt/version_check.cpp | 4 +-- src/svnqt/wc.cpp | 2 +- 21 files changed, 103 insertions(+), 103 deletions(-) (limited to 'src/svnqt') diff --git a/src/svnqt/cache/DatabaseException.cpp b/src/svnqt/cache/DatabaseException.cpp index 880c041..199a5f9 100644 --- a/src/svnqt/cache/DatabaseException.cpp +++ b/src/svnqt/cache/DatabaseException.cpp @@ -7,6 +7,6 @@ svn::cache::DatabaseException::DatabaseException(const TQString&msg,int aNumber) : Exception(msg),m_number(aNumber) { if (aNumber>-1) { - setMessage(TQString("(Code %1) %2").tqarg(aNumber).tqarg(msg)); + setMessage(TQString("(Code %1) %2").arg(aNumber).arg(msg)); } } diff --git a/src/svnqt/cache/LogCache.cpp b/src/svnqt/cache/LogCache.cpp index fd62eee..4dcb27b 100644 --- a/src/svnqt/cache/LogCache.cpp +++ b/src/svnqt/cache/LogCache.cpp @@ -154,7 +154,7 @@ public: int i = 0; TQString _key = dbFile; while (TQSqlDatabase::contains(_key)) { - _key = TQString("%1-%2").tqarg(dbFile).tqarg(i++); + _key = TQString("%1-%2").arg(dbFile).arg(i++); } // qDebug("The repository key is now: %s",_key.TOUTF8().data()); TQDataBase _db = TQSqlDatabase::addDatabase(SQLTYPE,_key); diff --git a/src/svnqt/cache/ReposLog.cpp b/src/svnqt/cache/ReposLog.cpp index d63d1d3..34aa99f 100644 --- a/src/svnqt/cache/ReposLog.cpp +++ b/src/svnqt/cache/ReposLog.cpp @@ -360,15 +360,15 @@ bool svn::cache::ReposLog::log(const svn::Path&what,const svn::Revision&_start, svn::Revision peg = date2numberRev(_peg,true); svn::Revision end = date2numberRev(_end,true); svn::Revision start = date2numberRev(_start,true); - TQString query_string = TQString(s_q).tqarg(what.native()).tqarg(what.native()).tqarg((peg==svn::Revision::UNDEFINED?"":TQString(" AND revision<=%1").tqarg(peg.revnum()))); + TQString query_string = TQString(s_q).arg(what.native()).arg(what.native()).arg((peg==svn::Revision::UNDEFINED?"":TQString(" AND revision<=%1").arg(peg.revnum()))); if (peg==svn::Revision::UNDEFINED) { peg = latestCachedRev(); } if (!itemExists(peg,what)) { - throw svn::cache::DatabaseException(TQString("Entry '%1' does not exists at revision %2").tqarg(what.native()).tqarg(peg.toString())); + throw svn::cache::DatabaseException(TQString("Entry '%1' does not exists at revision %2").arg(what.native()).arg(peg.toString())); } if (limit>0) { - query_string+=TQString(" LIMIT %1").tqarg(limit); + query_string+=TQString(" LIMIT %1").arg(limit); } TQSqlQuery _q(TQString(),m_Database); TQSqlQuery _q2(TQString(),m_Database); @@ -384,7 +384,7 @@ bool svn::cache::ReposLog::log(const svn::Path&what,const svn::Revision&_start, target[revision].author=_q.value(1).toString(); target[revision].date=_q.value(2).toLongLong(); target[revision].message=_q.value(3).toString(); - query_string=s_e.tqarg(revision); + query_string=s_e.arg(revision); _q2.prepare(query_string); if (!_q2.exec()) { qDebug("Could not select values: %s",_q2.lastError().text().TOUTF8().data()); @@ -416,7 +416,7 @@ bool svn::cache::ReposLog::itemExists(const svn::Revision&peg,const svn::Path&pa #if 0 static TQString _s1("select revision from changeditems where changeditem='%1' and action='A' and revision<=%2 order by revision desc limit 1"); TQSqlQuery _q(TQString(),m_Database); - TQString query_string=TQString(_s1).tqarg(path.native()).tqarg(peg.revnum()); + TQString query_string=TQString(_s1).arg(path.native()).arg(peg.revnum()); if (!_q.exec(query_string)) { qDebug("Could not select values: %s",_q.lastError().text().TOUTF8().data()); qDebug(_q.lastQuery().TOUTF8().data()); @@ -429,10 +429,10 @@ bool svn::cache::ReposLog::itemExists(const svn::Revision&peg,const svn::Path&pa static TQString _s2("select revision from changeditem where changeditem in (%1) and action='D' and revision>%2 and revision<=%3 order by revision desc limit 1"); TQStringList p_list; while (_p.length()>0) { - p_list.append(TQString("'%1'").tqarg(_p.native())); + p_list.append(TQString("'%1'").arg(_p.native())); _p.removeLast(); } - query_string=TQString(_s2).tqarg(p_list.join(",")).tqarg(); + query_string=TQString(_s2).arg(p_list.join(",")).arg(); #endif return true; } diff --git a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp index 46e165f..d104e66 100644 --- a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp +++ b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp @@ -81,7 +81,7 @@ public: sqlite3_stmt *stmt; - uint skippedtqStatus: 1; // the status of the fetchNext() that's skipped + uint skippedStatus: 1; // the status of the fetchNext() that's skipped uint skipRow: 1; // skip the next fetchNext()? uint utf8: 1; TQSqlRecord rInf; @@ -90,7 +90,7 @@ public: static const uint initial_cache_size = 128; TQSQLite3ResultPrivate::TQSQLite3ResultPrivate(TQSQLite3Result* res) : q(res), access(0), - stmt(0), skippedtqStatus(false), skipRow(false), utf8(false) + stmt(0), skippedStatus(false), skipRow(false), utf8(false) { } @@ -98,7 +98,7 @@ void TQSQLite3ResultPrivate::cleanup() { finalize(); rInf.clear(); - skippedtqStatus = false; + skippedStatus = false; skipRow = false; q->setAt(TQSql::BeforeFirst); q->setActive(false); @@ -143,7 +143,7 @@ bool TQSQLite3ResultPrivate::fetchNext(TQSqlCachedResult::ValueCache &values, in // already fetched Q_ASSERT(!initialFetch); skipRow = false; - return skippedtqStatus; + return skippedStatus; } skipRow = initialFetch; @@ -226,7 +226,7 @@ bool TQSQLite3Result::reset (const TQString &query) return false; } - d->skippedtqStatus = d->fetchNext(cache(), 0, true); + d->skippedStatus = d->fetchNext(cache(), 0, true); setSelect(!d->rInf.isEmpty()); setActive(true); diff --git a/src/svnqt/cache/test/sqlite.cpp b/src/svnqt/cache/test/sqlite.cpp index 07b5148..937c332 100644 --- a/src/svnqt/cache/test/sqlite.cpp +++ b/src/svnqt/cache/test/sqlite.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include "svnqt/client.hpp" #include "svnqt/svnqttypes.hpp" diff --git a/src/svnqt/client.hpp b/src/svnqt/client.hpp index 4fb6015..68d0aa0 100644 --- a/src/svnqt/client.hpp +++ b/src/svnqt/client.hpp @@ -125,7 +125,7 @@ namespace svn * @param revision list specific revision when browsing remote, on working copies parameter will ignored * @param detailed_remote if on remote listing detailed item info should get if possible * that may slow so should configureable in frontends! - * @return vector with tqStatus entries. + * @return vector with Status entries. */ virtual StatusEntries status (const Path& path, @@ -146,10 +146,10 @@ namespace svn * @param path File to gather status. * @param update if check against repository if new updates are there (for WC only) * @param revision list specific revision when browsing remote, on working copies parameter will ignored - * @return a tqStatus with Statis.isVersioned = FALSE + * @return a Status with Statis.isVersioned = FALSE */ virtual StatusPtr - singletqStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException)=0; + singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException)=0; /** * Executes a revision checkout. @@ -428,7 +428,7 @@ namespace svn * @param native_eol Either "LF", "CR" or "CRLF" or NULL. * @param ignore_externals don't process externals definitions as part of this operation. * @param recurse if true, export recursively.
- Otherwise, export just the directory represented by from and its immediate non-directory tqchildren. + Otherwise, export just the directory represented by from and its immediate non-directory children. */ virtual svn_revnum_t doExport (const Path & srcPath, diff --git a/src/svnqt/client_impl.hpp b/src/svnqt/client_impl.hpp index 25d5b62..4e2ea60 100644 --- a/src/svnqt/client_impl.hpp +++ b/src/svnqt/client_impl.hpp @@ -96,7 +96,7 @@ namespace svn * @param revision list specific revision when browsing remote, on working copies parameter will ignored * @param detailed_remote if on remote listing detailed item info should get if possible * that may slow so should configureable in frontends! - * @return vector with tqStatus entries. + * @return vector with Status entries. */ virtual StatusEntries status (const Path& path, @@ -117,10 +117,10 @@ namespace svn * @param path File to gather status. * @param update if check against repository if new updates are there (for WC only) * @param revision list specific revision when browsing remote, on working copies parameter will ignored - * @return a tqStatus with Statis.isVersioned = FALSE + * @return a Status with Statis.isVersioned = FALSE */ virtual StatusPtr - singletqStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException); + singleStatus (const Path& path,bool update=false,const Revision revision = svn::Revision::HEAD) throw (ClientException); /** * Executes a revision checkout. @@ -398,7 +398,7 @@ namespace svn * @param overwrite overwrite existing files * @param native_eol Either "LF", "CR" or "CRLF" or NULL. * @param ignore_externals don't process externals definitions as part of this operation. - * @param recurse if true, export recursively. Otherwise, export just the directory represented by from and its immediate non-directory tqchildren. + * @param recurse if true, export recursively. Otherwise, export just the directory represented by from and its immediate non-directory children. */ virtual svn_revnum_t doExport (const Path & srcPath, diff --git a/src/svnqt/client_status.cpp b/src/svnqt/client_status.cpp index 4468b0d..1c58610 100644 --- a/src/svnqt/client_status.cpp +++ b/src/svnqt/client_status.cpp @@ -269,7 +269,7 @@ namespace svn } static StatusEntries - localtqStatus (const Path& path, + localStatus (const Path& path, Depth depth, const bool get_all, const bool update, @@ -342,28 +342,28 @@ namespace svn status = (svn_wc_status2_t *) item->value; filePath = (const char *) item->key; - entries.push_back (StatusPtr(new tqStatus(filePath, status))); + entries.push_back (StatusPtr(new Status(filePath, status))); } return entries; } static StatusPtr - dirEntryTotqStatus (const Path& path, DirEntryPtr dirEntry) + dirEntryToStatus (const Path& path, DirEntryPtr dirEntry) { TQString url = path.path(); url += TQString::FROMUTF8("/"); url += dirEntry->name(); - return StatusPtr(new tqStatus (url, dirEntry)); + return StatusPtr(new Status (url, dirEntry)); } static StatusPtr - infoEntryTotqStatus(const Path&,const InfoEntry&infoEntry) + infoEntryToStatus(const Path&,const InfoEntry&infoEntry) { - return StatusPtr(new tqStatus(infoEntry.url(),infoEntry)); + return StatusPtr(new Status(infoEntry.url(),infoEntry)); } static StatusEntries - remotetqStatus (Client * client, + remoteStatus (Client * client, const Path& path, Depth depth, const bool , @@ -385,7 +385,7 @@ namespace svn DirEntryPtr dirEntry = *it; if (dirEntry->name().isEmpty()) continue; - entries.push_back(dirEntryTotqStatus (path, dirEntry)); + entries.push_back(dirEntryToStatus (path, dirEntry)); } return entries; } @@ -402,16 +402,16 @@ namespace svn const StringArray & changelists) throw (ClientException) { if (Url::isValid (path.path())) { - return remotetqStatus (this, path, depth, get_all, update, + return remoteStatus (this, path, depth, get_all, update, no_ignore,revision,m_context,detailed_remote); } else { - return localtqStatus (path, depth, get_all, update, + return localStatus (path, depth, get_all, update, no_ignore, hide_externals,changelists, m_context); } } static StatusPtr - localSingletqStatus (const Path& path, Context * context,bool update=false) + localSingleStatus (const Path& path, Context * context,bool update=false) { svn_error_t *error; apr_hash_t *status_hash; @@ -470,26 +470,26 @@ namespace svn status = (svn_wc_status2_t *) item->value; filePath = (const char *) item->key; - return StatusPtr(new tqStatus (filePath, status)); + return StatusPtr(new Status (filePath, status)); }; static StatusPtr - remoteSingletqStatus (Client * client, const Path& path,const Revision revision, Context * ) + remoteSingleStatus (Client * client, const Path& path,const Revision revision, Context * ) { InfoEntries infoEntries = client->info(path,DepthEmpty,revision,Revision(Revision::UNDEFINED)); if (infoEntries.size () == 0) - return StatusPtr(new tqStatus()); + return StatusPtr(new Status()); else - return infoEntryTotqStatus (path, infoEntries [0]); + return infoEntryToStatus (path, infoEntries [0]); } StatusPtr - Client_impl::singletqStatus (const Path& path,bool update,const Revision revision) throw (ClientException) + Client_impl::singleStatus (const Path& path,bool update,const Revision revision) throw (ClientException) { if (Url::isValid (path.path())) - return remoteSingletqStatus (this, path,revision, m_context); + return remoteSingleStatus (this, path,revision, m_context); else - return localSingletqStatus (path, m_context,update); + return localSingleStatus (path, m_context,update); } bool diff --git a/src/svnqt/diff_data.cpp b/src/svnqt/diff_data.cpp index f1837ce..756e771 100644 --- a/src/svnqt/diff_data.cpp +++ b/src/svnqt/diff_data.cpp @@ -130,7 +130,7 @@ namespace svn close(); TQFile fi(m_outFileName); if (!fi.open(IO_ReadOnly|IO_Raw)) { - throw ClientException(TQString("%1 '%2'").tqarg(fi.errorString()).tqarg(m_outFileName)); + throw ClientException(TQString("%1 '%2'").arg(fi.errorString()).arg(m_outFileName)); } TQByteArray res = fi.readAll(); diff --git a/src/svnqt/dirent.cpp b/src/svnqt/dirent.cpp index 7a42ae7..9015d13 100644 --- a/src/svnqt/dirent.cpp +++ b/src/svnqt/dirent.cpp @@ -60,7 +60,7 @@ namespace svn hasProps (dirEntry->has_props != 0), createdRev (dirEntry->created_rev), time (dirEntry->time), m_Lock() { - lastAuthor = dirEntry->last_author == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(dirEntry->last_author); + lastAuthor = dirEntry->last_author == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(dirEntry->last_author); } DirEntry_Data (const DirEntry & src) diff --git a/src/svnqt/exception.cpp b/src/svnqt/exception.cpp index bc25345..1824572 100644 --- a/src/svnqt/exception.cpp +++ b/src/svnqt/exception.cpp @@ -121,7 +121,7 @@ namespace svn { message += TQString::FROMUTF8("In file "); message += TQString::FROMUTF8(error->file); - message += TQString(" Line %1").tqarg(error->line); + message += TQString(" Line %1").arg(error->line); } } while (next != NULL && next->message != NULL) diff --git a/src/svnqt/log_entry.cpp b/src/svnqt/log_entry.cpp index f641b17..720642d 100644 --- a/src/svnqt/log_entry.cpp +++ b/src/svnqt/log_entry.cpp @@ -96,8 +96,8 @@ namespace svn const char *message_; svn_compat_log_revprops_out(&author_, &date_, &message_, log_entry->revprops); - author = author_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(author_); - message = message_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(message_); + author = author_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(author_); + message = message_ == 0 ? TQString::fromLatin1("") : 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 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(author_); - message = message_ == 0 ? TQString::tqfromLatin1("") : TQString::FROMUTF8(message_); + author = author_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(author_); + message = message_ == 0 ? TQString::fromLatin1("") : TQString::FROMUTF8(message_); } void LogEntry::setDate(const char*date_) diff --git a/src/svnqt/path.cpp b/src/svnqt/path.cpp index 4281de7..4e0b14d 100644 --- a/src/svnqt/path.cpp +++ b/src/svnqt/path.cpp @@ -213,7 +213,7 @@ namespace svn if (pos == -1) { filename = basename; - ext = TQString::tqfromLatin1(""); + ext = TQString::fromLatin1(""); } else { diff --git a/src/svnqt/revision.hpp b/src/svnqt/revision.hpp index 5acaab2..178397e 100644 --- a/src/svnqt/revision.hpp +++ b/src/svnqt/revision.hpp @@ -38,7 +38,7 @@ // qt #include #include -#include +#include // subversion api #include "svn_types.h" diff --git a/src/svnqt/status.cpp b/src/svnqt/status.cpp index a7913f6..c5e47a3 100644 --- a/src/svnqt/status.cpp +++ b/src/svnqt/status.cpp @@ -175,7 +175,7 @@ namespace svn m_hasReal=true; } - tqStatus::tqStatus (const tqStatus & src) + Status::Status (const Status & src) : m_Data(new Status_private()) { if( &src != this ) @@ -188,37 +188,37 @@ namespace svn } } - tqStatus::tqStatus (const TQString&path, svn_wc_status2_t * status) + Status::Status (const TQString&path, svn_wc_status2_t * status) : m_Data(new Status_private()) { m_Data->init(path, status); } - tqStatus::tqStatus (const char*path, svn_wc_status2_t * status) + Status::Status (const char*path, svn_wc_status2_t * status) : m_Data(new Status_private()) { m_Data->init(TQString::FROMUTF8(path),status); } - tqStatus::tqStatus(const TQString&url,const DirEntryPtr&src) + Status::Status(const TQString&url,const DirEntryPtr&src) : m_Data(new Status_private()) { m_Data->init(url,src); } - tqStatus::tqStatus(const TQString&url,const InfoEntry&src) + Status::Status(const TQString&url,const InfoEntry&src) : m_Data(new Status_private()) { m_Data->init(url,src); } - tqStatus::~tqStatus () + Status::~Status () { delete m_Data; } - tqStatus & - tqStatus::operator=(const tqStatus & status) + Status & + Status::operator=(const Status & status) { if (this == &status) return *this; @@ -231,89 +231,89 @@ namespace svn } const LockEntry& - tqStatus::lockEntry () const + Status::lockEntry () const { return m_Data->m_Lock; } svn_wc_status_kind - tqStatus::reposProptqStatus () const + Status::reposPropStatus () const { return m_Data->_repos_prop_status; } svn_wc_status_kind - tqStatus::reposTexttqStatus () const + Status::reposTextStatus () const { return m_Data->_repos_text_status; } bool - tqStatus::isSwitched () const + Status::isSwitched () const { return m_Data->_switched != 0; } bool - tqStatus::isCopied () const + Status::isCopied () const { return m_Data->_copied; } bool - tqStatus::isLocked () const + Status::isLocked () const { return m_Data->m_Lock.Locked(); } bool - tqStatus::isModified()const + Status::isModified()const { - return texttqStatus()==svn_wc_status_modified||proptqStatus()==svn_wc_status_modified - ||texttqStatus ()==svn_wc_status_replaced; + return textStatus()==svn_wc_status_modified||propStatus()==svn_wc_status_modified + ||textStatus ()==svn_wc_status_replaced; } bool - tqStatus::isRealVersioned()const + Status::isRealVersioned()const { return m_Data->m_hasReal; } bool - tqStatus::isVersioned () const + Status::isVersioned () const { return m_Data->m_isVersioned; } svn_wc_status_kind - tqStatus::proptqStatus () const + Status::propStatus () const { return m_Data->_prop_status; } svn_wc_status_kind - tqStatus::texttqStatus () const + Status::textStatus () const { return m_Data->_text_status; } const Entry& - tqStatus::entry () const + Status::entry () const { return m_Data->m_entry; } const TQString& - tqStatus::path () const + Status::path () const { return m_Data->m_Path; } bool - tqStatus::validRepostqStatus()const + Status::validReposStatus()const { - return reposTexttqStatus()!=svn_wc_status_none||reposProptqStatus()!=svn_wc_status_none; + return reposTextStatus()!=svn_wc_status_none||reposPropStatus()!=svn_wc_status_none; } bool - tqStatus::validLocaltqStatus()const + Status::validLocalStatus()const { - return texttqStatus()!=svn_wc_status_none||proptqStatus()!=svn_wc_status_none; + return textStatus()!=svn_wc_status_none||propStatus()!=svn_wc_status_none; } } diff --git a/src/svnqt/status.hpp b/src/svnqt/status.hpp index 3b6e03e..281f905 100644 --- a/src/svnqt/status.hpp +++ b/src/svnqt/status.hpp @@ -53,13 +53,13 @@ namespace svn */ class Status_private; - class SVNTQT_EXPORT tqStatus + class SVNTQT_EXPORT Status { public: /** * copy constructor */ - tqStatus (const tqStatus & src); + Status (const Status & src); /** * default constructor @@ -67,27 +67,27 @@ namespace svn * @param path path for this status entry * @param status status entry */ - tqStatus (const TQString&path=TQString(), svn_wc_status2_t * status = NULL); + Status (const TQString&path=TQString(), svn_wc_status2_t * status = NULL); /** * default constructor * * @param path path for this status entry * @param status status entry */ - tqStatus (const char*path, svn_wc_status2_t * status = NULL); + Status (const char*path, svn_wc_status2_t * status = NULL); /** * converting constructor */ - tqStatus(const TQString&path,const DirEntryPtr&src); + Status(const TQString&path,const DirEntryPtr&src); /** * converting constructor */ - tqStatus(const TQString&path,const InfoEntry&src); + Status(const TQString&path,const InfoEntry&src); /** * destructor */ - virtual ~tqStatus (); + virtual ~Status (); /** * @return path of status entry @@ -105,13 +105,13 @@ namespace svn * @return file status property enum of the "textual" component. */ svn_wc_status_kind - texttqStatus () const; + textStatus () const; /** * @return file status property enum of the "property" component. */ svn_wc_status_kind - proptqStatus () const; + propStatus () const; /** * @retval TRUE if under version control @@ -152,28 +152,28 @@ namespace svn * @return the entry's text status in the repository */ svn_wc_status_kind - reposTexttqStatus () const; + reposTextStatus () const; /** * @return the entry's prop status in the repository */ svn_wc_status_kind - reposProptqStatus () const; + reposPropStatus () const; const LockEntry& lockEntry () const; bool - validRepostqStatus()const; + validReposStatus()const; bool - validLocaltqStatus()const; + validLocalStatus()const; /** * assignment operator */ - tqStatus & - operator = (const tqStatus &); + Status & + operator = (const Status &); private: Status_private*m_Data; }; diff --git a/src/svnqt/svnqttypes.hpp b/src/svnqt/svnqttypes.hpp index 5b470f2..5d16658 100644 --- a/src/svnqt/svnqttypes.hpp +++ b/src/svnqt/svnqttypes.hpp @@ -41,7 +41,7 @@ namespace svn class InfoEntry; class LogEntry; class Revision; - class tqStatus; + class Status; class Targets; class Path; class StringArray; @@ -61,7 +61,7 @@ namespace svn /// shared_pointer for LogEntriesMap typedef SharedPointer LogEntriesMapPtr; - typedef SharedPointer StatusPtr; + typedef SharedPointer StatusPtr; typedef TQLIST StatusEntries; typedef TQLIST Revisions; diff --git a/src/svnqt/tests/lsdir.cpp b/src/svnqt/tests/lsdir.cpp index 1ac0140..f3a2f6f 100644 --- a/src/svnqt/tests/lsdir.cpp +++ b/src/svnqt/tests/lsdir.cpp @@ -15,8 +15,8 @@ int main(int,char**) m_Svnclient->setContext(m_CurrentContext); svn::DirEntries dlist; - TQString p = TQString("file://%1").tqarg(TESTREPOPATH); - TQString l = TQString("%1").tqarg(TESTCOPATH); + TQString p = TQString("file://%1").arg(TESTREPOPATH); + TQString l = TQString("%1").arg(TESTCOPATH); try { dlist = m_Svnclient->list(svn::Path(p),svn::Revision::HEAD,svn::Revision::HEAD,svn::DepthInfinity,true); diff --git a/src/svnqt/url.cpp b/src/svnqt/url.cpp index 2478997..6f55356 100644 --- a/src/svnqt/url.cpp +++ b/src/svnqt/url.cpp @@ -64,10 +64,10 @@ namespace svn { bool cs = false; if ( - url.tqstartsWith("file://",cs) || - url.tqstartsWith("/") || - url.tqstartsWith("svn+file://",cs) || - url.tqstartsWith("ksvn+file://",cs) ) + url.startsWith("file://",cs) || + url.startsWith("/") || + url.startsWith("svn+file://",cs) || + url.startsWith("ksvn+file://",cs) ) { return true; } diff --git a/src/svnqt/version_check.cpp b/src/svnqt/version_check.cpp index 44c79d3..ceb8e49 100644 --- a/src/svnqt/version_check.cpp +++ b/src/svnqt/version_check.cpp @@ -52,8 +52,8 @@ namespace svn { { if (curr_version_string.length()==0) { curr_version_string = - TQString("%1.%2.%3.%4").tqarg(svn_client_version()->major).tqarg(svn_client_version()->minor) - .tqarg(svn_client_version()->patch).tqarg(svn_client_version()->tag); + TQString("%1.%2.%3.%4").arg(svn_client_version()->major).arg(svn_client_version()->minor) + .arg(svn_client_version()->patch).arg(svn_client_version()->tag); } return curr_version_string; } diff --git a/src/svnqt/wc.cpp b/src/svnqt/wc.cpp index 4729696..bf3b5dd 100644 --- a/src/svnqt/wc.cpp +++ b/src/svnqt/wc.cpp @@ -116,7 +116,7 @@ namespace svn TQString result = ""; const svn_wc_entry_t *entry; entry = getEntry( path ); - result = entry ? TQString::FROMUTF8(entry->repos) : TQString::tqfromLatin1(""); + result = entry ? TQString::FROMUTF8(entry->repos) : TQString::fromLatin1(""); return result; } -- cgit v1.2.1