rename the following methods:

tqfind find
tqreplace replace
tqcontains contains

1 files changed, 13 insertions, 13 deletions

diff --git a/tqtinterface/qt4/src/canvas/tqcanvas.cpp b/tqtinterface/qt4/src/canvas/tqcanvas.cpp
index 22ee9f4..a827602 100644
--- a/tqtinterface/qt4/src/canvas/tqcanvas.cpp
+++ b/tqtinterface/qt4/src/canvas/tqcanvas.cpp
@@ -150,7 +150,7 @@ void TQCanvasClusterizer::add(const TQRect& rect)
     int cursor;
 
     for (cursor=0; cursor<count; cursor++) {
-	if (cluster[cursor].tqcontains(rect)) {
+	if (cluster[cursor].contains(rect)) {
 	    // Wholly contained already.
 	    return;
 	}
@@ -449,7 +449,7 @@ static int scm(int a, int b)
     \module canvas
 
     The TQCanvas class manages its 2D graphic area and all the canvas
-    items the area tqcontains. The canvas has no visual appearance of
+    items the area contains. The canvas has no visual appearance of
     its own. Instead, it is displayed on screen using a TQCanvasView.
     Multiple TQCanvasView widgets may be associated with a canvas to
     provide multiple views of the same canvas.
@@ -493,7 +493,7 @@ static int scm(int a, int b)
     is perfectly possible. At such a size a widget might be very
     inefficient, and some window systems might not support it at all,
     whereas TQCanvas scales well. Even with a billion pixels and a million
-    items, tqfinding a particular canvas item, detecting collisions, etc.,
+    items, finding a particular canvas item, detecting collisions, etc.,
     is still fast (though the memory consumption may be prohibitive
     at such extremes).
 
@@ -1046,7 +1046,7 @@ void TQCanvas::advance()
 	if ( i )
 	    i->advance(0);
     }
-    // we expect the dict tqcontains the exact same items as in the
+    // we expect the dict contains the exact same items as in the
     // first pass.
     it.toFirst();
     while ( it.current() ) {
@@ -1081,7 +1081,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr,
 
     TQRect all(0,0,width(),height());
 
-    if ( !all.tqcontains(ivr) ) {
+    if ( !all.contains(ivr) ) {
 	// Need to clip with edge of canvas.
 
 #ifndef TQT_NO_TRANSFORMATIONS
@@ -1126,7 +1126,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr,
         p->drawPixmap(vr.x(), vr.y(), offscr, 0, 0, vr.width(), vr.height());
     } else {
 	TQRect r = vr; r.moveBy(tl.x(),tl.y()); // move to untransformed co-ords
-	if ( !all.tqcontains(ivr) ) {
+	if ( !all.contains(ivr) ) {
 	    TQRegion inside = p->clipRegion() & r;
 	    //TQRegion outside = p->clipRegion() - r;
 	    //p->setClipRegion(outside);
@@ -1893,7 +1893,7 @@ class TQCanvasItemExtra {
     \e after the next advance(1) call.
 
     The rtti() function is used for identifying subclasses of TQCanvasItem.
-    The canvas() function returns a pointer to the canvas which tqcontains the
+    The canvas() function returns a pointer to the canvas which contains the
     canvas item.
 
     TQCanvasItem provides the show() and isVisible() functions like those in
@@ -2722,8 +2722,8 @@ TQCanvasItemList TQCanvas::collisions(const TQPointArray& chunklist,
 	    for (TQCanvasItemList::ConstIterator it=l->begin(); it!=l->end(); ++it) {
 		TQCanvasItem *g=*it;
 		if ( g != item ) {
-		    if ( !seen.tqfind(g) ) {
-			seen.tqreplace(g,(void*)1);
+		    if ( !seen.find(g) ) {
+			seen.replace(g,(void*)1);
 			if ( !exact || item->collidesWith(g) )
 			    result.append(g);
 		    }
@@ -3056,7 +3056,7 @@ TQCanvasPixmapArray::TQCanvasPixmapArray(TQValueList<TQPixmap> list, TQPointArra
 }
 
 /*!
-    Destroys the pixmap array and all the pixmaps it tqcontains.
+    Destroys the pixmap array and all the pixmaps it contains.
 */
 TQCanvasPixmapArray::~TQCanvasPixmapArray()
 {
@@ -3107,13 +3107,13 @@ bool TQCanvasPixmapArray::readPixmaps( const TQString& filenamepattern,
 
     If count() is 1 \a filename must specify a real filename to read
     the tqmask from. If count() is greater than 1, the \a filename must
-    contain a "%1" that will get tqreplaced by the number of the tqmask to
+    contain a "%1" that will get replaced by the number of the tqmask to
     be loaded, just like TQCanvasPixmapArray::readPixmaps().
 
     All collision masks must be 1-bit images or this function call
     will fail.
 
-    If the file isn't readable, tqcontains the wrong number of images,
+    If the file isn't readable, contains the wrong number of images,
     or there is some other error, this function will return FALSE, and
     the array will be flagged as invalid; otherwise this function
     returns TRUE.
@@ -3510,7 +3510,7 @@ void TQCanvasSprite::draw(TQPainter& painter)
 
     Example:
 
-    The following code tqfinds the part of the canvas that is visible in
+    The following code finds the part of the canvas that is visible in
     this view, i.e. the bounding rectangle of the view in canvas coordinates.
 
     \code