Remove additional unneeded tq method conversions

35 files changed, 186 insertions, 186 deletions

diff --git a/twin/client.cpp b/twin/client.cpp
index fbd2d75aa..c09df53fa 100644
--- a/twin/client.cpp
+++ b/twin/client.cpp
@@ -140,7 +140,7 @@ Client::Client( Workspace *ws )
     deleting = false;
     keep_above = FALSE;
     keep_below = FALSE;
-    is_tqshape = FALSE;
+    is_shape = FALSE;
     motif_noborder = false;
     motif_may_move = TRUE;
     motif_may_resize = TRUE;
@@ -285,7 +285,7 @@ void Client::destroyClient()
     destroyDecoration();
     cleanGrouping();
     workspace()->removeClient( this, Allowed );
-    client = None; // tqinvalidate
+    client = None; // invalidate
     XDestroyWindow( qt_xdisplay(), wrapper );
     wrapper = None;
     XDestroyWindow( qt_xdisplay(), frame );
@@ -306,7 +306,7 @@ void Client::updateDecoration( bool check_workspace_pos, bool force )
         destroyDecoration();
     if( !noBorder())
         {
-        setMask( TQRegion()); // reset tqshape mask
+        setMask( TQRegion()); // reset shape mask
         decoration = workspace()->createDecoration( bridge );
         // TODO check decoration's minimum size?
         decoration->init();
@@ -344,7 +344,7 @@ void Client::destroyDecoration()
         decoration = NULL;
         TQPoint grav = calculateGravitation( true );
         border_left = border_right = border_top = border_bottom = 0;
-        setMask( TQRegion()); // reset tqshape mask
+        setMask( TQRegion()); // reset shape mask
         int save_workarea_diff_x = workarea_diff_x;
         int save_workarea_diff_y = workarea_diff_y;
         plainResize( sizeForClientSize( clientSize()), ForceGeometrySet );
@@ -515,32 +515,32 @@ bool Client::isModalSystemNotification() const
 
 void Client::updateShape()
     {
-    // workaround for #19644 - tqshaped windows shouldn't have decoration
-    if( tqshape() && !noBorder()) 
+    // workaround for #19644 - shaped windows shouldn't have decoration
+    if( shape() && !noBorder()) 
         {
         noborder = true;
         updateDecoration( true );
         }
     updateOpacityCache();
-    if ( tqshape() )
+    if ( shape() )
         {
         XShapeCombineShape(qt_xdisplay(), frameId(), ShapeBounding,
                            clientPos().x(), clientPos().y(),
                            window(), ShapeBounding, ShapeSet);
         setShapable(TRUE);
         }
-    // !tqshape() mask setting is done in setMask() when the decoration
+    // !shape() mask setting is done in setMask() when the decoration
     // calls it or when the decoration is created/destroyed
 
-    if( Shape::version() >= 0x11 ) // 1.1, has input tqshape support
+    if( Shape::version() >= 0x11 ) // 1.1, has input shape support
         { // There appears to be no way to find out if a window has input
-          // tqshape set or not, so always propagate the input tqshape
-          // (it's the same like the bounding tqshape by default).
-          // Also, build the tqshape using a helper window, not directly
-          // in the frame window, because the sequence set-tqshape-to-frame,
-          // remove-tqshape-of-client, add-input-tqshape-of-client has the problem
-          // that after the second step there's a hole in the input tqshape
-          // until the real tqshape of the client is added and that can make
+          // shape set or not, so always propagate the input shape
+          // (it's the same like the bounding shape by default).
+          // Also, build the shape using a helper window, not directly
+          // in the frame window, because the sequence set-shape-to-frame,
+          // remove-shape-of-client, add-input-shape-of-client has the problem
+          // that after the second step there's a hole in the input shape
+          // until the real shape of the client is added and that can make
           // the window lose focus (which is a problem with mouse focus policies)
         static Window helper_window = None;
         if( helper_window == None )
@@ -571,7 +571,7 @@ void Client::setMask( const TQRegion& reg, int mode )
             reg.handle(), ShapeSet );
     else
         {
-        TQMemArray< TQRect > rects = reg.tqrects();
+        TQMemArray< TQRect > rects = reg.rects();
         XRectangle* xrects = new XRectangle[ rects.count() ];
         for( unsigned int i = 0;
              i < rects.count();
@@ -874,7 +874,7 @@ void Client::setShade( ShadeMode mode )
         XSelectInput( qt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask );
         //as we hid the unmap event, xcompmgr didn't recognize the client wid has vanished, so we'll extra inform it        
         //done xcompmgr workaround
-// FRAME       tqrepaint( FALSE );
+// FRAME       repaint( FALSE );
 //        bool wasStaticContents = testWFlags( WStaticContents );
 //        setWFlags( WStaticContents );
         int step = QMAX( 4, QABS( h - s.height() ) / as )+1;
@@ -915,7 +915,7 @@ void Client::setShade( ShadeMode mode )
             resizeDecoration( TQSize( s.width(), h ));
             // assume a border
             // we do not have time to wait for X to send us paint events
-// FRAME           tqrepaint( 0, h - step-5, width(), step+5, TRUE);
+// FRAME           repaint( 0, h - step-5, width(), step+5, TRUE);
             TQApplication::syncX();
             } while ( h < s.height() - step );
 //        if ( !wasStaticContents )
@@ -1078,7 +1078,7 @@ void Client::drawIntersectingShadows() {
         // active window has a shadow.
         return;
 
-    region = tqshapeBoundingRegion;
+    region = shapeBoundingRegion;
 
     // Generate list of Clients whose shadows need to be redrawn. That is,
     // those that are currently intersecting or intersected by other windows or
@@ -1116,7 +1116,7 @@ void Client::drawOverlappingShadows(bool waitForMe)
         // active window has a shadow.
         return;
 
-    region = tqshapeBoundingRegion;
+    region = shapeBoundingRegion;
 
     stacking_order = workspace()->stackingOrder();
     for (it = stacking_order.fromLast(); it != stacking_order.end(); --it) {
@@ -1167,7 +1167,7 @@ void Client::drawOverlappingShadows(bool waitForMe)
 
 /*!
    Draw shadow after some time has elapsed, to give recently exposed windows a
-   chance to tqrepaint before a shadow gradient is drawn over them.
+   chance to repaint before a shadow gradient is drawn over them.
  */
 void Client::drawDelayedShadow()
 {
@@ -1190,7 +1190,7 @@ void Client::drawShadowAfter(Client *after)
 void Client::drawShadow()
 {
     Window shadows[2];
-    XRectangle *tqshapes;
+    XRectangle *shapes;
     int i, count, ordering;
 
     // If we are waiting for another Client's shadow to be drawn, stop waiting now
@@ -1206,31 +1206,31 @@ void Client::drawShadow()
      * this type of window. Otherwise, drawIntersectingShadows() won't update
      * properly when this window is moved/resized/hidden/closed.
      */
-    tqshapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding,
+    shapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding,
             &count, &ordering);
-    if (!tqshapes)
+    if (!shapes)
         // XShape extension not supported
-        tqshapeBoundingRegion = TQRegion(x(), y(), width(), height());
+        shapeBoundingRegion = TQRegion(x(), y(), width(), height());
     else {
-        tqshapeBoundingRegion = TQRegion();
+        shapeBoundingRegion = TQRegion();
         for (i = 0; i < count; i++) {
             // Translate XShaped window into a TQRegion
-            TQRegion tqshapeRectangle(tqshapes[i].x, tqshapes[i].y, tqshapes[i].width,
-                    tqshapes[i].height);
-            tqshapeBoundingRegion += tqshapeRectangle;
+            TQRegion shapeRectangle(shapes[i].x, shapes[i].y, shapes[i].width,
+                    shapes[i].height);
+            shapeBoundingRegion += shapeRectangle;
         }
         if (isShade())
             // Since XResize() doesn't change a window's XShape regions, ensure that
-            // tqshapeBoundingRegion is not taller than the window's shaded height,
+            // shapeBoundingRegion is not taller than the window's shaded height,
             // or the bottom shadow will appear to be missing
-            tqshapeBoundingRegion &= TQRegion(0, 0, width(), height());
-        tqshapeBoundingRegion.translate(x(), y());
+            shapeBoundingRegion &= TQRegion(0, 0, width(), height());
+        shapeBoundingRegion.translate(x(), y());
     }
 
     if (!isShadowed() || hidden || isMinimized() ||
             maximizeMode() == MaximizeFull ||
             !options->shadowWindowType(windowType())) {
-        XFree(tqshapes);
+        XFree(shapes);
 
         // Tell whatever Clients are listening that this Client's shadow has been drawn.
         // It hasn't, but there's no sense waiting for something that won't happen.
@@ -1264,9 +1264,9 @@ void Client::drawShadow()
             ButtonPressMask | ButtonReleaseMask | StructureNotifyMask);
     shadowWidget->installEventFilter(this);
 
-    if (!tqshapes) {
+    if (!shapes) {
         // XShape extension not supported
-        exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(),
+        exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(),
                 shadow.y(), shadow.width(), shadow.height(), thickness,
                 xOffset, yOffset);
         shadowRegion.region = exposedRegion;
@@ -1274,7 +1274,7 @@ void Client::drawShadow()
         shadowRegions.append(shadowRegion);
 
         if (opacityCache->isNull())
-            imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion,
+            imposeRegionShadow(shadowPixmap, shapeBoundingRegion,
                     exposedRegion, thickness,
                     options->shadowOpacity(isActive()));
         else
@@ -1285,7 +1285,7 @@ void Client::drawShadow()
         TQMemArray<TQRect>::Iterator it, itEnd;
         XRectangle *shadowShapes;
 
-        exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(),
+        exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(),
                 shadow.y(), shadow.width(), shadow.height(), thickness,
                 xOffset, yOffset);
         shadowRegion.region = exposedRegion;
@@ -1293,7 +1293,7 @@ void Client::drawShadow()
         shadowRegions.append(shadowRegion);
 
         // XShape the shadow
-        exposedRects = exposedRegion.tqrects();
+        exposedRects = exposedRegion.rects();
         i = 0;
         itEnd = exposedRects.end();
         shadowShapes = new XRectangle[exposedRects.count()];
@@ -1311,14 +1311,14 @@ void Client::drawShadow()
         delete [] shadowShapes;
 
         if (opacityCache->isNull())
-            imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion,
+            imposeRegionShadow(shadowPixmap, shapeBoundingRegion,
                     exposedRegion, thickness,
                     options->shadowOpacity(isActive()));
         else
             imposeCachedShadow(shadowPixmap, exposedRegion);
     }
 
-    XFree(tqshapes);
+    XFree(shapes);
 
     // Set the background pixmap
     //shadowPixmap.convertFromImage(shadowImage);
@@ -1391,10 +1391,10 @@ TQRegion Client::getExposedRegion(TQRegion occludedRegion, int x, int y, int w,
         TQMemArray<TQRect>::Iterator it, itEnd;
         TQRegion shadowRegion;
 
-        occludedRects = occludedRegion.tqrects();
+        occludedRects = occludedRegion.rects();
         itEnd = occludedRects.end();
         for (it = occludedRects.begin(); it != itEnd; ++it) {
-            // Expand each of the occluded region's tqshape rectangles to contain
+            // Expand each of the occluded region's shape rectangles to contain
             // where a shadow of the specified thickness will be drawn. Create
             // a new TQRegion that contains the expanded occluded region
             it->setTop(it->top() - thickness + yOffset);
@@ -1425,7 +1425,7 @@ void Client::imposeCachedShadow(TQPixmap &pixmap, TQRegion exposed)
     Window rootWindow;
     int thickness, windowX, windowY, xOffset, yOffset;
 
-    rectangles = exposed.tqrects();
+    rectangles = exposed.rects();
     rootWindow = qt_xrootwin();
     thickness = options->shadowThickness(isActive());
     windowX = this->x();
@@ -1485,7 +1485,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded,
     Window rootWindow;
     int windowX, windowY, xOffset, yOffset;
 
-    rectangles = exposed.tqrects();
+    rectangles = exposed.rects();
     rootWindow = qt_xrootwin();
     windowX = this->x();
     windowY = this->y();
@@ -2430,7 +2430,7 @@ NET::WindowType Client::windowType( bool direct, int supported_types ) const
     }
 
 /*!
-  Sets an appropriate cursor tqshape for the logical mouse position \a m
+  Sets an appropriate cursor shape for the logical mouse position \a m
 
  */
 void Client::setCursor( Position m )
diff --git a/twin/client.h b/twin/client.h
index ec94a994d..21c40afa9 100644
--- a/twin/client.h
+++ b/twin/client.h
@@ -214,8 +214,8 @@ class Client : public TQObject, public KDecorationDefines
         // window to be redrawn.
         friend void Workspace::updateOverlappingShadows(WId);
 
-    // tqshape extensions
-        bool tqshape() const;
+    // shape extensions
+        bool shape() const;
         void updateShape();
 
         void setGeometry( int x, int y, int w, int h, ForceGeometry_t force = NormalGeometrySet );
@@ -501,7 +501,7 @@ class Client : public TQObject, public KDecorationDefines
         uint active :1;
         uint deleting : 1; // true when doing cleanup and destroying the client
         uint keep_above : 1; // NET::KeepAbove (was stays_on_top)
-        uint is_tqshape :1;
+        uint is_shape :1;
         uint skip_taskbar :1;
         uint original_skip_taskbar :1; // unaffected by KWin
         uint Pdeletewindow :1; // does the window understand the DeleteWindow protocol?
@@ -570,7 +570,7 @@ class Client : public TQObject, public KDecorationDefines
         TQMemArray<double> activeOpacityCache;
         TQMemArray<double> inactiveOpacityCache;
         TQMemArray<double>* opacityCache;
-        TQRegion tqshapeBoundingRegion;
+        TQRegion shapeBoundingRegion;
         TQTimer* shadowDelayTimer;
         bool shadowMe;
 
@@ -797,9 +797,9 @@ inline bool Client::keepBelow() const
     return keep_below;
     }
 
-inline bool Client::tqshape() const
+inline bool Client::shape() const
     {
-    return is_tqshape;
+    return is_shape;
     }
 
 
diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 28ebc9c76..8e62360a6 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -558,7 +558,7 @@ bool B2Client::mustDrawHandle() const
 void B2Client::iconChange()
 {
     if (button[BtnMenu])
-        button[BtnMenu]->tqrepaint(false);
+        button[BtnMenu]->repaint(false);
 }
 
 // Gallium: New button show/hide magic for customizable
@@ -607,7 +607,7 @@ void B2Client::resizeEvent(TQResizeEvent * /*e*/)
     titleMoveAbs(bar_x_ofs);
 
     doShape();
-    widget()->tqrepaint(); // the frame is misrendered without this
+    widget()->repaint(); // the frame is misrendered without this
 }
 
 void B2Client::captionChange()
@@ -616,7 +616,7 @@ void B2Client::captionChange()
     titleMoveAbs(bar_x_ofs);
     doShape();
     titlebar->recalcBuffer();
-    titlebar->tqrepaint(false);
+    titlebar->repaint(false);
 }
 
 void B2Client::paintEvent(TQPaintEvent* e)
@@ -710,7 +710,7 @@ void B2Client::paintEvent(TQPaintEvent* e)
        visibilitinotify events until its state changes, so we just try
      */
     if (titlebar->isFullyObscured()) {
-        /* We first see, if our tqrepaint contained the titlebar area */
+        /* We first see, if our repaint contained the titlebar area */
 	TQRegion reg(TQRect(0, 0, width(), buttonSize + 4));
 	reg = reg.intersect(e->region());
 	if (!reg.isEmpty())
@@ -815,8 +815,8 @@ void B2Client::titleMoveAbs(int new_ofs)
         bar_x_ofs = new_ofs;
 	positionButtons();
 	doShape();
-	widget()->tqrepaint(0, 0, width(), buttonSize + 4, false);
-	titlebar->tqrepaint(false);
+	widget()->repaint(0, 0, width(), buttonSize + 4, false);
+	titlebar->repaint(false);
     }
 }
 
@@ -841,7 +841,7 @@ void B2Client::maximizeChange()
     bool m = maximizeMode() == MaximizeFull;
     if (button[BtnMax]) {
         button[BtnMax]->setPixmaps(m ? P_NORMALIZE : P_MAX);
-        button[BtnMax]->tqrepaint();
+        button[BtnMax]->repaint();
 	TQToolTip::remove(button[BtnMax]);
 	TQToolTip::add(button[BtnMax],
 		m ? i18n("Restore") : i18n("Maximize"));
@@ -851,13 +851,13 @@ void B2Client::maximizeChange()
 
     g->activate();
     doShape();
-    widget()->tqrepaint(false);
+    widget()->repaint(false);
 }
 
 void B2Client::activeChange()
 {
-    widget()->tqrepaint(false);
-    titlebar->tqrepaint(false);
+    widget()->repaint(false);
+    titlebar->repaint(false);
 
     TQColor c = options()->colorGroup(
 	    KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button);
@@ -865,7 +865,7 @@ void B2Client::activeChange()
     for (int i = 0; i < BtnCount; i++)
         if (button[i]) {
            button[i]->setBg(c);
-           button[i]->tqrepaint(false);
+           button[i]->repaint(false);
         }
 }
 
@@ -1128,7 +1128,7 @@ void B2Client::positionButtons()
 // Transparent bound stuff.
 
 static TQRect *visible_bound;
-static TQPointArray bound_tqshape;
+static TQPointArray bound_shape;
 
 bool B2Client::drawbound(const TQRect& geom, bool clear)
 {
@@ -1153,7 +1153,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
         barLeft += 2;
         barRight -= 2;
 
-	bound_tqshape.putPoints(0, 8,
+	bound_shape.putPoints(0, 8,
 		g.left(), frameTop,
 		barLeft, frameTop,
 		barLeft, g.top(),
@@ -1168,7 +1168,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
     TQPainter p(workspaceWidget());
     p.setPen(TQPen(Qt::white, 5));
     p.setRasterOp(TQt::XorROP);
-    p.drawPolygon(bound_tqshape);
+    p.drawPolygon(bound_shape);
 
     if (clear) {
 	delete visible_bound;
@@ -1273,7 +1273,7 @@ void B2Button::setPixmaps(int button_id)
     for (int i = 0; i < NumStates; i++) {
 	icon[i] = B2::pixmap[button_id + i];
     }
-    tqrepaint(false);
+    repaint(false);
 }
 
 void B2Button::mousePressEvent(TQMouseEvent * e)
@@ -1297,14 +1297,14 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e)
 void B2Button::enterEvent(TQEvent *e)
 {
     hover = true;
-    tqrepaint(false);
+    repaint(false);
     TQButton::enterEvent(e);
 }
 
 void B2Button::leaveEvent(TQEvent *e)
 {
     hover = false;
-    tqrepaint(false);
+    repaint(false);
     TQButton::leaveEvent(e);
 }
 
@@ -1388,7 +1388,7 @@ void B2Titlebar::recalcBuffer()
 void B2Titlebar::resizeEvent(TQResizeEvent *)
 {
     recalcBuffer();
-    tqrepaint(false);
+    repaint(false);
 }
 
 
diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp
index 987e80ee2..c3be60c80 100644
--- a/twin/clients/default/kdedefault.cpp
+++ b/twin/clients/default/kdedefault.cpp
@@ -240,7 +240,7 @@ unsigned long KDEDefaultHandler::readConfig( bool update )
                     || new_useGradients != useGradients
                     || new_titleHeight != normalTitleHeight
                     || new_toolTitleHeight != toolTitleHeight )
-                        changed |= SettingColors; // just recreate the pixmaps and tqrepaint
+                        changed |= SettingColors; // just recreate the pixmaps and repaint
         }
 
         showGrabBar             = new_showGrabBar;
@@ -720,7 +720,7 @@ void KDEDefaultButton::drawButton(TQPainter *p)
 void KDEDefaultButton::enterEvent(TQEvent *e)
 {
 	isMouseOver=true;
-	tqrepaint(false);
+	repaint(false);
 	TQButton::enterEvent(e);
 }
 
@@ -728,7 +728,7 @@ void KDEDefaultButton::enterEvent(TQEvent *e)
 void KDEDefaultButton::leaveEvent(TQEvent *e)
 {
 	isMouseOver=false;
-	tqrepaint(false);
+	repaint(false);
 	TQButton::leaveEvent(e);
 }
 
@@ -856,7 +856,7 @@ void KDEDefaultClient::init()
 
 void KDEDefaultClient::reset( unsigned long changed)
 {
-    widget()->tqrepaint();
+    widget()->repaint();
 
 	KCommonDecoration::reset(changed);
 }
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index ce137cd20..121861865 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -784,7 +784,7 @@ void KeramikButton::enterEvent( TQEvent *e )
 	TQButton::enterEvent( e );
 
 	hover = true;
-	tqrepaint( false );
+	repaint( false );
 }
 
 
@@ -793,7 +793,7 @@ void KeramikButton::leaveEvent( TQEvent *e )
 	TQButton::leaveEvent( e );
 
 	hover = false;
-	tqrepaint( false );
+	repaint( false );
 }
 
 
