rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

15 files changed, 106 insertions, 106 deletions

diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp
index d449d5a73..9d09055b1 100644
--- a/kstyles/asteroid/asteroid.cpp
+++ b/kstyles/asteroid/asteroid.cpp
@@ -1555,7 +1555,7 @@ void AsteroidStyle::tqdrawControl(TQ_ControlElement ce,
 				TQString s = mi->text();
 
 				if(!s.isNull()) {
-					int t = s.tqfind('\t');
+					int t = s.find('\t');
 					int m = itemVMargin;
 
 					int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine;
@@ -2267,7 +2267,7 @@ TQSize AsteroidStyle::tqsizeFromContents(ContentsType ct,
 			}
 
 			if (!mi->text().isNull()) {
-				if ((mi->text().tqfind('\t') >= 0)) {
+				if ((mi->text().find('\t') >= 0)) {
 					sw += 16;
 				} else if (mi->popup()) {
 					sw += 8;
diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp
index d02e9484c..602a138ca 100644
--- a/kstyles/highcolor/highcolor.cpp
+++ b/kstyles/highcolor/highcolor.cpp
@@ -1407,7 +1407,7 @@ void HighColorStyle::tqdrawControl( TQ_ControlElement element,
 
 				// Does the menu item have a text label?
 				if ( !s.isNull() ) {
-					int t = s.tqfind( '\t' );
+					int t = s.find( '\t' );
 					int m = itemVMargin;
 					int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine;
 					text_flags |= reverse ? AlignRight : AlignLeft;
@@ -1901,7 +1901,7 @@ TQSize HighColorStyle::tqsizeFromContents( ContentsType contents,
 								2 * itemFrame );
 			}
 
-			if ( ! mi->text().isNull() && mi->text().tqfind('\t') >= 0 )
+			if ( ! mi->text().isNull() && mi->text().find('\t') >= 0 )
 				w += 12;
 			else if ( mi->popup() )
 				w += 2 * arrowHMargin;
@@ -2037,7 +2037,7 @@ void HighColorStyle::renderGradient( TQPainter* p, const TQRect& r,
 	// We use these to draw parent-relative pixmaps for toolbar buttons
 	// and menubar items.
 
-	GradientSet* grSet = gDict.tqfind( clr.rgb() );
+	GradientSet* grSet = gDict.find( clr.rgb() );
 
 	if (!grSet) {
 		grSet = new GradientSet(clr);
diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp
index e8f8d7792..4bc417f7e 100644
--- a/kstyles/highcontrast/highcontrast.cpp
+++ b/kstyles/highcontrast/highcontrast.cpp
@@ -1078,7 +1078,7 @@ void HighContrastStyle::tqdrawControl (TQ_ControlElement element,
 
 				// Does the menu item have a text label?
 				if ( !s.isNull() ) {
-					int t = s.tqfind( '\t' );
+					int t = s.find( '\t' );
 					int m = itemVMargin;
 					int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine;
 					text_flags |= reverse ? AlignRight : AlignLeft;
@@ -1756,7 +1756,7 @@ TQSize HighContrastStyle::tqsizeFromContents( ContentsType contents,
 								2 * itemFrame );
 			}
 
-			if ( ! mi->text().isNull() && mi->text().tqfind('\t') >= 0 )
+			if ( ! mi->text().isNull() && mi->text().find('\t') >= 0 )
 				w += 12;
 			else if ( mi->popup() )
 				w += 2 * arrowHMargin;
diff --git a/kstyles/keramik/genembed.cpp b/kstyles/keramik/genembed.cpp
index b79147dda..18608205d 100644
--- a/kstyles/keramik/genembed.cpp
+++ b/kstyles/keramik/genembed.cpp
@@ -146,7 +146,7 @@ int main(int argc, char** argv)
 		int readJustID = 0;
 
 
-		if ((pos = s.tqfindRev("-")) != -1)
+		if ((pos = s.findRev("-")) != -1)
 		{
 				int suffix = evalSuffix(s.mid(pos));
 				if (suffix !=-1 )
@@ -156,7 +156,7 @@ int main(int argc, char** argv)
 				}
 		}
 
-		if (!assignID.tqcontains(id))
+		if (!assignID.contains(id))
 		{
 			assignID[id] = nextID;
 			nextID += 256;
diff --git a/kstyles/keramik/gradients.cpp b/kstyles/keramik/gradients.cpp
index 4a5c7dfc9..ab804d117 100644
--- a/kstyles/keramik/gradients.cpp
+++ b/kstyles/keramik/gradients.cpp
@@ -96,7 +96,7 @@ void GradientPainter::renderGradient( TQPainter* p, const TQRect& r, TQColor c,
 	
 	int key = entry.key();
 	
-	if ((cacheEntry = cache.tqfind(key, false)))
+	if ((cacheEntry = cache.find(key, false)))
 	{
 		if (entry == *cacheEntry)
 		{
diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp
index 5a4112025..cb3078063 100644
--- a/kstyles/keramik/keramik.cpp
+++ b/kstyles/keramik/keramik.cpp
@@ -1725,7 +1725,7 @@ void KeramikStyle::tqdrawControl( TQ_ControlElement element,
 				TQString s = mi->text();
 				// Does the menu item have a text label?
 				if ( !s.isNull() ) {
-					int t = s.tqfind( '\t' );
+					int t = s.find( '\t' );
 					int m = itemVMargin;
 					int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine;
 					text_flags |= reverse ? AlignRight : AlignLeft;
@@ -2501,7 +2501,7 @@ TQSize KeramikStyle::tqsizeFromContents( ContentsType contents,
 								2 * itemFrame );
 			}
 
-			if ( ! mi->text().isNull() && mi->text().tqfind('\t') >= 0 )
+			if ( ! mi->text().isNull() && mi->text().find('\t') >= 0 )
 				w += itemHMargin + itemFrame*2 + 7;
 			else if ( mi->popup() )
 				w += 2 * arrowHMargin;
diff --git a/kstyles/keramik/pixmaploader.cpp b/kstyles/keramik/pixmaploader.cpp
index 79d26955e..414965c01 100644
--- a/kstyles/keramik/pixmaploader.cpp
+++ b/kstyles/keramik/pixmaploader.cpp
@@ -260,7 +260,7 @@ TQPixmap PixmapLoader::scale( int name, int width, int height, const TQColor& co
 
 	int key = entry.key();
 
-	if ((cacheEntry = m_pixmapCache.tqfind(key, true)))
+	if ((cacheEntry = m_pixmapCache.find(key, true)))
 	{
 		if (entry == *cacheEntry) //True match!
 			return *cacheEntry->m_pixmap;
diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp
index 1579ac1cf..cb3ddf1fa 100644
--- a/kstyles/klegacy/klegacystyle.cpp
+++ b/kstyles/klegacy/klegacystyle.cpp
@@ -1156,7 +1156,7 @@ bool KLegacyStylePrivate::parseClass() {
 	return false;
     }
 
-    KLegacyStyleData *styledata = styleDict.tqfind(stylename);
+    KLegacyStyleData *styledata = styleDict.find(stylename);
 
     if (! styledata) {
 	qWarning("no such style '%s' for class '%s' (%p)", stylename.latin1(),
@@ -1227,10 +1227,10 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) {
 	    TQString border =filestream.readLine();
 
 	    int lp, rp, tp, bp, l, r, t, b;
-	    lp = border.tqfind(',');
-	    rp = border.tqfind(',', lp + 1);
-	    tp = border.tqfind(',', rp + 1);
-	    bp = border.tqfind('}', tp + 1);
+	    lp = border.find(',');
+	    rp = border.find(',', lp + 1);
+	    tp = border.find(',', rp + 1);
+	    bp = border.find('}', tp + 1);
 
 	    l = border.left(lp).toUInt();
 	    r = border.mid(lp + 1, rp - lp - 1).toUInt();
@@ -1336,10 +1336,10 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) {
 	    TQString border = filestream.readLine();
 
 	    int lp, rp, tp, bp, l, r, t, b;
-	    lp = border.tqfind(',');
-	    rp = border.tqfind(',', lp + 1);
-	    tp = border.tqfind(',', rp + 1);
-	    bp = border.tqfind('}', tp + 1);
+	    lp = border.find(',');
+	    rp = border.find(',', lp + 1);
+	    tp = border.find(',', rp + 1);
+	    bp = border.find('}', tp + 1);
 
 	    l = border.left(lp).toUInt();
 	    r = border.mid(lp + 1, rp - lp - 1).toUInt();
@@ -1486,7 +1486,7 @@ bool KLegacyStylePrivate::parsePixmapPath() {
 
     next = next.mid(1, next.length() - 2);
 
-    int start = 0, end = next.tqfind(":");
+    int start = 0, end = next.find(":");
     while (end != -1) {
 	TQString path(next.mid(start, end - start));
 
@@ -1500,7 +1500,7 @@ bool KLegacyStylePrivate::parsePixmapPath() {
 	}
 
 	start = end + 1;
-	end = next.tqfind(":", start);
+	end = next.find(":", start);
     }
 
     // get the straggler
@@ -1543,7 +1543,7 @@ bool KLegacyStylePrivate::parseStyle() {
 
 	newstylename = newstylename.mid(1, newstylename.length() - 2);
 
-	KLegacyStyleData *styledata = styleDict.tqfind(stylename);
+	KLegacyStyleData *styledata = styleDict.find(stylename);
 
 	if (! styledata) return false;
 
@@ -1573,7 +1573,7 @@ bool KLegacyStylePrivate::parseStyle() {
 	}
 
 	if (next.left(5) == "base[") {
-	    int l = next.tqfind('['), r = next.tqfind(']'), state;
+	    int l = next.find('['), r = next.find(']'), state;
 
 	    if (l < 1 || r < 1 || r < l) continue;
 
@@ -1605,9 +1605,9 @@ bool KLegacyStylePrivate::parseStyle() {
 		int rp, gp, bp;
 		float ri, gi, bi;
 
-		rp = color.tqfind(',');
-		gp = color.tqfind(',', rp + 1);
-		bp = color.tqfind('}', gp + 1);
+		rp = color.find(',');
+		gp = color.find(',', rp + 1);
+		bp = color.find('}', gp + 1);
 
 		ri = color.left(rp).toFloat();
 		gi = color.mid(rp + 1, gp - rp - 1).toFloat();
@@ -1619,7 +1619,7 @@ bool KLegacyStylePrivate::parseStyle() {
 		styledata->base[state].setRgb(red, green, blue);
 	    }
 	} else if (next.left(3) == "bg[") {
-	    int l = next.tqfind('['), r = next.tqfind(']'), state;
+	    int l = next.find('['), r = next.find(']'), state;
 
 	    if (l < 1 || r < 1 || r < l) continue;
 
@@ -1651,9 +1651,9 @@ bool KLegacyStylePrivate::parseStyle() {
 		int rp, gp, bp;
 		float ri, gi, bi;
 
-		rp = color.tqfind(',');
-		gp = color.tqfind(',', rp + 1);
-		bp = color.tqfind('}', gp + 1);
+		rp = color.find(',');
+		gp = color.find(',', rp + 1);
+		bp = color.find('}', gp + 1);
 
 		ri = color.left(rp).toFloat();
 		gi = color.mid(rp + 1, gp - rp - 1).toFloat();
@@ -1668,7 +1668,7 @@ bool KLegacyStylePrivate::parseStyle() {
 	    if (! parseEngine(styledata))
 		fprintf(stderr, "engine parse error\n");
 	} else if (next.left(3) == "fg[") {
-	    int l = next.tqfind('['), r = next.tqfind(']'), state;
+	    int l = next.find('['), r = next.find(']'), state;
 
 	    if (l < 1 || r < 1 || r < l) continue;
 
@@ -1700,9 +1700,9 @@ bool KLegacyStylePrivate::parseStyle() {
 		int rp, gp, bp;
 		float ri, gi, bi;
 
-		rp = color.tqfind(',');
-		gp = color.tqfind(',', rp + 1);
-		bp = color.tqfind('}', gp + 1);
+		rp = color.find(',');
+		gp = color.find(',', rp + 1);
+		bp = color.find('}', gp + 1);
 
 		ri = color.left(rp).toFloat();
 		gi = color.mid(rp + 1, gp - rp - 1).toFloat();
@@ -1767,7 +1767,7 @@ void KLegacyStyle::polish(TQApplication *app) {
     priv->oldfont = app->font();
     priv->oldpalette = app->palette();
 
-    GtkObject *gobj = priv->gtkDict.tqfind(TQMainWindow::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQMainWindow::staticMetaObject());
 
     if (gobj) {
 	if (gobj->font()) {
@@ -1974,7 +1974,7 @@ void KLegacyStyle::polish(TQWidget *widget) {
 	widget->setBackgroundMode(TQWidget::PaletteBackground);
     }
 
-    GtkObject *gobj = gobj = priv->gtkDict.tqfind(((metaobject) ? metaobject :
+    GtkObject *gobj = gobj = priv->gtkDict.find(((metaobject) ? metaobject :
 						 widget->tqmetaObject()));
 
     if (gobj) {
@@ -2115,7 +2115,7 @@ void KLegacyStyle::drawMenuBarItem(TQPainter *p, int x, int y, int w, int h, TQM
 				   TQColorGroup &g, bool enabled, bool active)
 {
     if (enabled && active) {
-	GtkObject *gobj = priv->gtkDict.tqfind(&menuitem_ptr);
+	GtkObject *gobj = priv->gtkDict.find(&menuitem_ptr);
 
 	if (gobj) {
 	    KLegacyImageDataKey key;
@@ -2147,7 +2147,7 @@ void KLegacyStyle::drawBevelButton(TQPainter *p, int x, int y, int w, int h,
 				const TQColorGroup & g, bool sunken,
 				const TQBrush *fill)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQButton::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQButton::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill);
@@ -2170,7 +2170,7 @@ void KLegacyStyle::drawBevelButton(TQPainter *p, int x, int y, int w, int h,
 
 
 void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQPushButton::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQPushButton::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawPushButton(btn, p);
@@ -2237,7 +2237,7 @@ void KLegacyStyle::drawIndicator(TQPainter *p, int x, int y, int w, int h,
 			      const TQColorGroup &g, int state,
 			      bool down, bool enabled)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQCheckBox::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled);
@@ -2260,7 +2260,7 @@ void KLegacyStyle::drawIndicator(TQPainter *p, int x, int y, int w, int h,
 
 
 void KLegacyStyle::drawIndicatorMask(TQPainter *p, int x, int y, int w, int h, int state) {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQCheckBox::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawIndicatorMask(p, x, y, w, h, state);
@@ -2283,7 +2283,7 @@ void KLegacyStyle::drawIndicatorMask(TQPainter *p, int x, int y, int w, int h, i
 
 
 TQSize KLegacyStyle::indicatorSize(void) const {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQCheckBox::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject());
 
     if (! gobj)	return KStyle::indicatorSize();
 
@@ -2320,7 +2320,7 @@ void KLegacyStyle::drawExclusiveIndicator(TQPainter *p, int x, int y, int w, int
 				      const TQColorGroup &g, bool on,
 				       bool down, bool enabled)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQRadioButton::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject());
 
     if (! gobj) {
 	drawExclusiveIndicator(p, x, y, w, h, g, on, down, enabled);
@@ -2345,7 +2345,7 @@ void KLegacyStyle::drawExclusiveIndicator(TQPainter *p, int x, int y, int w, int
 void KLegacyStyle::drawExclusiveIndicatorMask(TQPainter *p, int x, int y, int w, int h,
 					   bool on)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQRadioButton::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on);
@@ -2368,7 +2368,7 @@ void KLegacyStyle::drawExclusiveIndicatorMask(TQPainter *p, int x, int y, int w,
 
 
 TQSize KLegacyStyle::exclusiveIndicatorSize(void) const {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQRadioButton::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject());
 
     if (! gobj) {
 	return KStyle::indicatorSize();
@@ -2427,7 +2427,7 @@ void KLegacyStyle::drawPopupMenuItem(TQPainter *p, bool checkable, int maxpmw, i
     }
 
     if ( act && enabled ) {
-	GtkObject *gobj = priv->gtkDict.tqfind(&menuitem_ptr);
+	GtkObject *gobj = priv->gtkDict.find(&menuitem_ptr);
 
 	if (gobj) {
 	    KLegacyImageDataKey key;
@@ -2501,7 +2501,7 @@ void KLegacyStyle::drawPopupMenuItem(TQPainter *p, bool checkable, int maxpmw, i
 
     TQString s = mi->text();
     if ( !s.isNull() ) {			// draw text
-	int t = s.tqfind( '\t' );
+	int t = s.find( '\t' );
 	int m = 2;
 	const int text_flags = AlignVCenter|ShowPrefix | DontClip | SingleLine;
 	if ( t >= 0 ) {				// draw tab text
@@ -2531,7 +2531,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h,
 				const TQColorGroup &g, bool sunken, bool editable,
 				bool enabled, const TQBrush *b)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQComboBox::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQComboBox::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b);
@@ -2571,7 +2571,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h,
 
 
 TQRect KLegacyStyle::comboButtonRect(int x, int y, int w, int h) {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQComboBox::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQComboBox::staticMetaObject());
 
     if (! gobj) {
 	return KStyle::comboButtonRect(x, y, w, h);
@@ -2648,7 +2648,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
 {
     if (! scrollbar->isVisible()) return;
 
-    GtkObject *gobj = priv->gtkDict.tqfind(TQScrollBar::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQScrollBar::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawScrollBarControls(p, scrollbar, start, controls, active);
@@ -2762,7 +2762,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll
 void KLegacyStyle::drawSlider(TQPainter *p, int x, int y, int w, int h, const TQColorGroup &g,
 			   Orientation orientation, bool tickAbove, bool tickBelow)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQSlider::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQSlider::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow);
@@ -2789,7 +2789,7 @@ void KLegacyStyle::drawSlider(TQPainter *p, int x, int y, int w, int h, const TQ
 void KLegacyStyle::drawSliderGroove(TQPainter *p, int x, int y, int w, int h,
 				const TQColorGroup &g, QCOORD c, Orientation o)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQSlider::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQSlider::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawSliderGroove(p, x, y, w, h, g, c, o);
@@ -2816,7 +2816,7 @@ void KLegacyStyle::drawArrow(TQPainter *p, ArrowType type, bool down,
 			 int x, int y, int w, int h,
 			 const TQColorGroup &g, bool enabled, const TQBrush *b)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(&arrow_ptr);
+    GtkObject *gobj = priv->gtkDict.find(&arrow_ptr);
 
     if (! gobj) {
 	KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
@@ -2848,7 +2848,7 @@ void KLegacyStyle::drawMenuArrow(TQPainter *p, ArrowType type, bool down,
 			 int x, int y, int w, int h,
 			 const TQColorGroup &g, bool enabled, const TQBrush *b)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(&menuitem_ptr);
+    GtkObject *gobj = priv->gtkDict.find(&menuitem_ptr);
 
     if (! gobj) {
 	KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b);
@@ -2891,7 +2891,7 @@ void KLegacyStyle::drawPopupPanel(TQPainter *p, int x, int y, int w, int h,
 void KLegacyStyle::drawCheckMark(TQPainter *p, int x, int y, int w, int h,
 			      const TQColorGroup &g, bool activated, bool disabled)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(&checkmenuitem_ptr);
+    GtkObject *gobj = priv->gtkDict.find(&checkmenuitem_ptr);
 
     if (! gobj) {
 	KStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled);
@@ -2942,7 +2942,7 @@ void KLegacyStyle::drawSplitter(TQPainter *p, int x, int y, int w, int h,
 
 void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, bool selected)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQTabBar::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQTabBar::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawTab(p, tabbar, tab, selected);
@@ -2981,7 +2981,7 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo
 void KLegacyStyle::drawKBarHandle(TQPainter *p, int x, int y, int w, int h,
 				  const TQColorGroup &g, KToolBarPos type, TQBrush *fill)
 {
-    GtkObject *gobj = priv->gtkDict.tqfind(TQToolBar::staticMetaObject());
+    GtkObject *gobj = priv->gtkDict.find(TQToolBar::staticMetaObject());
 
     if (! gobj) {
 	KStyle::drawKBarHandle(p, x, y, w, h, g, type, fill);
@@ -3043,7 +3043,7 @@ void KLegacyStyle::drawKickerTaskButton(TQPainter *p, int x, int y, int w, int h
     static const TQString &modStr = KGlobal::staticQString(
         TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]"));
 
-    int modStrPos = s.tqfind(modStr);
+    int modStrPos = s.find(modStr);
 
     if (modStrPos != -1) {
         s.remove(modStrPos, modStr.length()+1);
@@ -3082,7 +3082,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 	    TQWidget *w = (TQWidget *) obj;
 
 	    if (w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) && w->width() < 700) {
-		GtkObject *gobj = priv->gtkDict.tqfind(TQPopupMenu::staticMetaObject());
+		GtkObject *gobj = priv->gtkDict.find(TQPopupMenu::staticMetaObject());
 
 		if (gobj) {
 		    KLegacyImageDataKey key;
@@ -3139,7 +3139,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 		    }
 		}
 	    } else if (w->isTopLevel() || w->inherits("QWorkspaceChild")) {
-		GtkObject *gobj = priv->gtkDict.tqfind(TQMainWindow::staticMetaObject());
+		GtkObject *gobj = priv->gtkDict.find(TQMainWindow::staticMetaObject());
 
 		if (gobj) {
 		    KLegacyImageDataKey key;
@@ -3152,7 +3152,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 			w->setBackgroundPixmap(*p);
 		}
 	    } else if (w->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) {
-		GtkObject *gobj = priv->gtkDict.tqfind(TQLineEdit::staticMetaObject());
+		GtkObject *gobj = priv->gtkDict.find(TQLineEdit::staticMetaObject());
 
 		if (gobj) {
 		    KLegacyImageDataKey key;
@@ -3193,7 +3193,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 		}
 	    } else if (w->inherits(TQMENUBAR_OBJECT_NAME_STRING) ||
 		       w->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) {
-		GtkObject *gobj = priv->gtkDict.tqfind(TQMenuBar::staticMetaObject());
+		GtkObject *gobj = priv->gtkDict.find(TQMenuBar::staticMetaObject());
 
 		if (gobj) {
 		    KLegacyImageDataKey key;
@@ -3266,7 +3266,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 		TQWidget *w = (TQWidget *) obj;
 
 		if (! w->isTopLevel() && w->isEnabled()) {
-		    GtkObject *gobj = priv->gtkDict.tqfind(TQRadioButton::staticMetaObject());
+		    GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject());
 
 		    if (gobj) {
 			KLegacyImageDataKey key;
@@ -3294,7 +3294,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 		TQWidget *w = (TQWidget *) obj;
 
 		if (! w->isTopLevel() && w->isEnabled()) {
-		    GtkObject *gobj = priv->gtkDict.tqfind(TQCheckBox::staticMetaObject());
+		    GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject());
 
 		    if (gobj) {
 			KLegacyImageDataKey key;
diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp
index 6edb234e7..70d820212 100644
--- a/kstyles/kthemestyle/kthemebase.cpp
+++ b/kstyles/kthemestyle/kthemebase.cpp
@@ -78,7 +78,7 @@ static TQColor readColorEntry( TQSettings* s, const char *pKey,
         {
             bool bOK;
             // find first part (red)
-            int nIndex = aValue.tqfind( ',' );
+            int nIndex = aValue.find( ',' );
             if ( nIndex == -1 )
             {
                 // return a sensible default -- Bernd
@@ -91,7 +91,7 @@ static TQColor readColorEntry( TQSettings* s, const char *pKey,
 
             // find second part (green)
             int nOldIndex = nIndex;
-            nIndex = aValue.tqfind( ',', nOldIndex + 1 );
+            nIndex = aValue.find( ',', nOldIndex + 1 );
 
             if ( nIndex == -1 )
             {
@@ -176,7 +176,7 @@ public:
     */
     TQColor pixmapAveColor( const TQPixmap* p )
     {
-        if ( colorCache.tqcontains( p ) )
+        if ( colorCache.contains( p ) )
             return colorCache[ p ];
 
         TQImage to_ave = p->convertToImage();
@@ -565,7 +565,7 @@ void KThemeBase::applyConfigFile( TQSettings& config )
 {
     TQStringList keys = config.entryList( configFileName );
 
-    if ( keys.tqcontains( "foreground" ) )
+    if ( keys.contains( "foreground" ) )
     {
         d->overrideForeground = true;
         d->overrideForegroundCol = readColorEntry( &config, ( configFileName + "foreground" ).latin1(), 0 );
@@ -573,7 +573,7 @@ void KThemeBase::applyConfigFile( TQSettings& config )
     else
         d->overrideForeground = false;
 
-    if ( keys.tqcontains( "background" ) )
+    if ( keys.contains( "background" ) )
     {
         d->overrideBackground = true;
         d->overrideBackgroundCol = readColorEntry( &config, ( configFileName + "background" ).latin1(), 0 );
@@ -583,7 +583,7 @@ void KThemeBase::applyConfigFile( TQSettings& config )
 
 
 
-    if ( keys.tqcontains( "selectForeground" ) )
+    if ( keys.contains( "selectForeground" ) )
     {
         d->overrideSelectForeground = true;
         d->overrideSelectForegroundCol = readColorEntry( &config, ( configFileName + "selectForeground" ).latin1(), 0 );
@@ -591,7 +591,7 @@ void KThemeBase::applyConfigFile( TQSettings& config )
     else
         d->overrideSelectForeground = false;
 
-    if ( keys.tqcontains( "selectBackground" ) )
+    if ( keys.contains( "selectBackground" ) )
     {
         d->overrideSelectBackground = true;
         d->overrideSelectBackgroundCol = readColorEntry( &config, ( configFileName + "selectBackground" ).latin1(), 0 );
@@ -599,7 +599,7 @@ void KThemeBase::applyConfigFile( TQSettings& config )
     else
         d->overrideSelectBackground = false;
 
-    if ( keys.tqcontains( "windowBackground" ) )
+    if ( keys.contains( "windowBackground" ) )
     {
         d->overrideWindowBackground = true;
         d->overrideWindowBackgroundCol = readColorEntry( &config, ( configFileName + "windowBackground" ).latin1(), 0 );
@@ -608,7 +608,7 @@ void KThemeBase::applyConfigFile( TQSettings& config )
         d->overrideWindowBackground = false;
 
 
-    if ( keys.tqcontains( "windowForeground" ) )
+    if ( keys.contains( "windowForeground" ) )
     {
         d->overrideWindowForeground = true;
         d->overrideWindowForegroundCol = readColorEntry( &config, ( configFileName + "windowForeground" ).latin1(), 0 );
@@ -1271,22 +1271,22 @@ void KThemeBase::applyResourceGroup( TQSettings *config, int i )
     TQStringList keys = config->entryList( base );
 
     // Gradient low color or blend background
-    if ( keys.tqcontains( "GradientLow" ) )
+    if ( keys.contains( "GradientLow" ) )
         prop[ "GrLow" ] = readColorEntry( config, TQString( base + "GradientLow" ).latin1(),
                                           &TQApplication::tqpalette().active().background() ).name();
 
     // Gradient high color
-    if ( keys.tqcontains( "GradientHigh" ) )
+    if ( keys.contains( "GradientHigh" ) )
         prop[ "GrHigh" ] = readColorEntry( config, TQString( base + "GradientHigh" ).latin1(),
                                            &TQApplication::tqpalette().active().foreground() ).name();
 
     // Extended color attributes
-    if ( keys.tqcontains( "Foreground" ) || keys.tqcontains( "Background" ) )
+    if ( keys.contains( "Foreground" ) || keys.contains( "Background" ) )
     {
         TQColor fg, bg;
-        if ( keys.tqcontains( "Background" ) )
+        if ( keys.contains( "Background" ) )
             bg = readColorEntry( config, TQString( base + "Background" ).latin1(), &bg );
-        if ( keys.tqcontains( "Foreground" ) )
+        if ( keys.contains( "Foreground" ) )
             fg = readColorEntry( config, TQString( base + "Foreground" ).latin1(), &fg );
         prop[ "Foreground" ] = fg.name();
         prop[ "Background" ] = bg.name();
@@ -1320,7 +1320,7 @@ void KThemeBase::applyResourceGroup( TQSettings *config, int i )
         prop[ "Width" ] = TQString::number( config->readNumEntry( base + "Width", 10 ) );
     else if ( i == ComboBox || i == ComboBoxDown )
     {
-        if ( keys.tqcontains( "Round" ) )
+        if ( keys.contains( "Round" ) )
             prop[ "Round" ] = TQString::number( config->readBoolEntry( base + "Round", false ) );
         else
             prop[ "Round" ] = "5000"; // invalid, used w/multiple groups
@@ -1328,25 +1328,25 @@ void KThemeBase::applyResourceGroup( TQSettings *config, int i )
     }
     else if ( i == PushButton || i == PushButtonDown )
     {
-        if ( keys.tqcontains( "XShift" ) )
+        if ( keys.contains( "XShift" ) )
             prop[ "XShift" ] = TQString::number( config->readNumEntry( base + "XShift", 0 ) );
         else
             prop[ "XShift" ] = "5000";
-        if ( keys.tqcontains( "YShift" ) )
+        if ( keys.contains( "YShift" ) )
             prop[ "YShift" ] = TQString::number( config->readNumEntry( base + "YShift", 0 ) );
         else
             prop[ "YShift" ] = "5000";
-        if ( keys.tqcontains( "3DFocusRect" ) )
+        if ( keys.contains( "3DFocusRect" ) )
             prop[ "3DFRect" ] = TQString::number( config->
                                                  readBoolEntry(  base + "3DFocusRect", false ) );
         else
             prop[ "3DFRect" ] = "5000";
-        if ( keys.tqcontains( "3DFocusOffset" ) )
+        if ( keys.contains( "3DFocusOffset" ) )
             prop[ "3DFOffset" ] = TQString::number( config->
                                                    readBoolEntry(  base + "3DFocusOffset", 0 ) );
         else
             prop[ "3DFOffset" ] = "5000";
-        if ( keys.tqcontains( "Round" ) )
+        if ( keys.contains( "Round" ) )
             prop[ "Round" ] = TQString::number( config->readBoolEntry( base + "Round", false ) );
         else
             prop[ "Round" ] = "5000";
@@ -1765,7 +1765,7 @@ KThemePixmap* KThemeCache::pixmap( int w, int h, int widgetID, bool border,
     key.data.border = border;
     key.data.mask = mask;
 
-    KThemePixmap *pix = cache.tqfind( ( unsigned long ) key.cacheKey );
+    KThemePixmap *pix = cache.find( ( unsigned long ) key.cacheKey );
     if ( pix )
         pix->updateAccessed();
     return ( pix );
@@ -1780,7 +1780,7 @@ KThemePixmap* KThemeCache::horizontalPixmap( int w, int widgetID )
     key.data.height = 0;
     key.data.border = false;
     key.data.mask = false;
-    KThemePixmap *pix = cache.tqfind( ( unsigned long ) key.cacheKey );
+    KThemePixmap *pix = cache.find( ( unsigned long ) key.cacheKey );
     if ( pix )
         pix->updateAccessed();
     return ( pix );
@@ -1795,7 +1795,7 @@ KThemePixmap* KThemeCache::verticalPixmap( int h, int widgetID )
     key.data.height = h;
     key.data.border = false;
     key.data.mask = false;
-    KThemePixmap *pix = cache.tqfind( ( unsigned long ) key.cacheKey );
+    KThemePixmap *pix = cache.find( ( unsigned long ) key.cacheKey );
     if ( pix )
         pix->updateAccessed();
     return ( pix );
@@ -1814,7 +1814,7 @@ bool KThemeCache::insert( KThemePixmap *pixmap, ScaleHint scale, int widgetID,
     key.data.border = border;
     key.data.mask = mask;
 
-    if ( cache.tqfind( ( unsigned long ) key.cacheKey, true ) != NULL )
+    if ( cache.find( ( unsigned long ) key.cacheKey, true ) != NULL )
     {
         return ( true ); // a pixmap of this scale is already in there
     }
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index 817d078e6..59ff2c30f 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -286,7 +286,7 @@ TQSize KThemeStyle::tqsizeFromContents( ContentsType contents,
                                   2 * itemFrame );
                 }
 
-                if ( ! mi->text().isNull() && mi->text().tqfind( '\t' ) >= 0 )
+                if ( ! mi->text().isNull() && mi->text().find( '\t' ) >= 0 )
                     w += 12;
                 else if ( mi->popup() )
                     w += 2 * arrowHMargin;
@@ -1580,7 +1580,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
                     // Does the menu item have a text label?
                     if ( !s.isNull() )
                     {
-                        int t = s.tqfind( '\t' );
+                        int t = s.find( '\t' );
                         int m = itemVMargin;
                         int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine;
                         text_flags |= reverse ? AlignRight : AlignLeft;
diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp
index 8ccc1ac96..f6007a1f0 100644
--- a/kstyles/light/lightstyle-v2.cpp
+++ b/kstyles/light/lightstyle-v2.cpp
@@ -890,7 +890,7 @@ void LightStyleV2::tqdrawControl( TQ_ControlElement control,
 
 	    TQString text = mi->text();
 	    if (! text.isNull()) {
-		int t = text.tqfind('\t');
+		int t = text.find('\t');
 
 		// draw accelerator/tab-text
 		if (t >= 0) {
@@ -1556,7 +1556,7 @@ TQSize LightStyleV2::tqsizeFromContents( ContentsType contents,
 	    maxpmw = QMAX(maxpmw, 16);
 	    w += (maxpmw * 2) + 8;
 
-	    if (! mi->text().isNull() && mi->text().tqfind('\t') >= 0)
+	    if (! mi->text().isNull() && mi->text().find('\t') >= 0)
 		w += 8;
 
 	    ret = TQSize(w, h);
diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp
index 3401b66d7..9af257bf1 100644
--- a/kstyles/light/lightstyle-v3.cpp
+++ b/kstyles/light/lightstyle-v3.cpp
@@ -1010,7 +1010,7 @@ void LightStyleV3::tqdrawControl( TQ_ControlElement control,
 
 	    TQString text = mi->text();
 	    if (! text.isNull()) {
-		int t = text.tqfind('\t');
+		int t = text.find('\t');
 
 		// draw accelerator/tab-text
 		if (t >= 0) {
@@ -1783,7 +1783,7 @@ TQSize LightStyleV3::tqsizeFromContents( ContentsType contents,
 	    maxpmw = QMAX(maxpmw, 16);
 	    w += (maxpmw * 2) + 8;
 
-	    if (! mi->text().isNull() && mi->text().tqfind('\t') >= 0)
+	    if (! mi->text().isNull() && mi->text().find('\t') >= 0)
 		w += 8;
 
 	    ret = TQSize(w, h);
diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp
index 3779bfd9b..4cc2a0fbc 100644
--- a/kstyles/plastik/plastik.cpp
+++ b/kstyles/plastik/plastik.cpp
@@ -662,7 +662,7 @@ void PlastikStyle::renderPixel(TQPainter *p,
         int key = search.key();
 
         CacheEntry *cacheEntry;
-        if( (cacheEntry = pixmapCache->tqfind(key)) ) {
+        if( (cacheEntry = pixmapCache->find(key)) ) {
             if( search == *cacheEntry ) { // match! we can draw now...
                 if(cacheEntry->pixmap)
                     p->drawPixmap(pos, *(cacheEntry->pixmap) );
@@ -798,7 +798,7 @@ void PlastikStyle::renderGradient(TQPainter *painter,
     int key = search.key();
 
     CacheEntry *cacheEntry;
-    if( (cacheEntry = pixmapCache->tqfind(key)) ) {
+    if( (cacheEntry = pixmapCache->find(key)) ) {
         if( search == *cacheEntry ) { // match! we can draw now...
             if(cacheEntry->pixmap) {
                 painter->drawTiledPixmap(rect, *(cacheEntry->pixmap) );
@@ -1515,7 +1515,7 @@ void PlastikStyle::tqdrawPrimitive(TQ_PrimitiveElement pe,
         case PE_ButtonTool:
         case PE_ButtonDropDown:
         case PE_ButtonCommand: {
-            bool khtmlMode = opt.isDefault() ? false : khtmlWidgets.tqcontains(opt.widget());
+            bool khtmlMode = opt.isDefault() ? false : khtmlWidgets.contains(opt.widget());
             renderButton(p, r, cg, (on||down), mouseOver, true, enabled, khtmlMode );
             break;
         }
@@ -2265,7 +2265,7 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
                 } else {
                     // find the animation Offset for the current Widget
                     TQWidget* nonConstWidget = const_cast<TQWidget*>(widget);
-                    TQMapConstIterator<TQWidget*, int> iter = progAnimWidgets.tqfind(nonConstWidget);
+                    TQMapConstIterator<TQWidget*, int> iter = progAnimWidgets.find(nonConstWidget);
                     if (iter != progAnimWidgets.end())
                         animShift = iter.data();
                 }
@@ -2605,7 +2605,7 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
                 TQString s = mi->text();
                 // Does the menu item have a text label?
                 if ( !s.isNull() ) {
-                    int t = s.tqfind( '\t' );
+                    int t = s.find( '\t' );
                     int m = 2;
                     int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine;
                     text_flags |= reverse ? AlignRight : AlignLeft;
@@ -2785,7 +2785,7 @@ void PlastikStyle::tqdrawComplexControl(TQ_ComplexControl control,
                                               :cg.background();
 
             uint contourFlags = 0;
-            if( khtmlWidgets.tqcontains(cb) )
+            if( khtmlWidgets.contains(cb) )
                 contourFlags |= Draw_AlphaBlend;
             
             if (_inputFocusHighlight && hasFocus && editable && enabled)
@@ -3386,7 +3386,7 @@ TQSize PlastikStyle::tqsizeFromContents(ContentsType t,
                 }
             }
 
-            if (!mi->text().isNull() && (mi->text().tqfind('\t') >= 0)) {
+            if (!mi->text().isNull() && (mi->text().find('\t') >= 0)) {
                 w += itemHMargin + itemFrame*2 + 7;
             } else if (mi->popup()) {
                 w += 2 * arrowHMargin;
diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp
index 10945d57f..5ddf8cd56 100644
--- a/kstyles/utils/installtheme/main.cpp
+++ b/kstyles/utils/installtheme/main.cpp
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
         if (config.readEntry( "widgetStyle" ) == "basicstyle.la")
         {
             //OK, emit a style entry...
-            if (!themes.tqcontains(name)) //Only add first occurrence, i.e. user local one.
+            if (!themes.contains(name)) //Only add first occurrence, i.e. user local one.
                 themes[name] = file;
         }
     }
diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp
index 08474c701..f1416526e 100644
--- a/kstyles/web/webstyle.cpp
+++ b/kstyles/web/webstyle.cpp
@@ -1603,7 +1603,7 @@ WebStyle::drawKickerTaskButton
   static TQString modStr =
     TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]");
 
-  int modStrPos = s.tqfind(modStr);
+  int modStrPos = s.find(modStr);
 
   if (-1 != modStrPos)
   {