rename the following methods:

tqfind find
tqreplace replace
tqcontains contains

8 files changed, 57 insertions, 57 deletions

diff --git a/tqtinterface/qt4/src/styles/qt_styles.pri b/tqtinterface/qt4/src/styles/qt_styles.pri
index baf36d5..1dc8983 100644
--- a/tqtinterface/qt4/src/styles/qt_styles.pri
+++ b/tqtinterface/qt4/src/styles/qt_styles.pri
@@ -10,19 +10,19 @@ styles {
 		  $$STYLES_CPP/tqstyleplugin.cpp \
 		  $$STYLES_CPP/tqcommonstyle.cpp
 
-	tqcontains( styles, all ) {
+	contains( styles, all ) {
 		styles += mac cde motifplus sgi platinum compact interlace windows motif
 	}
 
 	x11|embedded|!macx-*:styles -= mac
-	tqcontains( styles, mac ) {
+	contains( styles, mac ) {
 		HEADERS +=$$STYLES_H/tqmacstyle_mac.h \
                           $$STYLES_H/tqmacstylepixmaps_mac_p.h
 		SOURCES +=$$STYLES_CPP/tqmacstyle_mac.cpp
 		HEADERS *= $$STYLES_CPP/tqaquastyle_p.h 
 		SOURCES *= $$STYLES_CPP/tqaquastyle_p.cpp 
 
-		!tqcontains( styles, windows ) {
+		!contains( styles, windows ) {
 			message( mac requires windows )
 			styles += windows
 		}
@@ -30,84 +30,84 @@ styles {
 	else:DEFINES += TQT_NO_STYLE_MAC
 
 	#embedded|!macx-*:styles -= aqua
-	tqcontains( styles, aqua ) {
+	contains( styles, aqua ) {
 		HEADERS += $$STYLES_H/tqaquastyle.h 
 		SOURCES += $$STYLES_CPP/tqaquastyle.cpp 
 		HEADERS *= $$STYLES_CPP/tqaquastyle_p.h 
 		SOURCES *= $$STYLES_CPP/tqaquastyle_p.cpp 
 
-		!tqcontains( styles, windows ) {
+		!contains( styles, windows ) {
 			message( aqua requires windows )
 			styles += windows
 		}
 	}
 	else:DEFINES += TQT_NO_STYLE_AQUA
 
-	tqcontains( styles, cde ) {
+	contains( styles, cde ) {
 		HEADERS +=$$STYLES_H/tqcdestyle.h
 		SOURCES +=$$STYLES_CPP/tqcdestyle.cpp
 
-		!tqcontains( styles, motif ) {
+		!contains( styles, motif ) {
 			message( cde requires motif )
 			styles += motif
 		}
 	}
 	else:DEFINES += TQT_NO_STYLE_CDE
 
-	tqcontains( styles, motifplus ) {
+	contains( styles, motifplus ) {
 		HEADERS +=$$STYLES_H/tqmotifplusstyle.h
 		SOURCES +=$$STYLES_CPP/tqmotifplusstyle.cpp
-		!tqcontains( styles, motif ) {
+		!contains( styles, motif ) {
 			message( motifplus requires motif )
 			styles += motif
 		}
 	}
 	else:DEFINES += TQT_NO_STYLE_MOTIFPLUS
 
-	tqcontains( styles, interlace ) {
+	contains( styles, interlace ) {
 		HEADERS +=$$STYLES_H/tqinterlacestyle.h
 		SOURCES +=$$STYLES_CPP/tqinterlacestyle.cpp
-		!tqcontains( styles, windows ) {
+		!contains( styles, windows ) {
 			message( interlace requires windows )
 			styles += windows
 		}
 	}
 	else:DEFINES += TQT_NO_STYLE_INTERLACE
 
-	tqcontains( styles, platinum ) {
+	contains( styles, platinum ) {
 		HEADERS +=$$STYLES_H/tqplatinumstyle.h
 		SOURCES +=$$STYLES_CPP/tqplatinumstyle.cpp
-		!tqcontains( styles, windows ) {
+		!contains( styles, windows ) {
 			message( platinum requires windows )
 			styles += windows
 		}
 	}
 	else:DEFINES += TQT_NO_STYLE_PLATINUM
 
-	tqcontains( styles, windowsxp ) {
+	contains( styles, windowsxp ) {
 		HEADERS +=$$STYLES_H/tqwindowsxpstyle.h
 		SOURCES +=$$STYLES_CPP/tqwindowsxpstyle.cpp
-		!tqcontains( styles, windowsxp ) {
+		!contains( styles, windowsxp ) {
 			message( windowsxp requires windows )
 			styles += windows
 		}
         }
         else:DEFINES += TQT_NO_STYLE_WINDOWSXP
 
-	tqcontains( styles, sgi ) {
+	contains( styles, sgi ) {
 		HEADERS +=$$STYLES_H/tqsgistyle.h
 		SOURCES +=$$STYLES_CPP/tqsgistyle.cpp
-		!tqcontains( styles, motif ) {
+		!contains( styles, motif ) {
 			message( sgi requires motif )
 			styles += motif
 		}
 	}
 	else:DEFINES += TQT_NO_STYLE_SGI
 
-	tqcontains( styles, compact ) {
+	contains( styles, compact ) {
 		HEADERS +=$$STYLES_H/tqcompactstyle.h
 		SOURCES +=$$STYLES_CPP/tqcompactstyle.cpp
-		!tqcontains( styles, windows ) {
+		!contains( styles, windows ) {
 			message( compact requires windows )
 			styles += windows
 		}
@@ -115,24 +115,24 @@ styles {
 	else:DEFINES += TQT_NO_STYLE_COMPACT
 
         wince-*:styles += pocketpc
-	tqcontains( styles, pocketpc ) {
+	contains( styles, pocketpc ) {
 		HEADERS +=$$STYLES_H/tqpocketpcstyle_wce.h
 		SOURCES +=$$STYLES_CPP/tqpocketpcstyle_wce.cpp
 		
-		!tqcontains( styles, windows ) {
+		!contains( styles, windows ) {
 			message( pocketpc requires windows )
 			styles += windows
 		}
 	}
         else:DEFINES += TQT_NO_STYLE_POCKETPC
         
-	tqcontains( styles, windows ) {
+	contains( styles, windows ) {
 		HEADERS +=$$STYLES_H/tqwindowsstyle.h
 		SOURCES +=$$STYLES_CPP/tqwindowsstyle.cpp
 	}
 	else:DEFINES += TQT_NO_STYLE_WINDOWS
 
-	tqcontains( styles, motif ) {
+	contains( styles, motif ) {
 		HEADERS +=$$STYLES_H/tqmotifstyle.h
 		SOURCES +=$$STYLES_CPP/tqmotifstyle.cpp
 	}
diff --git a/tqtinterface/qt4/src/styles/tqcommonstyle.cpp b/tqtinterface/qt4/src/styles/tqcommonstyle.cpp
index 79439b9..8ab5d91 100644
--- a/tqtinterface/qt4/src/styles/tqcommonstyle.cpp
+++ b/tqtinterface/qt4/src/styles/tqcommonstyle.cpp
@@ -2182,7 +2182,7 @@ TQStyle::SubControl TQCommonStyle::querySubControl(TQ_ComplexControl control,
 	    while (ret == SC_None && ctrl <= SC_ScrollBarGroove) {
 		r = querySubControlMetrics(control, widget,
 					   (TQStyle::SubControl) ctrl, opt);
-		if (r.isValid() && r.tqcontains(pos))
+		if (r.isValid() && r.contains(pos))
 		    ret = (TQStyle::SubControl) ctrl;
 
 		ctrl <<= 1;
@@ -2201,7 +2201,7 @@ TQStyle::SubControl TQCommonStyle::querySubControl(TQ_ComplexControl control,
 	    // we can do this because subcontrols were designed to be masks as well...
 	    while (ret == SC_None && ctrl <= SC_TitleBarUnshadeButton) {
 		r = tqvisualRect( querySubControlMetrics( control, widget, (TQStyle::SubControl) ctrl, opt ), widget );
-		if (r.isValid() && r.tqcontains(pos))
+		if (r.isValid() && r.contains(pos))
 		    ret = (TQStyle::SubControl) ctrl;
 
 		ctrl <<= 1;
@@ -2608,7 +2608,7 @@ TQSize TQCommonStyle::tqsizeFromContents(ContentsType contents,
 	    }
 
 	    if (! mi->text().isNull()) {
-		if (mi->text().tqfind('\t') >= 0)
+		if (mi->text().find('\t') >= 0)
 		    w += 12;
 	    }
 
diff --git a/tqtinterface/qt4/src/styles/tqcompactstyle.cpp b/tqtinterface/qt4/src/styles/tqcompactstyle.cpp
index 44cd711..7f90df9 100644
--- a/tqtinterface/qt4/src/styles/tqcompactstyle.cpp
+++ b/tqtinterface/qt4/src/styles/tqcompactstyle.cpp
@@ -94,7 +94,7 @@ static int extraPopupMenuItemWidth( bool checkable, int maxpmw, TQMenuItem* mi,
 	w += mi->pixmap()->width();	// pixmap only
 
     if ( !mi->text().isNull() ) {
-	if ( mi->text().tqfind('\t') >= 0 )	// string tqcontains tab
+	if ( mi->text().find('\t') >= 0 )	// string contains tab
 	    w += motifTabSpacing;
     }
 
@@ -265,7 +265,7 @@ void TQCompactStyle::tqdrawControl( ControlElement element, TQPainter *p, const
 	    }
 	    TQString s = mi->text();
 	    if ( !s.isNull() ) {			// draw text
-		int t = s.tqfind( '\t' );
+		int t = s.find( '\t' );
 		int m = motifItemVMargin;
 		const int text_flags = AlignVCenter|ShowPrefix | DontClip | SingleLine;
 		if ( t >= 0 ) {				// draw tab text
diff --git a/tqtinterface/qt4/src/styles/tqmotifplusstyle.cpp b/tqtinterface/qt4/src/styles/tqmotifplusstyle.cpp
index bef75db..c10183c 100644
--- a/tqtinterface/qt4/src/styles/tqmotifplusstyle.cpp
+++ b/tqtinterface/qt4/src/styles/tqmotifplusstyle.cpp
@@ -859,7 +859,7 @@ void TQMotifPlusStyle::tqdrawControl( TQ_ControlElement element,
 
 	    TQString s = mi->text();
 	    if ( !s.isNull() ) {                        // draw text
-		int t = s.tqfind( '\t' );
+		int t = s.find( '\t' );
 		int m = 2;
 		int text_flags = TQt::AlignVCenter|TQt::ShowPrefix | TQt::DontClip | TQt::SingleLine;
 		text_flags |= (TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft );
@@ -1127,15 +1127,15 @@ void TQMotifPlusStyle::tqdrawComplexControl(TQ_ComplexControl control,
 
 	    bool skipUpdate = FALSE;
 	    if (singleton->hovering) {
-		if (addline.tqcontains(singleton->mousePos)) {
+		if (addline.contains(singleton->mousePos)) {
 		    skipUpdate =
 			(singleton->scrollbarElement == SC_ScrollBarAddLine);
 		    singleton->scrollbarElement = SC_ScrollBarAddLine;
-		} else if (subline.tqcontains(singleton->mousePos)) {
+		} else if (subline.contains(singleton->mousePos)) {
 		    skipUpdate =
 			(singleton->scrollbarElement == SC_ScrollBarSubLine);
 		    singleton->scrollbarElement = SC_ScrollBarSubLine;
-		} else if (slider.tqcontains(singleton->mousePos)) {
+		} else if (slider.contains(singleton->mousePos)) {
 		    skipUpdate =
 			(singleton->scrollbarElement == SC_ScrollBarSlider);
 		    singleton->scrollbarElement = SC_ScrollBarSlider;
@@ -1353,7 +1353,7 @@ void TQMotifPlusStyle::tqdrawComplexControl(TQ_ComplexControl control,
 	    }
 
 	    if ((controls & SC_SliderHandle) && handle.isValid()) {
-		if ((mouseover && handle.tqcontains(singleton->mousePos)) ||
+		if ((mouseover && handle.contains(singleton->mousePos)) ||
 		    singleton->sliderActive)
 		    flags |= Style_MouseOver;
 		else
diff --git a/tqtinterface/qt4/src/styles/tqmotifstyle.cpp b/tqtinterface/qt4/src/styles/tqmotifstyle.cpp
index 257c0ad..b05c46d 100644
--- a/tqtinterface/qt4/src/styles/tqmotifstyle.cpp
+++ b/tqtinterface/qt4/src/styles/tqmotifstyle.cpp
@@ -1122,7 +1122,7 @@ void TQMotifStyle::tqdrawControl( TQ_ControlElement element,
 	    }
 	    TQString s = mi->text();
 	    if ( !s.isNull() ) {                        // draw text
-		int t = s.tqfind( '\t' );
+		int t = s.find( '\t' );
 		int m = motifItemVMargin;
 		int text_flags = TQt::AlignVCenter|TQt::ShowPrefix | TQt::DontClip | TQt::SingleLine;
 		text_flags |= (TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft );
@@ -1777,8 +1777,8 @@ TQSize TQMotifStyle::tqsizeFromContents( ContentsType contents,
 	    // a little bit of border can never harm
 	    w += 2*motifItemHMargin + 2*motifItemFrame;
 
-	    if ( !mi->text().isNull() && mi->text().tqfind('\t') >= 0 )
-		// string tqcontains tab
+	    if ( !mi->text().isNull() && mi->text().find('\t') >= 0 )
+		// string contains tab
 		w += motifTabSpacing;
 	    else if (mi->popup())
 		// submenu indicator needs some room if we don't have a tab column
diff --git a/tqtinterface/qt4/src/styles/tqsgistyle.cpp b/tqtinterface/qt4/src/styles/tqsgistyle.cpp
index 6b8a17b..45ac25b 100644
--- a/tqtinterface/qt4/src/styles/tqsgistyle.cpp
+++ b/tqtinterface/qt4/src/styles/tqsgistyle.cpp
@@ -487,7 +487,7 @@ static void drawSGIPrefix( TQPainter *p, int x, int y, TQString* miText )
     if ( miText && (!!(*miText)) ) {
         int amp = 0;
         bool nextAmp = FALSE;
-        while ( ( amp = miText->tqfind( '&', amp ) ) != -1 ) {
+        while ( ( amp = miText->find( '&', amp ) ) != -1 ) {
             if ( (uint)amp == miText->length()-1 )
                 return;
             miText->remove( amp,1 );
@@ -795,7 +795,7 @@ void TQSGIStyle::tqdrawPrimitiveBase( TQ_PrimitiveElement pe,
 	break;
 
     case PE_ScrollBarSubLine:
-	if ( !r.tqcontains( d->mousePos ) && !(flags & Style_Active) )
+	if ( !r.contains( d->mousePos ) && !(flags & Style_Active) )
 	    flags &= ~Style_MouseOver;
 	tqdrawPrimitive( PE_ButtonCommand, p, r, cg, flags, opt );
 	tqdrawPrimitive(((flags & Style_Horizontal) ? PE_ArrowLeft : PE_ArrowUp),
@@ -803,7 +803,7 @@ void TQSGIStyle::tqdrawPrimitiveBase( TQ_PrimitiveElement pe,
 	break;
 
     case PE_ScrollBarAddLine:
-	if ( !r.tqcontains( d->mousePos ) )
+	if ( !r.contains( d->mousePos ) )
 	    flags &= ~Style_MouseOver;
 	tqdrawPrimitive( PE_ButtonCommand, p, r, cg, flags, opt );
 	tqdrawPrimitive(((flags & Style_Horizontal) ? PE_ArrowRight : PE_ArrowDown),
@@ -812,7 +812,7 @@ void TQSGIStyle::tqdrawPrimitiveBase( TQ_PrimitiveElement pe,
 
     case PE_ScrollBarSubPage:
     case PE_ScrollBarAddPage:
-	if ( !r.tqcontains( d->mousePos ) )
+	if ( !r.contains( d->mousePos ) )
 	    flags &= ~Style_MouseOver;
 	if ( r.isValid() )
 	    qDrawShadePanel( p, x, y, w, h, cg, FALSE, 1, hot ? &cg.brush( TQColorGroup::Midlight ) : &cg.brush( TQColorGroup::Button ) );
@@ -822,7 +822,7 @@ void TQSGIStyle::tqdrawPrimitiveBase( TQ_PrimitiveElement pe,
 	{
 	    if ( !r.isValid() )
 		break;
-	    if ( !(r.tqcontains( d->mousePos ) || flags & Style_Active) || !(flags & Style_Enabled ) )
+	    if ( !(r.contains( d->mousePos ) || flags & Style_Active) || !(flags & Style_Enabled ) )
 		flags &= ~Style_MouseOver;
 
 	    TQPixmap pm( r.width(), r.height() );
@@ -1056,7 +1056,7 @@ void TQSGIStyle::tqdrawControl( TQ_ControlElement element,
 
 	    TQString s = mi->text();
 	    if ( !!s ) {
-		int t = s.tqfind( '\t' );
+		int t = s.find( '\t' );
 		int m = sgiItemVMargin;
 		const int text_flags = TQt::AlignVCenter | TQt::DontClip | TQt::SingleLine; //special underline for &x
 
@@ -1195,7 +1195,7 @@ void TQSGIStyle::tqdrawComplexControl( TQ_ComplexControl control,
 	    }
 
 	    if (( sub & SC_SliderHandle ) && handle.isValid()) {
-		if ( flags & Style_MouseOver && !handle.tqcontains( d->mousePos ) && subActive != SC_SliderHandle )
+		if ( flags & Style_MouseOver && !handle.contains( d->mousePos ) && subActive != SC_SliderHandle )
 		    flags &= ~Style_MouseOver;
 		tqdrawPrimitive( PE_ButtonBevel, p, handle, cg, flags );
 
diff --git a/tqtinterface/qt4/src/styles/tqstylefactory.cpp b/tqtinterface/qt4/src/styles/tqstylefactory.cpp
index 42f1c2f..6d72738 100644
--- a/tqtinterface/qt4/src/styles/tqstylefactory.cpp
+++ b/tqtinterface/qt4/src/styles/tqstylefactory.cpp
@@ -212,39 +212,39 @@ TQStringList TQStyleFactory::keys()
 #endif //TQT_NO_COMPONENT
 
 #ifndef TQT_NO_STYLE_WINDOWS
-    if ( !list.tqcontains( "Windows" ) )
+    if ( !list.contains( "Windows" ) )
 	list << "Windows";
 #endif
 #ifndef TQT_NO_STYLE_WINDOWSXP
-    if ( !list.tqcontains( "WindowsXP" ) && TQWindowsXPStyle::resolveSymbols() )
+    if ( !list.contains( "WindowsXP" ) && TQWindowsXPStyle::resolveSymbols() )
 	list << "WindowsXP";
 #endif
 #ifndef TQT_NO_STYLE_MOTIF
-    if ( !list.tqcontains( "Motif" ) )
+    if ( !list.contains( "Motif" ) )
 	list << "Motif";
 #endif
 #ifndef TQT_NO_STYLE_CDE
-    if ( !list.tqcontains( "CDE" ) )
+    if ( !list.contains( "CDE" ) )
 	list << "CDE";
 #endif
 #ifndef TQT_NO_STYLE_MOTIFPLUS
-    if ( !list.tqcontains( "MotifPlus" ) )
+    if ( !list.contains( "MotifPlus" ) )
 	list << "MotifPlus";
 #endif
 #ifndef TQT_NO_STYLE_PLATINUM
-    if ( !list.tqcontains( "Platinum" ) )
+    if ( !list.contains( "Platinum" ) )
 	list << "Platinum";
 #endif
 #ifndef TQT_NO_STYLE_SGI
-    if ( !list.tqcontains( "SGI" ) )
+    if ( !list.contains( "SGI" ) )
 	list << "SGI";
 #endif
 #ifndef TQT_NO_STYLE_COMPACT
-    if ( !list.tqcontains( "Compact" ) )
+    if ( !list.contains( "Compact" ) )
 	list << "Compact";
 #endif
 #ifndef TQT_NO_STYLE_ATQUA
-    if ( !list.tqcontains( "Aqua" ) )
+    if ( !list.contains( "Aqua" ) )
 	list << "Aqua";
 #endif
 #if !defined( TQT_NO_STYLE_MAC ) && defined( TQ_WS_MAC )
@@ -257,7 +257,7 @@ TQStringList TQStyleFactory::keys()
 	if(!GetCollectionItem(c, kThemeNameTag, 0, &s, &str))
 	    mstyle += " (" + p2qstring(str) + ")";
     }
-    if (!list.tqcontains(mstyle))
+    if (!list.contains(mstyle))
 	list << mstyle;
     DisposeCollection(c);
 #endif
diff --git a/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp b/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp
index aa65a5b..5a25f3d 100644
--- a/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp
+++ b/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp
@@ -121,7 +121,7 @@ TQWindowsStyle::Private::Private(TQWindowsStyle *tqparent)
 bool TQWindowsStyle::Private::hasSeenAlt(const TQWidget *widget) const
 {
     widget = widget->tqtopLevelWidget();
-    return seenAlt.tqcontains(widget);
+    return seenAlt.contains(widget);
 }
 
 // Records Alt- and Focus events
@@ -137,7 +137,7 @@ bool TQWindowsStyle::Private::eventFilter(TQObject *o, TQEvent *e)
 	if (((TQKeyEvent*)e)->key() == Qt::Key_Alt) {
 	    widget = widget->tqtopLevelWidget();
 
-	    // Alt has been pressed - tqfind all widgets that care
+	    // Alt has been pressed - find all widgets that care
 	    TQObjectList *l = widget->queryList("TQWidget");
 	    TQObjectListIt it( *l );
 	    TQWidget *w;
@@ -976,7 +976,7 @@ void TQWindowsStyle::tqdrawControl( TQ_ControlElement element,
 	    }
 	    TQString s = mi->text();
 	    if ( !s.isNull() ) {                        // draw text
-		int t = s.tqfind( '\t' );
+		int t = s.find( '\t' );
 		int text_flags = TQt::AlignVCenter|TQt::ShowPrefix | TQt::DontClip | TQt::SingleLine;
 		if (!tqstyleHint(SH_UnderlineAccelerator, widget))
 		    text_flags |= TQt::NoAccel;
@@ -1232,7 +1232,7 @@ TQSize TQWindowsStyle::tqsizeFromContents( ContentsType contents,
 			     2*windowsItemFrame);
 	    }
 
-	    if (! mi->text().isNull() && mi->text().tqfind('\t') >= 0) {
+	    if (! mi->text().isNull() && mi->text().find('\t') >= 0) {
 		if ( use2000style )
 		    w += 20;
 		else