summaryrefslogtreecommitdiffstats
path: root/kdelirc
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
commit6335dc55802871b5a43492f217b6edbb420204c4 (patch)
tree50c6c8672a52687568edea475614dfe3d98e62e5 /kdelirc
parent9b8c9f1f9e974ff0176108cfbd8852cd99ea68c8 (diff)
downloadtdeutils-6335dc55802871b5a43492f217b6edbb420204c4.tar.gz
tdeutils-6335dc55802871b5a43492f217b6edbb420204c4.zip
rename the following methods:
tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdelirc')
-rw-r--r--kdelirc/irkick/irkick.cpp6
-rw-r--r--kdelirc/irkick/klircclient.cpp4
-rw-r--r--kdelirc/kcmlirc/addaction.cpp28
-rw-r--r--kdelirc/kcmlirc/editaction.cpp4
-rw-r--r--kdelirc/kdelirc/modes.cpp8
5 files changed, 25 insertions, 25 deletions
diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp
index 036974c..cd3140c 100644
--- a/kdelirc/irkick/irkick.cpp
+++ b/kdelirc/irkick/irkick.cpp
@@ -195,7 +195,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs)
for(QCStringList::iterator i = buf.begin(); i != buf.end(); ++i)
{
TQString program = TQString::fromUtf8(*i);
- if(program.tqcontains(r))
+ if(program.contains(r))
programs += program;
}
if(programs.size() > 1 && action.ifMulti() == IM_DONTSEND)
@@ -206,7 +206,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs)
for(TQValueList<WId>::iterator i = s.fromLast(); i != s.end(); i--)
{ int p = KWin::info(*i).pid;
TQString id = action.program() + "-" + TQString().setNum(p);
- if(programs.tqcontains(id))
+ if(programs.contains(id))
{ programs.clear();
programs += id;
break;
@@ -220,7 +220,7 @@ bool IRKick::getPrograms(const IRAction &action, TQStringList &programs)
for(TQValueList<WId>::iterator i = s.begin(); i != s.end(); ++i)
{ int p = KWin::info(*i).pid;
TQString id = action.program() + "-" + TQString().setNum(p);
- if(programs.tqcontains(id))
+ if(programs.contains(id))
{ programs.clear();
programs += id;
break;
diff --git a/kdelirc/irkick/klircclient.cpp b/kdelirc/irkick/klircclient.cpp
index 544eb2a..d78b1e0 100644
--- a/kdelirc/irkick/klircclient.cpp
+++ b/kdelirc/irkick/klircclient.cpp
@@ -177,14 +177,14 @@ void KLircClient::slotRead()
{
// <code> <repeat> <button name> <remote control name>
line.remove(0, 17); // strip code
- int pos = line.tqfind(' ');
+ int pos = line.find(' ');
if (pos < 0) return;
bool ok;
int repeat = line.left(pos).toInt(&ok, 16);
if (!ok) return;
line.remove(0, pos + 1);
- pos = line.tqfind(' ');
+ pos = line.find(' ');
if (pos < 0) return;
TQString btn = line.left(pos);
if(btn.startsWith("'") && btn.endsWith("'"))
diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp
index 1d13f19..0209f5f 100644
--- a/kdelirc/kcmlirc/addaction.cpp
+++ b/kdelirc/kcmlirc/addaction.cpp
@@ -92,8 +92,8 @@ void AddAction::updateButton(const TQString &remote, const TQString &button)
{
if(theMode.remote() == remote)
{ // note this isn't the "correct" way of doing it; really i should iterate throughg the items and try to find the item which when put through buttonMap[item] returns the current button name. but i cant be arsed.
- theButtons->setCurrentItem(theButtons->tqfindItem(RemoteServer::remoteServer()->getButtonName(remote, button), 0));
- theButtons->ensureItemVisible(theButtons->tqfindItem(RemoteServer::remoteServer()->getButtonName(remote, button), 0));
+ theButtons->setCurrentItem(theButtons->findItem(RemoteServer::remoteServer()->getButtonName(remote, button), 0));
+ theButtons->ensureItemVisible(theButtons->findItem(RemoteServer::remoteServer()->getButtonName(remote, button), 0));
}
else
KMessageBox::error(this, i18n( "You did not select a mode of that remote control. Please use %1, "
@@ -149,7 +149,7 @@ const TQStringList AddAction::getFunctions(const TQString app, const TQString ob
if( *i != "QCStringList interfaces()" &&
*i != "QCStringList functions()" &&
*i != "QCStringList objects()" &&
- *i != "QCStringList tqfind(TQCString)" )
+ *i != "QCStringList find(TQCString)" )
ret += TQString::fromUtf8(*i);
return ret;
}
@@ -262,19 +262,19 @@ void AddAction::updateParameter()
if(theParameters->currentItem())
{ TQString type = theParameters->currentItem()->text(2);
int index = theParameters->currentItem()->text(3).toInt() - 1;
- if(type.tqfind("int") != -1 || type.tqfind("short") != -1 || type.tqfind("long") != -1)
+ if(type.find("int") != -1 || type.find("short") != -1 || type.find("long") != -1)
{ theValue->raiseWidget(2);
theValueIntNumInput->setValue(theArguments[index].toInt());
}
- else if(type.tqfind("double") != -1 || type.tqfind("float") != -1)
+ else if(type.find("double") != -1 || type.find("float") != -1)
{ theValue->raiseWidget(3);
theValueDoubleNumInput->setValue(theArguments[index].toDouble());
}
- else if(type.tqfind("bool") != -1)
+ else if(type.find("bool") != -1)
{ theValue->raiseWidget(1);
theValueCheckBox->setChecked(theArguments[index].toBool());
}
- else if(type.tqfind(TQSTRINGLIST_OBJECT_NAME_STRING) != -1)
+ else if(type.find(TQSTRINGLIST_OBJECT_NAME_STRING) != -1)
{ theValue->raiseWidget(4);
TQStringList backup = theArguments[index].toStringList();
// backup needed because calling clear will kill what ever has been saved.
@@ -307,13 +307,13 @@ void AddAction::slotParameterChanged()
if(!theParameters->currentItem()) return;
int index = theParameters->currentItem()->text(3).toInt() - 1;
TQString type = theParameters->currentItem()->text(2);
- if(type.tqfind("int") != -1 || type.tqfind("short") != -1 || type.tqfind("long") != -1)
+ if(type.find("int") != -1 || type.find("short") != -1 || type.find("long") != -1)
theArguments[index].asInt() = theValueIntNumInput->value();
- else if(type.tqfind("double") != -1 || type.tqfind("float") != -1)
+ else if(type.find("double") != -1 || type.find("float") != -1)
theArguments[index].asDouble() = theValueDoubleNumInput->value();
- else if(type.tqfind("bool") != -1)
+ else if(type.find("bool") != -1)
theArguments[index].asBool() = theValueCheckBox->isChecked();
- else if(type.tqfind(TQSTRINGLIST_OBJECT_NAME_STRING) != -1)
+ else if(type.find(TQSTRINGLIST_OBJECT_NAME_STRING) != -1)
theArguments[index].asStringList() = theValueEditListBox->items();
else
theArguments[index].asString() = theValueLineEdit->text();
@@ -339,11 +339,11 @@ void AddAction::updateObjects()
QCStringList theApps = theClient->registeredApplications();
for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
{
- if(!TQString(*i).tqfind("anonymous")) continue;
- if(!TQString(*i).tqfind(i18n( "anonymous" ))) continue;
+ if(!TQString(*i).find("anonymous")) continue;
+ if(!TQString(*i).find(i18n( "anonymous" ))) continue;
TQRegExp r("(.*)-[0-9]+");
TQString name = r.exactMatch(TQString(*i)) ? r.cap(1) : *i;
- if(names.tqcontains(name)) continue;
+ if(names.contains(name)) continue;
names += name;
KListViewItem *a = new KListViewItem(theObjects, name);
diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp
index a48ece9..d54f23c 100644
--- a/kdelirc/kcmlirc/editaction.cpp
+++ b/kdelirc/kcmlirc/editaction.cpp
@@ -319,10 +319,10 @@ void EditAction::updateDCOPApplications()
QCStringList theApps = theClient->registeredApplications();
for(QCStringList::iterator i = theApps.begin(); i != theApps.end(); ++i)
{
- if(!TQString(*i).tqfind("anonymous")) continue;
+ if(!TQString(*i).find("anonymous")) continue;
TQRegExp r("(.*)-[0-9]+");
TQString name = r.exactMatch(TQString(*i)) ? r.cap(1) : *i;
- if(names.tqcontains(name)) continue;
+ if(names.contains(name)) continue;
names += name;
theDCOPApplications->insertItem(name);
diff --git a/kdelirc/kdelirc/modes.cpp b/kdelirc/kdelirc/modes.cpp
index 5ecd418..5346837 100644
--- a/kdelirc/kdelirc/modes.cpp
+++ b/kdelirc/kdelirc/modes.cpp
@@ -41,8 +41,8 @@ void Modes::loadFromConfig(KConfig &theConfig)
void Modes::generateNulls(const TQStringList &theRemotes)
{
for(TQStringList::const_iterator i = theRemotes.begin(); i != theRemotes.end(); ++i)
- { if(!tqcontains(*i) || !operator[](*i).tqcontains("")) operator[](*i)[""] = Mode(*i, "");
- if(!theDefaults.tqcontains(*i)) theDefaults[*i].isEmpty();
+ { if(!contains(*i) || !operator[](*i).contains("")) operator[](*i)[""] = Mode(*i, "");
+ if(!theDefaults.contains(*i)) theDefaults[*i].isEmpty();
}
}
@@ -59,8 +59,8 @@ const Mode Modes::getDefault(const TQString &remote) const
{
// if(theDefaults[remote] == TQString())
// return Mode(remote, "");
- if(tqcontains(remote))
- if(operator[](remote).tqcontains(theDefaults[remote]))
+ if(contains(remote))
+ if(operator[](remote).contains(theDefaults[remote]))
return operator[](remote)[theDefaults[remote]];
else return Mode(remote, "");
else return Mode(remote, "");