@@ -1014,13 +1014,13 @@ void KeramikClient::reset( unsigned long )
 
 	captionBufferDirty = maskDirty = true;
 
-	// Only tqrepaint the window if it's visible
+	// Only repaint the window if it's visible
 	// (i.e. not minimized and on the current desktop)
 	if ( widget()->isVisible() ) {
-		widget()->tqrepaint( false );
+		widget()->repaint( false );
 
 		for ( int i = 0; i < NumButtons; i++ )
-			if ( button[i] ) button[i]->tqrepaint( false );
+			if ( button[i] ) button[i]->repaint( false );
 	}
 }
 
@@ -1365,7 +1365,7 @@ void KeramikClient::captionChange()
 
 	captionBufferDirty = true;
 
-	widget()->tqrepaint( r | captionRect, false );
+	widget()->repaint( r | captionRect, false );
 }
 
 
@@ -1381,7 +1381,7 @@ void KeramikClient::iconChange()
 		activeIcon = inactiveIcon = NULL;
 
 		captionBufferDirty = true;
-		widget()->tqrepaint( captionRect, false );
+		widget()->repaint( captionRect, false );
 	}
 }
 
@@ -1400,10 +1400,10 @@ void KeramikClient::activeChange()
 
 	captionBufferDirty = true;
 
