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

3 files changed, 11 insertions, 11 deletions

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
 
     /**