summaryrefslogtreecommitdiffstats
path: root/conduits/docconduit
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commit539a35866f0bac8f00e493654d4a8ec6863726e2 (patch)
tree8991e5472fe88379787cafa85542d94706bd6fa4 /conduits/docconduit
parent45598e35650c5806ecf2d684afeeb0da41c3ff6b (diff)
downloadkpilot-539a35866f0bac8f00e493654d4a8ec6863726e2.tar.gz
kpilot-539a35866f0bac8f00e493654d4a8ec6863726e2.zip
rename the following methods:
tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'conduits/docconduit')
-rw-r--r--conduits/docconduit/DOC-converter.cc6
-rw-r--r--conduits/docconduit/doc-conduit.cc10
2 files changed, 8 insertions, 8 deletions
diff --git a/conduits/docconduit/DOC-converter.cc b/conduits/docconduit/DOC-converter.cc
index 06f45b7..2e25b61 100644
--- a/conduits/docconduit/DOC-converter.cc
+++ b/conduits/docconduit/DOC-converter.cc
@@ -79,7 +79,7 @@ int docMatchBookmark::findMatches(TQString doctext, bmkList &fBookmarks) {
#endif
while (pos >= 0 && found<to) {
- pos = doctext.tqfind(pattern, pos);
+ pos = doctext.find(pattern, pos);
#ifdef DEBUG
DEBUGKPILOT<<"Result of search: pos="<<pos<<endl;
#endif
@@ -120,8 +120,8 @@ int docRegExpBookmark::findMatches(TQString doctext, bmkList &fBookmarks)
// TODO: use the subexpressions from the regexp for the bmk name ($1..$9) (given as separate regexp)
TQString bmkText(bmkName);
for (int i=0; i<=rx.numCaptures(); ++i) {
- bmkText.tqreplace(CSL1("$%1").tqarg(i), rx.cap(i));
- bmkText.tqreplace(CSL1("\\%1").tqarg(i), rx.cap(i));
+ bmkText.replace(CSL1("$%1").tqarg(i), rx.cap(i));
+ bmkText.replace(CSL1("\\%1").tqarg(i), rx.cap(i));
}
fBookmarks.append(new docBookmark(bmkText.left(16), pos));
}
diff --git a/conduits/docconduit/doc-conduit.cc b/conduits/docconduit/doc-conduit.cc
index 0bce0fe..0ac14f1 100644
--- a/conduits/docconduit/doc-conduit.cc
+++ b/conduits/docconduit/doc-conduit.cc
@@ -414,7 +414,7 @@ void DOCConduit::syncNextDB() {
// if creator and/or type don't match, go to next db
if (!isCorrectDBTypeCreator(dbinfo) ||
- fDBNames.tqcontains(TQString::tqfromLatin1(dbinfo.name)))
+ fDBNames.contains(TQString::tqfromLatin1(dbinfo.name)))
{
TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
return;
@@ -474,7 +474,7 @@ void DOCConduit::syncNextTXT()
memset(&dbinfo.name[0], 0, 33);
strncpy(&dbinfo.name[0], fl.baseName(TRUE).latin1(), 30);
- bool alreadySynced=fDBNames.tqcontains(fl.baseName(TRUE));
+ bool alreadySynced=fDBNames.contains(fl.baseName(TRUE));
if (!alreadySynced) {
docSyncInfo syncInfo(TQString::tqfromLatin1(dbinfo.name),
txtfilename, pdbfilename, eSyncNone);
@@ -529,7 +529,7 @@ void DOCConduit::checkPDBFiles() {
// Get the doc title and check if it has already been synced (in the synced docs list of in fDBNames to be synced)
// If the doc title doesn't appear in either list, install it to the Handheld, and add it to the list of dbs to be synced.
TQString dbname=fl.baseName(TRUE).left(30);
- if (!fDBNames.tqcontains(dbname) && !fDBListSynced.tqcontains(dbname)) {
+ if (!fDBNames.contains(dbname) && !fDBListSynced.contains(dbname)) {
if (fHandle->installFiles(pdbfilename, false)) {
DBInfo dbinfo;
// Include all "extensions" except the last. This allows full stops inside the database name (e.g. abbreviations)
@@ -559,7 +559,7 @@ void DOCConduit::checkDeletedDocs()
FUNCTIONSETUP;
for (TQStringList::Iterator it=fDBListSynced.begin(); it!=fDBListSynced.end(); ++it ) {
- if (!fDBNames.tqcontains(*it)) {
+ if (!fDBNames.contains(*it)) {
// We need to delete this doc:
TQString dbname(*it);
TQString txtfilename=constructTXTFileName(dbname);
@@ -702,7 +702,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
sinfo.direction = eSyncNone;
PilotDatabase*docdb=openDOCDatabase(TQString::tqfromLatin1(sinfo.dbinfo.name));
- if (!fDBListSynced.tqcontains(sinfo.handheldDB)) {
+ if (!fDBListSynced.contains(sinfo.handheldDB)) {
// the database wasn't included on last sync, so it has to be new.
#ifdef DEBUG
DEBUGKPILOT<<"Database "<<sinfo.dbinfo.name<<" wasn't included in the previous sync!"<<endl;