summaryrefslogtreecommitdiffstats
path: root/src/svnqt
diff options
context:
space:
mode:
Diffstat (limited to 'src/svnqt')
-rw-r--r--src/svnqt/cache/LogCache.cpp12
-rw-r--r--src/svnqt/cache/sqlite3/qsql_sqlite3.cpp6
-rw-r--r--src/svnqt/entry.hpp2
-rw-r--r--src/svnqt/path.cpp8
-rw-r--r--src/svnqt/url.cpp4
5 files changed, 16 insertions, 16 deletions
diff --git a/src/svnqt/cache/LogCache.cpp b/src/svnqt/cache/LogCache.cpp
index 15fe04e..c2261c8 100644
--- a/src/svnqt/cache/LogCache.cpp
+++ b/src/svnqt/cache/LogCache.cpp
@@ -70,18 +70,18 @@ public:
TQSqlQuery _q(TQString(), aDb);
TQStringList list = aDb->tables();
- if (list.tqfind("logentries")==list.end()) {
+ if (list.find("logentries")==list.end()) {
aDb->transaction();
_q.exec("CREATE TABLE \"logentries\" (\"revision\" INTEGER UNITQUE,\"date\" INTEGER,\"author\" TEXT, \"message\" TEXT)");
aDb->commit();
}
- if (list.tqfind("changeditems")==list.end()) {
+ if (list.find("changeditems")==list.end()) {
aDb->transaction();
_q.exec("CREATE TABLE \"changeditems\" (\"revision\" INTEGER,\"changeditem\" TEXT,\"action\" TEXT,\"copyfrom\" TEXT,\"copyfromrev\" INTEGER, PRIMARY KEY(revision,changeditem,action))");
aDb->commit();
}
list = aDb->tables();
- if (list.tqfind("logentries")==list.end() || list.tqfind("changeditems")==list.end()) {
+ if (list.find("logentries")==list.end() || list.find("changeditems")==list.end()) {
return false;
}
return true;
@@ -148,12 +148,12 @@ public:
}
checkDone=true;
}
- if (m_mainDB.localData()->reposCacheNames.tqfind(dbFile)!=m_mainDB.localData()->reposCacheNames.end()) {
+ if (m_mainDB.localData()->reposCacheNames.find(dbFile)!=m_mainDB.localData()->reposCacheNames.end()) {
return TQSqlDatabase::database(m_mainDB.localData()->reposCacheNames[dbFile]);
}
int i = 0;
TQString _key = dbFile;
- while (TQSqlDatabase::tqcontains(_key)) {
+ while (TQSqlDatabase::contains(_key)) {
_key = TQString("%1-%2").tqarg(dbFile).tqarg(i++);
}
// qDebug("The repository key is now: %s",_key.TOUTF8().data());
@@ -179,7 +179,7 @@ public:
if (!m_mainDB.hasLocalData()) {
unsigned i=0;
TQString _key = STQLMAIN;
- while (TQSqlDatabase::tqcontains(_key)) {
+ while (TQSqlDatabase::contains(_key)) {
_key.sprintf("%s-%i",STQLMAIN,i++);
}
qDebug("The key is now: %s",_key.TOUTF8().data());
diff --git a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp
index a5faff5..6a8bea2 100644
--- a/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp
+++ b/src/svnqt/cache/sqlite3/qsql_sqlite3.cpp
@@ -128,7 +128,7 @@ void TQSQLite3ResultPrivate::initColumns()
for (int i = 0; i < nCols; ++i) {
TQString colName = TQString::fromUtf8(sqlite3_column_name(stmt, i));
- int dotIdx = colName.tqfindRev('.');
+ int dotIdx = colName.findRev('.');
rInf.append(TQSqlField(colName.mid(dotIdx == -1 ? 0 : dotIdx + 1),
qSqliteType(sqlite3_column_type(stmt, i))));
}
@@ -427,8 +427,8 @@ TQSqlIndex TQSQLite3Driver::primaryIndex(const TQString &tblname) const
while(q.next()) {
TQString name = q.value(2).toString();
TQSqlVariant::Type type = TQSqlVariant::Invalid;
- if (rec.tqcontains(name))
- type = rec.tqfind(name).type();
+ if (rec.contains(name))
+ type = rec.find(name).type();
index.append(TQSqlField(name, type));
}
return index;
diff --git a/src/svnqt/entry.hpp b/src/svnqt/entry.hpp
index 3b11055..0a1a571 100644
--- a/src/svnqt/entry.hpp
+++ b/src/svnqt/entry.hpp
@@ -126,7 +126,7 @@ namespace svn
svn_node_kind_t
kind () const;
/**
- * @return scheduling (add, delete, tqreplace)
+ * @return scheduling (add, delete, replace)
*/
svn_wc_schedule_t
schedule () const;
diff --git a/src/svnqt/path.cpp b/src/svnqt/path.cpp
index 71b877c..737d0ae 100644
--- a/src/svnqt/path.cpp
+++ b/src/svnqt/path.cpp
@@ -77,11 +77,11 @@ namespace svn
}
}
m_path = TQString::FROMUTF8(int_path);
- if (Url::isValid(path) && m_path.tqfind("@")!=-1 ) {
+ if (Url::isValid(path) && m_path.find("@")!=-1 ) {
/// @todo make sure that "@" is never used as revision paramter
TQUrl uri = m_path;
m_path = uri.path();
- m_path.tqreplace("@","%40");
+ m_path.replace("@","%40");
m_path = uri.protocol()+"://"+(uri.hasUser()?uri.user()+(uri.hasPassword()?":"+uri.password():"")+"@":"")
+uri.host()+m_path;
if (m_path.endsWith("/")) {
@@ -116,7 +116,7 @@ namespace svn
Pool pool;
const char * int_path = svn_path_uri_decode(m_path.TOUTF8(), pool.pool () );
TQString _p = TQString::FROMUTF8(int_path);
- _p.tqreplace("%40","@");
+ _p.replace("%40","@");
return _p;
}
@@ -208,7 +208,7 @@ namespace svn
split (dir, basename);
// next search for last .
- int pos = basename.tqfindRev(TQChar('.'));
+ int pos = basename.findRev(TQChar('.'));
if (pos == -1)
{
diff --git a/src/svnqt/url.cpp b/src/svnqt/url.cpp
index 40565f6..383bdd1 100644
--- a/src/svnqt/url.cpp
+++ b/src/svnqt/url.cpp
@@ -151,13 +151,13 @@ namespace svn
{
const TQString tokenStart ("handles '");
const TQString tokenEnd ("' schem");
- pos = descriptions.tqfind (tokenStart, pos);
+ pos = descriptions.find (tokenStart, pos);
if (pos == not_found)
break;
pos += tokenStart.length ();
- int posEnd = descriptions.tqfind (tokenEnd, pos);
+ int posEnd = descriptions.find (tokenEnd, pos);
if (posEnd == not_found)
break;