rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

12 files changed, 41 insertions, 41 deletions

diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 2265f801b..6eb40993d 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -806,9 +806,9 @@ void FuzzyClock::drawContents(TQPainter *p)
       }
 
       newTimeStr = normalFuzzy[sector];
-      int phStart = newTimeStr.tqfind("%");
+      int phStart = newTimeStr.find("%");
       if (phStart >= 0) { // protect yourself from translations
-          int phLength = newTimeStr.tqfind(" ", phStart) - phStart;
+          int phLength = newTimeStr.find(" ", phStart) - phStart;
 
           // larrosa: we want the exact length, in case the translation needs it,
           // in other case, we would cut off the end of the translation.
@@ -821,13 +821,13 @@ void FuzzyClock::drawContents(TQPainter *p)
               realHour = 12 - ((_time.hour() + deltaHour) % 12 + 1);
           if (realHour==0) {
               newTimeStr = normalFuzzyOne[sector];
-              phStart = newTimeStr.tqfind("%");
+              phStart = newTimeStr.find("%");
               // larrosa: Note that length is the same,
               // so we only have to update phStart
           }
           if (phStart >= 0)
-              newTimeStr.tqreplace(phStart, phLength, hourNames[realHour]);
-          newTimeStr.tqreplace(0, 1, TQString(newTimeStr.tqat(0).upper()));
+              newTimeStr.replace(phStart, phLength, hourNames[realHour]);
+          newTimeStr.replace(0, 1, TQString(newTimeStr.tqat(0).upper()));
       }
     } else if (_prefs->fuzzyness() == 3) {
         newTimeStr = dayTime[_time.hour() / 3];
@@ -1120,7 +1120,7 @@ int ClockApplet::heightForWidth(int w) const
         {
             TQString dateStr = _date->text();
             // if we're too wide to fit, replace the first non-digit from the end with a space
-            int p = dateStr.tqfindRev(TQRegExp("[^0-9]"));
+            int p = dateStr.findRev(TQRegExp("[^0-9]"));
             if (p > 0)
             {
                 _date->setText(dateStr.insert(p, '\n'));
@@ -1568,7 +1568,7 @@ void ClockApplet::aboutToShowContextMenu()
             }
             else
             {
-                zoneMenu->insertItem(i18n(zone->zone(i).utf8()).tqreplace("_", " "), 500 + i);
+                zoneMenu->insertItem(i18n(zone->zone(i).utf8()).replace("_", " "), 500 + i);
             }
         }
         zoneMenu->setItemChecked(500 + zone->zoneIndex(),true);
@@ -1699,7 +1699,7 @@ void ClockApplet::updateDateLabel(bool reLayout)
     if (zone->zoneIndex() != 0)
     {
         TQString zone_s = i18n(zone->zone().utf8());
-        _date->setText(zone_s.mid(zone_s.tqfind('/') + 1).tqreplace("_", " "));
+        _date->setText(zone_s.mid(zone_s.find('/') + 1).replace("_", " "));
         _date->setShown(true);
     }
     else
@@ -1737,7 +1737,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
         if (!activeZone.isEmpty())
         {
             activeZone = i18n(activeZone.utf8());
-            data.subtext.append("<br>").append(activeZone.mid(activeZone.tqfind('/') + 1).tqreplace("_", " "));
+            data.subtext.append("<br>").append(activeZone.mid(activeZone.find('/') + 1).replace("_", " "));
         }
     }
     else
@@ -1760,7 +1760,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
 
             if (activeIndex == i)
             {
-                data.message = m_zone.mid(m_zone.tqfind('/') + 1).tqreplace("_", " ");
+                data.message = m_zone.mid(m_zone.find('/') + 1).replace("_", " ");
                 data.message += "  " + _time + "<br>" + _date;
             }
             else
@@ -1771,7 +1771,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
                 }
                 else
                 {
-                    data.subtext += "<b>" + m_zone.mid(m_zone.tqfind('/') + 1).tqreplace("_", " ") + "</b>";
+                    data.subtext += "<b>" + m_zone.mid(m_zone.find('/') + 1).replace("_", " ") + "</b>";
                 }
                 data.subtext += " " + _time + ", " + _date + "<br>";
             }
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index 48cce1ccb..c81faacc4 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -105,7 +105,7 @@ void Zone::readZoneList(KListView *listView )
     if (!comment.isEmpty())
       comment = i18n(comment.utf8());
 
