diff options
Diffstat (limited to 'src/svnqt')
-rw-r--r-- | src/svnqt/cache/DatabaseException.cpp | 2 | ||||
-rw-r--r-- | src/svnqt/cache/LogCache.cpp | 2 | ||||
-rw-r--r-- | src/svnqt/cache/ReposLog.cpp | 14 | ||||
-rw-r--r-- | src/svnqt/client.hpp | 2 | ||||
-rw-r--r-- | src/svnqt/client_impl.hpp | 2 | ||||
-rw-r--r-- | src/svnqt/diff_data.cpp | 2 | ||||
-rw-r--r-- | src/svnqt/exception.cpp | 2 | ||||
-rw-r--r-- | src/svnqt/tests/lsdir.cpp | 4 | ||||
-rw-r--r-- | src/svnqt/version_check.cpp | 4 |
9 files changed, 17 insertions, 17 deletions
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/client.hpp b/src/svnqt/client.hpp index 70195ac..68d0aa0 100644 --- a/src/svnqt/client.hpp +++ b/src/svnqt/client.hpp @@ -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.<br> - 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 361603b..4e2ea60 100644 --- a/src/svnqt/client_impl.hpp +++ b/src/svnqt/client_impl.hpp @@ -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/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/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/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/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; } |