From 937b2991d8e78166eea904c80ad04d34607017a4 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/kdenetwork@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdict/applet/kdictapplet.cpp | 4 ++-- kdict/dict.cpp | 8 ++++---- kdict/matchview.cpp | 2 +- kdict/queryview.cpp | 4 ++-- kdict/sets.cpp | 2 +- kdict/toplevel.cpp | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kdict') diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp index eda347e4..74ad2e0b 100644 --- a/kdict/applet/kdictapplet.cpp +++ b/kdict/applet/kdictapplet.cpp @@ -286,7 +286,7 @@ void DictApplet::sendCommand(const TQCString &fun, const TQString &data) return; } else { QCStringList list = client->remoteObjects("kdict"); - if (list.tqfindIndex("KDictIface")==-1) { + if (list.findIndex("KDictIface")==-1) { waiting = 1; delayedFunc = fun.copy(); delayedData = data; @@ -313,7 +313,7 @@ void DictApplet::sendDelayedCommand() return; } else { QCStringList list = client->remoteObjects("kdict"); - if (list.tqfindIndex("KDictIface")==-1) { + if (list.findIndex("KDictIface")==-1) { waiting++; TQTimer::singleShot(100, this, TQT_SLOT(sendDelayedCommand())); return; diff --git a/kdict/dict.cpp b/kdict/dict.cpp index 11d5e12b..8e55061c 100644 --- a/kdict/dict.cpp +++ b/kdict/dict.cpp @@ -215,7 +215,7 @@ void DictAsyncClient::define() TQString lastDb; TQStringList::iterator it; for (it = job->matches.begin(); it != job->matches.end(); ++it) { - int pos = (*it).tqfind(' '); + int pos = (*it).find(' '); if (pos != -1) { if (lastDb != (*it).left(pos)) { if (lastDb.length() > 0) @@ -430,7 +430,7 @@ bool DictAsyncClient::getDefinitions() } resultAppend("

\n"); - if (hashList.tqfind(context.hexDigest())>=0) // duplicate?? + if (hashList.find(context.hexDigest())>=0) // duplicate?? job->result.truncate(oldResPos); // delete the whole definition else { hashList.append(context.hexDigest()); @@ -1521,7 +1521,7 @@ JobData* DictInterface::generateQuery(JobData::QueryType type, TQString query) return 0L; if (query.length()>300) // shorten if necessary query.truncate(300); - query = query.tqreplace(TQRegExp("[\"\\]"), ""); // remove remaining illegal chars... + query = query.replace(TQRegExp("[\"\\]"), ""); // remove remaining illegal chars... if (query.isEmpty()) return 0L; @@ -1537,7 +1537,7 @@ JobData* DictInterface::generateQuery(JobData::QueryType type, TQString query) if ((global->currentDatabase > 0)&& // database set (global->currentDatabase < global->databaseSets.count()+1)) { for (int i = 0;i<(int)global->serverDatabases.count();i++) - if ((global->databaseSets.at(global->currentDatabase-1))->tqfindIndex(global->serverDatabases[i])>0) + if ((global->databaseSets.at(global->currentDatabase-1))->findIndex(global->serverDatabases[i])>0) newjob->databases.append(global->serverDatabases[i].utf8().data()); if (newjob->databases.count()==0) { KMessageBox::sorry(global->topLevel, i18n("Please select at least one database.")); diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp index e633c2a2..76e05c6f 100644 --- a/kdict/matchview.cpp +++ b/kdict/matchview.cpp @@ -176,7 +176,7 @@ void MatchView::updateStrategyCombo() bool MatchView::selectStrategy(const TQString &strategy) const { - int newCurrent = global->strategies.tqfindIndex(strategy); + int newCurrent = global->strategies.findIndex(strategy); if (newCurrent == -1) return false; else { diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp index 40aac513..61411cd2 100644 --- a/kdict/queryview.cpp +++ b/kdict/queryview.cpp @@ -231,7 +231,7 @@ void QueryView::saveQuery() if (!browseList.isEmpty()) { BrowseData* brw = browseList.at(browsePos); TQString fName = brw->queryText+".html"; - fName.tqreplace(TQRegExp("[\\s/]"),"_"); + fName.replace(TQRegExp("[\\s/]"),"_"); SaveHelper helper(fName,"*.html",global->topLevel); TQFile *file = helper.getFile(TQString()); @@ -282,7 +282,7 @@ void QueryView::copySelection() void QueryView::showFindDialog() { - KAction *act = part->actionCollection()->action("tqfind"); + KAction *act = part->actionCollection()->action("find"); if (act) act->activate(); } diff --git a/kdict/sets.cpp b/kdict/sets.cpp index a7621b35..e4fccd2b 100644 --- a/kdict/sets.cpp +++ b/kdict/sets.cpp @@ -269,7 +269,7 @@ void DbSetsDialog::activateSet(int num) } else { w_set->setCurrentItem(num); for (unsigned int i=0;iserverDatabases.count();i++) - if (global->databaseSets.at(num)->tqfindIndex(global->serverDatabases[i])>0) + if (global->databaseSets.at(num)->findIndex(global->serverDatabases[i])>0) w_leftBox->insertItem(global->serverDatabases[i]); else w_rightBox->insertItem(global->serverDatabases[i]); diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp index 48a5c30a..31cb4dfa 100644 --- a/kdict/toplevel.cpp +++ b/kdict/toplevel.cpp @@ -203,7 +203,7 @@ bool TopLevel::setDatabase(TQString db) { kdDebug(5004) << "*DCOP call* TopLevel::setDatabase()" << endl; - int newCurrent = global->databases.tqfindIndex(db); + int newCurrent = global->databases.findIndex(db); if (newCurrent == -1) return false; else { -- cgit v1.2.1