-	widget()->tqrepaint( false );
+	widget()->repaint( false );
 
 	for ( int i=0; i < NumButtons; i++ )
-		if ( button[i] ) button[i]->tqrepaint( false );
+		if ( button[i] ) button[i]->repaint( false );
 }
 
 
@@ -1420,7 +1420,7 @@ void KeramikClient::maximizeChange()
 			captionBufferDirty = maskDirty = true;
 
 			widget()->layout()->activate();
-			widget()->tqrepaint( false );
+			widget()->repaint( false );
 		} else if (( maximizeMode() & MaximizeVertical ) == 0 && !largeTitlebar ) {
 			// We've been restored - enlarge the titlebar by 3 pixels
 			topSpacer->changeSize( 10, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
@@ -1430,14 +1430,14 @@ void KeramikClient::maximizeChange()
 			captionBufferDirty = maskDirty = true;
 
 			widget()->layout()->activate();
-			widget()->tqrepaint( false );
+			widget()->repaint( false );
 		}
 	}
 
 	if ( button[ MaxButton ] ) {
 		TQToolTip::remove( button[ MaxButton ] );
 		TQToolTip::add( button[ MaxButton ], maximizeMode() == MaximizeFull ? i18n("Restore") : i18n("Maximize") );
-		button[ MaxButton ]->tqrepaint();
+		button[ MaxButton ]->repaint();
 	}
 }
 
