summaryrefslogtreecommitdiffstats
path: root/src/svnqt/cache
diff options
context:
space:
mode:
Diffstat (limited to 'src/svnqt/cache')
-rw-r--r--src/svnqt/cache/DatabaseException.cpp2
-rw-r--r--src/svnqt/cache/LogCache.cpp2
-rw-r--r--src/svnqt/cache/ReposLog.cpp14
-rw-r--r--src/svnqt/cache/sqlite3/qsql_sqlite3.cpp10
-rw-r--r--src/svnqt/cache/test/sqlite.cpp2
5 files changed, 15 insertions, 15 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/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 <tqstringlist.h>
#include <iostream>
#include <tqapplication.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include "svnqt/client.hpp"
#include "svnqt/svnqttypes.hpp"
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-06 16:07:27 +0000