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

4 files changed, 4 insertions, 4 deletions

diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index c39ac5d4b..aee6a728c 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -335,7 +335,7 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p)
          it != containers.constEnd();
          ++it, ++i)
     {
-        if ((*it)->tqgeometry().tqcontains(p))
+        if ((*it)->tqgeometry().contains(p))
         {
             return i;
         }
diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp
index 482a14db1..3d63c8c4e 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -670,7 +670,7 @@ KasItem* KasBar::itemAt(const TQPoint &p)
        cr.setTopLeft( i->pos() );
        cr.setSize( TQSize( itemExtent(), itemExtent() ) );
 
-       if(cr.tqcontains(p))
+       if(cr.contains(p))
 	   return i;
    }
 
diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h
index 507712cce..201fcc882 100644
--- a/kicker/extensions/kasbar/kasbar.h
+++ b/kicker/extensions/kasbar/kasbar.h
@@ -121,7 +121,7 @@ public:
    void clear();
    KasItem *take( KasItem *i ) { return items.take( indexOf(i) ); }
    KasItem *itemAt( uint i ) { return items.tqat( i ); }
-   int indexOf( KasItem *i ) { return items.tqfind( i ); }
+   int indexOf( KasItem *i ) { return items.find( i ); }
 
    KasItemList *itemList() { return &items; }
 
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index bbc4f6654..cc10b6410 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -445,7 +445,7 @@ TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data )
         if ( pos >= 0 ) {
 	    TQVariant val = data->property( TQString(re.cap(1)).latin1() );
 	    TQString v = val.asString();
-	    s.tqreplace( pos, re.matchedLength(), v );
+	    s.replace( pos, re.matchedLength(), v );
             pos = pos + v.length();
         }
     }