@@ -1446,7 +1446,7 @@ void KeramikClient::desktopChange()
 {
 	if ( button[ OnAllDesktopsButton ] )
 		{
-                button[ OnAllDesktopsButton ]->tqrepaint( true );
+                button[ OnAllDesktopsButton ]->repaint( true );
 		TQToolTip::remove( button[ OnAllDesktopsButton ] );
 		TQToolTip::add( button[ OnAllDesktopsButton ], isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops") );
 		}
@@ -1457,7 +1457,7 @@ void KeramikClient::shadeChange()
 {
 	if ( button[ ShadeButton ] )
 		{
-                button[ ShadeButton ]->tqrepaint( true );
+                button[ ShadeButton ]->repaint( true );
 		TQToolTip::remove( button[ ShadeButton ] );
 		TQToolTip::add( button[ ShadeButton ], isSetShade() ? i18n("Unshade") : i18n("Shade") );
 		}
@@ -1467,14 +1467,14 @@ void KeramikClient::shadeChange()
 void KeramikClient::keepAboveChange( bool )
 {
 	if ( button[ AboveButton ] )
-                button[ AboveButton ]->tqrepaint( true );
+                button[ AboveButton ]->repaint( true );
 }
 
 
 void KeramikClient::keepBelowChange( bool )
 {
 	if ( button[ BelowButton ] )
-                button[ BelowButton ]->tqrepaint( true );
+                button[ BelowButton ]->repaint( true );
 }
 
 
@@ -1502,21 +1502,21 @@ void KeramikClient::slotMaximize()
 void KeramikClient::slotAbove()
 {
     setKeepAbove( !keepAbove());
-    button[ AboveButton ]->tqrepaint( true );
+    button[ AboveButton ]->repaint( true );
 }
 
 
 void KeramikClient::slotBelow()
 {
     setKeepBelow( !keepBelow());
-    button[ BelowButton ]->tqrepaint( true );
+    button[ BelowButton ]->repaint( true );
 }
 
 
 void KeramikClient::slotShade()
 {
     setShade( !isSetShade());
-    button[ ShadeButton ]->tqrepaint( true );
+    button[ ShadeButton ]->repaint( true );
 }
 
 
diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp
index 4533cf3e8..c67a2d227 100644
--- a/twin/clients/kwmtheme/cli_installer/main.cpp
+++ b/twin/clients/kwmtheme/cli_installer/main.cpp
@@ -73,36 +73,36 @@ int main(int argc, char **argv)
     input.setGroup("Window Border");
     output->setGroup("General");
 
-    tmpStr = input.readEntry("tqshapePixmapTop");
+    tmpStr = input.readEntry("shapePixmapTop");
     if(!tmpStr.isEmpty()){
         copy(srcStr+tmpStr, localDirStr+tmpStr);
     }
     output->writeEntry("wm_top", tmpStr, true, true);
-    tmpStr = input.readEntry("tqshapePixmapBottom");
+    tmpStr = input.readEntry("shapePixmapBottom");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
     output->writeEntry("wm_bottom", tmpStr, true, true);
-    tmpStr = input.readEntry("tqshapePixmapLeft");
+    tmpStr = input.readEntry("shapePixmapLeft");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
     output->writeEntry("wm_left", tmpStr, true, true);
-    tmpStr = input.readEntry("tqshapePixmapRight");
+    tmpStr = input.readEntry("shapePixmapRight");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
     output->writeEntry("wm_right", tmpStr, true, true);
-    tmpStr = input.readEntry("tqshapePixmapTopLeft");
+    tmpStr = input.readEntry("shapePixmapTopLeft");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
     output->writeEntry("wm_topleft", tmpStr, true, true);
-    tmpStr = input.readEntry("tqshapePixmapTopRight");
+    tmpStr = input.readEntry("shapePixmapTopRight");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
     output->writeEntry("wm_topright", tmpStr, true, true);
-    tmpStr = input.readEntry("tqshapePixmapBottomLeft");
+    tmpStr = input.readEntry("shapePixmapBottomLeft");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
     output->writeEntry("wm_bottomleft", tmpStr, true, true);
-    tmpStr = input.readEntry("tqshapePixmapBottomRight");
+    tmpStr = input.readEntry("shapePixmapBottomRight");
     if(!tmpStr.isEmpty())
         copy(srcStr+tmpStr, localDirStr+tmpStr);
     output->writeEntry("wm_bottomright", tmpStr, true, true);
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index 1a1316dc1..e7db7c2d6 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -402,12 +402,12 @@ void KWMThemeClient::drawTitle(TQPainter &dest)
 void KWMThemeClient::resizeEvent( TQResizeEvent* )
 {
     doShape();
-    widget()->tqrepaint();
+    widget()->repaint();
 }
 
 void KWMThemeClient::captionChange()
 {
-    widget()->tqrepaint( titlebar->geometry(), false );
+    widget()->repaint( titlebar->geometry(), false );
 }
 
 void KWMThemeClient::paintEvent( TQPaintEvent *)
@@ -576,10 +576,10 @@ void KWMThemeClient::paintEvent( TQPaintEvent *)
 void KWMThemeClient::doShape()
 {
 
-    TQBitmap tqshapemask(width(), height());
-    tqshapemask.fill(color0);
+    TQBitmap shapemask(width(), height());
+    shapemask.fill(color0);
     TQPainter p;
-    p.begin(&tqshapemask);
+    p.begin(&shapemask);
     p.setBrush(color1);
     p.setPen(color1);
     int x,y;
@@ -740,14 +740,14 @@ void KWMThemeClient::doShape()
         }
     }
     p.fillRect(maxExtent-1, maxExtent-1, width()-2*maxExtent+2, height()-2*maxExtent+2, color1);
-    setMask(tqshapemask);
+    setMask(shapemask);
 }
 
 
 void KWMThemeClient::showEvent(TQShowEvent *)
 {
     doShape();
-    widget()->tqrepaint(false);
+    widget()->repaint(false);
 }
 
 void KWMThemeClient::mouseDoubleClickEvent( TQMouseEvent * e )
diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp
index 3b0a1c7ef..58d54a118 100644
--- a/twin/clients/laptop/laptopclient.cpp
+++ b/twin/clients/laptop/laptopclient.cpp
@@ -293,7 +293,7 @@ void LaptopButton::setBitmap(const unsigned char *bitmap)
         deco.fill(Qt::color0);
     }
     deco.setMask(deco);
