rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

27 files changed, 123 insertions, 123 deletions

diff --git a/kwin/activation.cpp b/kwin/activation.cpp
index ad9dc8eba..544569a2d 100644
--- a/kwin/activation.cpp
+++ b/kwin/activation.cpp
@@ -431,7 +431,7 @@ bool Workspace::activateNextClient( Client* c )
                     if( c == NULL && !(*it)->isOnScreen( activeScreen()))
                         continue;
                     }
-                if( mainwindows.tqcontains( *it ))
+                if( mainwindows.contains( *it ))
                     {
                     get_focus = *it;
                     break;
@@ -484,7 +484,7 @@ void Workspace::setCurrentScreen( int new_screen )
 
 void Workspace::gotFocusIn( const Client* c )
     {
-    if( should_get_focus.tqcontains( const_cast< Client* >( c )))
+    if( should_get_focus.contains( const_cast< Client* >( c )))
         { // remove also all sooner elements that should have got FocusIn,
       // but didn't for some reason (and also won't anymore, because they were sooner)
         while( should_get_focus.first() != c )
@@ -521,7 +521,7 @@ bool Workspace::allowClientActivation( const Client* c, Time time, bool focus_in
     Client* ac = mostRecentlyActivatedClient();
     if( focus_in )
         {
-        if( should_get_focus.tqcontains( const_cast< Client* >( c )))
+        if( should_get_focus.contains( const_cast< Client* >( c )))
             return true; // FocusIn was result of KWin's action
         // Before getting FocusIn, the active Client already
         // got FocusOut, and therefore got deactivated.
diff --git a/kwin/bridge.cpp b/kwin/bridge.cpp
index 17b801475..49840e248 100644
--- a/kwin/bridge.cpp
+++ b/kwin/bridge.cpp
@@ -160,7 +160,7 @@ TQRegion Bridge::unobscuredRegion( const TQRegion& r ) const
     {
     TQRegion reg( r );
     const ClientList stacking_order = c->workspace()->stackingOrder();
-    ClientList::ConstIterator it = stacking_order.tqfind( c );
+    ClientList::ConstIterator it = stacking_order.find( c );
     ++it;
     for(;
          it != stacking_order.end();
diff --git a/kwin/client.cpp b/kwin/client.cpp
index dfb352408..3205b9ec7 100644
--- a/kwin/client.cpp
+++ b/kwin/client.cpp
@@ -1514,7 +1514,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded,
                         // irTop is not necessarily larger than irBottom and
                         // yIncrement isn't necessarily positive
                         for (i = irLeft; i <= irRight; i++) {
-                            if (occluded.tqcontains(TQPoint(i, j)))
+                            if (occluded.contains(TQPoint(i, j)))
                                 intersectCount++;
                         }
                     }
@@ -1524,7 +1524,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded,
                         intersectCount = 0;
 
                     for (i = irLeft; i <= irRight; i++) {
-                        if (occluded.tqcontains(TQPoint(i, irBottom)))
+                        if (occluded.contains(TQPoint(i, irBottom)))
                             intersectCount++;
                     }
                 }
@@ -1543,7 +1543,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded,
                             (int)(pixelBlue + (blue - pixelBlue) * opacity)));
 
                 for (i = irLeft; i <= irRight; i++) {
-                    if (occluded.tqcontains(TQPoint(i, irTop)))
+                    if (occluded.contains(TQPoint(i, irTop)))
                         intersectCount--;
                 }
 
@@ -1553,12 +1553,12 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded,
 
             irTop += yIncrement;
             for (j = irTop; j != irBottom; j += yIncrement) {
-                if (occluded.tqcontains(TQPoint(irLeft, j)))
+                if (occluded.contains(TQPoint(irLeft, j)))
                     intersectCount--;
             }
             irRight++;
             for (j = irTop; j != irBottom; j += yIncrement) {
-                if (occluded.tqcontains(TQPoint(irRight, j)))
+                if (occluded.contains(TQPoint(irRight, j)))
                     intersectCount++;
             }
 
diff --git a/kwin/clients/b2/b2client.cpp b/kwin/clients/b2/b2client.cpp
index ae010e830..adb594282 100644
--- a/kwin/clients/b2/b2client.cpp
+++ b/kwin/clients/b2/b2client.cpp
@@ -1391,7 +1391,7 @@ void B2Titlebar::mouseDoubleClickEvent(TQMouseEvent *e)
 
 void B2Titlebar::wheelEvent(TQWheelEvent *e)
 {
-    if (client->isSetShade() || TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos())) 
+    if (client->isSetShade() || TQT_TQRECT_OBJECT(rect()).contains(e->pos())) 
 	client->titlebarMouseWheelOperation( e->delta());
 }
 
diff --git a/kwin/clients/keramik/embedtool.cpp b/kwin/clients/keramik/embedtool.cpp
index 415862842..d1cbd78fd 100644
--- a/kwin/clients/keramik/embedtool.cpp
+++ b/kwin/clients/keramik/embedtool.cpp
@@ -100,7 +100,7 @@ void KeramikEmbedder::embed( const char *name )
 	TQString     codename( basename );
 	TQImage      image( name );
 	
-	codename = codename.tqreplace( TQRegExp("[^a-zA-Z0-9]"), "_" );
+	codename = codename.replace( TQRegExp("[^a-zA-Z0-9]"), "_" );
 	
 	stream << "\tstatic const QRgb " << codename << "_data[] = {" << endl << "\t\t";
 	stream.setf( TQTextStream::hex | TQTextStream::right );
@@ -200,7 +200,7 @@ void KeramikEmbedder::writeIndex()
 	stream << "\t\t\tm_inst = NULL;\n";
 	stream << "\t\t}\n\n";
 	stream << "\t\tTQImage *image( const TQString &name ) const {\n";
-	stream << "\t\t\treturn db->tqfind( name );\n";
+	stream << "\t\t\treturn db->find( name );\n";
 	stream << "\t\t}\n\n";
 	stream << "\t}; // class KeramikImageDb\n\n";
 	stream << "\tKeramikImageDb *KeramikImageDb::m_inst = NULL;\n\n";
diff --git a/kwin/clients/keramik/keramik.cpp b/kwin/clients/keramik/keramik.cpp
index 2d5f111c8..089c7ed69 100644
--- a/kwin/clients/keramik/keramik.cpp
+++ b/kwin/clients/keramik/keramik.cpp
@@ -1657,14 +1657,14 @@ void KeramikClient::resizeEvent( TQResizeEvent *e )
 void KeramikClient::mouseDoubleClickEvent( TQMouseEvent *e )
 {
 	if ( e->button() == Qt::LeftButton
-            && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).tqcontains( e->pos() ) )
+            && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) )
 		titlebarDblClickOperation();
 }
 
 void KeramikClient::wheelEvent( TQWheelEvent *e )
 {
 	if (isSetShade() 
-            || TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).tqcontains( e->pos() ) )
+            || TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) )
 		titlebarMouseWheelOperation( e->delta());
 }
 
