From 0813b39aed2cf4c84157a22c4c9594336d93d412 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- .../modules/dbsearchengine/KDBSearchEngine.cpp | 26 +++++++++++----------- .../kbabeldict/modules/dbsearchengine/database.cpp | 2 +- .../kbabeldict/modules/dbsearchengine/dbscan.cpp | 2 +- .../modules/dbsearchengine/dbseprefwidget.ui | 2 +- .../kbabeldict/modules/dbsearchengine/makemsgdb.C | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'kbabel/kbabeldict/modules/dbsearchengine') diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index 3292ccc9..fe312253 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -607,7 +607,7 @@ KDBSearchEngine::repeat () if (tot >= min && !inlibs) { id = item.key; - id = id.tqreplace ("\n", "\"\n\""); + id = id.replace ("\n", "\"\n\""); mle->append (txt.arg (tot).arg (ntra).arg (id)); } @@ -667,7 +667,7 @@ KDBSearchEngine::startSearchNow (int searchmode) bool allkey = (searchmode == MD_ALL_GOOD_KEYS); - bool equal, tqcontains, contained, regexp, intra; + bool equal, contains, contained, regexp, intra; intra = searchmode & MD_IN_TRANSLATION; @@ -700,12 +700,12 @@ KDBSearchEngine::startSearchNow (int searchmode) int pos; for (i = 0; i < len; i++) { - while ((pos = idMod->tqfind (remchar.at (i))) != -1) + while ((pos = idMod->find (remchar.at (i))) != -1) idMod->remove (pos, 1); } if (comm) - idMod->tqreplace (TQRegExp ("\\_\\:.*\\\\n"), ""); //Read it from catalog !!! (NOT ONLY HERE) + idMod->replace (TQRegExp ("\\_\\:.*\\\\n"), ""); //Read it from catalog !!! (NOT ONLY HERE) if (norm) @@ -802,12 +802,12 @@ KDBSearchEngine::startSearchNow (int searchmode) //Remove character in list of character to be ignored for (i = 0; i < len; i++) - while ((pos = msgId.tqfind (remchar.at (i))) != -1) + while ((pos = msgId.find (remchar.at (i))) != -1) msgId.remove (pos, 1); //Remove context information from id found if (comm) - msgId.tqreplace (TQRegExp ("\\_\\:.*\\\\n"), ""); + msgId.replace (TQRegExp ("\\_\\:.*\\\\n"), ""); if (norm) @@ -838,14 +838,14 @@ KDBSearchEngine::startSearchNow (int searchmode) //Remove character in list of character to be ignored for (i = 0; i < len; i++) while ((pos = - msgId.tqfind (remchar.at (i))) != + msgId.find (remchar.at (i))) != -1) msgId.remove (pos, 1); //Remove context information from id found if (comm) msgId. - tqreplace (TQRegExp ("\\_\\:.*\\\\n"), + replace (TQRegExp ("\\_\\:.*\\\\n"), ""); @@ -867,12 +867,12 @@ KDBSearchEngine::startSearchNow (int searchmode) equal = false; if (rules & Contains) - tqcontains = idMod->tqcontains (msgId); + contains = idMod->contains (msgId); else - tqcontains = false; + contains = false; if (rules & Contained) - contained = msgId.tqcontains (*idMod); + contained = msgId.contains (*idMod); else contained = false; @@ -887,7 +887,7 @@ KDBSearchEngine::startSearchNow (int searchmode) } while (intra && nn < item.numTra); - if (equal || tqcontains || contained || regexp || allkey) + if (equal || contains || contained || regexp || allkey) { if (equal) @@ -1034,7 +1034,7 @@ KDBSearchEngine::startSingleSearch (TQString searchString, in = reg.search (searchString, in + len); len = reg.matchedLength (); TQString regToAdd = searchString; - regToAdd.tqreplace (in, len, "[a-zA-Z0-9_%" + regaddchar + "]*"); + regToAdd.replace (in, len, "[a-zA-Z0-9_%" + regaddchar + "]*"); regToAdd.append ("$"); regToAdd.prepend ("^"); // fprintf(stderr,"%s",(const char *)regToAdd.local8Bit()); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp index 1d1cb9ae..6fa383df 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp @@ -1446,7 +1446,7 @@ DataBaseManager::putNewTranslation (TQString key, TQString tran, int catalog, isThisOne = (*ittr).translation == msgstr; // is there the catnum we are looking for? - if ((*ittr).infoRef.tqfind (catnum) != (*ittr).infoRef.end ()) + if ((*ittr).infoRef.find (catnum) != (*ittr).infoRef.end ()) { found_catalog_info = true; if (ow && !isThisOne) diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp index 3d86ebb1..5a4d5a6e 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp @@ -120,7 +120,7 @@ InfoItem cinfo; Catalog * catalog=new Catalog(this,"ScanPoCatalog"); -TQString location=fileName.right(fileName.length()-fileName.tqfindRev("/")-1); +TQString location=fileName.right(fileName.length()-fileName.findRev("/")-1); connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int))); emit filename(location); emit fileProgress(0); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui index 3e694330..b457bf74 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui @@ -285,7 +285,7 @@ It also substitutes groups of more than one space character with only one space containsCB - Query tqcontains + Query contains Match if query contains the database string diff --git a/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C b/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C index 74a09037..a83d947b 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C +++ b/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C @@ -116,9 +116,9 @@ nmax++; normalizestr(a); // printf("#%s#\n",a); -// while (st.tqfind("#~")==0) +// while (st.find("#~")==0) // st = st.right(st.length()-2); -// while (st.tqfind(" ")==0) +// while (st.find(" ")==0) // st = st.right(st.length()-1); if(isAMsgId) nextIsFuzzy=false; -- cgit v1.2.1