-    tqrepaint();
+    repaint();
 }
 
 void LaptopButton::drawButton(TQPainter *p)
diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp
index 5f81033cb..428c8e72c 100644
--- a/twin/clients/plastik/plastikbutton.cpp
+++ b/twin/clients/plastik/plastikbutton.cpp
@@ -140,7 +140,7 @@ void PlastikButton::animate()
         }
     }
 
-    tqrepaint(false);
+    repaint(false);
 }
 
 void PlastikButton::enterEvent(TQEvent *e)
diff --git a/twin/clients/plastik/plastikclient.cpp b/twin/clients/plastik/plastikclient.cpp
index 0e72ff59c..f48417779 100644
--- a/twin/clients/plastik/plastikclient.cpp
+++ b/twin/clients/plastik/plastikclient.cpp
@@ -435,7 +435,7 @@ void PlastikClient::reset( unsigned long changed )
 {
     if (changed & SettingColors)
     {
-        // tqrepaint the whole thing
+        // repaint the whole thing
         clearCaptionPixmaps();
         widget()->update();
         updateButtons();
@@ -445,7 +445,7 @@ void PlastikClient::reset( unsigned long changed )
 
         updateLayout();
 
-        // then tqrepaint
+        // then repaint
         clearCaptionPixmaps();
         widget()->update();
     }
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index 7530adc84..21b4c039c 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -437,7 +437,7 @@ void QuartzButton::setBitmap(const unsigned char *bitmap)
 	if (bitmap) {
 		deco = new TQBitmap(10, 10, bitmap, true);
 		deco->setMask( *deco );
-		tqrepaint( false );
+		repaint( false );
 	}
 }
 
@@ -643,8 +643,8 @@ void QuartzClient::reset( unsigned long changed )
 {
 	if (changed & SettingColors || changed & SettingFont)
 	{
-		// tqrepaint the whole thing
-		widget()->tqrepaint(false);
+		// repaint the whole thing
+		widget()->repaint(false);
 	}
 
 	KCommonDecoration::reset(changed);
diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp
index e4127adaa..790afa461 100644
--- a/twin/clients/redmond/redmond.cpp
+++ b/twin/clients/redmond/redmond.cpp
@@ -294,7 +294,7 @@ void RedmondButton::setPixmap( const TQPixmap &p )
 	deco.resize(0, 0);
 	pix = p;
 
-	tqrepaint(false);
+	repaint(false);
 }
 
 
diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp
index 0f3b9c70b..f799e1b8b 100644
--- a/twin/clients/web/Web.cpp
+++ b/twin/clients/web/Web.cpp
@@ -120,31 +120,31 @@ KCommonDecorationButton *WebClient::createButton(ButtonType type)
 {
     switch (type) {
         case MenuButton:
-            return new WebButton(MenuButton, this, "menu", tqshape_);
+            return new WebButton(MenuButton, this, "menu", shape_);
 
         case OnAllDesktopsButton:
-            return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", tqshape_);
+            return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", shape_);
 
         case HelpButton:
-            return new WebButton(HelpButton, this, "help", tqshape_);
+            return new WebButton(HelpButton, this, "help", shape_);
 
         case MinButton:
-            return new WebButton(MinButton, this, "minimize", tqshape_);
+            return new WebButton(MinButton, this, "minimize", shape_);
 
         case MaxButton:
-            return new WebButton(MaxButton, this, "maximize", tqshape_);
+            return new WebButton(MaxButton, this, "maximize", shape_);
 
         case CloseButton:
-            return new WebButton(CloseButton, this, "close", tqshape_);
+            return new WebButton(CloseButton, this, "close", shape_);
 
         case AboveButton:
-            return new WebButton(AboveButton, this, "above", tqshape_);
+            return new WebButton(AboveButton, this, "above", shape_);
 
         case BelowButton:
-            return new WebButton(BelowButton, this, "below", tqshape_);
+            return new WebButton(BelowButton, this, "below", shape_);
 
         case ShadeButton:
-            return new WebButton(ShadeButton, this, "shade", tqshape_);
+            return new WebButton(ShadeButton, this, "shade", shape_);
 
         default:
             return 0;
@@ -185,7 +185,7 @@ WebClient::init()
 
   KConfig c("twinwebrc");
   c.setGroup("General");
-  tqshape_ = c.readBoolEntry("Shape", true);
+  shape_ = c.readBoolEntry("Shape", true);
 
   KCommonDecoration::init();
 }
@@ -195,8 +195,8 @@ WebClient::reset( unsigned long changed )
 {
   if (changed & SettingColors)
   {
-    // tqrepaint the whole thing
-    widget()->tqrepaint(false);
+    // repaint the whole thing
+    widget()->repaint(false);
   } else if (changed & SettingFont) {
     // font has changed -- update title height
     // title height
@@ -206,7 +206,7 @@ WebClient::reset( unsigned long changed )
     if (0 != titleHeight_ % 2)
       titleHeight_ += 1;
 
-    widget()->tqrepaint(false);
+    widget()->repaint(false);
   }
 
   KCommonDecoration::reset(changed);
@@ -241,7 +241,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
 
   p.fillRect(titleRect, options()->color(ColorTitleBar, isActive()));
 
-  if (tqshape_)
+  if (shape_)
   {
     int r(width());
     int b(height());
@@ -288,7 +288,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
 
 void WebClient::updateWindowShape()
 {
-  if (!tqshape_)
+  if (!shape_)
     return;
 
   TQRegion mask(0, 0, width(), height());
diff --git a/twin/clients/web/Web.h b/twin/clients/web/Web.h
index c2c18b0bd..ec1b08dc5 100644
--- a/twin/clients/web/Web.h
+++ b/twin/clients/web/Web.h
@@ -62,7 +62,7 @@ namespace Web
 
       int titleHeight_, borderSize_;
 
-      bool tqshape_;
+      bool shape_;
 
       TQBitmap       _buttonBitmap(ButtonType t) const;
   };
diff --git a/twin/clients/web/WebButton.cpp b/twin/clients/web/WebButton.cpp
index 3c96cac2d..785abe699 100644
--- a/twin/clients/web/WebButton.cpp
+++ b/twin/clients/web/WebButton.cpp
@@ -69,10 +69,10 @@ namespace Web {
     0xff, 0x81, 0x81, 0xff, 0x81, 0xff, 0x81, 0xff
   };
 
-WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape)
+WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool shape)
   : KCommonDecorationButton (type, parent, name),
     mouseOver_  (false),
-    tqshape_      (tqshape),
+    shape_      (shape),
     deco_       (parent)
 {
   setBackgroundMode(NoBackground);
@@ -127,7 +127,7 @@ void WebButton::reset(unsigned long changed)
 WebButton::enterEvent(TQEvent * e)
 {
   mouseOver_ = true;
-  tqrepaint();
+  repaint();
   TQButton::enterEvent(e);
 }
 
@@ -135,7 +135,7 @@ WebButton::enterEvent(TQEvent * e)
 WebButton::leaveEvent(TQEvent * e)
 {
   mouseOver_ = false;
-  tqrepaint();
+  repaint();
   TQButton::leaveEvent(e);
 }
 
@@ -174,7 +174,7 @@ WebButton::drawButton(TQPainter *p)
 
         p->drawLine(0, 0, width(), 0);
         p->drawLine(0, 1, 0, height() - 1);
-        if (tqshape_)
+        if (shape_)
         {
           p->drawPoint(3, 1);
           p->drawPoint(4, 1);
@@ -187,11 +187,11 @@ WebButton::drawButton(TQPainter *p)
         p->setBrush(NoBrush);
         p->setPen(highlightPen);
 
-        if (tqshape_)
+        if (shape_)
           p->setClipRegion(TQRegion(rect()) - TQRect(0, 0, 6, 6));
 
         p->drawRect(2, 2, width() - 4, height() - 4);
-        if (tqshape_)
+        if (shape_)
         {
           p->setClipRect(rect());
           p->drawPoint(4, 3);
@@ -210,7 +210,7 @@ WebButton::drawButton(TQPainter *p)
         p->setPen(Qt::black);
         p->drawLine(0, 0, width(), 0);
         p->drawLine(width() - 1, 1, width() - 1, height() - 1);
-        if (tqshape_)
+        if (shape_)
         {
           p->drawPoint(width() - 5, 1);
           p->drawPoint(width() - 4, 1);
@@ -223,11 +223,11 @@ WebButton::drawButton(TQPainter *p)
         p->setBrush(NoBrush);
         p->setPen(highlightPen);
 
-        if (tqshape_)
+        if (shape_)
           p->setClipRegion(TQRegion(rect()) - TQRect(width() - 6, 0, 6, 6));
 
         p->drawRect(2, 2, width() - 4, height() - 4);
-        if (tqshape_)
+        if (shape_)
         {
           p->setClipRect(rect());
           p->drawPoint(width() - 5, 3);
diff --git a/twin/clients/web/WebButton.h b/twin/clients/web/WebButton.h
index 108aa2a52..d86db6cc6 100644
--- a/twin/clients/web/WebButton.h
+++ b/twin/clients/web/WebButton.h
@@ -41,7 +41,7 @@ namespace Web
         Left, Mid, Right
       };
 
-      WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape);
+      WebButton(ButtonType type, WebClient *parent, const char *name, bool shape);
 
       virtual ~WebButton();
 
@@ -59,7 +59,7 @@ namespace Web
 
       bool mouseOver_;
 
-      bool tqshape_;
+      bool shape_;
       WebClient* deco_;
   };
 }
diff --git a/twin/events.cpp b/twin/events.cpp
index fc6b77988..72047bffc 100644
--- a/twin/events.cpp
+++ b/twin/events.cpp
@@ -626,9 +626,9 @@ bool Client::windowEvent( XEvent* e )
         default:
             if( e->xany.window == window())
             {
-            if( e->type == Shape::tqshapeEvent() )
+            if( e->type == Shape::shapeEvent() )
                 {
-                is_tqshape = Shape::hasShape( window()); // workaround for #19644
+                is_shape = Shape::hasShape( window()); // workaround for #19644
                 updateShape();
                 }
             }
diff --git a/twin/geometry.cpp b/twin/geometry.cpp
index 70ad90991..ab7311556 100644
--- a/twin/geometry.cpp
+++ b/twin/geometry.cpp
@@ -2637,7 +2637,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
             ( isResize() ? options->resizeMode : options->moveMode ) == Options::Transparent )
             {
             clearbound();  // it's necessary to move the geometry tip when there's no outline
-            positionGeometryTip(); // shown, otherwise it would cause tqrepaint problems in case
+            positionGeometryTip(); // shown, otherwise it would cause repaint problems in case
             drawbound( moveResizeGeom ); // they overlap; the paint event will come after this,
             }                               // so the geometry tip will be painted above the outline
         }
diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp
index 3f9a509b3..c686ac8c8 100644
--- a/twin/kcmtwin/twindecoration/buttons.cpp
+++ b/twin/kcmtwin/twindecoration/buttons.cpp
@@ -572,7 +572,7 @@ bool ButtonDropSite::removeSelectedButton()
 		delete m_selected;
 		m_selected = 0;
 		recalcItemGeometry();
-		update(); // tqrepaint...
+		update(); // repaint...
 	}
 
 	return succ;
diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp
index f5148b57c..573971f27 100644
--- a/twin/kcmtwin/twindecoration/preview.cpp
+++ b/twin/kcmtwin/twindecoration/preview.cpp
@@ -150,7 +150,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act
         }
     else
         {
-        TQMemArray< TQRect > rects = reg.tqrects();
+        TQMemArray< TQRect > rects = reg.rects();
         XRectangle* xrects = new XRectangle[ rects.count() ];
         for( unsigned int i = 0;
              i < rects.count();
@@ -166,7 +166,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act
         delete[] xrects;
         }
     if( active )
-        mask = reg; // keep tqshape of the active window for unobscuredRegion()
+        mask = reg; // keep shape of the active window for unobscuredRegion()
     }
 
 TQRect KDecorationPreview::windowGeometry( bool active ) const
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index db3a9fc48..b589d5005 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -151,7 +151,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who
     Rules* ret = new Rules;
     if( whole_app )
         {
-        ret->description = i18n( "Application settings for %1" ).tqarg( static_cast<const char *>(wmclass_class) );
+        ret->description = i18n( "Application settings for %1" ).arg( static_cast<const char *>(wmclass_class) );
         // TODO maybe exclude some types? If yes, then also exclude them above
         // when searching.
         ret->types = NET::AllTypesMask; 
@@ -175,7 +175,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who
             }
         return ret;
         }
-    ret->description = i18n( "Window settings for %1" ).tqarg( static_cast<const char *>(wmclass_class) );
+    ret->description = i18n( "Window settings for %1" ).arg( static_cast<const char *>(wmclass_class) );
     if( type == NET::Unknown )
         ret->types = NET::NormalMask;
     else
diff --git a/twin/killer/killer.cpp b/twin/killer/killer.cpp
index dc01e4178..ebd4fea90 100644
--- a/twin/killer/killer.cpp
+++ b/twin/killer/killer.cpp
@@ -71,7 +71,7 @@ int main( int argc, char* argv[] )
 	"<qt>Window with title \"<b>%2</b>\" is not responding. "
 	"This window belongs to application <b>%1</b> (PID=%3, hostname=%4).<p>"
 	"Do you wish to terminate this application? (All unsaved data in this application will be lost.)</qt>" )
-	.tqarg( appname ).tqarg( caption ).tqarg( pid ).tqarg( static_cast<const char *>(hostname) );
+	.arg( appname ).arg( caption ).arg( pid ).arg( static_cast<const char *>(hostname) );
     app.updateUserTimestamp( timestamp );
     if( KMessageBox::warningYesNoWId( id, question, TQString::null, i18n("Terminate"), i18n("Keep Running") ) == KMessageBox::Yes )
         {    
diff --git a/twin/layers.cpp b/twin/layers.cpp
index 773ea2d58..794d06636 100644
--- a/twin/layers.cpp
+++ b/twin/layers.cpp
@@ -87,7 +87,7 @@ void Workspace::updateClientLayer( Client* c )
     if( c->layer() == c->belongsToLayer())
         return;
     StackingUpdatesBlocker blocker( this );
-    c->invalidateLayer(); // tqinvalidate, will be updated when doing restacking
+    c->invalidateLayer(); // invalidate, will be updated when doing restacking
     for( ClientList::ConstIterator it = c->transients().begin();
          it != c->transients().end();
          ++it )
diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp
index c6f9abbbc..bd33e979f 100644
--- a/twin/lib/kcommondecoration.cpp
+++ b/twin/lib/kcommondecoration.cpp
@@ -684,7 +684,7 @@ void KCommonDecoration::resizeEvent(TQResizeEvent */*e*/)
 
     updateWindowShape();
     // FIXME: don't update() here! this would result in two paintEvent()s
-    // because there is already "something" else triggering the tqrepaint...
+    // because there is already "something" else triggering the repaint...
 //     widget()->update();
 }
 
diff --git a/twin/lib/kcommondecoration.h b/twin/lib/kcommondecoration.h
index a9161b762..bd55ffa0a 100644
--- a/twin/lib/kcommondecoration.h
+++ b/twin/lib/kcommondecoration.h
@@ -178,7 +178,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration
         /**
          * This updates the window mask using the information provided by
          * cornerShape(). Edges which are aligned to screen corners are not
-         * tqshaped for better usability (remember to paint these areas in paintEvent(), too).
+         * shaped for better usability (remember to paint these areas in paintEvent(), too).
          * You normally don't want/need to reimplement updateWindowShape().
          * @see cornerShape()
          */
diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h
index 17045025c..19fe494ed 100644
--- a/twin/lib/kdecoration.h
+++ b/twin/lib/kdecoration.h
@@ -481,15 +481,15 @@ class KWIN_EXPORT KDecoration
 	void performWindowOperation( WindowOperation op );
 	/**
 	 * If the decoration is non-rectangular, this function needs to be called
-	 * to set the tqshape of the decoration.
+	 * to set the shape of the decoration.
 	 *
-	 * @param reg  The tqshape of the decoration.
+	 * @param reg  The shape of the decoration.
 	 * @param mode The X11 values Unsorted, YSorted, YXSorted and YXBanded that specify
 	 *             the sorting of the rectangles, default value is Unsorted.
 	 */
         void setMask( const TQRegion& reg, int mode = 0 );
 	/**
-	 * This convenience function resets the tqshape mask.
+	 * This convenience function resets the shape mask.
 	 */
         void clearMask(); // convenience
 	/**
diff --git a/twin/lib/kdecorationfactory.h b/twin/lib/kdecorationfactory.h
index fb560c492..7396ad987 100644
--- a/twin/lib/kdecorationfactory.h
+++ b/twin/lib/kdecorationfactory.h
@@ -56,7 +56,7 @@ class KWIN_EXPORT KDecorationFactory
 	 * The argument specifies what has changed, using the SettingXXX masks.
 	 * It should be determined whether the decorations need to be completely
 	 * remade, in which case true should be returned, or whether only e.g.
-	 * a tqrepaint will be sufficient, in which case false should be returned,
+	 * a repaint will be sufficient, in which case false should be returned,
 	 * and resetDecorations() can be called to reset all decoration objects.
 	 * Note that true should be returned only when really necessary.
 	 */
diff --git a/twin/manage.cpp b/twin/manage.cpp
index 48a32dad7..2c6777153 100644
--- a/twin/manage.cpp
+++ b/twin/manage.cpp
@@ -319,7 +319,7 @@ bool Client::manage( Window w, bool isMapped )
         keepInArea( area, partial_keep_in_area );
 
     XShapeSelectInput( qt_xdisplay(), window(), ShapeNotifyMask );
-    is_tqshape = Shape::hasShape( window());
+    is_shape = Shape::hasShape( window());
     updateShape();
 	
     //CT extra check for stupid jdk 1.3.1. But should make sense in general
diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp
index 6f7ed5450..943ba6dc6 100644
--- a/twin/tabbox.cpp
+++ b/twin/tabbox.cpp
@@ -373,7 +373,7 @@ void TabBox::drawContents( TQPainter * )
     pix.fill(this, 0, 0);
 
     TQPainter p;
