rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

61 files changed, 169 insertions, 169 deletions

diff --git a/chalk/chalkcolor/kis_abstract_colorspace.cc b/chalk/chalkcolor/kis_abstract_colorspace.cc
index 66b8e1ad..f532f18e 100644
--- a/chalk/chalkcolor/kis_abstract_colorspace.cc
+++ b/chalk/chalkcolor/kis_abstract_colorspace.cc
@@ -232,7 +232,7 @@ bool KisAbstractColorSpace::convertPixelsTo(const TQ_UINT8 * src,
 
     if (!tf && m_profile && dstColorSpace->getProfile()) {
 
-        if (!m_transforms.tqcontains(dstColorSpace)) {
+        if (!m_transforms.contains(dstColorSpace)) {
             tf = createTransform(dstColorSpace,
 				 m_profile,
 				 dstColorSpace->getProfile(),
diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.cc b/chalk/chalkcolor/kis_colorspace_factory_registry.cc
index 6758f7d5..424e346d 100644
--- a/chalk/chalkcolor/kis_colorspace_factory_registry.cc
+++ b/chalk/chalkcolor/kis_colorspace_factory_registry.cc
@@ -100,7 +100,7 @@ KisColorSpaceFactoryRegistry::~KisColorSpaceFactoryRegistry()
 
 KisProfile *  KisColorSpaceFactoryRegistry::getProfileByName(const TQString & name)
 {
-    if (m_profileMap.tqfind(name) == m_profileMap.end()) {
+    if (m_profileMap.find(name) == m_profileMap.end()) {
         return 0;
     }
 
@@ -160,7 +160,7 @@ KisColorSpace * KisColorSpaceFactoryRegistry::getColorSpace(const KisID & csID,
 
     TQString name = csID.id() + "<comb>" + profileName;
 
-    if (m_csMap.tqfind(name) == m_csMap.end()) {
+    if (m_csMap.find(name) == m_csMap.end()) {
         KisColorSpaceFactory *csf = get(csID);
         if(!csf)
             return 0;
@@ -175,7 +175,7 @@ KisColorSpace * KisColorSpaceFactoryRegistry::getColorSpace(const KisID & csID,
         m_csMap[name] = cs;
     }
 
-    if(m_csMap.tqcontains(name))
+    if(m_csMap.contains(name))
         return m_csMap[name];
     else
         return 0;
diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.h b/chalk/chalkcolor/kis_colorspace_factory_registry.h
index 104c99aa..1ecff87a 100644
--- a/chalk/chalkcolor/kis_colorspace_factory_registry.h
+++ b/chalk/chalkcolor/kis_colorspace_factory_registry.h
@@ -27,7 +27,7 @@ class TQStringList;
 class KisPaintDeviceAction;
 
 /**
- * This class tqcontains:
+ * This class contains:
  *      - a registry of colorspace instantiated with specific profiles.
  *      - a registry of singleton colorspace factories.
  *      - a registry of icc profiles
diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.cc b/chalk/colorspaces/wet/kis_wet_colorspace.cc
index edb09289..7d8d84ab 100644
--- a/chalk/colorspaces/wet/kis_wet_colorspace.cc
+++ b/chalk/colorspaces/wet/kis_wet_colorspace.cc
@@ -190,7 +190,7 @@ void KisWetColorSpace::fromTQColor(const TQColor& c, TQ_UINT8 *dst, KisProfile *
     }
 
     // Translate the special TQCOlors from our paintbox to wetpaint paints.
-    if (m_conversionMap.tqcontains(key)) {
+    if (m_conversionMap.contains(key)) {
         (*p).paint = m_conversionMap[key];
         (*p).adsorb = m_conversionMap[key]; // or maybe best add water here?
     } else {
diff --git a/chalk/colorspaces/wetsticky/ws/GNU Public Licence.txt b/chalk/colorspaces/wetsticky/ws/GNU Public Licence.txt
index 5e79907b..a3f2100e 100644
--- a/chalk/colorspaces/wetsticky/ws/GNU Public Licence.txt
+++ b/chalk/colorspaces/wetsticky/ws/GNU Public Licence.txt
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which tqcontains
+  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it tqcontains, plus any
+code means all the source code for all modules it contains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/chalk/core/createdcop.py b/chalk/core/createdcop.py
index bac48f33..de773270 100755
--- a/chalk/core/createdcop.py
+++ b/chalk/core/createdcop.py
@@ -84,10 +84,10 @@ dcopiface_template = """/*
 def parseHeader(headerfile, classname):
 	# parse the source class header to get a list of functions we're going to wrap
 	functions = []
-	if (headerfile.tqfind("private:") > -1):
-		lines = headerfile[headerfile.tqfind(classname):headerfile.tqfind("private")].splitlines()
+	if (headerfile.find("private:") > -1):
+		lines = headerfile[headerfile.find(classname):headerfile.find("private")].splitlines()
 	else:
-		lines = headerfile[headerfile.tqfind(classname):headerfile.tqfind("#endif")].splitlines()
+		lines = headerfile[headerfile.find(classname):headerfile.find("#endif")].splitlines()
 	i = 0
 	while i < len(lines):
 		line = lines[i].strip()
@@ -100,7 +100,7 @@ def parseHeader(headerfile, classname):
 			line.startswith("#") or
 			line.startswith("}") or
 			line.startswith("public Q_SLOTS:") or
-			line.tqfind("~")  != -1 or
+			line.find("~")  != -1 or
 			len(line) == 0
 			):
 			i+=1	
@@ -112,17 +112,17 @@ def parseHeader(headerfile, classname):
 		function = line
 		complete = 0
 		# strip the inline implementation
-		if (line.tqfind("{") > -1):
-			function = line[:line.tqfind("{")]
-			if function.tqfind("}") > -1:
-				function += line[line.tqfind("}") + 1:]
+		if (line.find("{") > -1):
+			function = line[:line.find("{")]
+			if function.find("}") > -1:
+				function += line[line.find("}") + 1:]
 				complete = 1
 			else:
 				i += 1
 				# search for the missing } on the next lines
 				while i < len(lines):
-					if (lines[i].tqfind("}") > -1):
-						function += lines[i][lines[i].tqfind("}") + 1:]
+					if (lines[i].find("}") > -1):
+						function += lines[i][lines[i].find("}") + 1:]
 						complete = 1
 					i += 1
 		else:
diff --git a/chalk/core/kis_exif_info.h b/chalk/core/kis_exif_info.h
index d3fa3428..090d58c6 100644
--- a/chalk/core/kis_exif_info.h
+++ b/chalk/core/kis_exif_info.h
@@ -36,7 +36,7 @@ class KisExifInfo
 
         bool getValue(TQString name, ExifValue& value)
         {
-            if ( m_values.tqfind( name ) == m_values.end() ) {
+            if ( m_values.find( name ) == m_values.end() ) {
                 return false;
             }
             else {
diff --git a/chalk/core/kis_filter_configuration.cc b/chalk/core/kis_filter_configuration.cc
index b25dcb24..c1dec978 100644
--- a/chalk/core/kis_filter_configuration.cc
+++ b/chalk/core/kis_filter_configuration.cc
@@ -109,7 +109,7 @@ TQ_INT32 KisFilterConfiguration::version() const
 
 void KisFilterConfiguration::setProperty(const TQString & name, const TQVariant & value)
 {
-    if ( m_properties.tqfind( name ) == m_properties.end() ) {
+    if ( m_properties.find( name ) == m_properties.end() ) {
         m_properties.insert( name, value );
     }
     else {
@@ -119,7 +119,7 @@ void KisFilterConfiguration::setProperty(const TQString & name, const TQVariant
 
 bool KisFilterConfiguration::getProperty(const TQString & name, TQVariant & value)
 {
-   if ( m_properties.tqfind( name ) == m_properties.end() ) {
+   if ( m_properties.find( name ) == m_properties.end() ) {
        return false;
    }
    else {
@@ -130,7 +130,7 @@ bool KisFilterConfiguration::getProperty(const TQString & name, TQVariant & valu
 
 TQVariant KisFilterConfiguration::getProperty(const TQString & name)
 {
-    if ( m_properties.tqfind( name ) == m_properties.end() ) {
+    if ( m_properties.find( name ) == m_properties.end() ) {
         return TQVariant();
     }
     else {
diff --git a/chalk/core/kis_group_layer.cc b/chalk/core/kis_group_layer.cc
index a3a35339..ea8d0213 100644
--- a/chalk/core/kis_group_layer.cc
+++ b/chalk/core/kis_group_layer.cc
@@ -163,7 +163,7 @@ void KisGroupLayer::setIndex(KisLayerSP layer, int index)
 bool KisGroupLayer::addLayer(KisLayerSP newLayer, int x)
 {
     if (x < 0 || kClamp(uint(x), uint(0), childCount()) != uint(x) ||
-        newLayer->tqparent() || m_layers.tqcontains(newLayer))
+        newLayer->tqparent() || m_layers.contains(newLayer))
     {
         kdWarning() << "invalid input to KisGroupLayer::addLayer(KisLayerSP newLayer, int x)!" << endl;
         return false;
diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cc
index 5cef04d6..9b71c83d 100644
--- a/chalk/core/kis_imagepipe_brush.cc
+++ b/chalk/core/kis_imagepipe_brush.cc
@@ -228,8 +228,8 @@ bool KisImagePipeBrush::init()
      }
 
     TQString paramline = TQString::fromUtf8((&line2[0]), line2.size());
-    TQ_UINT32 m_numOfBrushes = paramline.left(paramline.tqfind(' ')).toUInt();
-    m_parasite = paramline.mid(paramline.tqfind(' ') + 1);
+    TQ_UINT32 m_numOfBrushes = paramline.left(paramline.find(' ')).toUInt();
+    m_parasite = paramline.mid(paramline.find(' ') + 1);
     i++; // Skip past the second newline
 
      TQ_UINT32 numOfBrushes = 0;
diff --git a/chalk/core/kis_layer.cc b/chalk/core/kis_layer.cc
index cac178e5..752159c0 100644
--- a/chalk/core/kis_layer.cc
+++ b/chalk/core/kis_layer.cc
@@ -311,7 +311,7 @@ void KisLayer::setClean(const TQRect & rect)
 
         // XXX: We should only set the parts clean that were actually cleaned. However, extent and exactBounds conspire
         // to make that very hard atm.
-        //if (rect.tqcontains(m_dirtyRect)) m_dirtyRect = TQRect();
+        //if (rect.contains(m_dirtyRect)) m_dirtyRect = TQRect();
         m_dirtyRect = TQRect();
     }
 
diff --git a/chalk/core/kis_paint_device.h b/chalk/core/kis_paint_device.h
index 6c8d7331..7fe6250b 100644
--- a/chalk/core/kis_paint_device.h
+++ b/chalk/core/kis_paint_device.h
@@ -137,12 +137,12 @@ public:
     /**
      * Returns true of x,y is within the extent of this paint device
      */
-    bool tqcontains(TQ_INT32 x, TQ_INT32 y) const;
+    bool contains(TQ_INT32 x, TQ_INT32 y) const;
 
     /**
      * Convenience method for the above
      */
-    bool tqcontains(const TQPoint& pt) const;
+    bool contains(const TQPoint& pt) const;
 
     /**
      * Retrieve the bounds of the paint device. The size is not exact,
diff --git a/chalk/core/kis_palette.cc b/chalk/core/kis_palette.cc
index daf8d84d..161a4ff8 100644
--- a/chalk/core/kis_palette.cc
+++ b/chalk/core/kis_palette.cc
@@ -238,7 +238,7 @@ bool KisPalette::init()
             }
             else if (!lines[i].isEmpty())
             {
-                TQStringList a = TQStringList::split(" ", lines[i].tqreplace(TQChar('\t'), " "));
+                TQStringList a = TQStringList::split(" ", lines[i].replace(TQChar('\t'), " "));
 
                 if (a.count() < 3)
                 {
diff --git a/chalk/core/kis_pattern.cc b/chalk/core/kis_pattern.cc
index 516d3d8b..72130db6 100644
--- a/chalk/core/kis_pattern.cc
+++ b/chalk/core/kis_pattern.cc
@@ -277,7 +277,7 @@ bool KisPattern::init()
 
 KisPaintDeviceSP KisPattern::image(KisColorSpace * colorSpace) {
     // Check if there's already a pattern prepared for this colorspace
-    TQMap<TQString, KisPaintDeviceSP>::const_iterator it = m_colorspaces.tqfind(colorSpace->id().id());
+    TQMap<TQString, KisPaintDeviceSP>::const_iterator it = m_colorspaces.find(colorSpace->id().id());
     if (it != m_colorspaces.end())
         return (*it);
 
diff --git a/chalk/core/kis_perspective_grid.cpp b/chalk/core/kis_perspective_grid.cpp
index 6eb5fbe8..597f1d40 100644
--- a/chalk/core/kis_perspective_grid.cpp
+++ b/chalk/core/kis_perspective_grid.cpp
@@ -27,7 +27,7 @@ KisSubPerspectiveGrid::KisSubPerspectiveGrid(KisPerspectiveGridNodeSP topLeft, K
     
 }
 
-bool KisSubPerspectiveGrid::tqcontains(const KisPoint p) const
+bool KisSubPerspectiveGrid::contains(const KisPoint p) const
 {
     return true;
     KisPerspectiveMath::LineEquation d1 = KisPerspectiveMath::computeLineEquation( topLeft(), topRight() );
@@ -90,7 +90,7 @@ KisSubPerspectiveGrid* KisPerspectiveGrid::gridAt(KisPoint p)
 {
     for( TQValueList<KisSubPerspectiveGrid*>::const_iterator it = begin(); it != end(); ++it)
     {
-        if( (*it)->tqcontains(p) )
+        if( (*it)->contains(p) )
         {
             return *it;
         }
diff --git a/chalk/core/kis_perspective_grid.h b/chalk/core/kis_perspective_grid.h
index 4bd22815..81ec2966 100644
--- a/chalk/core/kis_perspective_grid.h
+++ b/chalk/core/kis_perspective_grid.h
@@ -67,7 +67,7 @@ class KisSubPerspectiveGrid {
         /**
          * @return true if the point p is contain by the grid
          */
-        bool tqcontains(const KisPoint p) const;
+        bool contains(const KisPoint p) const;
     private:
         inline KisPoint computeVanishingPoint(KisPerspectiveGridNodeSP p11, KisPerspectiveGridNodeSP p12, KisPerspectiveGridNodeSP p21, KisPerspectiveGridNodeSP p22)
         {
diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc
index 10e96a05..b5cd8e6e 100644
--- a/chalk/core/kis_selection.cc
+++ b/chalk/core/kis_selection.cc
@@ -204,9 +204,9 @@ void KisSelection::startCachingExactRect()
 void KisSelection::paintUniformSelectionRegion(TQImage img, const TQRect& imageRect, const TQRegion& uniformRegion)
 {
     Q_ASSERT(img.size() == imageRect.size());
-    Q_ASSERT(imageRect.tqcontains(uniformRegion.boundingRect()));
+    Q_ASSERT(imageRect.contains(uniformRegion.boundingRect()));
 
-    if (img.isNull() || img.size() != imageRect.size() || !imageRect.tqcontains(uniformRegion.boundingRect())) {
+    if (img.isNull() || img.size() != imageRect.size() || !imageRect.contains(uniformRegion.boundingRect())) {
         return;
     }
 
diff --git a/chalk/core/kis_thread_pool.cc b/chalk/core/kis_thread_pool.cc
index e617c8cb..2f80a0ae 100644
--- a/chalk/core/kis_thread_pool.cc
+++ b/chalk/core/kis_thread_pool.cc
@@ -115,18 +115,18 @@ void KisThreadPool::dequeue(KisThread * thread)
 
     m_poolMutex.lock();
 
-    int i = m_threads.tqfindRef(thread);
+    int i = m_threads.findRef(thread);
     if (i >= 0) {
         t = m_threads.take(i);
         m_numberOfQueuedThreads--;
     } else {
-        i = m_runningThreads.tqfindRef(thread);
+        i = m_runningThreads.findRef(thread);
         if (i >= 0) {
             t = m_runningThreads.take(i);
             m_numberOfRunningThreads--;
         }
         else {
-            i = m_oldThreads.tqfindRef(thread);
+            i = m_oldThreads.findRef(thread);
             if (i >= 0) {
                 t = m_oldThreads.take(i);
             }
diff --git a/chalk/core/tiles/kis_tile.h b/chalk/core/tiles/kis_tile.h
index f2d6f1e9..2a0b3a22 100644
--- a/chalk/core/tiles/kis_tile.h
+++ b/chalk/core/tiles/kis_tile.h
@@ -25,7 +25,7 @@ class KisTiledDataManager;
 class KisTiledIterator;
 
 /**
- * Provides abstraction to a tile.  A tile tqcontains
+ * Provides abstraction to a tile.  A tile contains
  * a part of a PaintDevice, but only the individual pixels
  * are accesable and that only via iterators.
  */
diff --git a/chalk/core/tiles/kis_tileddatamanager.cc b/chalk/core/tiles/kis_tileddatamanager.cc
index 629b1b38..2dd633fd 100644
--- a/chalk/core/tiles/kis_tileddatamanager.cc
+++ b/chalk/core/tiles/kis_tileddatamanager.cc
@@ -245,7 +245,7 @@ void KisTiledDataManager::setExtent(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32
     //printRect("oldRect", oldRect);
 
     // Do nothing if the desired size is bigger than we currently are: that is handled by the autoextending automatically
-    if (newRect.tqcontains(oldRect)) return;
+    if (newRect.contains(oldRect)) return;
 
     // Loop through all tiles, if a tile is wholly outside the extent, add to the memento, then delete it,
     // if the tile is partially outside the extent, clear the outside pixels to the default pixel.
@@ -259,7 +259,7 @@ void KisTiledDataManager::setExtent(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32
             TQRect tileRect = TQRect(tile->getCol() * KisTile::WIDTH, tile->getRow() * KisTile::HEIGHT, KisTile::WIDTH, KisTile::HEIGHT);
             //printRect("tileRect", tileRect);
 
-            if (newRect.tqcontains(tileRect)) {
+            if (newRect.contains(tileRect)) {
                 // Completely inside, do nothing
                 previousTile = tile;
                 tile = tile->getNext();
@@ -279,7 +279,7 @@ void KisTiledDataManager::setExtent(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32
                     tile->addReader();
                     for (int y = 0; y < KisTile::HEIGHT; ++y) {
                         for (int x = 0; x < KisTile::WIDTH; ++x) {
-                            if (!intersection.tqcontains(x,y)) {
+                            if (!intersection.contains(x,y)) {
                                 TQ_UINT8 * ptr = tile->data(x, y);
                                 memcpy(ptr, m_defPixel, m_pixelSize);
                             }
diff --git a/chalk/core/tiles/kis_tilemanager.cc b/chalk/core/tiles/kis_tilemanager.cc
index dc9811e9..2c3fed8e 100644
--- a/chalk/core/tiles/kis_tilemanager.cc
+++ b/chalk/core/tiles/kis_tilemanager.cc
@@ -157,11 +157,11 @@ void KisTileManager::deregisterTile(KisTile* tile) {
 
     m_swapMutex->lock();
 
-    if (!m_tileMap.tqcontains(tile)) {
+    if (!m_tileMap.contains(tile)) {
         m_swapMutex->unlock();
         return;
     }
-    // Q_ASSERT(m_tileMap.tqcontains(tile));
+    // Q_ASSERT(m_tileMap.contains(tile));
 
     TileInfo* info = m_tileMap[tile];
 
diff --git a/chalk/doc/brush.txt b/chalk/doc/brush.txt
index 17df4b48..739194c7 100644
--- a/chalk/doc/brush.txt
+++ b/chalk/doc/brush.txt
@@ -6,7 +6,7 @@ sources:
 
 * The old Chalk brush code (http://webcvs.kde.org/cgi-bin/cvsweb.cgi/koffice/chalk/tools/kis_tool_brush.cc?rev=1.58&content-type=text/x-cvsweb-markup)
 * Peter Jodda's Perico (http://software.jodda.de/perico.html)
-* The source of the Gimp (both current and 0.99.11 -- the oldest version I could tqfind) (http://www.gimp.org)
+* The source of the Gimp (both current and 0.99.11 -- the oldest version I could find) (http://www.gimp.org)
 * David Hodson's article on Gimp brushes (http://members.ozemail.com.au/~hodsond/gimpbrush.html)
 * Raph Levien's article on Gimp brushes (http://www.levien.com/gimp/brush-arch.html)
 
diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi
index ec204a76..df763e02 100644
--- a/chalk/doc/chalk.xmi
+++ b/chalk/doc/chalk.xmi
@@ -342,7 +342,7 @@ data to rbg for screen rendering." visibility="public" xmi.id="259" name="CMYK"
     <UML:Operation visibility="public" xmi.id="271" type="virtual KisStrategyColorSpaceSP" name="create" >
      <UML:Parameter visibility="private" xmi.id="272" value="" type="enumImgType" name="imgType" />
     </UML:Operation>
-    <UML:Operation visibility="protected" xmi.id="273" type="KisStrategyColorSpaceSP" name="tqfind" >
+    <UML:Operation visibility="protected" xmi.id="273" type="KisStrategyColorSpaceSP" name="find" >
      <UML:Parameter visibility="private" xmi.id="274" value="" type="enumImgType" name="imgType" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="275" type="virtual " name="~KisColorSpaceFactoryFlyweight" />
@@ -650,7 +650,7 @@ of tile in x and y." visibility="public" xmi.id="408" type="void" name="tileCoor
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="480" type="virtual " name="~KisTileCacheInterface" />
    </UML:Class>
-   <UML:Class stereotype="class" comment="Provides abstraction to a tile.  A tile tqcontains
+   <UML:Class stereotype="class" comment="Provides abstraction to a tile.  A tile contains
 a part of a layer.  Layers form an image." visibility="public" xmi.id="481" name="KisTile" >
     <UML:Operation visibility="protected" xmi.id="496" type="KisTile &amp;" name="=" >
      <UML:Parameter visibility="private" xmi.id="497" value="" type="const KisTile &amp;" />
@@ -1059,7 +1059,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
      <UML:Parameter visibility="private" xmi.id="810" value="" type="Q_INT32" name="yOffset" />
      <UML:Parameter visibility="private" xmi.id="811" value="" type="double" name="zoom" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="812" type="KisGuideSP" name="tqfind" >
+    <UML:Operation visibility="public" xmi.id="812" type="KisGuideSP" name="find" >
      <UML:Parameter visibility="private" xmi.id="813" value="" type="double" name="x" />
      <UML:Parameter visibility="private" xmi.id="814" value="" type="double" name="y" />
      <UML:Parameter visibility="private" xmi.id="815" value="" type="double" name="d" />
@@ -1208,7 +1208,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
     <UML:Operation visibility="public" xmi.id="929" type="virtual bool" name="completeSaving" >
      <UML:Parameter visibility="private" xmi.id="930" value="" type="KoStore *" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="931" type="bool" name="tqcontains" >
+    <UML:Operation visibility="public" xmi.id="931" type="bool" name="contains" >
      <UML:Parameter visibility="private" xmi.id="932" value="" type="KisImageSP" name="img" />
     </UML:Operation>
     <UML:Operation visibility="protected" xmi.id="933" type="virtual KoView *" name="createViewInstance" >
@@ -1906,11 +1906,11 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
      <UML:Parameter visibility="private" xmi.id="1511" value="" type="const QString &amp;" name="name" />
      <UML:Parameter visibility="private" xmi.id="1512" value="" type="CompositeOp" name="compositeOp" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1513" type="bool" name="tqcontains" >
+    <UML:Operation visibility="public" xmi.id="1513" type="bool" name="contains" >
      <UML:Parameter visibility="private" xmi.id="1514" value="" type="Q_INT32" name="x" />
      <UML:Parameter visibility="private" xmi.id="1515" value="" type="Q_INT32" name="y" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1516" type="bool" name="tqcontains" >
+    <UML:Operation visibility="public" xmi.id="1516" type="bool" name="contains" >
      <UML:Parameter visibility="private" xmi.id="1517" value="" type="const QPoint &amp;" name="pt" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1518" type="virtual const KisTileMgrSP" name="data" />
@@ -3629,7 +3629,7 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="268" label="KisColorSpaceFactoryFlyweight" />
       <listitem open="0" type="815" id="269" label="create" />
       <listitem open="0" type="815" id="271" label="create" />
-      <listitem open="0" type="815" id="273" label="tqfind" />
+      <listitem open="0" type="815" id="273" label="find" />
       <listitem open="0" type="815" id="275" label="~KisColorSpaceFactoryFlyweight" />
      </listitem>
      <listitem open="0" type="813" id="193" label="KisColorSpaceFactoryInterface" >
@@ -3714,7 +3714,7 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="926" label="clipboardSelection" />
       <listitem open="0" type="815" id="927" label="completeLoading" />
       <listitem open="0" type="815" id="929" label="completeSaving" />
-      <listitem open="0" type="815" id="931" label="tqcontains" />
+      <listitem open="0" type="815" id="931" label="contains" />
       <listitem open="0" type="815" id="933" label="createViewInstance" />
       <listitem open="0" type="815" id="936" label="dcopObject" />
       <listitem open="0" type="815" id="937" label="empty" />
@@ -3838,7 +3838,7 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="802" label="KisGuideMgr" />
       <listitem open="0" type="815" id="803" label="add" />
       <listitem open="0" type="815" id="806" label="erase" />
-      <listitem open="0" type="815" id="812" label="tqfind" />
+      <listitem open="0" type="815" id="812" label="find" />
       <listitem open="0" type="815" id="816" label="findHorizontal" />
       <listitem open="0" type="815" id="819" label="findVertical" />
       <listitem open="0" type="815" id="822" label="hasSelected" />
@@ -4116,8 +4116,8 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="1504" label="colorAt" />
       <listitem open="0" type="815" id="1505" label="compositeOp" />
       <listitem open="0" type="815" id="1506" label="configure" />
-      <listitem open="0" type="815" id="1513" label="tqcontains" />
-      <listitem open="0" type="815" id="1516" label="tqcontains" />
+      <listitem open="0" type="815" id="1513" label="contains" />
+      <listitem open="0" type="815" id="1516" label="contains" />
       <listitem open="0" type="815" id="1519" label="data" />
       <listitem open="0" type="815" id="1518" label="data" />
       <listitem open="0" type="815" id="1524" label="expand" />
@@ -29680,7 +29680,7 @@ in the constructor, you have to call loadAsync.
         </codeblockwithcomments>
         <cppheaderclassdeclarationblock parent_id="481" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
-          <cppcodecomment tag="" text="Class KisTile&amp;#010;Provides abstraction to a tile.  A tile tqcontains&amp;#010;a part of a layer.  Layers form an image." />
+          <cppcodecomment tag="" text="Class KisTile&amp;#010;Provides abstraction to a tile.  A tile contains&amp;#010;a part of a layer.  Layers form an image." />
          </header>
          <textblocks>
           <hierarchicalcodeblock tag="publicBlock" canDelete="false" >
diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi
index 18ac49f0..2f64556e 100644
--- a/chalk/doc/controller.xmi
+++ b/chalk/doc/controller.xmi
@@ -933,14 +933,14 @@ below this layer, remove the specified layer." isSpecification="false" isLeaf="f
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1469" isRoot="false" value="" type="558" isAbstract="false" name="v" />
        </UML:BehavioralFeature.parameter>
       </UML:Operation>
-      <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1470" isRoot="false" isAbstract="false" name="tqcontains" >
+      <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1470" isRoot="false" isAbstract="false" name="contains" >
        <UML:BehavioralFeature.parameter>
         <UML:Parameter kind="return" xmi.id="5372" type="558" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1471" isRoot="false" value="" type="463" isAbstract="false" name="x" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1472" isRoot="false" value="" type="463" isAbstract="false" name="y" />
        </UML:BehavioralFeature.parameter>
       </UML:Operation>
-      <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1473" isRoot="false" isAbstract="false" name="tqcontains" >
+      <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1473" isRoot="false" isAbstract="false" name="contains" >
        <UML:BehavioralFeature.parameter>
         <UML:Parameter kind="return" xmi.id="5373" type="558" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1474" isRoot="false" value="" type="498" isAbstract="false" name="pt" />
@@ -2243,7 +2243,7 @@ and the clipboard." isSpecification="false" isLeaf="false" visibility="public" x
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="700" isRoot="false" value="" type="430" isAbstract="false" name="gd" />
        </UML:BehavioralFeature.parameter>
       </UML:Operation>
-      <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="701" isRoot="false" isAbstract="false" name="tqfind" >
+      <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="701" isRoot="false" isAbstract="false" name="find" >
        <UML:BehavioralFeature.parameter>
         <UML:Parameter kind="return" xmi.id="5458" type="430" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="702" isRoot="false" value="" type="7" isAbstract="false" name="x" />
diff --git a/chalk/doc/histograms.xmi b/chalk/doc/histograms.xmi
index 209a795d..5cd0f484 100644
--- a/chalk/doc/histograms.xmi
+++ b/chalk/doc/histograms.xmi
@@ -1208,14 +1208,14 @@ there is no guarantee that the iterator will work scanline by scanline." isSpeci
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1187" isRoot="false" value="" type="5" isAbstract="false" name="visible" />
        </UML:BehavioralFeature.parameter>
       </UML:Operation>
-      <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1188" isRoot="false" isAbstract="false" name="tqcontains" >
+      <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1188" isRoot="false" isAbstract="false" name="contains" >
        <UML:BehavioralFeature.parameter>
         <UML:Parameter kind="return" xmi.id="17100" type="5" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1189" isRoot="false" value="" type="43" isAbstract="false" name="x" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1190" isRoot="false" value="" type="43" isAbstract="false" name="y" />
        </UML:BehavioralFeature.parameter>
       </UML:Operation>
-      <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1191" isRoot="false" isAbstract="false" name="tqcontains" >
+      <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1191" isRoot="false" isAbstract="false" name="contains" >
        <UML:BehavioralFeature.parameter>
         <UML:Parameter kind="return" xmi.id="17101" type="5" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1192" isRoot="false" value="" type="1176" isAbstract="false" name="pt" />
@@ -2699,7 +2699,7 @@ Doubles are in the 0-1 range, use the producer's positionToString function to di
      <UML:EnumerationLiteral isSpecification="false" isLeaf="false" visibility="public" xmi.id="486" isRoot="false" isAbstract="false" name="LOGARITHMIC" />
     </UML:Enumeration>
     <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="497" isRoot="false" isAbstract="false" name="Q_UINT32" />
-    <UML:Class comment="Provides abstraction to a tile.  A tile tqcontains
+    <UML:Class comment="Provides abstraction to a tile.  A tile contains
 a part of a PaintDevice, but only the individual pixels
 are accesable and that only via iterators." isSpecification="false" isLeaf="false" visibility="public" xmi.id="558" isRoot="false" isAbstract="false" name="KisTile" >
      <UML:Classifier.feature>
diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h
index f69fe2a1..8d6a24f6 100644
--- a/chalk/plugins/filters/cimg/CImg.h
+++ b/chalk/plugins/filters/cimg/CImg.h
@@ -5144,7 +5144,7 @@ namespace cimg_library {
      
      \par Image structure
 
-     The \ref CImg<\c T> structure tqcontains \a five fields :
+     The \ref CImg<\c T> structure contains \a five fields :
      - \ref width defines the number of \a columns of the image (size along the X-axis).
      - \ref height defines the number of \a rows of the image (size along the Y-axis).
      - \ref depth defines the number of \a slices of the image (size along the Z-axis).
diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
index d89db6ae..e9280425 100644
--- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
@@ -87,7 +87,7 @@ void KisBrightnessContrastFilterConfiguration::fromXML( const TQString& s )
                 curve.clear(); // XXX TQPtrList, sure I won't leak stuff here?
                 for (TQStringList::Iterator it = pairStart; it != pairEnd; ++it) {
                     TQString pair = * it;
-                    if (pair.tqfind(",") > -1) {
+                    if (pair.find(",") > -1) {
                         TQPair<double,double> *p = new TQPair<double,double>;
                         p->first = pair.section(",", 0, 0).toDouble();
                         p->second = pair.section(",", 1, 1).toDouble();
diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
index 5c5a1b2c..1eaa1417 100644
--- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
@@ -86,7 +86,7 @@ curvesElement.text() );
                         TQStringList::Iterator pairEnd = data.end();
                         for (TQStringList::Iterator it = pairStart; it != pairEnd; ++it) {
                             TQString pair = * it;
-                            if (pair.tqfind(",") > -1) {
+                            if (pair.find(",") > -1) {
                                 TQPair<double,double> *p = new TQPair<double,double>;
                                 p->first = pair.section(",", 0, 0).toDouble();
                                 p->second = pair.section(",", 1, 1).toDouble();
diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
index fc96b991..a658b863 100644
--- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
+++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
@@ -159,7 +159,7 @@ uint KisOilPaintFilter::MostFrequentColor (KisPaintDeviceSP src, const TQRect& b
 
     while (!it.isDone()) {
 
-        if (bounds.tqcontains(it.x(), it.y())) {
+        if (bounds.contains(it.x(), it.y())) {
 
 // XXX: COLORSPACE_INDEPENDENCE
 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
index 32dbcf9d..b238e746 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
@@ -104,7 +104,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e)
 
         TQPoint pos = TQPoint(e->pos().floorX(), e->pos().floorY());
 
-        if (!img->bounds().tqcontains(pos)) {
+        if (!img->bounds().contains(pos)) {
             return;
         }
 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
index 1e2b82c5..5a919771 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
@@ -151,7 +151,7 @@ void KisToolFill::buttonRelease(KisButtonReleaseEvent *e)
     int x, y;
     x = m_startPos.floorX();
     y = m_startPos.floorY();
-    if (!m_currentImage->bounds().tqcontains(x, y)) {
+    if (!m_currentImage->bounds().contains(x, y)) {
         return;
     }
     flood(x, y);
diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
index 30709fd7..0d7d9728 100644
--- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
@@ -818,7 +818,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         endy=start.y();
     }
 
-    if ( toTQRect ( startx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    if ( toTQRect ( startx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -827,7 +827,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return UpperLeft;
     }
-    else if ( toTQRect ( startx - m_handleSize / 2.0, endy -  m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( startx - m_handleSize / 2.0, endy -  m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -836,7 +836,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return LowerLeft;
     }
-    else if ( toTQRect ( endx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( endx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -845,7 +845,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return UpperRight;
     }
-    else if ( toTQRect ( endx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( endx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -854,7 +854,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return LowerRight;
     }
-    else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -862,7 +862,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return Upper;
     }
-    else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, endy - m_handleSize / 2, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, endy - m_handleSize / 2, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -870,7 +870,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return Lower;
     }
-    else if ( toTQRect ( startx - m_handleSize / 2.0, starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( startx - m_handleSize / 2.0, starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -878,7 +878,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return Left;
     }
-    else if ( toTQRect ( endx - m_handleSize / 2.0 , starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( endx - m_handleSize / 2.0 , starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -886,7 +886,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return Right;
     }
-    else if ( toTQRect ( startx , starty, endx - startx , endy - starty ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( startx , starty, endx - startx , endy - starty ).contains( currentViewPoint ) )
     {
         return Inside;
     }
diff --git a/chalk/plugins/tools/tool_curves/kis_curve_framework.cc b/chalk/plugins/tools/tool_curves/kis_curve_framework.cc
index 416d3bfd..8a9b4c88 100644
--- a/chalk/plugins/tools/tool_curves/kis_curve_framework.cc
+++ b/chalk/plugins/tools/tool_curves/kis_curve_framework.cc
@@ -79,12 +79,12 @@ KisCurve KisCurve::selectedPivots(bool selected)
 
 KisCurve KisCurve::subCurve(const KisPoint& tend)
 {
-    return subCurve(tqfind(tend).previousPivot(),tqfind(tend));
+    return subCurve(find(tend).previousPivot(),find(tend));
 }
 
 KisCurve KisCurve::subCurve(const CurvePoint& tend)
 {
-    return subCurve(tqfind(tend).previousPivot(),tqfind(tend));
+    return subCurve(find(tend).previousPivot(),find(tend));
 }
 
 KisCurve KisCurve::subCurve(iterator tend)
@@ -94,12 +94,12 @@ KisCurve KisCurve::subCurve(iterator tend)
 
 KisCurve KisCurve::subCurve(const KisPoint& tstart, const KisPoint& tend)
 {
-    return subCurve(tqfind(tstart),tqfind(tend));
+    return subCurve(find(tstart),find(tend));
 }
 
 KisCurve KisCurve::subCurve(const CurvePoint& tstart, const CurvePoint& tend)
 {
-    return subCurve(tqfind(tstart),tqfind(tend));
+    return subCurve(find(tstart),find(tend));
 }
 
 KisCurve KisCurve::subCurve(iterator tstart, iterator tend)
@@ -137,7 +137,7 @@ KisCurve::iterator KisCurve::deleteCurve (const KisPoint& pos1, const KisPoint&
 
 KisCurve::iterator KisCurve::deleteCurve (const CurvePoint& pos1, const CurvePoint& pos2)
 {
-    return deleteCurve (tqfind(pos1),tqfind(pos2));
+    return deleteCurve (find(pos1),find(pos2));
 }
 
 KisCurve::iterator KisCurve::deleteCurve (KisCurve::iterator pos1, KisCurve::iterator pos2)
@@ -154,12 +154,12 @@ KisCurve::iterator KisCurve::deleteCurve (KisCurve::iterator pos1, KisCurve::ite
 
 KisCurve::iterator KisCurve::selectPivot(const KisPoint& pt, bool isSelected)
 {
-    return selectPivot(tqfind(CurvePoint(pt,true)),isSelected);
+    return selectPivot(find(CurvePoint(pt,true)),isSelected);
 }
 
 KisCurve::iterator KisCurve::selectPivot(const CurvePoint& pt, bool isSelected)
 {
-    return selectPivot(tqfind(pt),isSelected);
+    return selectPivot(find(pt),isSelected);
 }
 
 KisCurve::iterator KisCurve::selectPivot(KisCurve::iterator it, bool isSelected)
@@ -171,7 +171,7 @@ KisCurve::iterator KisCurve::selectPivot(KisCurve::iterator it, bool isSelected)
     }
     KisCurve selected = pivots();
     for (iterator i = selected.begin(); i != selected.end(); i++)
-        (*tqfind((*i))).setSelected(sel);
+        (*find((*i))).setSelected(sel);
     (*it).setSelected(isSelected);
 
     return it;
@@ -184,7 +184,7 @@ KisCurve::iterator KisCurve::movePivot(const KisPoint& oldPt, const KisPoint& ne
 
 KisCurve::iterator KisCurve::movePivot(const CurvePoint& oldPt, const KisPoint& newPt)
 {
-    return movePivot(tqfind(oldPt), newPt);
+    return movePivot(find(oldPt), newPt);
 }
 
 KisCurve::iterator KisCurve::movePivot(KisCurve::iterator it, const KisPoint& newPt)
@@ -213,7 +213,7 @@ void KisCurve::deletePivot (const KisPoint& pt)
 
 void KisCurve::deletePivot (const CurvePoint& pt)
 {
-    deletePivot(tqfind(pt));
+    deletePivot(find(pt));
 }
 
 void KisCurve::deletePivot (KisCurve::iterator it)
diff --git a/chalk/plugins/tools/tool_curves/kis_curve_framework.h b/chalk/plugins/tools/tool_curves/kis_curve_framework.h
index c27369aa..614d51ff 100644
--- a/chalk/plugins/tools/tool_curves/kis_curve_framework.h
+++ b/chalk/plugins/tools/tool_curves/kis_curve_framework.h
@@ -130,10 +130,10 @@ public:
     iterator begin() const;
     iterator lastIterator() const;
     iterator end() const;
-    iterator tqfind(const CurvePoint& pt);
-    iterator tqfind(const KisPoint& pt);
-    iterator tqfind(iterator it, const CurvePoint& pt);
-    iterator tqfind(iterator it, const KisPoint& pt);
+    iterator find(const CurvePoint& pt);
+    iterator find(const KisPoint& pt);
+    iterator find(iterator it, const CurvePoint& pt);
+    iterator find(iterator it, const KisPoint& pt);
     
     KisCurve pivots();
     KisCurve selectedPivots(bool = true);
@@ -312,34 +312,34 @@ inline KisCurve::iterator KisCurve::end() const
     return iterator(*this,m_curve.end());
 }
 
-inline KisCurve::iterator KisCurve::tqfind (const CurvePoint& pt)
+inline KisCurve::iterator KisCurve::find (const CurvePoint& pt)
 {
-    return iterator(*this,m_curve.tqfind(pt));
+    return iterator(*this,m_curve.find(pt));
 }
 
-inline KisCurve::iterator KisCurve::tqfind (const KisPoint& pt)
+inline KisCurve::iterator KisCurve::find (const KisPoint& pt)
 {
-    return iterator(*this,m_curve.tqfind(CurvePoint(pt)));
+    return iterator(*this,m_curve.find(CurvePoint(pt)));
 }
 
-inline KisCurve::iterator KisCurve::tqfind (KisCurve::iterator it, const CurvePoint& pt)
+inline KisCurve::iterator KisCurve::find (KisCurve::iterator it, const CurvePoint& pt)
 {
-    return iterator(*this,m_curve.tqfind(it.position(),pt));
+    return iterator(*this,m_curve.find(it.position(),pt));
 }
 
-inline KisCurve::iterator KisCurve::tqfind (iterator it, const KisPoint& pt)
+inline KisCurve::iterator KisCurve::find (iterator it, const KisPoint& pt)
 {
-    return iterator(*this,m_curve.tqfind(it.position(),CurvePoint(pt)));
+    return iterator(*this,m_curve.find(it.position(),CurvePoint(pt)));
 }
 
 inline void KisCurve::calculateCurve(const KisPoint& start, const KisPoint& end, KisCurve::iterator it)
 {
-    calculateCurve(tqfind(CurvePoint(start)),tqfind(CurvePoint(end)),it);
+    calculateCurve(find(CurvePoint(start)),find(CurvePoint(end)),it);
 }
 
 inline void KisCurve::calculateCurve(const CurvePoint& start, const CurvePoint& end, KisCurve::iterator it)
 {
-    calculateCurve(tqfind(start),tqfind(end),it);
+    calculateCurve(find(start),find(end),it);
 }
 
 inline void KisCurve::calculateCurve(KisCurve::iterator, KisCurve::iterator, KisCurve::iterator)
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
index e3baf49c..e18b096c 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
@@ -289,7 +289,7 @@ KisCurve::iterator KisToolBezier::handleUnderMouse(const TQPoint& pos)
             continue;
         if (hint == BEZIERENDHINT && (m_actionOptions & SHIFTOPTION))
             continue;
-        if (pivotRect(qpos).tqcontains(pos)) {
+        if (pivotRect(qpos).contains(pos)) {
             inHandle.pushPoint((*it));
             if (hint == BEZIERENDHINT && !(m_actionOptions & SHIFTOPTION))
                 break;
@@ -300,7 +300,7 @@ KisCurve::iterator KisToolBezier::handleUnderMouse(const TQPoint& pos)
     if (inHandle.isEmpty())
         return m_curve->end();
 
-    return m_curve->tqfind(inHandle.last());
+    return m_curve->find(inHandle.last());
 }
 
 KisCurve::iterator KisToolBezier::drawPoint (KisCanvasPainter& gc, KisCurve::iterator point)
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
index f98d2c72..08becf67 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
@@ -124,7 +124,7 @@ void KisToolCurve::buttonPress(KisButtonPressEvent *event)
             m_curve->selectAll(false);
             draw(true, true);
             draw(m_curve->end());
-            m_previous = m_curve->tqfind(m_curve->last());
+            m_previous = m_curve->find(m_curve->last());
             m_current = m_curve->pushPivot(event->pos());
             if (m_curve->pivots().count() > 1)
                 m_curve->calculateCurve(m_previous,m_current,m_current);
@@ -158,7 +158,7 @@ void KisToolCurve::keyPress(TQKeyEvent *event)
         draw(false);
         m_dragging = false;
         m_curve->deleteSelected();
-        m_current = m_curve->tqfind(m_curve->last());
+        m_current = m_curve->find(m_curve->last());
         m_previous = m_curve->selectPivot(m_current);
         draw(false);
     }
@@ -250,12 +250,12 @@ KisCurve::iterator KisToolCurve::handleUnderMouse(const TQPoint& pos)
     KisCurve pivs = m_curve->pivots(), inHandle;
     KisCurve::iterator it;
     for (it = pivs.begin(); it != pivs.end(); it++) {
-        if (pivotRect(m_subject->canvasController()->windowToView((*it).point().toTQPoint())).tqcontains(pos))
+        if (pivotRect(m_subject->canvasController()->windowToView((*it).point().toTQPoint())).contains(pos))
             inHandle.pushPoint((*it));
     }
     if (inHandle.isEmpty())
         return m_curve->end();
-    return m_curve->tqfind(inHandle.last());
+    return m_curve->find(inHandle.last());
 }
 
 KisCurve::iterator KisToolCurve::selectByMouse(KisCurve::iterator it)
@@ -344,8 +344,8 @@ void KisToolCurve::draw(KisCurve::iterator inf, bool pivotonly, bool minimal)
                 return;
             }
             for (KisCurve::iterator i = sel.begin(); i != sel.end(); i++) {
-                it = m_curve->tqfind(*i).previousPivot();
-                finish = m_curve->tqfind(*i).nextPivot();
+                it = m_curve->find(*i).previousPivot();
+                finish = m_curve->find(*i).nextPivot();
                 if ((*finish).isSelected())
                     finish = finish.previousPivot();
                 while (it != finish) {
diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
index 3a21e72e..061db881 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
@@ -97,7 +97,7 @@ void KisToolPerspectiveGrid::update (KisCanvasSubject *subject)
 
 bool KisToolPerspectiveGrid::mouseNear(const TQPoint& mousep, const TQPoint point)
 {
-    return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).tqcontains(mousep) );
+    return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).contains(mousep) );
 }
 
 void KisToolPerspectiveGrid::buttonPress(KisButtonPressEvent *event)
diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
index 809d1a7d..dbcfd74c 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
+++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
@@ -240,7 +240,7 @@ void KisToolPerspectiveTransform::paint(KisCanvasPainter& gc, const TQRect& rc)
 
 bool KisToolPerspectiveTransform::mouseNear(const TQPoint& mousep, const TQPoint point)
 {
-    return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).tqcontains(mousep) );
+    return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).contains(mousep) );
 }
 
 void KisToolPerspectiveTransform::buttonPress(KisButtonPressEvent *event)
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
index 207c86c3..15e21400 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
@@ -133,7 +133,7 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, TQ_INT32
         {
             TQRect shadowBounds = shadowDev->exactBounds();
 
-            if (!image->bounds().tqcontains(shadowBounds)) {
+            if (!image->bounds().contains(shadowBounds)) {
 
                 TQRect newImageSize = image->bounds() | shadowBounds;
                 image->resize(newImageSize.width(), newImageSize.height());
diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
index 1d3a451d..f4511554 100644
--- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
+++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
@@ -60,7 +60,7 @@ void SizeTip::positionTip( const TQRect &rect )
     TQRect deskR = KGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) );
 
     tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) );
-    if ( !rect.tqcontains( tipRect, true ) && rect.intersects( tipRect ) )
+    if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) )
       tipRect.moveBottomRight( tqgeometry().bottomRight() );
   }
 
diff --git a/chalk/sdk/kis_shared_ptr_vector.h b/chalk/sdk/kis_shared_ptr_vector.h
index 679bdd9f..ee7961ae 100644
--- a/chalk/sdk/kis_shared_ptr_vector.h
+++ b/chalk/sdk/kis_shared_ptr_vector.h
@@ -57,7 +57,7 @@ public:
         return super::erase(first, last);
     }
 
-    bool tqcontains(KSharedPtr<T> ptr) const
+    bool contains(KSharedPtr<T> ptr) const
     {
         for (int i = 0, n = super::count(); i < n; ++i)
             if (super::at(i) == ptr)
diff --git a/chalk/ui/kis_cmb_composite.cc b/chalk/ui/kis_cmb_composite.cc
index 54c4b643..754e69da 100644
--- a/chalk/ui/kis_cmb_composite.cc
+++ b/chalk/ui/kis_cmb_composite.cc
@@ -55,7 +55,7 @@ KisCompositeOp KisCmbComposite::currentItem() const
 
 void KisCmbComposite::setCurrentItem(const KisCompositeOp& op)
 {
-    if (m_list.tqfind(op) != m_list.end()) {
+    if (m_list.find(op) != m_list.end()) {
         super::setCurrentText(op.id().name());
     }
 }
diff --git a/chalk/ui/kis_cmb_idlist.cc b/chalk/ui/kis_cmb_idlist.cc
index bdd6f09b..0936350e 100644
--- a/chalk/ui/kis_cmb_idlist.cc
+++ b/chalk/ui/kis_cmb_idlist.cc
@@ -57,7 +57,7 @@ KisID KisCmbIDList::currentItem() const
 
 void KisCmbIDList::setCurrent(const KisID id)
 {
-    if (m_list.tqfind(id) != m_list.end()) 
+    if (m_list.find(id) != m_list.end()) 
         super::setCurrentText(id.name());
     else {
         m_list.push_back(id);
diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc
index 72c26ec5..29d221a0 100644
--- a/chalk/ui/kis_dlg_image_properties.cc
+++ b/chalk/ui/kis_dlg_image_properties.cc
@@ -72,7 +72,7 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *tqparen
     //m_page->cmbColorSpaces->hide();
     //m_page->lblColorSpaces->setText(image->colorSpace()->id().name());
     KisIDList colorSpaces = KisMetaRegistry::instance()->csRegistry()->listKeys();
-    KisIDList::iterator i = colorSpaces.tqfind(KisID("WET",""));
+    KisIDList::iterator i = colorSpaces.find(KisID("WET",""));
     if (i != colorSpaces.end()) {
         colorSpaces.remove(i);
     }
diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc
index 9f82c0d7..941e033e 100644
--- a/chalk/ui/kis_dlg_preferences.cc
+++ b/chalk/ui/kis_dlg_preferences.cc
@@ -130,7 +130,7 @@ ColorSettingsTab::ColorSettingsTab(TQWidget *tqparent, const char *name  )
     refillMonitorProfiles(KisID("RGBA", ""));
     refillPrintProfiles(KisID(cfg.printerColorSpace(), ""));
 
-    if(m_page->cmbMonitorProfile->tqcontains(cfg.monitorProfile()))
+    if(m_page->cmbMonitorProfile->contains(cfg.monitorProfile()))
         m_page->cmbMonitorProfile->setCurrentText(cfg.monitorProfile());
     if(m_page->cmbPrintProfile->contains(cfg.printerProfile()))
         m_page->cmbPrintProfile->setCurrentText(cfg.printerProfile());
diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc
index a5b145da..e8bf5ba8 100644
--- a/chalk/ui/kis_filter_manager.cc
+++ b/chalk/ui/kis_filter_manager.cc
@@ -95,57 +95,57 @@ void KisFilterManager::setup(KActionCollection * ac)
         if (!f) break;
 
         TQString s = f->menuCategory();
-        if (s == "adjust" && !m_filterActionMenus.tqfind("adjust")) {
+        if (s == "adjust" && !m_filterActionMenus.find("adjust")) {
             am = new KActionMenu(i18n("Adjust"), ac, "adjust_filters");
             m_filterActionMenus.insert("adjust", am);
         }
 
-        else if (s == "artistic" && !m_filterActionMenus.tqfind("artistic")) {
+        else if (s == "artistic" && !m_filterActionMenus.find("artistic")) {
             am = new KActionMenu(i18n("Artistic"), ac, "artistic_filters");
             m_filterActionMenus.insert("artistic", am);
         }
 
-        else if (s == "blur" && !m_filterActionMenus.tqfind("blur")) {
+        else if (s == "blur" && !m_filterActionMenus.find("blur")) {
             am = new KActionMenu(i18n("Blur"), ac, "blur_filters");
             m_filterActionMenus.insert("blur", am);
         }
 
-        else if (s == "colors" && !m_filterActionMenus.tqfind("colors")) {
+        else if (s == "colors" && !m_filterActionMenus.find("colors")) {
             am = new KActionMenu(i18n("Colors"), ac, "color_filters");
             m_filterActionMenus.insert("colors", am);
         }
 
-        else if (s == "decor" && !m_filterActionMenus.tqfind("decor")) {
+        else if (s == "decor" && !m_filterActionMenus.find("decor")) {
             am = new KActionMenu(i18n("Decor"), ac, "decor_filters");
             m_filterActionMenus.insert("decor", am);
         }
 
-        else if (s == "edge" && !m_filterActionMenus.tqfind("edge")) {
+        else if (s == "edge" && !m_filterActionMenus.find("edge")) {
             am = new KActionMenu(i18n("Edge Detection"), ac, "edge_filters");
             m_filterActionMenus.insert("edge", am);
         }
 
-        else if (s == "emboss" && !m_filterActionMenus.tqfind("emboss")) {
+        else if (s == "emboss" && !m_filterActionMenus.find("emboss")) {
             am = new KActionMenu(i18n("Emboss"), ac, "emboss_filters");
             m_filterActionMenus.insert("emboss", am);
         }
 
-        else if (s == "enhance" && !m_filterActionMenus.tqfind("enhance")) {
+        else if (s == "enhance" && !m_filterActionMenus.find("enhance")) {
             am = new KActionMenu(i18n("Enhance"), ac, "enhance_filters");
             m_filterActionMenus.insert("enhance", am);
         }
 
-        else if (s == "map" && !m_filterActionMenus.tqfind("map")) {
+        else if (s == "map" && !m_filterActionMenus.find("map")) {
             am = new KActionMenu(i18n("Map"), ac, "map_filters");
             m_filterActionMenus.insert("map", am);
         }
 
-        else if (s == "nonphotorealistic" && !m_filterActionMenus.tqfind("nonphotorealistic")) {
+        else if (s == "nonphotorealistic" && !m_filterActionMenus.find("nonphotorealistic")) {
             am = new KActionMenu(i18n("Non-photorealistic"), ac, "nonphotorealistic_filters");
             m_filterActionMenus.insert("nonphotorealistic", am);
         }
 
-        else if (s == "other" && !m_filterActionMenus.tqfind("other")) {
+        else if (s == "other" && !m_filterActionMenus.find("other")) {
             other = new KActionMenu(i18n("Other"), ac, "misc_filters");
             m_filterActionMenus.insert("other", other);
         }
@@ -171,7 +171,7 @@ void KisFilterManager::setup(KActionCollection * ac)
                                   TQString("chalk_filter_%1").tqarg((*it) . id()).ascii());
 
         // Add action to the right submenu
-        KActionMenu * m = m_filterActionMenus.tqfind( f->menuCategory() );
+        KActionMenu * m = m_filterActionMenus.find( f->menuCategory() );
         if (m) {
             m->insert(a);
         }
diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc
index 788a787d..163c88a4 100644
--- a/chalk/ui/kis_filters_listview.cc
+++ b/chalk/ui/kis_filters_listview.cc
@@ -173,7 +173,7 @@ void KisFiltersListView::setLayer(KisLayerSP layer) {
 
 void KisFiltersListView::setCurrentFilter(KisID filter)
 {
-    setCurrentItem(tqfindItem(filter.name()));
+    setCurrentItem(findItem(filter.name()));
 }
 
 void KisFiltersListView::buildPreview()
diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc
index 3777a214..0547bdb5 100644
--- a/chalk/ui/kis_gradient_slider_widget.cc
+++ b/chalk/ui/kis_gradient_slider_widget.cc
@@ -132,20 +132,20 @@ void KisGradientSliderWidget::mousePressEvent( TQMouseEvent * e )
         // Change the activation order of the handles to avoid deadlocks
         if( t > 0.5 )
         {
-            if( leftHandle.tqcontains( e->pos() ) )
+            if( leftHandle.contains( e->pos() ) )
                 m_drag = LEFT_DRAG;
-            else if( middleHandle.tqcontains( e->pos() ) )
+            else if( middleHandle.contains( e->pos() ) )
                 m_drag = MIDDLE_DRAG;
-            else if( rightHandle.tqcontains( e->pos() ) )
+            else if( rightHandle.contains( e->pos() ) )
                 m_drag = RIGHT_DRAG;
         }
         else
         {
-            if( rightHandle.tqcontains( e->pos() ) )
+            if( rightHandle.contains( e->pos() ) )
                 m_drag = RIGHT_DRAG;
-            else if( middleHandle.tqcontains( e->pos() ) )
+            else if( middleHandle.contains( e->pos() ) )
                 m_drag = MIDDLE_DRAG;
-            else if( leftHandle.tqcontains( e->pos() ) )
+            else if( leftHandle.contains( e->pos() ) )
                 m_drag = LEFT_DRAG;
         }
 
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc
index e257e2b0..cfdc6acd 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cc
@@ -499,7 +499,7 @@ void KisLayerBox::slotAddMenuActivated(int type)
 void KisLayerBox::slotRmClicked()
 {
     TQValueList<int> l = list()->selectedLayerIDs();
-    if (l.count() < 2 && list()->activeLayer() && !l.tqcontains(list()->activeLayer()->id()))
+    if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer()->id()))
     {
         l.clear();
         l.append(list()->activeLayer()->id());
@@ -515,7 +515,7 @@ void KisLayerBox::slotRmClicked()
 void KisLayerBox::slotRaiseClicked()
 {
     TQValueList<int> l = list()->selectedLayerIDs();
-    if (l.count() < 2 && list()->activeLayer() && !l.tqcontains(list()->activeLayer()->id()))
+    if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer()->id()))
     {
         l.clear();
         l.append(list()->activeLayer()->id());
@@ -542,7 +542,7 @@ void KisLayerBox::slotRaiseClicked()
 void KisLayerBox::slotLowerClicked()
 {
     TQValueList<LayerItem*> l = list()->selectedLayers();
-    if (l.count() < 2 && list()->activeLayer() && !l.tqcontains(list()->activeLayer()))
+    if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer()))
     {
         l.clear();
         l.append(list()->activeLayer());
@@ -594,7 +594,7 @@ TQPixmap KisLayerBox::loadPixmap(const TQString& filename, const KIconLoader&
     TQPixmap pixmap = il.loadIcon(filename, KIcon::NoGroup, size);
 
     if (pixmap.isNull())
-        KMessageBox::error(0, i18n("Cannot tqfind %1").tqarg(filename),
+        KMessageBox::error(0, i18n("Cannot find %1").tqarg(filename),
                            i18n("Canvas"));
 
     return pixmap;
@@ -612,7 +612,7 @@ void KisLayerBox::markModified(KisLayer* layer)
         layer = layer->tqparent();
     }
     for (int i = v.count() - 1; i >= 0; --i)
-        if (!m_modified.tqcontains(v[i]))
+        if (!m_modified.contains(v[i]))
             m_modified.append(v[i]);
 }
 
diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc
index 9f8ac9de..ad4dbabb 100644
--- a/chalk/ui/kis_paintop_box.cc
+++ b/chalk/ui/kis_paintop_box.cc
@@ -126,7 +126,7 @@ void KisPaintopBox::colorSpaceChanged(KisColorSpace *cs)
         }
     }
 
-    int index = m_displayedOps->tqfindIndex(currentPaintop());
+    int index = m_displayedOps->findIndex(currentPaintop());
 
     if (index == -1) {
         // Must change the paintop as the current one is not supported
@@ -162,7 +162,7 @@ void KisPaintopBox::slotInputDeviceChanged(const KisInputDevice & inputDevice)
         paintop = (*it).second;
     }
 
-    int index = m_displayedOps->tqfindIndex(paintop);
+    int index = m_displayedOps->findIndex(paintop);
 
     if (index == -1) {
         // Must change the paintop as the current one is not supported
@@ -238,7 +238,7 @@ const KisPaintOpSettings *KisPaintopBox::paintopSettings(const KisID & paintop,
         settingsArray = (*it).second;
     }
 
-    const int index = m_paintops->tqfindIndex(paintop);
+    const int index = m_paintops->findIndex(paintop);
     if (index >= 0 && index < (int)settingsArray.count())
         return settingsArray[index];
     else
diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc
index 459770d1..ace29965 100644
--- a/chalk/ui/kis_part_layer.cc
+++ b/chalk/ui/kis_part_layer.cc
@@ -129,7 +129,7 @@ void KisPartLayerImpl::paintSelection(TQImage &img, TQ_INT32 x, TQ_INT32 y, TQ_I
 
     for (int y2 = y; y2 < h + y; ++y2) {
         for (int x2 = x; x2 < w + x; ++x2) {
-            if (!rect.tqcontains(x2, y2)) {
+            if (!rect.contains(x2, y2)) {
                 TQ_UINT8 g = (*(j + 0)  + *(j + 1 ) + *(j + 2 )) / 9;
                 *(j+0) = 165+g;
                 *(j+1) = 128+g;
diff --git a/chalk/ui/kis_resource_mediator.cc b/chalk/ui/kis_resource_mediator.cc
index 204a1033..d4993807 100644
--- a/chalk/ui/kis_resource_mediator.cc
+++ b/chalk/ui/kis_resource_mediator.cc
@@ -64,7 +64,7 @@ KisResource *KisResourceMediator::currentResource() const
 
 KisIconItem *KisResourceMediator::itemFor(KisResource *r) const
 {
-    if(m_items.tqcontains(r))
+    if(m_items.contains(r))
     {
         return m_items[r];
     }
diff --git a/chalk/ui/kis_resourceserver.cc b/chalk/ui/kis_resourceserver.cc
index d464e1bc..e7593ceb 100644
--- a/chalk/ui/kis_resourceserver.cc
+++ b/chalk/ui/kis_resourceserver.cc
@@ -64,7 +64,7 @@ void KisResourceServerBase::loadResources(TQStringList filenames)
         // XXX: Don't load resources with the same filename. Actually, we should look inside
         //      the resource to find out whether they are really the same, but for now this
         //      will prevent the same brush etc. showing up twice.
-        if (uniqueFiles.empty() || uniqueFiles.tqfind(fname) == uniqueFiles.end()) {
+        if (uniqueFiles.empty() || uniqueFiles.find(fname) == uniqueFiles.end()) {
             uniqueFiles.append(fname);
             KisResource *resource;
             resource = createResource(front);
diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc
index 5885c433..bbe575d1 100644
--- a/chalk/ui/kis_tool_freehand.cc
+++ b/chalk/ui/kis_tool_freehand.cc
@@ -87,7 +87,7 @@ void KisToolFreehand::buttonPress(KisButtonPressEvent *e)
         // People complain that they can't start brush strokes outside of the image boundaries.
         // This makes sense, especially when combined with BUG:132759, so commenting out the
         // next line makes sense.
-        //if (!m_currentImage->bounds().tqcontains(e->pos().floorTQPoint())) return;
+        //if (!m_currentImage->bounds().contains(e->pos().floorTQPoint())) return;
 
         initPaint(e);
         paintAt(e->pos(), e->pressure(), e->xTilt(), e->yTilt());
@@ -309,7 +309,7 @@ void KisToolFreehand::paintOutline(const KisPoint& point) {
 
     KisCanvasController *controller = m_subject->canvasController();
 
-    if (currentImage() && !currentImage()->bounds().tqcontains(point.floorTQPoint())) {
+    if (currentImage() && !currentImage()->bounds().contains(point.floorTQPoint())) {
         if (m_paintedOutline) {
             controller->kiscanvas()->update();
             m_paintedOutline = false;
diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc
index d8d19f36..aa1bf7a7 100644
--- a/chalk/ui/kis_tool_paint.cc
+++ b/chalk/ui/kis_tool_paint.cc
@@ -244,7 +244,7 @@ void KisToolPaint::updateCompositeOpComboBox()
                 KisCompositeOpList compositeOps = device->colorSpace()->userVisiblecompositeOps();
                 m_cmbComposite->setCompositeOpList(compositeOps);
 
-                if (compositeOps.tqfind(m_compositeOp) == compositeOps.end()) {
+                if (compositeOps.find(m_compositeOp) == compositeOps.end()) {
                     m_compositeOp = COMPOSITE_OVER;
                 }
                 m_cmbComposite->setCurrentItem(m_compositeOp);
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index e3500f97..0b288da5 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -2281,7 +2281,7 @@ void KisView::canvasGotButtonPressEvent(KisButtonPressEvent *e)
 //        m_currentGuide = 0;
 //
 //        if ((e->state() & ~TQt::ShiftButton) == Qt::NoButton) {
-//            KisGuideSP gd = mgr->tqfind(static_cast<TQ_INT32>(pt.x() / zoom()), static_cast<TQ_INT32>(pt.y() / zoom()), TQMAX(2.0, 2.0 / zoom()));
+//            KisGuideSP gd = mgr->find(static_cast<TQ_INT32>(pt.x() / zoom()), static_cast<TQ_INT32>(pt.y() / zoom()), TQMAX(2.0, 2.0 / zoom()));
 //
 //            if (gd) {
 //                m_currentGuide = gd;
@@ -3544,7 +3544,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e)
         mgr = img->guides();
 
         if (e->type() == TQEvent::MouseMove && (me->state() & Qt::LeftButton)) {
-            bool flag = tqgeometry().tqcontains(pt);
+            bool flag = tqgeometry().contains(pt);
             KisGuideSP gd;
 
             if (m_currentGuide == 0 && flag) {
diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp
index 0cd835b1..34dd043f 100644
--- a/chalk/ui/kobirdeyepanel.cpp
+++ b/chalk/ui/kobirdeyepanel.cpp
@@ -362,23 +362,23 @@ KoBirdEyePanel::enumDragHandle KoBirdEyePanel::dragHandleAt(TQPoint p)
     TQRect top = TQRect(m_visibleAreaInThumbnail.left()-1, m_visibleAreaInThumbnail.top()-1, m_visibleAreaInThumbnail.width()+2, 3);
     TQRect bottom = TQRect(m_visibleAreaInThumbnail.left()-1, m_visibleAreaInThumbnail.bottom()-1, m_visibleAreaInThumbnail.width()+2, 3);
 
-    if (left.tqcontains(p)) {
+    if (left.contains(p)) {
         return DragHandleLeft;
     }
 
-    if (right.tqcontains(p)) {
+    if (right.contains(p)) {
         return DragHandleRight;
     }
 
-    if (top.tqcontains(p)) {
+    if (top.contains(p)) {
         return DragHandleTop;
     }
 
-    if (bottom.tqcontains(p)) {
+    if (bottom.contains(p)) {
         return DragHandleBottom;
     }
 
-    if (m_visibleAreaInThumbnail.tqcontains(p)) {
+    if (m_visibleAreaInThumbnail.contains(p)) {
         return DragHandleCentre;
     }
 
@@ -403,7 +403,7 @@ void KoBirdEyePanel::handleMouseMove(TQPoint p)
         break;
     default:
     case DragHandleNone:
-        if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).tqcontains(p)) {
+        if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).contains(p)) {
             cursor = TQt::PointingHandCursor;
         } else {
             cursor = TQt::arrowCursor;
@@ -462,7 +462,7 @@ void KoBirdEyePanel::handleMousePress(TQPoint p)
         enumDragHandle dragHandle = dragHandleAt(p);
 
         if (dragHandle == DragHandleNone) {
-            if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).tqcontains(p)) {
+            if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).contains(p)) {
     
                 // Snap visible area centre to p and begin a centre drag.
     
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 059d4e35..6f7cb4e2 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -681,7 +681,7 @@ void LayerList::contentsMouseDoubleClickEvent( TQMouseEvent *e )
     super::contentsMouseDoubleClickEvent( e );
     if( LayerItem *layer = static_cast<LayerItem*>( itemAt( contentsToViewport( e->pos() ) ) ) )
     {
-        if( !layer->iconsRect().tqcontains( layer->mapFromListView( e->pos() ) ) )
+        if( !layer->iconsRect().contains( layer->mapFromListView( e->pos() ) ) )
         {
             emit requestLayerProperties( layer );
             emit requestLayerProperties( layer->id() );
@@ -867,7 +867,7 @@ void LayerItem::init()
 
 LayerItem::~LayerItem()
 {
-    if (listView() && (listView()->activeLayer() == this || tqcontains(listView()->activeLayer())))
+    if (listView() && (listView()->activeLayer() == this || contains(listView()->activeLayer())))
         listView()->setActiveLayer( static_cast<LayerItem*>( 0 ) );
     delete d;
 }
@@ -885,7 +885,7 @@ bool LayerItem::isFolder() const
     return d->isFolder;
 }
 
-bool LayerItem::tqcontains(const LayerItem *item)
+bool LayerItem::contains(const LayerItem *item)
 {
     TQListViewItemIterator it(this);
 
@@ -1180,7 +1180,7 @@ bool LayerItem::mousePressEvent( TQMouseEvent *e )
 
     const TQRect ir = iconsRect(), tr = textRect();
 
-    if( ir.tqcontains( e->pos() ) )
+    if( ir.contains( e->pos() ) )
     {
         const int iconWidth = iconSize().width();
         int x = e->pos().x() - ir.left();
@@ -1201,7 +1201,7 @@ bool LayerItem::mousePressEvent( TQMouseEvent *e )
         return true;
     }
 
-    else if( tr.tqcontains( e->pos() ) && isSelected() && !listView()->renameLineEdit()->isVisible() )
+    else if( tr.contains( e->pos() ) && isSelected() && !listView()->renameLineEdit()->isVisible() )
     {
         listView()->rename( this, 0 );
         TQRect r( listView()->contentsToViewport( mapToListView( tr.topLeft() ) ), tr.size() );
diff --git a/chalk/ui/layerlist.h b/chalk/ui/layerlist.h
index 58c2a4bb..5c75b6b7 100644
--- a/chalk/ui/layerlist.h
+++ b/chalk/ui/layerlist.h
@@ -178,7 +178,7 @@ public:
 
     // Returns true if this item is the given item or the tree rooted at
     // this item contains the given item.
-    bool tqcontains(const LayerItem *item);
+    bool contains(const LayerItem *item);
 
     int id() const;
 
diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp
index 96929450..1c58f1dd 100644
--- a/chalk/ui/squeezedcombobox.cpp
+++ b/chalk/ui/squeezedcombobox.cpp
@@ -76,7 +76,7 @@ SqueezedComboBox::~SqueezedComboBox()
     delete m_timer;
 }
 
-bool SqueezedComboBox::tqcontains( const TQString& _text ) const
+bool SqueezedComboBox::contains( const TQString& _text ) const
 {
     if ( _text.isEmpty() )
         return false;
diff --git a/chalk/ui/squeezedcombobox.h b/chalk/ui/squeezedcombobox.h
index 66758335..0ca7bb41 100644
--- a/chalk/ui/squeezedcombobox.h
+++ b/chalk/ui/squeezedcombobox.h
@@ -97,7 +97,7 @@ public:
      */
     virtual ~SqueezedComboBox();
 
-    bool tqcontains(const TQString & text) const;
+    bool contains(const TQString & text) const;
 
     /**
      * This inserts a item to the list. See TQComboBox::insertItem()