diff --git a/kwin/clients/kwmtheme/kwmthemeclient.cpp b/kwin/clients/kwmtheme/kwmthemeclient.cpp
index 0293d47c4..9f51c0edf 100644
--- a/kwin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/kwin/clients/kwmtheme/kwmthemeclient.cpp
@@ -752,7 +752,7 @@ void KWMThemeClient::showEvent(TQShowEvent *)
 
 void KWMThemeClient::mouseDoubleClickEvent( TQMouseEvent * e )
 {
-    if (e->button() == LeftButton && titlebar->geometry().tqcontains( e->pos() ) )
+    if (e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) )
         titlebarDblClickOperation();
 }
 
diff --git a/kwin/clients/plastik/plastikclient.cpp b/kwin/clients/plastik/plastikclient.cpp
index 61dfdaba7..0e72ff59c 100644
--- a/kwin/clients/plastik/plastikclient.cpp
+++ b/kwin/clients/plastik/plastikclient.cpp
@@ -280,7 +280,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e)
     if(titleEdgeTop > 0)
     {
         tempRect.setRect(r_x+2, r_y, r_w-2*2, titleEdgeTop );
-        if (tempRect.isValid() && region.tqcontains(tempRect) ) {
+        if (tempRect.isValid() && region.contains(tempRect) ) {
             painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTileTop, active, toolWindow) );
         }
     }
@@ -291,7 +291,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e)
     if(titleEdgeLeft > 0)
     {
         tempRect.setRect(r_x, r_y, borderLeft, titleEdgeTop+titleHeight+titleEdgeBottom);
-        if (tempRect.isValid() && region.tqcontains(tempRect) ) {
+        if (tempRect.isValid() && region.contains(tempRect) ) {
             painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarLeft, active, toolWindow) );
             titleMarginLeft = borderLeft;
         }
@@ -301,7 +301,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e)
     if(titleEdgeRight > 0)
     {
         tempRect.setRect(borderRightLeft, r_y, borderRight, titleEdgeTop+titleHeight+titleEdgeBottom);
-        if (tempRect.isValid() && region.tqcontains(tempRect) ) {
+        if (tempRect.isValid() && region.contains(tempRect) ) {
             painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarRight, active, toolWindow) );
             titleMarginRight = borderRight;
         }
@@ -312,7 +312,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e)
     if(Rtitle.width() > 0)
     {
         m_captionRect = captionRect(); // also update m_captionRect!
-        if (m_captionRect.isValid() && region.tqcontains(m_captionRect) )
+        if (m_captionRect.isValid() && region.contains(m_captionRect) )
         {
             painter.drawTiledPixmap(m_captionRect, caption);
         }
@@ -320,14 +320,14 @@ void PlastikClient::paintEvent(TQPaintEvent *e)
         // left to the title
         tempRect.setRect(r_x+titleMarginLeft, m_captionRect.top(),
                          m_captionRect.left() - (r_x+titleMarginLeft), m_captionRect.height() );
-        if (tempRect.isValid() && region.tqcontains(tempRect) ) {
+        if (tempRect.isValid() && region.contains(tempRect) ) {
             painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTile, active, toolWindow) );
         }
 
         // right to the title
         tempRect.setRect(m_captionRect.right()+1, m_captionRect.top(),
                          (r_x2-titleMarginRight) - m_captionRect.right(), m_captionRect.height() );
-        if (tempRect.isValid() && region.tqcontains(tempRect) ) {
+        if (tempRect.isValid() && region.contains(tempRect) ) {
             painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTile, active, toolWindow) );
         }
 
@@ -337,7 +337,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e)
     if(borderLeft > 0 && sideHeight > 0)
     {
         tempRect.setCoords(r_x, titleEdgeBottomBottom+1, borderLeftRight, borderBottomTop-1);
-        if (tempRect.isValid() && region.tqcontains(tempRect) ) {
+        if (tempRect.isValid() && region.contains(tempRect) ) {
             painter.drawTiledPixmap(tempRect, handler->pixmap(BorderLeftTile, active, toolWindow) );
         }
     }
@@ -346,7 +346,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e)
     if(borderRight > 0 && sideHeight > 0)
     {
         tempRect.setCoords(borderRightLeft, titleEdgeBottomBottom+1, r_x2, borderBottomTop-1);
-        if (tempRect.isValid() && region.tqcontains(tempRect) ) {
+        if (tempRect.isValid() && region.contains(tempRect) ) {
             painter.drawTiledPixmap(tempRect, handler->pixmap(BorderRightTile, active, toolWindow) );
         }
     }
@@ -358,19 +358,19 @@ void PlastikClient::paintEvent(TQPaintEvent *e)
         int r = r_x2;
 
         tempRect.setRect(r_x, borderBottomTop, borderLeft, borderBottom);
-        if (tempRect.isValid() && region.tqcontains(tempRect) ) {
+        if (tempRect.isValid() && region.contains(tempRect) ) {
             painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomLeft, active, toolWindow) );
             l = tempRect.right()+1;
         }
 
         tempRect.setRect(borderRightLeft, borderBottomTop, borderLeft, borderBottom);
-        if (tempRect.isValid() && region.tqcontains(tempRect) ) {
+        if (tempRect.isValid() && region.contains(tempRect) ) {
             painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomRight, active, toolWindow) );
             r = tempRect.left()-1;
         }
 
         tempRect.setCoords(l, borderBottomTop, r, r_y2);
-        if (tempRect.isValid() && region.tqcontains(tempRect) ) {
+        if (tempRect.isValid() && region.contains(tempRect) ) {
             painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomTile, active, toolWindow) );
         }
     }
diff --git a/kwin/clients/quartz/quartz.cpp b/kwin/clients/quartz/quartz.cpp
index 4c4a883b6..2bb0205ae 100644
--- a/kwin/clients/quartz/quartz.cpp
+++ b/kwin/clients/quartz/quartz.cpp
@@ -207,7 +207,7 @@ void QuartzHandler::readConfig()
 	extraSlim    = conf.readBoolEntry( "UseQuartzExtraSlim", false );
 
 	// A small hack to make the on all desktops button look nicer