-    p.tqbegin(&pix, this);
+    p.begin(&pix, this);
 
     TQPixmap* menu_pix = twin_get_menu_pix_hack();
 
@@ -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().contains( pos ))
+    if( !geometry().contains( pos ))
         {
         workspace()->closeTabBox();  // click outside closes tab
         return;
diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp
index 59a6e6762..d89f773d0 100644
--- a/twin/tools/decobenchmark/main.cpp
+++ b/twin/tools/decobenchmark/main.cpp
@@ -40,7 +40,7 @@
 static KCmdLineOptions options[] =
 {
 	{ "+decoration", "Decoration library to use, such as twin3_plastik.", 0 },
-	{ "+tests", "Which test should be executed ('all', 'tqrepaint', 'caption', 'resize', 'recreation')", 0 },
+	{ "+tests", "Which test should be executed ('all', 'repaint', 'caption', 'resize', 'recreation')", 0 },
 	{ "+repetitions", "Number of test repetitions.", 0 },
 	{ 0, 0, 0 }
 };
@@ -117,7 +117,7 @@ int main(int argc, char** argv)
 	Tests test;
 	if (t == "all")
 		test = AllTests;
-	else if (t == "tqrepaint")
+	else if (t == "repaint")
 		test = RepaintTest;
 	else if (t == "caption")
 		test = CaptionTest;
diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp
index 7f8aa1e11..8154612ec 100644
--- a/twin/tools/decobenchmark/preview.cpp
+++ b/twin/tools/decobenchmark/preview.cpp
@@ -66,7 +66,7 @@ void KDecorationPreview::performRepaintTest(int n)
     deco->captionChange();
     positionPreviews(0);
     for (int i = 0; i < n; ++i) {
-        deco->widget()->tqrepaint();
+        deco->widget()->repaint();
         kapp->processEvents();
     }
 }
@@ -79,7 +79,7 @@ void KDecorationPreview::performCaptionTest(int n)
     for (int i = 0; i < n; ++i) {
         bridge->setCaption(caption.arg(i) );
         deco->captionChange();
-        deco->widget()->tqrepaint();
+        deco->widget()->repaint();
         kapp->processEvents();
     }
 }
diff --git a/twin/utils.cpp b/twin/utils.cpp
index 608b4bed3..d476c8932 100644
--- a/twin/utils.cpp
+++ b/twin/utils.cpp
@@ -46,11 +46,11 @@ namespace KWinInternal
 
 // used to store the return values of
 // XShapeQueryExtension.
-// Necessary since tqshaped window are an extension to X
-int Shape::twin_tqshape_version = 0;
-int Shape::twin_tqshape_event = 0;
+// Necessary since shaped window are an extension to X
+int Shape::twin_shape_version = 0;
+int Shape::twin_shape_event = 0;
 
-// does the window w  need a tqshape combine mask around it?
+// does the window w  need a shape combine mask around it?
 bool Shape::hasShape( WId w)
     {
     int xws, yws, xbs, ybs;
@@ -64,21 +64,21 @@ bool Shape::hasShape( WId w)
     return boundingShaped != 0;
     }
 
-int Shape::tqshapeEvent()
+int Shape::shapeEvent()
     {
-    return twin_tqshape_event;
+    return twin_shape_event;
     }
 
 void Shape::init()
     {
-    twin_tqshape_version = 0;
+    twin_shape_version = 0;
     int dummy;
-    if( !XShapeQueryExtension(qt_xdisplay(), &twin_tqshape_event, &dummy))
+    if( !XShapeQueryExtension(qt_xdisplay(), &twin_shape_event, &dummy))
         return;
     int major, minor;
     if( !XShapeQueryVersion( qt_xdisplay(), &major, &minor ))
         return;
-    twin_tqshape_version = major * 0x10 + minor;
+    twin_shape_version = major * 0x10 + minor;
     }
 
 void Motif::readFlags( WId w, bool& noborder, bool& resize, bool& move,
diff --git a/twin/utils.h b/twin/utils.h
index e8271e174..538a7c6b5 100644
--- a/twin/utils.h
+++ b/twin/utils.h
@@ -111,14 +111,14 @@ enum ShadeMode
 class Shape 
     {
     public:
-        static bool available() { return twin_tqshape_version > 0; }
-        static int version() { return twin_tqshape_version; } // as 16*major+minor, i.e. two hex digits
+        static bool available() { return twin_shape_version > 0; }
+        static int version() { return twin_shape_version; } // as 16*major+minor, i.e. two hex digits
         static bool hasShape( WId w);
-        static int tqshapeEvent();
+        static int shapeEvent();
         static void init();
     private:
-        static int twin_tqshape_version;
-        static int twin_tqshape_event;
+        static int twin_shape_version;
+        static int twin_shape_event;
     };
 
 // compile with XShape older than 1.0
diff --git a/twin/wm-spec/x351.html b/twin/wm-spec/x351.html
index 2e827fbc1..882f63fbf 100644
--- a/twin/wm-spec/x351.html
+++ b/twin/wm-spec/x351.html
@@ -97,10 +97,10 @@ NAME="AEN356"
 ></H2
 ><P
 >This spec suggests implementing the file manager desktop by mapping a
-desktop-sized window (no tqshape) to all desktops, with
+desktop-sized window (no shape) to all desktops, with
 _NET_WM_WINDOW_TYPE_DESKTOP.  This makes the desktop focusable and greatly
 simplifies implementation of the file manager.  It is also faster than
-managing lots of small tqshaped windows. The file manager draws the background
+managing lots of small shaped windows. The file manager draws the background
 on this window.  There should be a root property with a window handle for use
 in applications that want to draw the background (xearth).
 		</P
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index 93abd68bc..020224faf 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -1056,7 +1056,7 @@ void Workspace::slotReconfigure()
         topmenu_selection->release();
         lostTopMenuSelection();
         }
-    topmenu_height = 0; // tqinvalidate used menu height
+    topmenu_height = 0; // invalidate used menu height
     if( managingTopMenus())
         {
         updateTopMenuGeometry();
@@ -1938,7 +1938,7 @@ void Workspace::slotGrabWindow()
             int count, order;
             XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), active_client->frameId(),
                                                      ShapeBounding, &count, &order);
-	    //The ShapeBounding region is the outermost tqshape of the window;
+	    //The ShapeBounding region is the outermost shape of the window;
 	    //ShapeBounding - ShapeClipping is defined to be the border.
 	    //Since the border area is part of the window, we use bounding
 	    // to limit our work region
@@ -1956,7 +1956,7 @@ void Workspace::slotGrabWindow()
 
 		//Get the masked away area.
                 TQRegion maskedAway = bbox - contents;
-                TQMemArray<TQRect> maskedAwayRects = maskedAway.tqrects();
+                TQMemArray<TQRect> maskedAwayRects = maskedAway.rects();
 
 		//Construct a bitmap mask from the rectangles
                 TQBitmap mask( snapshot.width(), snapshot.height());