-    const TQStringList KontCity = TQStringList::split("/", i18n(tzName.utf8()).tqreplace("_", " "));
+    const TQStringList KontCity = TQStringList::split("/", i18n(tzName.utf8()).replace("_", " "));
     TQListViewItem* Kontinent = KontinentMap[KontCity[0]];
     if (!Kontinent) {
 	KontinentMap[KontCity[0]] = new TQListViewItem(listView, KontCity[0]);
@@ -117,7 +117,7 @@ void Zone::readZoneList(KListView *listView )
     li->setText(1, comment);
     li->setText(2, tzName); /* store complete path in ListView */
 
-    if (_remotezonelist.tqfindIndex(tzName) != -1)
+    if (_remotezonelist.findIndex(tzName) != -1)
        li->setOn(true);
 
     // locate the flag from /l10n/%1/flag.png
diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp
index 7dcb16098..0eebec315 100644
--- a/kicker/applets/launcher/quickaddappsmenu.cpp
+++ b/kicker/applets/launcher/quickaddappsmenu.cpp
@@ -53,7 +53,7 @@ QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQS
 
 void QuickAddAppsMenu::slotExec(int id)
 {
-   if (!entryMap_.tqcontains(id)) return;
+   if (!entryMap_.contains(id)) return;
    KSycocaEntry * e = entryMap_[id];
    KService::Ptr service = static_cast<KService *>(e);
    emit addAppBefore(locate("apps", service->desktopEntryPath()),_sender);
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 58f60715d..996d8abe3 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -76,7 +76,7 @@ QuickURL::QuickURL(const TQString &u)
       if (_menuId.endsWith(".desktop")) {
          // Strip path
          TQString s = _menuId;
-         s = s.mid(s.tqfindRev('/')+1);
+         s = s.mid(s.findRev('/')+1);
          s = s.left(s.length()-8);
          _service = KService::serviceByStorageId(s);
          if (!_service) {
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index b5b512d20..7ead9eced 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -865,7 +865,7 @@ void QuickLauncher::loadConfig()
     for (n=0; n<int(m_buttons->size()); ++n)
     {
         QuickButton* button = (*m_buttons)[n];
-        if (volatileButtons.tqcontains(button->menuId()) == false)
+        if (volatileButtons.contains(button->menuId()) == false)
         {
             button->setSticky(true);
         }
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index d07bfdd2b..8f2d69ab7 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -285,7 +285,7 @@ void MediaApplet::slotNewItems(const KFileItemList &entries)
         }
         }
         
-        if(!found && !mExcludedList.tqcontains(it.current()->url().url()) )
+        if(!found && !mExcludedList.contains(it.current()->url().url()) )
         {
         MediumButton *button = new MediumButton(this, *it.current());
         button->show();
@@ -336,7 +336,7 @@ void MediaApplet::slotRefreshItems(const KFileItemList &entries)
         
         if(button->fileItem().url()==(*it.current()).url())
         {
-            if(mExcludedTypesList.tqcontains(mimetype))
+            if(mExcludedTypesList.contains(mimetype))
             {
             mButtonList.remove(button);
             delete button;
@@ -350,7 +350,7 @@ void MediaApplet::slotRefreshItems(const KFileItemList &entries)
         }
         }
     
-        if(!found && !mExcludedTypesList.tqcontains(mimetype) && !mExcludedList.tqcontains(it.current()->url().url()) )
+        if(!found && !mExcludedTypesList.contains(mimetype) && !mExcludedList.contains(it.current()->url().url()) )
         {
         MediumButton *button = new MediumButton(this, *it.current());
         button->show();
diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp
index 3833f5062..bf8234fe5 100644
--- a/kicker/applets/media/preferencesdialog.cpp
+++ b/kicker/applets/media/preferencesdialog.cpp
@@ -125,7 +125,7 @@ void PreferencesDialog::setExcludedMediumTypes(TQStringList excludedTypesList)
 	{
 		if ((*it)->name().startsWith("media/"))
 		{
-			bool ok=excludedTypesList.tqcontains((*it)->name())==0;
+			bool ok=excludedTypesList.contains((*it)->name())==0;
 			MediumTypeItem *item = new MediumTypeItem(mpMediumTypesListView, (*it)->comment(), (*it)->name());
 			item->setOn(ok);
 		}
@@ -156,7 +156,7 @@ void PreferencesDialog::setExcludedMedia(TQStringList excludedList)
 	{
 		++it;
 
-		bool ok = excludedList.tqcontains(file->url().url())==0;
+		bool ok = excludedList.contains(file->url().url())==0;
 		MediumItem *item = new MediumItem(mpMediaListView,
 		                                  file->text(), *file);
 		item->setOn(ok);
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 7120fb1f1..d6047d407 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -157,8 +157,8 @@ bool KMiniPagerButton::shouldPaintWindow( KWin::WindowInfo *info ) const
         TQRect r = mapGeometryToViewport(*info);
 
         if (!info->hasState(NET::Sticky) &&
-            !TQApplication::desktop()->tqgeometry().tqcontains(r.topLeft()) &&
-            !TQApplication::desktop()->tqgeometry().tqcontains(r.topRight()))
+            !TQApplication::desktop()->tqgeometry().contains(r.topLeft()) &&
+            !TQApplication::desktop()->tqgeometry().contains(r.topRight()))
             return false;
     }
 
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index 05a64b94b..953bcacbd 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -105,7 +105,7 @@ NaughtyApplet::~NaughtyApplet()
   void
 NaughtyApplet::slotWarn(ulong pid, const TQString & name)
 {
-  if (ignoreList_.tqcontains(name))
+  if (ignoreList_.contains(name))
     return;
 
   TQString s = i18n("A program called '%1' is slowing down the others "
diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
index e8cdaf60f..0a9d5c676 100644
--- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp
+++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
@@ -164,7 +164,7 @@ NaughtyProcessMonitor::slotTimeout()
   void
 NaughtyProcessMonitor::_process(ulong pid, uint load)
 {
-  if (!d->loadMap_.tqcontains(pid))
+  if (!d->loadMap_.contains(pid))
   {
     d->loadMap_.insert(pid, load);
     return;
@@ -172,12 +172,12 @@ NaughtyProcessMonitor::_process(ulong pid, uint load)
 
   uint oldLoad = d->loadMap_[pid];
   bool misbehaving = (load - oldLoad) > 40 * (d->interval_ / 1000);
-  bool wasMisbehaving = d->scoreMap_.tqcontains(pid);
+  bool wasMisbehaving = d->scoreMap_.contains(pid);
 
   if (misbehaving)
     if (wasMisbehaving)
     {
-      d->scoreMap_.tqreplace(pid, d->scoreMap_[pid] + 1);
+      d->scoreMap_.replace(pid, d->scoreMap_[pid] + 1);
       if (canKill(pid))
         emit(runawayProcess(pid, processName(pid)));
     }
@@ -187,7 +187,7 @@ NaughtyProcessMonitor::_process(ulong pid, uint load)
     if (wasMisbehaving)
       d->scoreMap_.remove(pid);
 
-  d->loadMap_.tqreplace(pid, load);
+  d->loadMap_.replace(pid, load);
 }
 
 // Here begins the set of system-specific methods.
@@ -221,7 +221,7 @@ NaughtyProcessMonitor::canKill(ulong pid) const
   return geteuid() == a;
 #elif defined(__OpenBSD__)
   // simply check if entry exists in the uid map and use it
-  if (!d->uidMap_.tqcontains(pid))
+  if (!d->uidMap_.contains(pid))
       return false ;
   
   return geteuid () == d->uidMap_[pid] ;
@@ -289,7 +289,7 @@ NaughtyProcessMonitor::processName(ulong pid) const
 
   TQString processName = parts[0] == "kdeinit:" ? parts[1] : parts[0];
 
-  int lastSlash = processName.tqfindRev('/');
+  int lastSlash = processName.findRev('/');
 
   // Get basename, if there's a path.
   if (-1 != lastSlash)
@@ -449,7 +449,7 @@ NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const
   return true;
 #elif defined(__OpenBSD__)
   // use cache
-  if (!d->cacheLoadMap_.tqcontains(pid))
+  if (!d->cacheLoadMap_.contains(pid))
       return false ;
   
   load = d->cacheLoadMap_[pid] ;
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index d5a231363..7112c706a 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -261,7 +261,7 @@ static void parseCommand(KProcess *proc, TQString cmd)
 
     cmd += " ";
 
-    pos = cmd.tqfind(' ');
+    pos = cmd.find(' ');
     *proc << cmd.left(pos);
     cmd.remove(0,pos);
     cmd = cmd.stripWhiteSpace();
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 6a693fbe8..99aa2d020 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -260,7 +260,7 @@ void SystemTrayApplet::preferences()
     for (; it != itEnd; ++it)
     {
         TQString name = KWin::windowInfo((*it)->embeddedWinId()).name();
-        if(!shownListBox->tqfindItem(name, TQt::ExactMatch | TQt::CaseSensitive))
+        if(!shownListBox->findItem(name, TQt::ExactMatch | TQt::CaseSensitive))
         {
             shownListBox->insertItem(KWin::icon((*it)->embeddedWinId(), 22, 22, true), name);
         }
@@ -271,7 +271,7 @@ void SystemTrayApplet::preferences()
     for (; it != itEnd; ++it)
     {
         TQString name = KWin::windowInfo((*it)->embeddedWinId()).name();
-        if(!hiddenListBox->tqfindItem(name, TQt::ExactMatch | TQt::CaseSensitive))
+        if(!hiddenListBox->findItem(name, TQt::ExactMatch | TQt::CaseSensitive))
         {
             hiddenListBox->insertItem(KWin::icon((*it)->embeddedWinId(), 22, 22, true), name);
         }
@@ -322,7 +322,7 @@ void SystemTrayApplet::applySettings()
         item;
         item = item->next())
     {
-        if( windowNameToClass.tqcontains(item->text()))
+        if( windowNameToClass.contains(item->text()))
             m_sortOrderIconList.append(windowNameToClass[item->text()]);
         else
             m_sortOrderIconList.append(item->text());
@@ -335,7 +335,7 @@ void SystemTrayApplet::applySettings()
         item;
         item = item->next())
     {
-        if( windowNameToClass.tqcontains(item->text()))
+        if( windowNameToClass.contains(item->text()))
             m_hiddenIconList.append(windowNameToClass[item->text()]);
         else
             m_hiddenIconList.append(item->text());
@@ -388,7 +388,7 @@ void SystemTrayApplet::checkAutoRetract()
         return;
     }
 
-    if (!tqgeometry().tqcontains(mapFromGlobal(TQCursor::pos())))
+    if (!tqgeometry().contains(mapFromGlobal(TQCursor::pos())))
     {
         m_autoRetractTimer->stop();
         if (m_autoRetract)
@@ -590,8 +590,8 @@ bool SystemTrayApplet::isWinManaged(WId w)
 
 bool SystemTrayApplet::shouldHide(WId w)
 {
-    return m_hiddenIconList.tqfind(KWin::windowInfo(w).name()) != m_hiddenIconList.end()
-        || m_hiddenIconList.tqfind('!'+KWin::windowInfo(w,0,NET::WM2WindowClass).windowClassClass())
+    return m_hiddenIconList.find(KWin::windowInfo(w).name()) != m_hiddenIconList.end()
+        || m_hiddenIconList.find('!'+KWin::windowInfo(w,0,NET::WM2WindowClass).windowClassClass())
             != m_hiddenIconList.end();
 }
 
@@ -711,7 +711,7 @@ void SystemTrayApplet::updateTrayWindows()
         WId wid = (*emb)->embeddedWinId();
         if ((wid == 0) ||
             ((*emb)->kdeTray() &&
-             !kwin_module->systemTrayWindows().tqcontains(wid)))
+             !kwin_module->systemTrayWindows().contains(wid)))
         {
             (*emb)->deleteLater();
             emb = m_shownWins.erase(emb);
@@ -728,7 +728,7 @@ void SystemTrayApplet::updateTrayWindows()
         WId wid = (*emb)->embeddedWinId();
         if ((wid == 0) ||
             ((*emb)->kdeTray() &&
-             !kwin_module->systemTrayWindows().tqcontains(wid)))
+             !kwin_module->systemTrayWindows().contains(wid)))
         {
             (*emb)->deleteLater();
             emb = m_hiddenWins.erase(emb);