-	onAllDesktopsButtonOnLeft = KDecoration::options()->titleButtonsLeft().tqcontains( 'S' );
+	onAllDesktopsButtonOnLeft = KDecoration::options()->titleButtonsLeft().contains( 'S' );
         if ( TQApplication::reverseLayout() )
             onAllDesktopsButtonOnLeft = !onAllDesktopsButtonOnLeft;
 	switch(options()->preferredBorderSize(this)) {
diff --git a/kwin/events.cpp b/kwin/events.cpp
index 70a4c3233..28489cc0e 100644
--- a/kwin/events.cpp
+++ b/kwin/events.cpp
@@ -385,7 +385,7 @@ bool Workspace::workspaceEvent( XEvent * e )
             {
             if ( TQWhatsThis::inWhatsThisMode() )
                 {
-                TQWidget* w = TQWidget::tqfind( e->xcrossing.window );
+                TQWidget* w = TQWidget::find( e->xcrossing.window );
                 if ( w )
                     TQWhatsThis::leaveWhatsThisMode();
                 }
@@ -926,7 +926,7 @@ void Client::leaveNotifyEvent( XCrossingEvent* e )
             mode = PositionCenter;
             setCursor( tqarrowCursor );
             }
-        bool lostMouse = !rect().tqcontains( TQPoint( e->x, e->y ) );
+        bool lostMouse = !rect().contains( TQPoint( e->x, e->y ) );
         // 'lostMouse' wouldn't work with e.g. B2 or Keramik, which have non-rectangular decorations
         // (i.e. the LeaveNotify event comes before leaving the rect and no LeaveNotify event
         // comes after leaving the rect) - so lets check if the pointer is really outside the window
diff --git a/kwin/geometry.cpp b/kwin/geometry.cpp
index 3116f16bf..3751348db 100644
--- a/kwin/geometry.cpp
+++ b/kwin/geometry.cpp
@@ -726,7 +726,7 @@ void Client::keepInArea( TQRect area, bool partial )
         move( area.right() - width(), y() );
     if ( geometry().bottom() > area.bottom() && height() < area.height() )
         move( x(), area.bottom() - height() );
-    if( !area.tqcontains( geometry().topLeft() ))
+    if( !area.contains( geometry().topLeft() ))
         {
         int tx = x();
         int ty = y();
@@ -1346,10 +1346,10 @@ void Client::getWmNormalHints()
                 // try to keep the window in its xinerama screen if possible,
                 // if that fails at least keep it visible somewhere
                 TQRect area = workspace()->clientArea( MovementArea, this );
-                if( area.tqcontains( orig_geometry ))
+                if( area.contains( orig_geometry ))
                     keepInArea( area );
                 area = workspace()->clientArea( WorkArea, this );
-                if( area.tqcontains( orig_geometry ))
+                if( area.contains( orig_geometry ))
                     keepInArea( area );
                 }
             }
@@ -1500,7 +1500,7 @@ void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, i
             updateFullScreenHack( TQRect( new_pos, TQSize( nw, nh )));
             TQRect area = workspace()->clientArea( WorkArea, this );
             if( !from_tool && ( !isSpecialWindow() || isToolbar()) && !isFullScreen()
-                && area.tqcontains( orig_geometry ))
+                && area.contains( orig_geometry ))
                 keepInArea( area );
 
             // this is part of the kicker-xinerama-hack... it should be
@@ -1537,10 +1537,10 @@ void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, i
                 // try to keep the window in its xinerama screen if possible,
                 // if that fails at least keep it visible somewhere
                 TQRect area = workspace()->clientArea( MovementArea, this );
-                if( area.tqcontains( orig_geometry ))
+                if( area.contains( orig_geometry ))
                     keepInArea( area );
                 area = workspace()->clientArea( WorkArea, this );
-                if( area.tqcontains( orig_geometry ))
+                if( area.contains( orig_geometry ))
                     keepInArea( area );
                 }
             }
diff --git a/kwin/group.cpp b/kwin/group.cpp
index e4fd46e2a..8df006def 100644
--- a/kwin/group.cpp
+++ b/kwin/group.cpp
@@ -64,7 +64,7 @@ bool performTransiencyCheck()
             kdDebug() << "TC: " << *it1 << " in not in a group" << endl;
             ret = false;
             }
-        else if( !(*it1)->in_group->members().tqcontains( *it1 ))
+        else if( !(*it1)->in_group->members().contains( *it1 ))
             {
             kdDebug() << "TC: " << *it1 << " has a group " << (*it1)->in_group << " but group does not contain it" << endl;
             ret = false;
@@ -85,15 +85,15 @@ bool performTransiencyCheck()
                  ++it2 )
                 {
                 if( transiencyCheckNonExistent
-                    && !Workspace::self()->clients.tqcontains( *it2 )
-                    && !Workspace::self()->desktops.tqcontains( *it2 ))
+                    && !Workspace::self()->clients.contains( *it2 )
+                    && !Workspace::self()->desktops.contains( *it2 ))
                     {
                     kdDebug() << "TC:" << *it1 << " has non-existent main client " << endl;
                     kdDebug() << "TC2:" << *it2 << endl; // this may crash
                     ret = false;
                     continue;
                     }
-                if( !(*it2)->transients_list.tqcontains( *it1 ))
+                if( !(*it2)->transients_list.contains( *it1 ))
                     {
                     kdDebug() << "TC:" << *it1 << " has main client " << *it2 << " but main client does not have it as a transient" << endl;
                     ret = false;
@@ -106,15 +106,15 @@ bool performTransiencyCheck()
              ++it2 )
             {
             if( transiencyCheckNonExistent
-                && !Workspace::self()->clients.tqcontains( *it2 )
-                && !Workspace::self()->desktops.tqcontains( *it2 ))
+                && !Workspace::self()->clients.contains( *it2 )
+                && !Workspace::self()->desktops.contains( *it2 ))
                 {
                 kdDebug() << "TC:" << *it1 << " has non-existent transient " << endl;
                 kdDebug() << "TC2:" << *it2 << endl; // this may crash
                 ret = false;
                 continue;
                 }
