rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

11 files changed, 39 insertions, 39 deletions

diff --git a/kradio3/src/debug-profiler.cpp b/kradio3/src/debug-profiler.cpp
index ac2f372..5194b7e 100644
--- a/kradio3/src/debug-profiler.cpp
+++ b/kradio3/src/debug-profiler.cpp
@@ -49,7 +49,7 @@ void  Profiler::startProfile(const TQString &descr)
 {
     stopInternalCounter();
 
-    if (m_ProfileData.tqcontains(descr)) {
+    if (m_ProfileData.contains(descr)) {
         profile_data &d = m_ProfileData[descr];
         d.startCounter = m_internalCounter;
     } else {
@@ -64,7 +64,7 @@ void Profiler::stopProfile (const TQString &descr)
 {
     stopInternalCounter();
 
-    if (!descr.isNull() && m_ProfileData.tqcontains(descr)) {
+    if (!descr.isNull() && m_ProfileData.contains(descr)) {
         profile_data &d = m_ProfileData[descr];
         long long diff = m_internalCounter - d.startCounter;
         d.accumulatedCounter += diff;
diff --git a/kradio3/src/include/gui_list_helper.h b/kradio3/src/include/gui_list_helper.h
index 3cf2d25..6a1479c 100644
--- a/kradio3/src/include/gui_list_helper.h
+++ b/kradio3/src/include/gui_list_helper.h
@@ -30,10 +30,10 @@ public:
 
     void     setData(const TQValueList<TQString> &data);
     TQString  getCurrentText() const           { return m_List->currentText(); }
-    void     setCurrentText(const TQString &s) { m_List->setCurrentItem(m_revData.tqcontains(s) ? m_revData[s] : 0); }
+    void     setCurrentText(const TQString &s) { m_List->setCurrentItem(m_revData.contains(s) ? m_revData[s] : 0); }
 
     int count() const { return m_revData.count(); }
-    bool tqcontains(const TQString &id) const { return m_revData.tqcontains(id); }
+    bool contains(const TQString &id) const { return m_revData.contains(id); }
 
 protected:
     TLIST              *m_List;
@@ -79,7 +79,7 @@ public:
 
     int count() const { return m_Index2ID.count(); }
 
-    bool tqcontains(const TID &id) const { return m_ID2Index.tqcontains(id); }
+    bool contains(const TID &id) const { return m_ID2Index.contains(id); }
 
 protected:
     SORT_KEY           m_skey;
@@ -158,7 +158,7 @@ void GUIListHelper<TLIST, TID>::setData (const TQMap<TID, TQString> &data)
 template <class TLIST, class TID>
 void GUIListHelper<TLIST, TID>::setCurrentItem(const TID &id) const
 {
-    if (m_ID2Index.tqcontains(id))
+    if (m_ID2Index.contains(id))
         m_List->setCurrentItem(m_ID2Index[id]);
     else
         m_List->setCurrentItem(0);
diff --git a/kradio3/src/include/interfaces.h b/kradio3/src/include/interfaces.h
index 1719315..7e53a24 100644
--- a/kradio3/src/include/interfaces.h
+++ b/kradio3/src/include/interfaces.h
@@ -373,7 +373,7 @@ public:
     thisIF *initThisInterfacePointer();
     thisIF *getThisInterfacePointer()     const { return me; }
     bool    isThisInterfacePointerValid() const { return me_valid; }
-    bool    hasConnectionTo(cmplInterface *other) const { return iConnections.tqcontainsRef(other); }
+    bool    hasConnectionTo(cmplInterface *other) const { return iConnections.containsRef(other); }
     void    appendConnectionTo(cmplInterface *other)    { iConnections.append(other); }
     void    removeConnectionTo(cmplInterface *other)    { iConnections.removeRef(other); }
 
@@ -576,7 +576,7 @@ bool InterfaceBase<thisIF, cmplIF>::connectI (Interface *__i)
     cmplIF    *i = _i->initThisInterfacePointer();
 
     if (i && me) {
-        bool i_connected  = iConnections.tqcontainsRef(i);
+        bool i_connected  = iConnections.containsRef(i);
         bool me_connected = i->hasConnectionTo(me);
 
         if (i_connected || me_connected) {
@@ -673,7 +673,7 @@ void InterfaceBase<thisIF, cmplIF>::disconnectAllI()
 template <class thisIF, class cmplIF>
 bool InterfaceBase<thisIF, cmplIF>::addListener(const cmplInterface *i, TQPtrList<cmplInterface> &list)
 {
-    if (iConnections.tqcontainsRef(i) && !list.tqcontains(i)) {
+    if (iConnections.containsRef(i) && !list.contains(i)) {
         list.append(i);
         m_FineListeners[i].append(&list);
         return true;
@@ -687,7 +687,7 @@ template <class thisIF, class cmplIF>
 void InterfaceBase<thisIF, cmplIF>::removeListener(const cmplInterface *i, TQPtrList<cmplInterface> &list)
 {
     list.remove(i);
-    if (m_FineListeners.tqcontains(i))
+    if (m_FineListeners.contains(i))
         m_FineListeners[i].remove(&list);
 }
 
@@ -695,7 +695,7 @@ void InterfaceBase<thisIF, cmplIF>::removeListener(const cmplInterface *i, TQPtr
 template <class thisIF, class cmplIF>
 void InterfaceBase<thisIF, cmplIF>::removeListener(const cmplInterface *i)
 {
-    if (m_FineListeners.tqcontains(i)) {
+    if (m_FineListeners.contains(i)) {
         TQPtrList<TQPtrList<cmplInterface> >        &list = m_FineListeners[i];
         TQPtrListIterator<TQPtrList<cmplInterface> > it(list);
         for (; it.current(); ++it) {
diff --git a/kradio3/src/include/stationlist.h b/kradio3/src/include/stationlist.h
index 5e259e7..dcacdca 100644
--- a/kradio3/src/include/stationlist.h
+++ b/kradio3/src/include/stationlist.h
@@ -72,7 +72,7 @@ public:
     void inSort  (const RadioStation *item);
     void prepend (const RadioStation *item);
     void append  (const RadioStation *item);
-    bool tqreplace (uint index, const RadioStation *item);
+    bool replace (uint index, const RadioStation *item);
 
     // simplify stationIDSearch
 
@@ -123,7 +123,7 @@ public:
     StationListMetaData &       metaData()       { return m_metaData; }
     StationListMetaData const & metaData() const { return m_metaData; }
 
-    // we do not need a special matchingStation/tqfind/... method because
+    // we do not need a special matchingStation/find/... method because
     // it is already implemented in RawStationList
 
     /**
diff --git a/kradio3/src/kradioapp.cpp b/kradio3/src/kradioapp.cpp
index 6937bcf..36be553 100644
--- a/kradio3/src/kradioapp.cpp
+++ b/kradio3/src/kradioapp.cpp
@@ -283,7 +283,7 @@ KLibrary *KRadioApp::LoadLibrary (const TQString &library)
 
 void KRadioApp::UnloadLibrary (const TQString &library)
 {
-    if (!m_PluginLibraries.tqcontains(library))
+    if (!m_PluginLibraries.contains(library))
         return;
 
     PluginLibraryInfo info = m_PluginLibraries[library];
@@ -314,7 +314,7 @@ PluginBase *KRadioApp::CreatePlugin (PluginManager *manager, const TQString &cla
     BlockProfiler create_profiler("KRadioApp::CreatePlugin - create");
 
     PluginBase *retval = NULL;
-    if (m_PluginInfos.tqcontains(class_name)) {
+    if (m_PluginInfos.contains(class_name)) {
         retval = m_PluginInfos[class_name].CreateInstance(object_name);
         if (!retval) {
             kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)
diff --git a/kradio3/src/pluginmanager-configuration.cpp b/kradio3/src/pluginmanager-configuration.cpp
index 2852e61..afea368 100644
--- a/kradio3/src/pluginmanager-configuration.cpp
+++ b/kradio3/src/pluginmanager-configuration.cpp
@@ -80,7 +80,7 @@ void PluginManagerConfiguration::noticePluginsChanged()
 
     for (PluginIterator it(plugins); it.current(); ++it) {
         TQString class_name = it.current()->pluginClassName();
-        if (classes.tqcontains(class_name)) {
+        if (classes.contains(class_name)) {
             TQString obj_name   = it.current()->name();
             listPluginInstances->insertItem(new KListViewItem(listPluginInstances, class_name, obj_name, classes[class_name].description));
         }
diff --git a/kradio3/src/pluginmanager.cpp b/kradio3/src/pluginmanager.cpp
index 286b588..6576c84 100644
--- a/kradio3/src/pluginmanager.cpp
+++ b/kradio3/src/pluginmanager.cpp
@@ -116,7 +116,7 @@ void PluginManager::addWidgetPluginMenuItems(TQMenuData *menu, TQMap<WidgetPlugi
 
 void PluginManager::updateWidgetPluginMenuItem(WidgetPluginBase *b, TQMenuData *menu, TQMap<WidgetPluginBase *,int> &map, bool shown) const
 {
-    if (!b || !map.tqcontains(b))
+    if (!b || !map.contains(b))
         return;
 
     const TQString &name = b->description();
@@ -211,7 +211,7 @@ void PluginManager::insertPlugin(PluginBase *p)
 
 void PluginManager::deletePlugin(PluginBase *p)
 {
-    if (p && m_plugins.tqcontains(p)) {
+    if (p && m_plugins.contains(p)) {
         removePlugin(p);
         delete p;
     }
@@ -220,7 +220,7 @@ void PluginManager::deletePlugin(PluginBase *p)
 
 void PluginManager::removePlugin(PluginBase *p)
 {
-    if (p && m_plugins.tqcontains(p)) {
+    if (p && m_plugins.contains(p)) {
 
         for (PluginIterator it(m_plugins); it.current(); ++it) {
             if (it.current() != p) {
@@ -236,12 +236,12 @@ void PluginManager::removePlugin(PluginBase *p)
         // remove config page from config dialog, only chance is to delete it
         // plugin will be notified automatically (mechanism implemented by
         // PluginBase)
-        while (TQFrame *f = m_configPageFrames.tqfind(p)) {
+        while (TQFrame *f = m_configPageFrames.find(p)) {
             m_configPageFrames.remove(p);
             m_configPages.remove(p);
             delete f;
         }
-        while (TQFrame *f = m_aboutPageFrames.tqfind(p)) {
+        while (TQFrame *f = m_aboutPageFrames.find(p)) {
             m_aboutPageFrames.remove(p);
             m_aboutPages.remove(p);
             delete f;
@@ -265,7 +265,7 @@ void PluginManager::removePlugin(PluginBase *p)
 void PluginManager::addConfigurationPage (PluginBase *forWhom,
                                           const ConfigPageInfo &info)
 {
-    if (!forWhom || !m_plugins.tqcontainsRef(forWhom) || !info.page)
+    if (!forWhom || !m_plugins.containsRef(forWhom) || !info.page)
         return;
     TQFrame *f = addConfigurationPage(info);
 
@@ -362,7 +362,7 @@ void PluginManager::addAboutPage (PluginBase *forWhom,
     if (!m_aboutDialog)
         createAboutDialog(i18n(m_aboutDialogTitle.ascii()));
 
-    if (   !forWhom || !m_plugins.tqcontainsRef(forWhom)
+    if (   !forWhom || !m_plugins.containsRef(forWhom)
         || !m_aboutDialog || !info.page)
         return;
 
@@ -419,7 +419,7 @@ void PluginManager::saveState (KConfig *c) const
         TQString class_name  = it.current()->pluginClassName();
         TQString object_name = it.current()->name();
         if (class_name.length() && object_name.length() &&
-            m_Application->getPluginClasses().tqcontains(class_name))
+            m_Application->getPluginClasses().contains(class_name))
         {
             ++n;
             c->writeEntry("plugin_class_" + TQString::number(n), class_name);
diff --git a/kradio3/src/radiostation.cpp b/kradio3/src/radiostation.cpp
index f1eb58c..4870f3d 100644
--- a/kradio3/src/radiostation.cpp
+++ b/kradio3/src/radiostation.cpp
@@ -128,7 +128,7 @@ void RadioStation::generateNewStationID()
 RadioStation const *RadioStation::getStationClass(const TQString &classname)
 {
     if (stationClassRegistry)
-        return stationClassRegistry->tqfind(classname);
+        return stationClassRegistry->find(classname);
     else
         return NULL;
 }
diff --git a/kradio3/src/stationlist.cpp b/kradio3/src/stationlist.cpp
index 737fd72..e7e7d64 100644
--- a/kradio3/src/stationlist.cpp
+++ b/kradio3/src/stationlist.cpp
@@ -104,7 +104,7 @@ bool RawStationList::insert (const RadioStation * item )
     if (!item) return false;
     int idx = idxWithID(item->stationID());
     if (idx >= 0) {
-        return tqreplace(idx, item);
+        return replace(idx, item);
     } else {
         append(item);
         return true;
@@ -145,11 +145,11 @@ void RawStationList::append ( const RadioStation * item )
 }
 
 
-bool RawStationList::tqreplace ( uint index, const RadioStation * item )
+bool RawStationList::replace ( uint index, const RadioStation * item )
 {
     bool r = true;
     RadioStation *rs = &stationWithID(item->stationID());
-    r = BaseClass::tqreplace(index, item);
+    r = BaseClass::replace(index, item);
     if (rs != item) {
         BaseClass::removeRef(rs);
     }
@@ -379,7 +379,7 @@ bool StationList::readXML (const KURL &url, const IErrorLogClient &logger, bool
     presetFile.reset();
 
     // preset file written with kradio <= 0.2.x
-    if (tmp.tqfind("<format>") < 0) {
+    if (tmp.find("<format>") < 0) {
         logger.logInfo(i18n("Old Preset File Format detected"));
         TQTextStream ins(&presetFile);
         ins.setEncoding(TQTextStream::Locale);
diff --git a/kradio3/src/stationselector.cpp b/kradio3/src/stationselector.cpp
index 8cf240c..4f8456e 100644
--- a/kradio3/src/stationselector.cpp
+++ b/kradio3/src/stationselector.cpp
@@ -68,14 +68,14 @@ bool StationSelector::noticeStationSelectionChanged(const TQStringList &sl)
     m_stationIDsAvailable.clear();
 
     for (unsigned int i = 0; i < m_stationIDsAll.count(); ++i) {
-        if (sl.tqcontains(m_stationIDsAll[i])) {
+        if (sl.contains(m_stationIDsAll[i])) {
             m_stationIDsSelected.append(m_stationIDsAll[i]);
         } else {
             m_stationIDsAvailable.append(m_stationIDsAll[i]);
         }
     }
     for (unsigned int i = 0; i < sl.count(); ++i) {
-        if (!m_stationIDsAll.tqcontains(sl[i]))
+        if (!m_stationIDsAll.contains(sl[i]))
             m_stationIDsNotDisplayed.append(sl[i]);
     }
     updateListViews();
@@ -103,7 +103,7 @@ bool StationSelector::noticeStationsChanged(const StationList &sl)
         const TQString &id = i.current()->stationID();
 
         m_stationIDsAll.append(id);
-        if (m_stationIDsNotDisplayed.tqcontains(id)) {
+        if (m_stationIDsNotDisplayed.contains(id)) {
             m_stationIDsNotDisplayed.remove(id);
             m_stationIDsSelected.append(id);
         } else {
@@ -171,7 +171,7 @@ void StationSelector::slotMoveToRight(const TQStringList &list)
     while (item) {
         TQListViewItem *next_item = item->nextSibling();
 
-        if (list.tqcontains(m_stationIDsAvailable[idx_from])) {
+        if (list.contains(m_stationIDsAvailable[idx_from])) {
 
             moveItem (listAvailable, m_stationIDsAvailable,
                       item,          idx_from,
@@ -194,7 +194,7 @@ void StationSelector::slotMoveToLeft(const TQStringList &list)
     while (item) {
         TQListViewItem *next_item = item->nextSibling();
 
-        if (list.tqcontains(m_stationIDsSelected[idx_from])) {
+        if (list.contains(m_stationIDsSelected[idx_from])) {
 
             moveItem (listSelected,  m_stationIDsSelected,
                       item,          idx_from,
diff --git a/kradio3/src/utils.cpp b/kradio3/src/utils.cpp
index fa60b02..90db463 100644
--- a/kradio3/src/utils.cpp
+++ b/kradio3/src/utils.cpp
@@ -26,11 +26,11 @@
 TQString XMLEscape (const TQString &s)
 {
     TQString c = s;
-    c.tqreplace(TQRegExp("&"),  "&amp;");
-    c.tqreplace(TQRegExp("<"),  "&lt;");
-    c.tqreplace(TQRegExp(">"),  "&gt;");
-    c.tqreplace(TQRegExp("\""), "&quot;");
-    c.tqreplace(TQRegExp("'"),  "&apos;");
+    c.replace(TQRegExp("&"),  "&amp;");
+    c.replace(TQRegExp("<"),  "&lt;");
+    c.replace(TQRegExp(">"),  "&gt;");
+    c.replace(TQRegExp("\""), "&quot;");
+    c.replace(TQRegExp("'"),  "&apos;");
     return c;
 }