rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

5 files changed, 10 insertions, 10 deletions

diff --git a/kiconedit/kcolorgrid.cpp b/kiconedit/kcolorgrid.cpp
index e08529e1..837958b8 100644
--- a/kiconedit/kcolorgrid.cpp
+++ b/kiconedit/kcolorgrid.cpp
@@ -269,7 +269,7 @@ void KColorGrid::setColor( int colNum, uint col, bool update )
     return;
 
   //kdDebug(4640) << "KColorGrid::setColor - before adding" << endl;
-  if(!numcolors.tqcontains(col))
+  if(!numcolors.contains(col))
   {
     //kdDebug(4640) << "KColorGrid::setColor() - adding " << //  col << " - " << tqRed(col) << " " << tqGreen(col) << " " << tqBlue(col) << endl;
     numcolors.append(col);
@@ -279,9 +279,9 @@ void KColorGrid::setColor( int colNum, uint col, bool update )
   }  
 
   //kdDebug(4640) << "KColorGrid::setColor - before removing" << endl;
-  if(!gridcolors.tqcontains(oldcolor))
+  if(!gridcolors.contains(oldcolor))
   {
-    int idx = numcolors.tqfind(oldcolor);
+    int idx = numcolors.find(oldcolor);
     if(idx != -1)
     {
       //kdDebug(4640) << "KColorGrid::setColor() - removing " << //  oldcolor << " - " << tqRed(oldcolor) << " " << tqGreen(oldcolor) << " " << tqBlue(oldcolor) << endl;
@@ -317,7 +317,7 @@ void KColorGrid::updateColors()
   for(int i = 0; i < (int)gridcolors.size(); i++)
   {
     uint col = gridcolors.at(i);
-    if(!numcolors.tqcontains(col))
+    if(!numcolors.contains(col))
       numcolors.append(col);
   }
   emit colorschanged(numcolors.size(), numcolors.data());
diff --git a/kiconedit/kcolorgrid.h b/kiconedit/kcolorgrid.h
index 00a3d478..2be09f28 100644
--- a/kiconedit/kcolorgrid.h
+++ b/kiconedit/kcolorgrid.h
@@ -56,7 +56,7 @@ public:
   bool hasGrid() { return hasgrid; }
   uint numColors() { return numcolors.size(); }
   uint colors( uint *c ) { c = numcolors.data(); return numcolors.size(); }
-  bool tqcontains(uint c) { return numcolors.tqcontains(c); }
+  bool contains(uint c) { return numcolors.contains(c); }
   uint colorAt(int idx) { return gridcolors.at(idx); }
   uint *data() {return numcolors.data(); }
   void fill(uint color);
diff --git a/kiconedit/kiconcolors.cpp b/kiconedit/kiconcolors.cpp
index c2042432..3bfc872d 100644
--- a/kiconedit/kiconcolors.cpp
+++ b/kiconedit/kiconcolors.cpp
@@ -119,7 +119,7 @@ void KCustomColors::mouseDoubleClickEvent(TQMouseEvent *e)
 
 void KCustomColors::addColor(uint c)
 {
-  if(!tqcontains(c))
+  if(!contains(c))
   {
     int f = getFreeCell();
     if(f != -1)
diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp
index d794cbe5..b8ed29ab 100644
--- a/kiconedit/kicongrid.cpp
+++ b/kiconedit/kicongrid.cpp
@@ -1179,7 +1179,7 @@ TQImage KIconEditGrid::getSelection(bool cut)
     {
         int x = pntarray[i].x();
         int y = pntarray[i].y();
-        if(img->valid(x, y) && rect.tqcontains(TQPoint(x, y)))
+        if(img->valid(x, y) && rect.contains(TQPoint(x, y)))
         {
             *((uint*)tmp.scanLine(y-ny) + (x-nx)) = *((uint*)img->scanLine(y) + x);
             if(cut)
@@ -1909,7 +1909,7 @@ void KIconEditGrid::drawPointArray(TQPointArray a, DrawAction action)
         int x = a[i].x();
         int y = a[i].y();
 
-        if(img->valid(x, y) && TQT_TQRECT_OBJECT(a.boundingRect()).tqcontains(a[ i ]))
+        if(img->valid(x, y) && TQT_TQRECT_OBJECT(a.boundingRect()).contains(a[ i ]))
         {
             //kdDebug(4640) << "x: " << x << " - y: " << y << endl;
             switch( action )
@@ -2195,7 +2195,7 @@ void KIconEditGrid::mapToKDEPalette()
         {
             if(*l != TRANSPARENT)
             {
-                if(!iconcolors.tqcontains(*l))
+                if(!iconcolors.contains(*l))
                     *l = iconcolors.closestMatch(*l);
             }
         }
diff --git a/kiconedit/palettetoolbar.cpp b/kiconedit/palettetoolbar.cpp
index bb9b1f1c..abd48737 100644
--- a/kiconedit/palettetoolbar.cpp
+++ b/kiconedit/palettetoolbar.cpp
@@ -112,7 +112,7 @@ void PaletteToolBar::addColors( uint n, uint *c )
 
 void PaletteToolBar::addColor( uint color )
 {
-    if( !m_sysColors->tqcontains( color ) )
+    if( !m_sysColors->contains( color ) )
         m_customColors->addColor( color );
 }