-            if( !(*it2)->mainClients().tqcontains( *it1 ))
+            if( !(*it2)->mainClients().contains( *it1 ))
                 {
                 kdDebug() << "TC:" << *it1 << " has transient " << *it2 << " but transient does not have it as a main client" << endl;
                 ret = false;
@@ -259,7 +259,7 @@ void Group::removeMember( Client* member_P )
     TRANSIENCY_CHECK( member_P );
 //    kdDebug() << "GROUPREMOVE:" << this << ":" << member_P << endl;
 //    kdDebug() << kdBacktrace() << endl;
-    Q_ASSERT( _members.tqcontains( member_P ));
+    Q_ASSERT( _members.contains( member_P ));
     _members.remove( member_P );
 // there are cases when automatic deleting of groups must be delayed,
 // e.g. when removing a member and doing some operation on the possibly
@@ -294,7 +294,7 @@ void Group::gotLeader( Client* leader_P )
 
 void Group::lostLeader()
     {
-    assert( !_members.tqcontains( leader_client ));
+    assert( !_members.contains( leader_client ));
     leader_client = NULL;
     if( _members.isEmpty())
         {
@@ -512,8 +512,8 @@ bool Client::sameAppWindowRoleMatch( const Client* c1, const Client* c2, bool ac
                 || c1->group()->leaderClient() == c1 || c2->group()->leaderClient() == c2;
 #endif
         }
-    int pos1 = c1->windowRole().tqfind( '#' );
-    int pos2 = c2->windowRole().tqfind( '#' );
+    int pos1 = c1->windowRole().find( '#' );
+    int pos2 = c2->windowRole().find( '#' );
     if(( pos1 >= 0 && pos2 >= 0 )
         ||
     // hacks here
@@ -835,7 +835,7 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined )
 void Client::addTransient( Client* cl )
     {
     TRANSIENCY_CHECK( this );
-    assert( !transients_list.tqcontains( cl ));
+    assert( !transients_list.contains( cl ));
 //    assert( !cl->hasTransient( this, true )); will be fixed in checkGroupTransients()
     assert( cl != this );
     transients_list.append( cl );
@@ -893,7 +893,7 @@ bool Client::hasTransientInternal( const Client* cl, bool indirect, ConstClientL
             return true;
         if( !indirect )
             return false;
-        if( set.tqcontains( cl ))
+        if( set.contains( cl ))
             return false;
         set.append( cl );
         return hasTransientInternal( cl->transientFor(), indirect, set );
@@ -903,11 +903,11 @@ bool Client::hasTransientInternal( const Client* cl, bool indirect, ConstClientL
     if( group() != cl->group())
         return false;
     // cl is group transient, search from top
-    if( transients().tqcontains( const_cast< Client* >( cl )))
+    if( transients().contains( const_cast< Client* >( cl )))
         return true;
     if( !indirect )
         return false;
-    if( set.tqcontains( this ))
+    if( set.contains( this ))
         return false;
     set.append( this );
     for( ClientList::ConstIterator it = transients().begin();
diff --git a/kwin/kcmkwin/kwindecoration/buttons.cpp b/kwin/kcmkwin/kwindecoration/buttons.cpp
index b5736fcce..7ddcb2af2 100644
--- a/kwin/kcmkwin/kwindecoration/buttons.cpp
+++ b/kwin/kcmkwin/kwindecoration/buttons.cpp
@@ -306,15 +306,15 @@ void ButtonDropSite::clearRight()
 void ButtonDropSite::dragMoveEvent( TQDragMoveEvent* e )
 {
 	TQPoint p = e->pos();
-	if (leftDropArea().tqcontains(p) || rightDropArea().tqcontains(p) || buttonAt(p) ) {
+	if (leftDropArea().contains(p) || rightDropArea().contains(p) || buttonAt(p) ) {
 		e->accept();
 
 		// 2 pixel wide drop visualizer...
 		TQRect r = contentsRect();
 		int x = -1;
-		if (leftDropArea().tqcontains(p) ) {
+		if (leftDropArea().contains(p) ) {
 			x = leftDropArea().left();
-		} else if (rightDropArea().tqcontains(p) ) {
+		} else if (rightDropArea().contains(p) ) {
 			x = rightDropArea().right()+1;
 		} else {
 			ButtonDropSiteItem *item = buttonAt(p);
@@ -373,10 +373,10 @@ void ButtonDropSite::dropEvent( TQDropEvent* e )
 	ButtonList *buttonList = 0;
 	ButtonList::iterator buttonPosition;
 
-	if (leftDropArea().tqcontains(p) ) {
+	if (leftDropArea().contains(p) ) {
 		buttonList = &buttonsLeft;
 		buttonPosition = buttonsLeft.end();
-	} else if (rightDropArea().tqcontains(p) ) {
+	} else if (rightDropArea().contains(p) ) {
 		buttonList = &buttonsRight;
 		buttonPosition = buttonsRight.begin();
 	} else {
@@ -446,9 +446,9 @@ bool ButtonDropSite::getItemIterator(ButtonDropSiteItem *item, ButtonList* &list
 	if (!item)
 		return false;
 
-	ButtonList::iterator it = buttonsLeft.tqfind(item); // try the left list first...
+	ButtonList::iterator it = buttonsLeft.find(item); // try the left list first...
 	if (it == buttonsLeft.end() ) {
-		it = buttonsRight.tqfind(item); // try the right list...
+		it = buttonsRight.find(item); // try the right list...
 		if (it == buttonsRight.end() ) {
 			return false; // item hasn't been found in one of the list, return...
 		} else {
@@ -521,14 +521,14 @@ void ButtonDropSite::recalcItemGeometry()
 ButtonDropSiteItem *ButtonDropSite::buttonAt(TQPoint p) {
 	// try to find the item in the left button list
 	for (ButtonList::const_iterator it = buttonsLeft.begin(); it != buttonsLeft.end(); ++it) {
-		if ( (*it)->rect.tqcontains(p) ) {
+		if ( (*it)->rect.contains(p) ) {
 			return *it;
 		}
 	}
 
 	// try to find the item in the right button list
 	for (ButtonList::const_iterator it = buttonsRight.begin(); it != buttonsRight.end(); ++it) {
-		if ( (*it)->rect.tqcontains(p) ) {
+		if ( (*it)->rect.contains(p) ) {
 			return *it;
 		}
 	}
@@ -761,7 +761,7 @@ void ButtonPositionWidget::setDecorationFactory(KDecorationFactory *factory)
 		ButtonSourceItem *i = dynamic_cast<ButtonSourceItem*>(it.current() );
 		if (i) {
 			Button b = i->button();
-			b.supported = m_supportedButtons.tqcontains(b.type);
+			b.supported = m_supportedButtons.contains(b.type);
 			i->setButton(b);
 		}
 		++it;
@@ -777,47 +777,47 @@ Button ButtonPositionWidget::getButton(TQChar type, bool& success) {
 	if (type == 'R') {
 		TQBitmap bmp(resize_width, resize_height, resize_bits, true);
 		bmp.setMask(bmp);
-		return Button(i18n("Resize"), bmp, 'R', false, m_supportedButtons.tqcontains('R') );
+		return Button(i18n("Resize"), bmp, 'R', false, m_supportedButtons.contains('R') );
 	} else if (type == 'L') {
 		TQBitmap bmp(shade_width, shade_height, shade_bits, true);
 		bmp.setMask(bmp);
-		return Button(i18n("Shade"), bmp, 'L', false, m_supportedButtons.tqcontains('L') );
+		return Button(i18n("Shade"), bmp, 'L', false, m_supportedButtons.contains('L') );
 	} else if (type == 'B') {
 		TQBitmap bmp(keepbelowothers_width, keepbelowothers_height, keepbelowothers_bits, true);
 		bmp.setMask(bmp);
-		return Button(i18n("Keep Below Others"), bmp, 'B', false, m_supportedButtons.tqcontains('B') );
+		return Button(i18n("Keep Below Others"), bmp, 'B', false, m_supportedButtons.contains('B') );
 	} else if (type == 'F') {
 		TQBitmap bmp(keepaboveothers_width, keepaboveothers_height, keepaboveothers_bits, true);
 		bmp.setMask(bmp);
-		return Button(i18n("Keep Above Others"), bmp, 'F', false, m_supportedButtons.tqcontains('F') );
+		return Button(i18n("Keep Above Others"), bmp, 'F', false, m_supportedButtons.contains('F') );
 	} else if (type == 'X') {
 		TQBitmap bmp(close_width, close_height, close_bits, true);
 		bmp.setMask(bmp);
-		return Button(i18n("Close"), bmp, 'X', false,  m_supportedButtons.tqcontains('X') );
+		return Button(i18n("Close"), bmp, 'X', false,  m_supportedButtons.contains('X') );
 	} else if (type == 'A') {
 		TQBitmap bmp(maximize_width, maximize_height, maximize_bits, true);
 		bmp.setMask(bmp);
-		return Button(i18n("Maximize"), bmp, 'A', false, m_supportedButtons.tqcontains('A') );
+		return Button(i18n("Maximize"), bmp, 'A', false, m_supportedButtons.contains('A') );
 	} else if (type == 'I') {
 		TQBitmap bmp(minimize_width, minimize_height, minimize_bits, true);
 		bmp.setMask(bmp);
-		return Button(i18n("Minimize"), bmp, 'I', false, m_supportedButtons.tqcontains('I') );
+		return Button(i18n("Minimize"), bmp, 'I', false, m_supportedButtons.contains('I') );
 	} else if (type == 'H') {
 		TQBitmap bmp(help_width, help_height, help_bits, true);
 		bmp.setMask(bmp);
-		return Button(i18n("Help"), bmp, 'H', false, m_supportedButtons.tqcontains('H') );
+		return Button(i18n("Help"), bmp, 'H', false, m_supportedButtons.contains('H') );
 	} else if (type == 'S') {
 		TQBitmap bmp(onalldesktops_width, onalldesktops_height, onalldesktops_bits, true);
 		bmp.setMask(bmp);
-		return Button(i18n("On All Desktops"), bmp, 'S', false, m_supportedButtons.tqcontains('S') );
+		return Button(i18n("On All Desktops"), bmp, 'S', false, m_supportedButtons.contains('S') );
 	} else if (type == 'M') {
 		TQBitmap bmp(menu_width, menu_height, menu_bits, true);
 		bmp.setMask(bmp);
-		return Button(i18n("Menu"), bmp, 'M', false, m_supportedButtons.tqcontains('M') );
+		return Button(i18n("Menu"), bmp, 'M', false, m_supportedButtons.contains('M') );
 	} else if (type == '_') {
 		TQBitmap bmp(spacer_width, spacer_height, spacer_bits, true);
 		bmp.setMask(bmp);
-		return Button(i18n("--- spacer ---"), bmp, '_', true, m_supportedButtons.tqcontains('_') );
+		return Button(i18n("--- spacer ---"), bmp, '_', true, m_supportedButtons.contains('_') );
 	} else {
 		success = false;
 		return Button();
diff --git a/kwin/kcmkwin/kwinoptions/windows.cpp b/kwin/kcmkwin/kwinoptions/windows.cpp
index f438cd5ef..69041c702 100644
--- a/kwin/kcmkwin/kwinoptions/windows.cpp
+++ b/kwin/kcmkwin/kwinoptions/windows.cpp
@@ -1114,7 +1114,7 @@ void KMovingConfig::load( void )
     //CT 13mar98 interactive placement
 //   if( key.left(11) == "interactive") {
 //     setPlacement(INTERACTIVE_PLACEMENT);
-//     int comma_pos = key.tqfind(',');
+//     int comma_pos = key.find(',');
 //     if (comma_pos < 0)
 //       interactiveTrigger->setValue(0);
 //     else
diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp
index 1663d88af..4ed26a9e6 100644
--- a/kwin/kcmkwin/kwinrules/main.cpp
+++ b/kwin/kcmkwin/kwinrules/main.cpp
@@ -248,7 +248,7 @@ static int edit( Window wid, bool whole_app )
         }
     else if( edited_rule != orig_rule )
         {
-        TQValueList< Rules* >::Iterator pos = rules.tqfind( orig_rule );
+        TQValueList< Rules* >::Iterator pos = rules.find( orig_rule );
         if( pos != rules.end())
             *pos = edited_rule;
         else
diff --git a/kwin/layers.cpp b/kwin/layers.cpp
index 8bb3f8c99..7f6c90378 100644
--- a/kwin/layers.cpp
+++ b/kwin/layers.cpp
@@ -304,7 +304,7 @@ void Workspace::raiseOrLowerClient( Client *c)
     if (!c) return;
     Client* topmost = NULL;
 // TODO    Q_ASSERT( block_stacking_updates == 0 );
-    if ( most_recently_raised && stacking_order.tqcontains( most_recently_raised ) &&
+    if ( most_recently_raised && stacking_order.contains( most_recently_raised ) &&
          most_recently_raised->isShown( true ) && c->isOnCurrentDesktop())
         topmost = most_recently_raised;
     else
@@ -469,11 +469,11 @@ void Workspace::restackClientUnderActive( Client* c )
         return;
         }
 
-    assert( unconstrained_stacking_order.tqcontains( active_client ));
+    assert( unconstrained_stacking_order.contains( active_client ));
     if( Client::belongToSameApplication( active_client, c ))
         { // put it below the active window if it's the same app
         unconstrained_stacking_order.remove( c );
-        unconstrained_stacking_order.insert( unconstrained_stacking_order.tqfind( active_client ), c );
+        unconstrained_stacking_order.insert( unconstrained_stacking_order.find( active_client ), c );
         }
     else
         { // put in the stacking order below _all_ windows belonging to the active application
@@ -492,17 +492,17 @@ void Workspace::restackClientUnderActive( Client* c )
                 }
             }
         }
-    assert( unconstrained_stacking_order.tqcontains( c ));
+    assert( unconstrained_stacking_order.contains( c ));
     for( int desktop = 1;
          desktop <= numberOfDesktops();
          ++desktop )
         { // do for every virtual desktop to handle the case of onalldesktop windows
-        if( c->wantsTabFocus() && c->isOnDesktop( desktop ) && focus_chain[ desktop ].tqcontains( active_client ))
+        if( c->wantsTabFocus() && c->isOnDesktop( desktop ) && focus_chain[ desktop ].contains( active_client ))
             {
             if( Client::belongToSameApplication( active_client, c ))
                 { // put it after the active window if it's the same app
                 focus_chain[ desktop ].remove( c );
-                focus_chain[ desktop ].insert( focus_chain[ desktop ].tqfind( active_client ), c );
+                focus_chain[ desktop ].insert( focus_chain[ desktop ].find( active_client ), c );
                 }
             else
                 { // put it in focus_chain[currentDesktop()] after all windows belonging to the active applicationa
@@ -521,12 +521,12 @@ void Workspace::restackClientUnderActive( Client* c )
             }
       	}
     // the same for global_focus_chain
-    if( c->wantsTabFocus() && global_focus_chain.tqcontains( active_client ))
+    if( c->wantsTabFocus() && global_focus_chain.contains( active_client ))
         {
         if( Client::belongToSameApplication( active_client, c ))
             {
             global_focus_chain.remove( c );
-            global_focus_chain.insert( global_focus_chain.tqfind( active_client ), c );
+            global_focus_chain.insert( global_focus_chain.find( active_client ), c );
             }
         else
             {
@@ -581,7 +581,7 @@ ClientList Workspace::constrainedStackingOrder()
         // If a window is raised above some other window in the same window group
         // which is in the ActiveLayer (i.e. it's fulscreened), make sure it stays
         // above that window (see #95731).
-        if( minimum_layer.tqcontains( (*it)->group())
+        if( minimum_layer.contains( (*it)->group())
             && minimum_layer[ (*it)->group() ] == ActiveLayer
             && ( l == NormalLayer || l == AboveLayer ))
             {
diff --git a/kwin/lib/kdecoration_plugins_p.cpp b/kwin/lib/kdecoration_plugins_p.cpp
index 2e870eaf4..0490e4755 100644
--- a/kwin/lib/kdecoration_plugins_p.cpp
+++ b/kwin/lib/kdecoration_plugins_p.cpp
@@ -167,7 +167,7 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr )
 
     // For clients in kdeartwork    
     TQString catalogue = nameStr;
-    catalogue.tqreplace( "kwin3_", "kwin_" );
+    catalogue.replace( "kwin3_", "kwin_" );
     KGlobal::locale()->insertCatalogue( catalogue );
     // For KCommonDecoration based clients
     KGlobal::locale()->insertCatalogue( "kwin_lib" );
diff --git a/kwin/lib/kdecorationfactory.cpp b/kwin/lib/kdecorationfactory.cpp
index 65fde37bc..7ad1aefbe 100644
--- a/kwin/lib/kdecorationfactory.cpp
+++ b/kwin/lib/kdecorationfactory.cpp
@@ -58,7 +58,7 @@ TQValueList< KDecorationDefines::BorderSize > KDecorationFactory::borderSizes()
     
 bool KDecorationFactory::exists( const KDecoration* deco ) const
     {
-    return _decorations.tqcontains( const_cast< KDecoration* >( deco ));
+    return _decorations.contains( const_cast< KDecoration* >( deco ));
     }
     
 void KDecorationFactory::addDecoration( KDecoration* deco )
diff --git a/kwin/main.cpp b/kwin/main.cpp
index a65a32431..8a15c219c 100644
--- a/kwin/main.cpp
+++ b/kwin/main.cpp
@@ -227,7 +227,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
             XCloseDisplay( dpy );
             dpy = 0;
 
-            if ((pos = display_name.tqfindRev('.')) != -1 )
+            if ((pos = display_name.findRev('.')) != -1 )
                 display_name.remove(pos,10); // 10 is enough to be sure we removed ".s"
 
             TQCString envir;
diff --git a/kwin/manage.cpp b/kwin/manage.cpp
index 3df18027e..85ba9adc9 100644
--- a/kwin/manage.cpp
+++ b/kwin/manage.cpp
@@ -264,7 +264,7 @@ bool Client::manage( Window w, bool isMapped )
         usePosition = true;
     if( !rules()->checkIgnoreGeometry( !usePosition ))
         {
-        bool ignorePPosition = ( options->ignorePositionClasses.tqcontains(TQString::tqfromLatin1(resourceClass())));
+        bool ignorePPosition = ( options->ignorePositionClasses.contains(TQString::tqfromLatin1(resourceClass())));
 
         if ( ( (xSizeHint.flags & PPosition) && !ignorePPosition ) ||
              (xSizeHint.flags & USPosition) ) 
diff --git a/kwin/options.cpp b/kwin/options.cpp
index e6afd4a1d..dc0ca2e8a 100644
--- a/kwin/options.cpp
+++ b/kwin/options.cpp
@@ -379,7 +379,7 @@ int Options::electricBorderDelay()
 
 bool Options::checkIgnoreFocusStealing( const Client* c )
     {
-    return ignoreFocusStealingClasses.tqcontains(TQString::tqfromLatin1(c->resourceClass()));
+    return ignoreFocusStealingClasses.contains(TQString::tqfromLatin1(c->resourceClass()));
     }
 
 Options::MouseCommand Options::wheelToMouseCommand( MouseWheelCommand com, int delta )
diff --git a/kwin/rules.cpp b/kwin/rules.cpp
index ed4a9a8b5..2d6ddded7 100644
--- a/kwin/rules.cpp
+++ b/kwin/rules.cpp
@@ -1038,7 +1038,7 @@ void Workspace::discardUsedWindowRules( Client* c, bool withdrawn )
          it != rules.end();
          )
         {
-        if( c->rules()->tqcontains( *it ))
+        if( c->rules()->contains( *it ))
             {
             updated = true;
             (*it)->discardUsed( withdrawn );
diff --git a/kwin/rules.h b/kwin/rules.h
index bf1943de7..992487e73 100644
--- a/kwin/rules.h
+++ b/kwin/rules.h
@@ -40,7 +40,7 @@ class WindowRules
         WindowRules();
         void update( Client* );
         void discardTemporary();
-        bool tqcontains( const Rules* rule ) const;
+        bool contains( const Rules* rule ) const;
         void remove( Rules* rule );
         Placement::Policy checkPlacement( Placement::Policy placement ) const;
         TQRect checkGeometry( TQRect rect, bool init = false ) const;
@@ -284,7 +284,7 @@ WindowRules::WindowRules()
     }
 
 inline
-bool WindowRules::tqcontains( const Rules* rule ) const
+bool WindowRules::contains( const Rules* rule ) const
     {
     return tqFind( rules.begin(), rules.end(), rule ) != rules.end();
     }
diff --git a/kwin/sm.cpp b/kwin/sm.cpp
index 045d4f924..3a6aa3ebe 100644
--- a/kwin/sm.cpp
+++ b/kwin/sm.cpp
@@ -259,8 +259,8 @@ bool Workspace::windowRoleMatch( const TQCString& role1, const TQCString& role2
     {
     if( role1.isEmpty() && role2.isEmpty())
         return true;
-    int pos1 = role1.tqfind( '#' );
-    int pos2 = role2.tqfind( '#' );
+    int pos1 = role1.find( '#' );
+    int pos2 = role2.find( '#' );
     bool ret;
     if( pos1 < 0 || pos2 < 0 || pos1 != pos2 )
         ret = role1 == role2;
diff --git a/kwin/tabbox.cpp b/kwin/tabbox.cpp
index 0f229637a..19f6560a1 100644
--- a/kwin/tabbox.cpp
+++ b/kwin/tabbox.cpp
@@ -114,7 +114,7 @@ void TabBox::createClientList(ClientList &list, int desktop /*-1 = all*/, Client
             Client* modal = c->findModal();
             if( modal == NULL || modal == c )
                 add = c;
-            else if( !list.tqcontains( modal ))
+            else if( !list.contains( modal ))
                 add = modal;
             else
                 {
@@ -271,7 +271,7 @@ void TabBox::nextPrev( bool next)
                 client = 0;
                 break;
                 }
-            } while ( client && !clients.tqcontains( client ));
+            } while ( client && !clients.contains( client ));
         setCurrentClient( client );
         }
     else if( mode() == DesktopMode )
@@ -696,7 +696,7 @@ void TabBox::handleMouseEvent( XEvent* e )
     if( e->type != ButtonPress )
         return;
     TQPoint pos( e->xbutton.x_root, e->xbutton.y_root );
-    if( !tqgeometry().tqcontains( pos ))
+    if( !tqgeometry().contains( pos ))
         {
         workspace()->closeTabBox();  // click outside closes tab
         return;
@@ -1227,7 +1227,7 @@ void Workspace::tabBoxKeyRelease( const XKeyEvent& ev )
 
 int Workspace::nextDesktopFocusChain( int iDesktop ) const
     {
-    int i = desktop_focus_chain.tqfind( iDesktop );
+    int i = desktop_focus_chain.find( iDesktop );
     if( i >= 0 && i+1 < (int)desktop_focus_chain.size() )
             return desktop_focus_chain[i+1];
     else if( desktop_focus_chain.size() > 0 )
@@ -1238,7 +1238,7 @@ int Workspace::nextDesktopFocusChain( int iDesktop ) const
 
 int Workspace::previousDesktopFocusChain( int iDesktop ) const
     {
-    int i = desktop_focus_chain.tqfind( iDesktop );
+    int i = desktop_focus_chain.find( iDesktop );
     if( i-1 >= 0 )
             return desktop_focus_chain[i-1];
     else if( desktop_focus_chain.size() > 0 )
@@ -1255,7 +1255,7 @@ Client* Workspace::nextFocusChainClient( Client* c ) const
     {
     if ( global_focus_chain.isEmpty() )
         return 0;
-    ClientList::ConstIterator it = global_focus_chain.tqfind( c );
+    ClientList::ConstIterator it = global_focus_chain.find( c );
     if ( it == global_focus_chain.end() )
         return global_focus_chain.last();
     if ( it == global_focus_chain.begin() )
@@ -1272,7 +1272,7 @@ Client* Workspace::previousFocusChainClient( Client* c ) const
     {
     if ( global_focus_chain.isEmpty() )
         return 0;
-    ClientList::ConstIterator it = global_focus_chain.tqfind( c );
+    ClientList::ConstIterator it = global_focus_chain.find( c );
     if ( it == global_focus_chain.end() )
         return global_focus_chain.first();
     ++it;
@@ -1289,7 +1289,7 @@ Client* Workspace::nextStaticClient( Client* c ) const
     {
     if ( !c || clients.isEmpty() )
         return 0;
-    ClientList::ConstIterator it = clients.tqfind( c );
+    ClientList::ConstIterator it = clients.find( c );
     if ( it == clients.end() )
         return clients.first();
     ++it;
@@ -1305,7 +1305,7 @@ Client* Workspace::previousStaticClient( Client* c ) const
     {
     if ( !c || clients.isEmpty() )
         return 0;
-    ClientList::ConstIterator it = clients.tqfind( c );
+    ClientList::ConstIterator it = clients.find( c );
     if ( it == clients.end() )
         return clients.last();
     if ( it == clients.begin() )
diff --git a/kwin/useractions.cpp b/kwin/useractions.cpp
index 50e495496..9e8b5d5a7 100644
--- a/kwin/useractions.cpp
+++ b/kwin/useractions.cpp
@@ -229,7 +229,7 @@ void Workspace::desktopPopupAboutToShow()
         id = desk_popup->insertItem(
                 basic_name
                     .arg(i)
-                    .arg( desktopName(i).tqreplace( '&', "&&" )),
+                    .arg( desktopName(i).replace( '&', "&&" )),
                 i );
         if ( active_popup_client &&
              !active_popup_client->isOnAllDesktops() && active_popup_client->desktop()  == i )
@@ -1093,7 +1093,7 @@ void Client::setShortcut( const TQString& _cut )
 // Format:
 // base+(abcdef)<space>base+(abcdef)
 // E.g. Alt+Ctrl+(ABCDEF) Win+X,Win+(ABCDEF)
-    if( !cut.tqcontains( '(' ) && !cut.tqcontains( ')' ) && !cut.tqcontains( ' ' ))
+    if( !cut.contains( '(' ) && !cut.contains( ')' ) && !cut.contains( ' ' ))
         {
         if( workspace()->shortcutAvailable( KShortcut( cut ), this ))
             setShortcutInternal( KShortcut( cut ));
diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp
index 6cf48258c..16efb606d 100644
--- a/kwin/workspace.cpp
+++ b/kwin/workspace.cpp
@@ -537,9 +537,9 @@ void Workspace::addClient( Client* c, allowed_t )
         updateFocusChains( c, FocusChainUpdate ); // add to focus chain if not already there
         clients.append( c );
         }
-    if( !unconstrained_stacking_order.tqcontains( c ))
+    if( !unconstrained_stacking_order.contains( c ))
         unconstrained_stacking_order.append( c );
-    if( !stacking_order.tqcontains( c )) // it'll be updated later, and updateToolWindows() requires
+    if( !stacking_order.contains( c )) // it'll be updated later, and updateToolWindows() requires
         stacking_order.append( c );    // c to be in stacking_order
     if( c->isTopMenu())
         addTopMenu( c );
@@ -578,7 +578,7 @@ void Workspace::removeClient( Client* c, allowed_t )
     if( c->isNormalWindow())
         Notify::raise( Notify::Delete );
 
-    Q_ASSERT( clients.tqcontains( c ) || desktops.tqcontains( c ));
+    Q_ASSERT( clients.contains( c ) || desktops.contains( c ));
     clients.remove( c );
     desktops.remove( c );
     unconstrained_stacking_order.remove( c );
@@ -639,7 +639,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change )
                 else
                     focus_chain[ i ].prepend( c );
                 }
-            else if( !focus_chain[ i ].tqcontains( c ))
+            else if( !focus_chain[ i ].contains( c ))
                 { // add it after the active one
                 if( active_client != NULL && active_client != c
                     && !focus_chain[ i ].isEmpty() && focus_chain[ i ].last() == active_client )
@@ -665,7 +665,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change )
                     focus_chain[ i ].remove( c );
                     focus_chain[ i ].prepend( c );
                     }
-                else if( !focus_chain[ i ].tqcontains( c ))
+                else if( !focus_chain[ i ].contains( c ))
                     {
                     if( active_client != NULL && active_client != c
                         && !focus_chain[ i ].isEmpty() && focus_chain[ i ].last() == active_client )
@@ -688,7 +688,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change )
         global_focus_chain.remove( c );
         global_focus_chain.prepend( c );
         }
-    else if( !global_focus_chain.tqcontains( c ))
+    else if( !global_focus_chain.contains( c ))
         {
         if( active_client != NULL && active_client != c
             && !global_focus_chain.isEmpty() && global_focus_chain.last() == active_client )
@@ -1269,7 +1269,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
         {
         // Search in focus chain
         if ( movingClient != NULL && active_client == movingClient
-            && focus_chain[currentDesktop()].tqcontains( active_client )
+            && focus_chain[currentDesktop()].contains( active_client )
             && active_client->isShown( true ) && active_client->isOnCurrentDesktop())
             {
             c = active_client; // the requestFocus below will fail, as the client is already active
@@ -1312,8 +1312,8 @@ bool Workspace::setCurrentDesktop( int new_desktop )
     //  If input: chain = { 1, 2, 3, 4 } and current_desktop = 3,
     //   Output: chain = { 3, 1, 2, 4 }.
 //    kdDebug(1212) << TQString("Switching to desktop #%1, at focus_chain[currentDesktop()] index %2\n")
-//      .arg(currentDesktop()).arg(desktop_focus_chain.tqfind( currentDesktop() ));
-    for( int i = desktop_focus_chain.tqfind( currentDesktop() ); i > 0; i-- )
+//      .arg(currentDesktop()).arg(desktop_focus_chain.find( currentDesktop() ));
+    for( int i = desktop_focus_chain.find( currentDesktop() ); i > 0; i-- )
         desktop_focus_chain[i] = desktop_focus_chain[i-1];
     desktop_focus_chain[0] = currentDesktop();
 
@@ -1667,7 +1667,7 @@ void Workspace::calcDesktopLayout(int &x, int &y) const
  */
 bool Workspace::addSystemTrayWin( WId w )
     {
-    if ( systemTrayWins.tqcontains( w ) )
+    if ( systemTrayWins.contains( w ) )
         return TRUE;
 
     NETWinInfo ni( qt_xdisplay(), w, root, NET::WMKDESystemTrayWinFor );
@@ -1689,7 +1689,7 @@ bool Workspace::addSystemTrayWin( WId w )
  */
 bool Workspace::removeSystemTrayWin( WId w, bool check )
     {
-    if ( !systemTrayWins.tqcontains( w ) )
+    if ( !systemTrayWins.contains( w ) )
         return FALSE;
     if( check )
         {
@@ -1904,7 +1904,7 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
     {
     if ( !w )
         return state;
-    TQWidget* widget = TQWidget::tqfind( w );
+    TQWidget* widget = TQWidget::find( w );
     if ( (!widget ||  widget->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) ) && !findClient( WindowMatchPredicate( w )) ) 
         {
         int x, y;
@@ -2379,7 +2379,7 @@ void Workspace::raiseElectricBorders()
 void Workspace::addTopMenu( Client* c )
     {
     assert( c->isTopMenu());
-    assert( !topmenus.tqcontains( c ));
+    assert( !topmenus.contains( c ));
     topmenus.append( c );
     if( managingTopMenus())
         {
@@ -2400,7 +2400,7 @@ void Workspace::removeTopMenu( Client* c )
 //    if( c->isTopMenu())
 //        kdDebug() << "REMOVE TOPMENU:" << c << endl;
     assert( c->isTopMenu());
-    assert( topmenus.tqcontains( c ));
+    assert( topmenus.contains( c ));
     topmenus.remove( c );
     updateCurrentTopMenu();
     // TODO reduce topMenuHeight() if possible?
@@ -2650,20 +2650,20 @@ void Workspace::handleKompmgrOutput( KProcess* , char *buffer, int buflen)
 {
     TQString message;
     TQString output = TQString::fromLocal8Bit( buffer, buflen );
-    if (output.tqcontains("Started",false))
+    if (output.contains("Started",false))
         ; // don't do anything, just pass to the connection release
-    else if (output.tqcontains("Can't open display",false))
+    else if (output.contains("Can't open display",false))
         message = i18n("<qt><b>kompmgr failed to open the display</b><br>There is probably an invalid display entry in your ~/.xcompmgrrc.</qt>");
-    else if (output.tqcontains("No render extension",false))
+    else if (output.contains("No render extension",false))
         message = i18n("<qt><b>kompmgr cannot find the Xrender extension</b><br>You are using either an outdated or a crippled version of XOrg.<br>Get XOrg &ge; 6.8 from www.freedesktop.org.<br></qt>");
-    else if (output.tqcontains("No composite extension",false))
+    else if (output.contains("No composite extension",false))
         message = i18n("<qt><b>Composite extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.<br>Additionally, you need to add a new section to your X config file:<br>"
         "<i>Section \"Extensions\"<br>"
         "Option \"Composite\" \"Enable\"<br>"
         "EndSection</i></qt>");
-    else if (output.tqcontains("No damage extension",false))
+    else if (output.contains("No damage extension",false))
         message = i18n("<qt><b>Damage extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.</qt>");
-    else if (output.tqcontains("No XFixes extension",false))
+    else if (output.contains("No XFixes extension",false))
         message = i18n("<qt><b>XFixes extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.</qt>");
     else return; //skip others
     // kompmgr startup failed or succeeded, release connection