From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 04:10:07 +0000
Subject: Revert automated changes Sorry guys, they are just not ready for
 prime time Work will continue as always

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kwin/clients/PORTING                         |  22 ++--
 kwin/clients/b2/b2client.cpp                 | 128 +++++++++++-----------
 kwin/clients/b2/b2client.h                   |   6 +-
 kwin/clients/b2/bitmaps.h                    |   8 +-
 kwin/clients/b2/config/config.cpp            |   2 +-
 kwin/clients/b2/config/config.h              |   2 +-
 kwin/clients/default/kdedefault.cpp          |  60 +++++------
 kwin/clients/default/kdedefault.h            |   2 +-
 kwin/clients/keramik/config/keramikconfig.ui |   6 +-
 kwin/clients/keramik/embedtool.cpp           |   8 +-
 kwin/clients/keramik/keramik.cpp             | 152 +++++++++++++--------------
 kwin/clients/keramik/keramik.h               |   4 +-
 kwin/clients/kwmtheme/cli_installer/main.cpp |  16 +--
 kwin/clients/kwmtheme/kwmthemeclient.cpp     | 100 +++++++++---------
 kwin/clients/kwmtheme/kwmthemeclient.h       |   6 +-
 kwin/clients/laptop/laptopclient.cpp         |  56 +++++-----
 kwin/clients/laptop/laptopclient.h           |   2 +-
 kwin/clients/modernsystem/buttondata.h       |   6 +-
 kwin/clients/modernsystem/config/config.cpp  |  18 ++--
 kwin/clients/modernsystem/modernsys.cpp      |  64 +++++------
 kwin/clients/modernsystem/modernsys.h        |   2 +-
 kwin/clients/plastik/config/configdialog.ui  |   4 +-
 kwin/clients/plastik/misc.cpp                |  10 +-
 kwin/clients/plastik/plastik.cpp             |   6 +-
 kwin/clients/plastik/plastikbutton.cpp       |   4 +-
 kwin/clients/plastik/plastikclient.cpp       |  72 ++++++-------
 kwin/clients/plastik/plastikclient.h         |   2 +-
 kwin/clients/quartz/config/config.cpp        |   2 +-
 kwin/clients/quartz/config/config.h          |   2 +-
 kwin/clients/quartz/quartz.cpp               |  42 ++++----
 kwin/clients/quartz/quartz.h                 |   2 +-
 kwin/clients/redmond/redmond.cpp             |  20 ++--
 kwin/clients/redmond/redmond.h               |   2 +-
 kwin/clients/test/test.cpp                   |  20 ++--
 kwin/clients/test/test.h                     |   2 +-
 kwin/clients/web/Web.cpp                     |  92 ++++++++--------
 kwin/clients/web/Web.h                       |   6 +-
 kwin/clients/web/WebButton.cpp               |  28 ++---
 kwin/clients/web/WebButton.h                 |   6 +-
 39 files changed, 496 insertions(+), 496 deletions(-)

(limited to 'kwin/clients')

diff --git a/kwin/clients/PORTING b/kwin/clients/PORTING
index 3b4259e34..9a5fb9f6b 100644
--- a/kwin/clients/PORTING
+++ b/kwin/clients/PORTING
@@ -3,7 +3,7 @@ Also, the API is documented in the .h header files.
 
 Makefile.am:
 - Change kwin_ to kwin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES).
-- Make sure LDFLAGS tqcontains $(KDE_PLUGIN) and -module .
+- Make sure LDFLAGS contains $(KDE_PLUGIN) and -module .
 - Add -lkdecorations to LIBADD.
 - Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/kwin/ ).
 
@@ -66,7 +66,7 @@ bool MyClient::eventFilter( QObject* o, QEvent* e )
 	}
 }
 =====
-- In MyClient, 'this' will have to be often tqreplaced with 'widget()', pay special attention
+- In MyClient, 'this' will have to be often replaced with 'widget()', pay special attention
   to cases where this won't cause compile error (e.g. in connect() calls, which take QObject* ).
 - Also, many calls may need 'widget()->' prepended.
 - Layout is created in init(), so call createLayout() directly there (if it's implemented).
@@ -91,18 +91,18 @@ inline const KDecorationOptions* options() { return KDecoration::options(); }
   Make sure it doesn't reenter the event loop (no kapp->processEvents()).
 - Buttons should use explicit setCursor() if they don't want cursor set by mousePosition().
   I.e. usually call setCursor( ArrowCursor ) in your MyButton.
-- In the part where you insert windowWrapper() into the tqlayout, i.e. something like
+- In the part where you insert windowWrapper() into the layout, i.e. something like
 =====
-    tqlayout->addWidget( windowWrapper());
+    layout->addWidget( windowWrapper());
 =====
-  tqreplace it with something like
+  replace it with something like
 =====
     if( isPreview())
-        tqlayout->addWidget( new QLabel( i18n( "<center><b>MyDecoration</b></center>" ), widget()));
+        layout->addWidget( new QLabel( i18n( "<center><b>MyDecoration</b></center>" ), widget()));
     else
-        tqlayout->addItem( new QSpacerItem( 0, 0 ));
+        layout->addItem( new QSpacerItem( 0, 0 ));
 =====
-- Implement MyClient::tqminimumSize().
+- Implement MyClient::minimumSize().
 - Handling maximization - to change vertical or horizontal maximalization, use e.g.
   'maximize( maximizeMode() ^ MaximizeVertical', to change normal maximalization, i.e. after
   left-clicking on the button, use
@@ -120,7 +120,7 @@ inline const KDecorationOptions* options() { return KDecoration::options(); }
   check values like 'maximizeMode() == MaximizeFull && !options()->moveResizeMaximizedWindows()'
   to check whether you can disable some borders completely.
   Note that your painting code must of course match these sizes.
-- If your code uses XGrabServer() or XUnGrabServer(), tqreplace them with (un)grabXServer().
+- If your code uses XGrabServer() or XUnGrabServer(), replace them with (un)grabXServer().
 - In cases where you call some function from the KDecoration API that can possibly destroy
   the decoration (e.g. showWindowMenu() or closeWindow()), make sure to use exists() if some more
   code will follow this call. Refer to showWindowMenu() documentation for an example.
@@ -142,10 +142,10 @@ extern "C"
 =====
 - The reset handling has changed: There's no signal resetClients(), and no
   slotResetAllClientsDelayed(). If your MyClient has some slotReset(), make it
-  reset( unsigned long ), where the argument is tqmask of things that have changed ( SettingXYZ ).
+  reset( unsigned long ), where the argument is mask of things that have changed ( SettingXYZ ).
   If you have some global function that handles resetting, make it
   MyFactory::reset( unsigned long ). Try to minimize the effects of the changed things,
-  e.g. if only the color setting has changed, doing a tqrepaint is often enough, and there's no need
+  e.g. if only the color setting has changed, doing a repaint is often enough, and there's no need
   to recreate the decorations. If you need to recreate the decorations, return true
   from MyFactory::reset(), otherwise, you may call resetDecorations() to call reset() in all
   MyClient instances.
diff --git a/kwin/clients/b2/b2client.cpp b/kwin/clients/b2/b2client.cpp
index 0bd9a4535..97d049ffb 100644
--- a/kwin/clients/b2/b2client.cpp
+++ b/kwin/clients/b2/b2client.cpp
@@ -146,7 +146,7 @@ static void drawB2Rect(KPixmap *pix, const TQColor &primary, bool down)
     TQColor hColor = primary.light(150);
     TQColor lColor = primary.dark(150);
 
-    if (down) tqSwap(hColor, lColor);
+    if (down) qSwap(hColor, lColor);
 
     if (TQPixmap::defaultDepth() > 8) {
 	KPixmapEffect::gradient(*pix, hColor, lColor, 
@@ -199,40 +199,40 @@ static void create_pixmaps()
     }
 
     // there seems to be no way to load X bitmaps from data properly, so
-    // we need to create new ones for each tqmask :P
-    TQBitmap pinupMask(16, 16, pinup_tqmask_bits, true);
+    // we need to create new ones for each mask :P
+    TQBitmap pinupMask(16, 16, pinup_mask_bits, true);
     PIXMAP_A(P_PINUP)->setMask(pinupMask);
     PIXMAP_I(P_PINUP)->setMask(pinupMask);
-    TQBitmap pindownMask(16, 16, pindown_tqmask_bits, true);
+    TQBitmap pindownMask(16, 16, pindown_mask_bits, true);
     PIXMAP_AD(P_PINUP)->setMask(pindownMask);
     PIXMAP_ID(P_PINUP)->setMask(pindownMask);
 
-    TQBitmap menuMask(16, 16, menu_tqmask_bits, true);
+    TQBitmap menuMask(16, 16, menu_mask_bits, true);
     for (i = 0; i < NumStates; i++) 
 	pixmap[P_MENU * NumStates + i]->setMask(menuMask);
 
-    TQBitmap helpMask(16, 16, help_tqmask_bits, true);
+    TQBitmap helpMask(16, 16, help_mask_bits, true);
     for (i = 0; i < NumStates; i++) 
 	pixmap[P_HELP * NumStates + i]->setMask(helpMask);
 
     TQBitmap normalizeMask(16, 16, true);
-    // draw normalize icon tqmask
-    TQPainter tqmask;
-    tqmask.begin(&normalizeMask);
+    // draw normalize icon mask
+    TQPainter mask;
+    mask.begin(&normalizeMask);
 
     TQBrush one(Qt::color1);
-    tqmask.fillRect(normalizeMask.width() - 12, normalizeMask.height() - 12, 
+    mask.fillRect(normalizeMask.width() - 12, normalizeMask.height() - 12, 
 		  12, 12, one);
-    tqmask.fillRect(0, 0, 10, 10, one);
-    tqmask.end();
+    mask.fillRect(0, 0, 10, 10, one);
+    mask.end();
 
     for (i = 0; i < NumStates; i++) 
 	pixmap[P_NORMALIZE * NumStates + i]->setMask(normalizeMask);
     
     TQBitmap shadeMask(bsize, bsize, true);
-    tqmask.begin(&shadeMask);
-    tqmask.fillRect(0, 0, bsize, 6, one);
-    tqmask.end();
+    mask.begin(&shadeMask);
+    mask.fillRect(0, 0, bsize, 6, one);
+    mask.end();
     for (i = 0; i < NumStates; i++) 
 	pixmap[P_SHADE * NumStates + i]->setMask(shadeMask);
 
@@ -418,7 +418,7 @@ void B2Client::init()
 
     titleLayout->addSpacing(3);
 
-    TQColor c = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()).
+    TQColor c = options()->colorGroup(KDecoration::ColorTitleBar, isActive()).
         color(TQColorGroup::Button);
 
     for (int i = 0; i < BtnCount; i++) {
@@ -537,7 +537,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
@@ -578,7 +578,7 @@ void B2Client::calcHiddenButtons()
 void B2Client::resizeEvent(TQResizeEvent * /*e*/)
 {
     calcHiddenButtons();
-    titlebar->tqlayout()->activate();
+    titlebar->layout()->activate();
     positionButtons();
 
     /* may be the resize cut off some space occupied by titlebar, which
@@ -586,7 +586,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()
@@ -595,7 +595,7 @@ void B2Client::captionChange()
     titleMoveAbs(bar_x_ofs);
     doShape();
     titlebar->recalcBuffer();
-    titlebar->tqrepaint(false);
+    titlebar->repaint(false);
 }
 
 void B2Client::paintEvent(TQPaintEvent* e)
@@ -605,7 +605,7 @@ void B2Client::paintEvent(TQPaintEvent* e)
     KDecoration::ColorType frameColorGroup = colored_frame ?
 	KDecoration::ColorTitleBar : KDecoration::ColorFrame;
 
-    TQRect t = titlebar->tqgeometry();
+    TQRect t = titlebar->geometry();
 
     // Frame height, this is used a lot of times
     int fHeight = height() - t.height();
@@ -614,7 +614,7 @@ void B2Client::paintEvent(TQPaintEvent* e)
     int bb = mustDrawHandle() ? 4 : 0;
     int bDepth = thickness + bb;
 
-    TQColorGroup fillColor = options()->tqcolorGroup(frameColorGroup, isActive());
+    TQColorGroup fillColor = options()->colorGroup(frameColorGroup, isActive());
     TQBrush fillBrush(options()->color(frameColorGroup, isActive()));
 
     // outer frame rect
@@ -689,7 +689,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())
@@ -699,36 +699,36 @@ void B2Client::paintEvent(TQPaintEvent* e)
 
 void B2Client::doShape()
 {
-    TQRect t = titlebar->tqgeometry();
-    TQRegion tqmask(widget()->rect());
+    TQRect t = titlebar->geometry();
+    TQRegion mask(widget()->rect());
     // top to the tilebar right
     if (bar_x_ofs) {
 	// left from bar
-	tqmask -= TQRect(0, 0, bar_x_ofs, t.height() - thickness); 
+	mask -= TQRect(0, 0, bar_x_ofs, t.height() - thickness); 
 	// top left point
-	tqmask -= TQRect(0, t.height() - thickness, 1, 1); 
+	mask -= TQRect(0, t.height() - thickness, 1, 1); 
     }
     if (t.right() < width() - 1) {
-	tqmask -= TQRect(width() - 1,
+	mask -= TQRect(width() - 1,
 		t.height() - thickness, 1, 1); //top right point
-	tqmask -= TQRect(t.right() + 1, 0,
+	mask -= TQRect(t.right() + 1, 0,
 		width() - t.right() - 1, t.height() - thickness);
     }
     // bottom right point
-    tqmask -= TQRect(width() - 1, height() - 1, 1, 1); 
+    mask -= TQRect(width() - 1, height() - 1, 1, 1); 
     if (mustDrawHandle()) {
 	// bottom left point
-	tqmask -= TQRect(0, height() - 5, 1, 1); 
+	mask -= TQRect(0, height() - 5, 1, 1); 
 	// handle left point
-	tqmask -= TQRect(width() - 40, height() - 1, 1, 1);
+	mask -= TQRect(width() - 40, height() - 1, 1, 1);
 	// bottom left 
-	tqmask -= TQRect(0, height() - 4, width() - 40, 4);
+	mask -= TQRect(0, height() - 4, width() - 40, 4);
     } else {
 	// bottom left point
-	tqmask -= TQRect(0, height() - 1, 1, 1); 
+	mask -= TQRect(0, height() - 1, 1, 1); 
     }
 
-    setMask(tqmask);
+    setMask(mask);
 }
 
 void B2Client::showEvent(TQShowEvent *)
@@ -741,7 +741,7 @@ void B2Client::showEvent(TQShowEvent *)
 KDecoration::Position B2Client::mousePosition(const TQPoint& p) const
 {
     const int range = 16;
-    TQRect t = titlebar->tqgeometry();
+    TQRect t = titlebar->geometry();
     t.setHeight(buttonSize + 4 - thickness);
     int ly = t.bottom();
     int lx = t.right();
@@ -794,8 +794,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);
     }
 }
 
@@ -820,7 +820,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"));
@@ -830,21 +830,21 @@ 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()->tqcolorGroup(
+    TQColor c = options()->colorGroup(
 	    KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button);
 
     for (int i = 0; i < BtnCount; i++)
         if (button[i]) {
            button[i]->setBg(c);
-           button[i]->tqrepaint(false);
+           button[i]->repaint(false);
         }
 }
 
@@ -860,7 +860,7 @@ void B2Client::shadeChange()
     }
 }
 
-TQSize B2Client::tqminimumSize() const
+TQSize B2Client::minimumSize() const
 {
     int left, right, top, bottom;
     borders(left, right, top, bottom);
@@ -918,7 +918,7 @@ void B2Client::unobscureTitlebar()
 {
     /* we just noticed, that we got obscured by other windows
        so we look at all windows above us (stacking_order) merging their
-       tqmasks, intersecting it with our titlebar area, and see if we can
+       masks, intersecting it with our titlebar area, and see if we can
        find a place not covered by any window */
     if (in_unobs) {
 	return;
@@ -939,8 +939,8 @@ void B2Client::unobscureTitlebar()
 static void redraw_pixmaps()
 {
     int i;
-    TQColorGroup aGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, true);
-    TQColorGroup iGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
+    TQColorGroup aGrp = options()->colorGroup(KDecoration::ColorButtonBg, true);
+    TQColorGroup iGrp = options()->colorGroup(KDecoration::ColorButtonBg, false);
 
     // close
     drawB2Rect(PIXMAP_A(P_CLOSE), aGrp.button(), false);
@@ -1096,7 +1096,7 @@ void B2Client::positionButtons()
         cap = "XXXXX";    // area for dragging the window
     int textLen = fm.width(cap);
 
-    TQRect t = titlebar->captionSpacer->tqgeometry();
+    TQRect t = titlebar->captionSpacer->geometry();
     int titleWidth = titlebar->width() - t.width() + textLen + 2;
     if (titleWidth > width()) titleWidth = width();
 
@@ -1107,7 +1107,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)
 {
@@ -1117,7 +1117,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
 
     if (!visible_bound) {
 	visible_bound = new TQRect(geom);
-	TQRect t = titlebar->tqgeometry();
+	TQRect t = titlebar->geometry();
 	int frameTop = geom.top() + t.bottom();
 	int barLeft = geom.left() + bar_x_ofs;
 	int barRight = barLeft + t.width() - 1;
@@ -1132,7 +1132,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(),
@@ -1147,7 +1147,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear)
     TQPainter p(workspaceWidget());
     p.setPen(TQPen(Qt::white, 5));
     p.setRasterOp(Qt::XorROP);
-    p.drawPolygon(bound_tqshape);
+    p.drawPolygon(bound_shape);
 
     if (clear) {
 	delete visible_bound;
@@ -1201,7 +1201,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent,
 }
 
 
-TQSize B2Button::tqsizeHint() const
+TQSize B2Button::sizeHint() const
 {
     return TQSize(buttonSize, buttonSize);
 }
@@ -1252,7 +1252,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)
@@ -1276,14 +1276,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);
 }
 
@@ -1292,7 +1292,7 @@ void B2Button::leaveEvent(TQEvent *e)
 B2Titlebar::B2Titlebar(B2Client *parent)
     : TQWidget(parent->widget(), 0, WStyle_Customize | WRepaintNoErase),
       client(parent),
-      set_x11tqmask(false), isfullyobscured(false), shift_move(false)
+      set_x11mask(false), isfullyobscured(false), shift_move(false)
 {
     setBackgroundMode(NoBackground);
     captionSpacer = new TQSpacerItem(buttonSize, buttonSize + 4,
@@ -1301,8 +1301,8 @@ B2Titlebar::B2Titlebar(B2Client *parent)
 
 bool B2Titlebar::x11Event(XEvent *e)
 {
-    if (!set_x11tqmask) {
-	set_x11tqmask = true;
+    if (!set_x11mask) {
+	set_x11mask = true;
 	XSelectInput(qt_xdisplay(), winId(),
 	    KeyPressMask | KeyReleaseMask |
 	    ButtonPressMask | ButtonReleaseMask |
@@ -1342,7 +1342,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state)
 
     // titlebar fill
     const TQColorGroup cg =
-	options()->tqcolorGroup(KDecoration::ColorTitleBar, state);
+	options()->colorGroup(KDecoration::ColorTitleBar, state);
     TQBrush brush(cg.background());
     if (gradient) brush.setPixmap(*gradient);
     qDrawShadeRect(&p, 1, 1, t.right() - 1, t.height() - 1,
@@ -1351,7 +1351,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state)
     // and the caption
     p.setPen(options()->color(KDecoration::ColorFont, state));
     p.setFont(options()->font(state));
-    t = captionSpacer->tqgeometry();
+    t = captionSpacer->geometry();
     p.drawText(t, AlignLeft | AlignVCenter, client->caption());
 }
 
@@ -1367,7 +1367,7 @@ void B2Titlebar::recalcBuffer()
 void B2Titlebar::resizeEvent(TQResizeEvent *)
 {
     recalcBuffer();
-    tqrepaint(false);
+    repaint(false);
 }
 
 
@@ -1391,7 +1391,7 @@ void B2Titlebar::mouseDoubleClickEvent(TQMouseEvent *e)
 
 void B2Titlebar::wheelEvent(TQWheelEvent *e)
 {
-    if (client->isSetShade() || rect().tqcontains(e->pos())) 
+    if (client->isSetShade() || rect().contains(e->pos())) 
 	client->titlebarMouseWheelOperation( e->delta());
 }
 
diff --git a/kwin/clients/b2/b2client.h b/kwin/clients/b2/b2client.h
index 4439bf1a1..198dfbb9b 100644
--- a/kwin/clients/b2/b2client.h
+++ b/kwin/clients/b2/b2client.h
@@ -38,7 +38,7 @@ public:
     void setToggle(){setToggleType(Toggle);}
     void setActive(bool on){setOn(on);}
     void setUseMiniIcon(){useMiniIcon = true;}
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
     TQSizePolicy sizePolicy() const;
 protected:
     virtual void drawButton(TQPainter *p);
@@ -86,7 +86,7 @@ private:
     TQString oldTitle;
     KPixmap titleBuffer;
     TQPoint moveOffset;
-    bool set_x11tqmask;
+    bool set_x11mask;
     bool isfullyobscured;
     bool shift_move;
 };
@@ -119,7 +119,7 @@ protected:
     Position mousePosition( const TQPoint& p ) const;
     void resize(const TQSize&);
     void borders(int &, int &, int &, int &) const;
-    TQSize tqminimumSize() const;
+    TQSize minimumSize() const;
     bool eventFilter(TQObject *, TQEvent *);
 private slots:
     void menuButtonPressed();
diff --git a/kwin/clients/b2/bitmaps.h b/kwin/clients/b2/bitmaps.h
index f521de292..2f610f4b2 100644
--- a/kwin/clients/b2/bitmaps.h
+++ b/kwin/clients/b2/bitmaps.h
@@ -28,7 +28,7 @@ static const unsigned char menu_dgray_bits[] = {
   0x00, 0x00, 0x00, 0x20, 0xf8, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-static const unsigned char menu_tqmask_bits[] = {
+static const unsigned char menu_mask_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0xfc, 0x3f, 0x04, 0x20, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -48,7 +48,7 @@ static const unsigned char pindown_dgray_bits[] = {
   0x48, 0x30, 0xc8, 0x38, 0x08, 0x1f, 0x08, 0x18, 0x10, 0x1c, 0x10, 0x0e,
   0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-static const unsigned char pindown_tqmask_bits[] = {
+static const unsigned char pindown_mask_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x1f, 0xf0, 0x3f, 0xf0, 0x3f,
   0xf8, 0x3f, 0xf8, 0x3f, 0xf8, 0x1f, 0xf8, 0x1f, 0xf0, 0x1f, 0xf0, 0x0f,
   0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -68,12 +68,12 @@ static const unsigned char pinup_dgray_bits[] = {
   0x40, 0x20, 0x40, 0x20, 0x7f, 0x2a, 0x40, 0x3f, 0xc0, 0x31, 0xc0, 0x20,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-static const unsigned char pinup_tqmask_bits[] = {
+static const unsigned char pinup_mask_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xc0, 0x31, 0xc0, 0x3f,
   0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xc0, 0x3f, 0xc0, 0x31, 0xc0, 0x20,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-static const unsigned char help_tqmask_bits[] = {
+static const unsigned char help_mask_bits[] = {
  0x00,0x00,0x00,0x00,0xe0,0x03,0xf0,0x07,0x70,0x0e,0x60,0x0e,0x00,0x0f,0x80,
  0x07,0xc0,0x03,0xc0,0x01,0x80,0x01,0xc0,0x00,0xc0,0x01,0x80,0x01,0x00,0x00,
  0x00,0x00,0x00,0x00,0x00,0x4c,0x0b,0x08,0x58,0x65,0x09,0x08,0x90,0x00,0x00,
diff --git a/kwin/clients/b2/config/config.cpp b/kwin/clients/b2/config/config.cpp
index 3a42b9eba..ca1dccc65 100644
--- a/kwin/clients/b2/config/config.cpp
+++ b/kwin/clients/b2/config/config.cpp
@@ -1,5 +1,5 @@
 /*
- *	This file tqcontains the B2 configuration widget
+ *	This file contains the B2 configuration widget
  *
  *	Copyright (c) 2001
  *		Karol Szwed <gallium@kde.org>
diff --git a/kwin/clients/b2/config/config.h b/kwin/clients/b2/config/config.h
index cf8c95736..92c255ae6 100644
--- a/kwin/clients/b2/config/config.h
+++ b/kwin/clients/b2/config/config.h
@@ -1,5 +1,5 @@
 /* 	
- *	This file tqcontains the B2 configuration widget
+ *	This file contains the B2 configuration widget
  *
  *	Copyright (c) 2001
  *		Karol Szwed <gallium@kde.org>
diff --git a/kwin/clients/default/kdedefault.cpp b/kwin/clients/default/kdedefault.cpp
index 0feb00725..d91ccf56b 100644
--- a/kwin/clients/default/kdedefault.cpp
+++ b/kwin/clients/default/kdedefault.cpp
@@ -89,7 +89,7 @@ static const unsigned char pindown_dgray_bits[] = {
   0x48, 0x30, 0xc8, 0x38, 0x08, 0x1f, 0x08, 0x18, 0x10, 0x1c, 0x10, 0x0e,
   0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-static const unsigned char pindown_tqmask_bits[] = {
+static const unsigned char pindown_mask_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x1f, 0xf0, 0x3f, 0xf0, 0x3f,
   0xf8, 0x3f, 0xf8, 0x3f, 0xf8, 0x1f, 0xf8, 0x1f, 0xf0, 0x1f, 0xf0, 0x0f,
   0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -109,7 +109,7 @@ static const unsigned char pinup_dgray_bits[] = {
   0x40, 0x20, 0x40, 0x20, 0x7f, 0x2a, 0x40, 0x3f, 0xc0, 0x31, 0xc0, 0x20,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-static const unsigned char pinup_tqmask_bits[] = {
+static const unsigned char pinup_mask_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xc0, 0x31, 0xc0, 0x3f,
   0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xc0, 0x3f, 0xc0, 0x31, 0xc0, 0x20,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -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;
@@ -263,28 +263,28 @@ void KDEDefaultHandler::createPixmaps()
 	if (showTitleBarStipple)
 	{
 		TQPainter p;
-		TQPainter tqmaskPainter;
+		TQPainter maskPainter;
 		int i, x, y;
 		titlePix = new TQPixmap(132, normalTitleHeight+2);
-		TQBitmap tqmask(132, normalTitleHeight+2);
-		tqmask.fill(Qt::color0);
+		TQBitmap mask(132, normalTitleHeight+2);
+		mask.fill(Qt::color0);
 
 		p.begin(titlePix);
-		tqmaskPainter.begin(&tqmask);
-		tqmaskPainter.setPen(Qt::color1);
+		maskPainter.begin(&mask);
+		maskPainter.setPen(Qt::color1);
 		for(i=0, y=2; i < 9; ++i, y+=4)
 			for(x=1; x <= 132; x+=3)
 			{
 				p.setPen(options()->color(ColorTitleBar, true).light(150));
 				p.drawPoint(x, y);
-				tqmaskPainter.drawPoint(x, y);
+				maskPainter.drawPoint(x, y);
 				p.setPen(options()->color(ColorTitleBar, true).dark(150));
 				p.drawPoint(x+1, y+1);
-				tqmaskPainter.drawPoint(x+1, y+1);
+				maskPainter.drawPoint(x+1, y+1);
 			}
-		tqmaskPainter.end();
+		maskPainter.end();
 		p.end();
-		titlePix->setMask(tqmask);
+		titlePix->setMask(mask);
 	} else
 		titlePix = NULL;
 
@@ -328,14 +328,14 @@ void KDEDefaultHandler::createPixmaps()
 	TQPainter p;
 
 	// Active pins
-	g = options()->tqcolorGroup( ColorButtonBg, true );
+	g = options()->colorGroup( ColorButtonBg, true );
 	pinUpPix  = new KPixmap();
 	pinUpPix->resize(16, 16);
 	p.begin( pinUpPix );
 	kColorBitmaps( &p, g, 0, 0, 16, 16, true, pinup_white_bits,
 		pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL );
 	p.end();
-	pinUpPix->setMask( TQBitmap(16, 16, pinup_tqmask_bits, true) );
+	pinUpPix->setMask( TQBitmap(16, 16, pinup_mask_bits, true) );
 
 	pinDownPix = new KPixmap();
 	pinDownPix->resize(16, 16);
@@ -343,17 +343,17 @@ void KDEDefaultHandler::createPixmaps()
 	kColorBitmaps( &p, g, 0, 0, 16, 16, true, pindown_white_bits,
 		pindown_gray_bits, NULL, NULL, pindown_dgray_bits, NULL );
 	p.end();
-	pinDownPix->setMask( TQBitmap(16, 16, pindown_tqmask_bits, true) );
+	pinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) );
 
 	// Inactive pins
-	g = options()->tqcolorGroup( ColorButtonBg, false );
+	g = options()->colorGroup( ColorButtonBg, false );
 	ipinUpPix = new KPixmap();
 	ipinUpPix->resize(16, 16);
 	p.begin( ipinUpPix );
 	kColorBitmaps( &p, g, 0, 0, 16, 16, true, pinup_white_bits,
 		pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL );
 	p.end();
-	ipinUpPix->setMask( TQBitmap(16, 16, pinup_tqmask_bits, true) );
+	ipinUpPix->setMask( TQBitmap(16, 16, pinup_mask_bits, true) );
 
 	ipinDownPix = new KPixmap();
 	ipinDownPix->resize(16, 16);
@@ -361,7 +361,7 @@ void KDEDefaultHandler::createPixmaps()
 	kColorBitmaps( &p, g, 0, 0, 16, 16, true, pindown_white_bits,
 		pindown_gray_bits, NULL, NULL, pindown_dgray_bits, NULL );
 	p.end();
-	ipinDownPix->setMask( TQBitmap(16, 16, pindown_tqmask_bits, true) );
+	ipinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) );
 
 	// Create a title buffer for flicker-free painting
 	titleBuffer = new KPixmap();
@@ -404,25 +404,25 @@ void KDEDefaultHandler::createPixmaps()
 	irightBtnDownPix[false]->resize(toolTitleHeight, toolTitleHeight);
 
 	// Draw the button state pixmaps
-	g = options()->tqcolorGroup( ColorTitleBar, true );
+	g = options()->colorGroup( ColorTitleBar, true );
 	drawButtonBackground( leftBtnUpPix[true], g, false );
 	drawButtonBackground( leftBtnDownPix[true], g, true );
 	drawButtonBackground( leftBtnUpPix[false], g, false );
 	drawButtonBackground( leftBtnDownPix[false], g, true );
 
-	g = options()->tqcolorGroup( ColorButtonBg, true );
+	g = options()->colorGroup( ColorButtonBg, true );
 	drawButtonBackground( rightBtnUpPix[true], g, false );
 	drawButtonBackground( rightBtnDownPix[true], g, true );
 	drawButtonBackground( rightBtnUpPix[false], g, false );
 	drawButtonBackground( rightBtnDownPix[false], g, true );
 
-	g = options()->tqcolorGroup( ColorTitleBar, false );
+	g = options()->colorGroup( ColorTitleBar, false );
 	drawButtonBackground( ileftBtnUpPix[true], g, false );
 	drawButtonBackground( ileftBtnDownPix[true], g, true );
 	drawButtonBackground( ileftBtnUpPix[false], g, false );
 	drawButtonBackground( ileftBtnDownPix[false], g, true );
 
-	g = options()->tqcolorGroup( ColorButtonBg, false );
+	g = options()->colorGroup( ColorButtonBg, false );
 	drawButtonBackground( irightBtnUpPix[true], g, false );
 	drawButtonBackground( irightBtnDownPix[true], g, true );
 	drawButtonBackground( irightBtnUpPix[false], g, false );
@@ -676,7 +676,7 @@ void KDEDefaultButton::drawButton(TQPainter *p)
 	// otherwise we paint a menu button (with mini icon), or a sticky button.
 	if( deco ) {
 		// Select the appropriate button decoration color
-   		bool darkDeco = tqGray( KDecoration::options()->color(
+   		bool darkDeco = qGray( KDecoration::options()->color(
 				isLeft() ? KDecoration::ColorTitleBar : KDecoration::ColorButtonBg,
 				active).rgb() ) > 127;
 
@@ -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);
 }
 
@@ -771,7 +771,7 @@ bool KDEDefaultClient::decorationBehaviour(DecorationBehaviour behaviour) const
 	}
 }
 
-int KDEDefaultClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
+int KDEDefaultClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
 {
 	switch (lm) {
 		case LM_BorderLeft:
@@ -810,7 +810,7 @@ int KDEDefaultClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, c
 				return borderWidth/2;
 			// fall though
 		default:
-			return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn);
+			return KCommonDecoration::layoutMetric(lm, respectWindowState, btn);
 	}
 }
 
@@ -856,7 +856,7 @@ void KDEDefaultClient::init()
 
 void KDEDefaultClient::reset( unsigned long changed)
 {
-    widget()->tqrepaint();
+    widget()->repaint();
 
 	KCommonDecoration::reset(changed);
 }
@@ -909,7 +909,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* )
 	p.drawRect(x,y,w,h);
 
     // Draw part of the frame that is the titlebar color
-	g = options()->tqcolorGroup(ColorTitleBar, isActive());
+	g = options()->colorGroup(ColorTitleBar, isActive());
 	p.setPen(g.light());
 	p.drawLine(x+1, y+1, rightOffset-1, y+1);
 	p.drawLine(x+1, y+1, x+1, leftFrameStart+borderWidth-4);
@@ -929,7 +929,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* )
 	p.drawLine(x+borderWidth-2, y+titleHeight+3, x+borderWidth-2, leftFrameStart-2);
 
     // Fill out the border edges
-    g = options()->tqcolorGroup(ColorFrame, isActive());
+    g = options()->colorGroup(ColorFrame, isActive());
     p.setPen(g.light());
     p.drawLine(rightOffset, y+1, x2-1, y+1);
     p.drawLine(x+1, leftFrameStart+borderWidth-3, x+1, y2-1);
diff --git a/kwin/clients/default/kdedefault.h b/kwin/clients/default/kdedefault.h
index 6dfaf6ac8..70b8847fa 100644
--- a/kwin/clients/default/kdedefault.h
+++ b/kwin/clients/default/kdedefault.h
@@ -80,7 +80,7 @@ class KDEDefaultClient : public KCommonDecoration
 		virtual TQString defaultButtonsLeft() const;
 		virtual TQString defaultButtonsRight() const;
 		virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
-		virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
+		virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
 		virtual KCommonDecorationButton *createButton(ButtonType type);
 
 		virtual TQRegion cornerShape(WindowCorner corner);
diff --git a/kwin/clients/keramik/config/keramikconfig.ui b/kwin/clients/keramik/config/keramikconfig.ui
index 6f7d84e90..f074a00b8 100644
--- a/kwin/clients/keramik/config/keramikconfig.ui
+++ b/kwin/clients/keramik/config/keramikconfig.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KeramikConfigUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -71,6 +71,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kwin/clients/keramik/embedtool.cpp b/kwin/clients/keramik/embedtool.cpp
index fe34ffcb4..4f5135a3f 100644
--- a/kwin/clients/keramik/embedtool.cpp
+++ b/kwin/clients/keramik/embedtool.cpp
@@ -60,7 +60,7 @@ private:
 
 KeramikEmbedder::KeramikEmbedder()
 {
-	TQDateTime date( TQDateTime::tqcurrentDateTime() );
+	TQDateTime date( TQDateTime::currentDateTime() );
 	TQString datestring( date.toString() );
 	
 	file = new TQFile( "tiles.h" );
@@ -100,19 +100,19 @@ 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 );
 	stream.fill( '0' );
 	
 	int pixels = image.width() * image.height();
-	TQ_UINT32 *data = reinterpret_cast<TQ_UINT32*>( image.bits() );
+	Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( image.bits() );
 	bool hasAlpha = false;
 
 	
 	for ( int i = 0, j = 0; i < pixels; i++ ) {
-		if ( tqAlpha( *data ) && tqAlpha( *data ) != 0xff )
+		if ( qAlpha( *data ) && qAlpha( *data ) != 0xff )
 			hasAlpha = true;
 		
 		stream << "0x" << qSetW(8) << *(data++);
diff --git a/kwin/clients/keramik/keramik.cpp b/kwin/clients/keramik/keramik.cpp
index 64592a3cd..48a187098 100644
--- a/kwin/clients/keramik/keramik.cpp
+++ b/kwin/clients/keramik/keramik.cpp
@@ -62,7 +62,7 @@ namespace Keramik
 	const int buttonSpacing    =  4;  // Spacing between the titlebar buttons
 	const int iconSpacing      =  5;  // Spacing between the icon and the text label
 
-	// Default button tqlayout
+	// Default button layout
 	const char default_left[]  = "M";
 	const char default_right[] = "HIAX";
 
@@ -201,7 +201,7 @@ KeramikHandler::KeramikHandler()
 	buttonDecos[ ShadeOn ]          = new TQBitmap( 17, 17, shade_on_bits,   true );
 	buttonDecos[ ShadeOff ]         = new TQBitmap( 17, 17, shade_off_bits,  true );
 
-	// Selftqmask the bitmaps
+	// Selfmask the bitmaps
 	for ( int i = 0; i < NumButtonDecos; i++ )
 		buttonDecos[i]->setMask( *buttonDecos[i] );
 
@@ -585,39 +585,39 @@ TQPixmap *KeramikHandler::composite( TQImage *over, TQImage *under )
 	int width = over->width(), height = over->height();
 
 	// Clear the destination image
-	TQ_UINT32 *data = reinterpret_cast<TQ_UINT32*>( dest.bits() );
+	Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( dest.bits() );
 	for (int i = 0; i < width * height; i++)
 		*(data++) = 0;
 
 	// Copy the under image (bottom aligned) to the destination image
 	for (int y1 = height - under->height(), y2 = 0; y1 < height; y1++, y2++ )
 	{
-		register TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( dest.scanLine(y1) );
-		register TQ_UINT32 *src = reinterpret_cast<TQ_UINT32*>( under->scanLine(y2) );
+		register Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( dest.scanLine(y1) );
+		register Q_UINT32 *src = reinterpret_cast<Q_UINT32*>( under->scanLine(y2) );
 
 		for ( int x = 0; x < width; x++ )
 			*(dst++) = *(src++);
 	}
 
 	// Blend the over image onto the destination
-	register TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( dest.bits() );
-	register TQ_UINT32 *src = reinterpret_cast<TQ_UINT32*>( over->bits() );
+	register Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( dest.bits() );
+	register Q_UINT32 *src = reinterpret_cast<Q_UINT32*>( over->bits() );
 	for ( int i = 0; i < width * height; i++ )
 	{
-		int r1 = tqRed( *dst ), g1 = tqGreen( *dst ), b1 = tqBlue( *dst );
-		int r2 = tqRed( *src ), g2 = tqGreen( *src ), b2 = tqBlue( *src );
-		int a  = tqAlpha( *src );
+		int r1 = qRed( *dst ), g1 = qGreen( *dst ), b1 = qBlue( *dst );
+		int r2 = qRed( *src ), g2 = qGreen( *src ), b2 = qBlue( *src );
+		int a  = qAlpha( *src );
 
 		if ( a == 0xff )
 			*dst = *src;
 
 		else if ( a != 0x00 )
-			*dst = tqRgba( TQ_UINT8( r1 + (((r2 - r1) * a) >> 8) ),
-		                  TQ_UINT8( g1 + (((g2 - g1) * a) >> 8) ),
-		                  TQ_UINT8( b1 + (((b2 - b1) * a) >> 8) ),
+			*dst = qRgba( Q_UINT8( r1 + (((r2 - r1) * a) >> 8) ),
+		                  Q_UINT8( g1 + (((g2 - g1) * a) >> 8) ),
+		                  Q_UINT8( b1 + (((b2 - b1) * a) >> 8) ),
 		                  0xff );
 
-		else if ( tqAlpha(*dst) == 0x00 )
+		else if ( qAlpha(*dst) == 0x00 )
 			*dst = 0;
 
 		src++; dst++;
@@ -783,7 +783,7 @@ void KeramikButton::enterEvent( TQEvent *e )
 	TQButton::enterEvent( e );
 
 	hover = true;
-	tqrepaint( false );
+	repaint( false );
 }
 
 
@@ -792,7 +792,7 @@ void KeramikButton::leaveEvent( TQEvent *e )
 	TQButton::leaveEvent( e );
 
 	hover = false;
-	tqrepaint( false );
+	repaint( false );
 }
 
 
@@ -831,14 +831,14 @@ void KeramikButton::drawButton( TQPainter *p )
 
 	if ( isDown() ) {
 		// Pressed
-		p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(2*size, 0, size, size), pix->rect() ) );
+		p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(2*size, 0, size, size), pix->rect() ) );
 		p->translate( TQApplication::reverseLayout() ? -1 : 1,  1 );
 	} else if ( hover )
 		// Mouse over
-		p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(size, 0, size, size), pix->rect() ) );
+		p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(size, 0, size, size), pix->rect() ) );
 	else
 		// Normal
-		p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(0, 0, size, size), pix->rect() ) );
+		p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(0, 0, size, size), pix->rect() ) );
 
 
 	// Draw the button deco on the bevel
@@ -900,7 +900,7 @@ void KeramikButton::drawButton( TQPainter *p )
 
 KeramikClient::KeramikClient( KDecorationBridge* bridge, KDecorationFactory* factory )
 		: KDecoration( bridge, factory ),
-		activeIcon( NULL ), inactiveIcon( NULL ), captionBufferDirty( true ), tqmaskDirty( true )
+		activeIcon( NULL ), inactiveIcon( NULL ), captionBufferDirty( true ), maskDirty( true )
 {
 }
 
@@ -987,7 +987,7 @@ void KeramikClient::reset( unsigned long )
 			largeTitlebar = true;
 			largeCaption = isActive();
 
-			widget()->tqlayout()->activate();
+			widget()->layout()->activate();
 
 			// Compensate for the titlebar size change
 
@@ -1002,7 +1002,7 @@ void KeramikClient::reset( unsigned long )
 		topSpacer->changeSize( 10, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
 		largeTitlebar = largeCaption = false;
 
-		widget()->tqlayout()->activate();
+		widget()->layout()->activate();
 
 		// Compensate for the titlebar size change
 		// FRAME
@@ -1011,20 +1011,20 @@ void KeramikClient::reset( unsigned long )
 
 	calculateCaptionRect();
 
-	captionBufferDirty = tqmaskDirty = true;
+	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 );
 	}
 }
 
 
-void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s )
+void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s )
 {
 	for ( uint i=0; i < s.length(); i++ )
 	{
@@ -1035,7 +1035,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s )
 				if ( !button[MenuButton] ) {
 					button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), LeftButton|RightButton );
 					connect( button[MenuButton], TQT_SIGNAL( pressed() ), TQT_SLOT( menuButtonPressed() ) );
-					tqlayout->addWidget( button[MenuButton] );
+					layout->addWidget( button[MenuButton] );
 				}
 				break;
 
@@ -1047,7 +1047,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s )
 					if(isOnAllDesktops())
 						button[OnAllDesktopsButton]->toggle();
 					connect( button[OnAllDesktopsButton], TQT_SIGNAL( clicked() ), TQT_SLOT( toggleOnAllDesktops() ) );
-					tqlayout->addWidget( button[OnAllDesktopsButton] );
+					layout->addWidget( button[OnAllDesktopsButton] );
 				}
 				break;
 
@@ -1056,7 +1056,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s )
 				if ( !button[HelpButton] && providesContextHelp() ) {
 					button[HelpButton] = new KeramikButton( this, "help", HelpButton, i18n("Help") );
 					connect( button[HelpButton], TQT_SIGNAL( clicked() ), TQT_SLOT( showContextHelp() ) );
-					tqlayout->addWidget( button[HelpButton] );
+					layout->addWidget( button[HelpButton] );
 				}
 				break;
 
@@ -1065,7 +1065,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s )
 				if ( !button[MinButton] && isMinimizable() ) {
 					button[MinButton] = new KeramikButton( this, "minimize", MinButton, i18n("Minimize") );
 					connect( button[MinButton], TQT_SIGNAL( clicked() ), TQT_SLOT( minimize() ) );
-					tqlayout->addWidget( button[MinButton] );
+					layout->addWidget( button[MinButton] );
 				}
 				break;
 
@@ -1074,7 +1074,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s )
 				if ( !button[MaxButton] && isMaximizable() ) {
 					button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), LeftButton|MidButton|RightButton );
 					connect( button[MaxButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotMaximize() ) );
-					tqlayout->addWidget( button[MaxButton] );
+					layout->addWidget( button[MaxButton] );
 				}
 				break;
 
@@ -1083,7 +1083,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s )
 				if ( !button[CloseButton] && isCloseable() ) {
 					button[CloseButton] = new KeramikButton( this, "close", CloseButton, i18n("Close") );
 					connect( button[CloseButton], TQT_SIGNAL( clicked() ), TQT_SLOT( closeWindow() ) );
-					tqlayout->addWidget( button[CloseButton] );
+					layout->addWidget( button[CloseButton] );
 				}
 				break;
 
@@ -1092,7 +1092,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s )
 				if ( !button[AboveButton]) {
 					button[AboveButton] = new KeramikButton( this, "above", AboveButton, i18n("Keep Above Others") );
 					connect( button[AboveButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotAbove() ) );
-					tqlayout->addWidget( button[AboveButton] );
+					layout->addWidget( button[AboveButton] );
 				}
 				break;
 
@@ -1101,7 +1101,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s )
 				if ( !button[BelowButton]) {
 					button[BelowButton] = new KeramikButton( this, "below", BelowButton, i18n("Keep Below Others") );
 					connect( button[BelowButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotBelow() ) );
-					tqlayout->addWidget( button[BelowButton] );
+					layout->addWidget( button[BelowButton] );
 				}
 				break;
 
@@ -1111,13 +1111,13 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s )
 					button[ShadeButton] = new KeramikButton( this, "shade", ShadeButton,
                                             isSetShade() ? i18n("Unshade") : i18n( "Shade" ));
 					connect( button[ShadeButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotShade() ) );
-					tqlayout->addWidget( button[ShadeButton] );
+					layout->addWidget( button[ShadeButton] );
 				}
 				break;
 
 			// Additional spacing
 			case '_' :
-				tqlayout->addSpacing( buttonSpacing );
+				layout->addSpacing( buttonSpacing );
 				break;
 		}
 	}
@@ -1130,8 +1130,8 @@ void KeramikClient::updateMask()
 		return;
 
 	// To maximize performance this code uses precalculated bounding rects
-	// to set the window tqmask. This saves us from having to allocate a 1bpp
-	// pixmap, paint the tqmask on it and then have the X server iterate
+	// to set the window mask. This saves us from having to allocate a 1bpp
+	// pixmap, paint the mask on it and then have the X server iterate
 	// over the pixels to compute the bounding rects from it.
 
 	TQRegion r;
@@ -1206,7 +1206,7 @@ void KeramikClient::updateMask()
 
         setMask( r, YXBanded );
 
-	tqmaskDirty = false;
+	maskDirty = false;
 }
 
 
@@ -1260,7 +1260,7 @@ void KeramikClient::updateCaptionBuffer()
 		( clientHandler->showAppIcons() ? 16 + iconSpacing : 0 );
 
 	int xpos = QMAX( (captionRect.width() - tw) / 3, 8 );
-	TQRect tr = TQStyle::tqvisualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10,
+	TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10,
 				captionRect.height() - 4), captionBuffer.rect() );
 
 	//p.setPen( Qt::red ); // debug
@@ -1269,7 +1269,7 @@ void KeramikClient::updateCaptionBuffer()
 	// Application icon
 	if ( clientHandler->showAppIcons() )
 	{
-		TQRect iconRect = TQStyle::tqvisualRect( TQRect(tr.x(),
+		TQRect iconRect = TQStyle::visualRect( TQRect(tr.x(),
 					1 + (captionRect.height() - 4 - 16) / 2, 16, 16), tr );
 		TQRect r( icon->rect() );
 		r.moveCenter( iconRect.center() );
@@ -1304,7 +1304,7 @@ void KeramikClient::updateCaptionBuffer()
 	{
 		p.translate( TQApplication::reverseLayout() ? -1 : 1, 1 );
 		//p.setPen( options()->color(ColorTitleBar, active).dark() );
-                if (tqGray(options()->color(ColorFont, active).rgb()) < 100)
+                if (qGray(options()->color(ColorFont, active).rgb()) < 100)
                     p.setPen( TQColor(200,200,200) );
                 else
                     p.setPen( black );
@@ -1328,10 +1328,10 @@ void KeramikClient::calculateCaptionRect()
 	if ( clientHandler->showAppIcons() )
 		cw += 16 + 4; // icon width + space
 
-	cw = QMIN( cw, titlebar->tqgeometry().width() );
-	captionRect = TQStyle::tqvisualRect( TQRect(titlebar->tqgeometry().x(), (largeCaption ? 0 : titleBaseY),
+	cw = QMIN( cw, titlebar->geometry().width() );
+	captionRect = TQStyle::visualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY),
 				cw, clientHandler->titleBarHeight(largeCaption) ),
-				titlebar->tqgeometry() );
+				titlebar->geometry() );
 }
 
 
@@ -1341,11 +1341,11 @@ void KeramikClient::captionChange()
 	calculateCaptionRect();
 
 	if ( r.size() != captionRect.size() )
-		tqmaskDirty = true;
+		maskDirty = true;
 
 	captionBufferDirty = true;
 
-	widget()->tqrepaint( r | captionRect, false );
+	widget()->repaint( r | captionRect, false );
 }
 
 
@@ -1361,7 +1361,7 @@ void KeramikClient::iconChange()
 		activeIcon = inactiveIcon = NULL;
 
 		captionBufferDirty = true;
-		widget()->tqrepaint( captionRect, false );
+		widget()->repaint( captionRect, false );
 	}
 }
 
@@ -1375,15 +1375,15 @@ void KeramikClient::activeChange()
 	if ( largeTitlebar ) {
 		largeCaption = ( active && !maximizedVertical() );
 		calculateCaptionRect();
-		tqmaskDirty = true;
+		maskDirty = true;
 	}
 
 	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 );
 }
 
 
@@ -1397,27 +1397,27 @@ void KeramikClient::maximizeChange()
 			largeCaption = largeTitlebar = false;
 
 			calculateCaptionRect();
-			captionBufferDirty = tqmaskDirty = true;
+			captionBufferDirty = maskDirty = true;
 
-			widget()->tqlayout()->activate();
-			widget()->tqrepaint( false );
+			widget()->layout()->activate();
+			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 );
 			largeCaption = largeTitlebar = true;
 
 			calculateCaptionRect();
-			captionBufferDirty = tqmaskDirty = true;
+			captionBufferDirty = maskDirty = true;
 
-			widget()->tqlayout()->activate();
-			widget()->tqrepaint( false );
+			widget()->layout()->activate();
+			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();
 	}
 }
 
@@ -1426,7 +1426,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") );
 		}
@@ -1437,7 +1437,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") );
 		}
@@ -1447,14 +1447,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 );
 }
 
 
@@ -1482,21 +1482,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 );
 }
 
 
@@ -1515,7 +1515,7 @@ void KeramikClient::paintEvent( TQPaintEvent *e )
 	int leftBorderWidth    = clientHandler->tile( BorderLeft, active )->width();
 	int rightBorderWidth   = clientHandler->tile( BorderRight, active )->width();
 
-	if ( tqmaskDirty )
+	if ( maskDirty )
 		updateMask();
 
 	// Titlebar
@@ -1624,7 +1624,7 @@ void KeramikClient::resizeEvent( TQResizeEvent *e )
 	if ( r.size() != captionRect.size() )
 		captionBufferDirty = true;
 
-	tqmaskDirty = true;
+	maskDirty = true;
 
 	if ( widget()->isVisible() )
 	{
@@ -1644,11 +1644,11 @@ void KeramikClient::resizeEvent( TQResizeEvent *e )
 		if ( dx )
 		{
 			widget()->update( width() - dx + 1, 0, dx, height() );
-			widget()->update( TQRect( TQPoint(4,4), titlebar->tqgeometry().bottomLeft() - TQPoint(1,0) ) );
-			widget()->update( TQRect( titlebar->tqgeometry().topRight(), TQPoint( width() - 4,
-							titlebar->tqgeometry().bottom() ) ) );
+			widget()->update( TQRect( TQPoint(4,4), titlebar->geometry().bottomLeft() - TQPoint(1,0) ) );
+			widget()->update( TQRect( titlebar->geometry().topRight(), TQPoint( width() - 4,
+							titlebar->geometry().bottom() ) ) );
 			// Titlebar needs no paint event
-			TQApplication::postEvent( this, new TQPaintEvent( titlebar->tqgeometry(), FALSE ) );
+			TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), FALSE ) );
 		}
 	}
 }
@@ -1657,14 +1657,14 @@ void KeramikClient::resizeEvent( TQResizeEvent *e )
 void KeramikClient::mouseDoubleClickEvent( TQMouseEvent *e )
 {
 	if ( e->button() == 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());
 }
 
@@ -1774,9 +1774,9 @@ void KeramikClient::borders( int& left, int& right, int& top, int& bottom ) cons
 }
 
 
-TQSize KeramikClient::tqminimumSize() const
+TQSize KeramikClient::minimumSize() const
 {
-	return widget()->tqminimumSize();
+	return widget()->minimumSize();
 }
 
 
diff --git a/kwin/clients/keramik/keramik.h b/kwin/clients/keramik/keramik.h
index 0ff31dbda..c90d3509f 100644
--- a/kwin/clients/keramik/keramik.h
+++ b/kwin/clients/keramik/keramik.h
@@ -148,7 +148,7 @@ namespace Keramik {
 			virtual Position mousePosition( const TQPoint& p ) const;
 		    	virtual void borders( int& left, int& right, int& top, int& bottom ) const;
 			virtual void resize( const TQSize& s );
-			virtual TQSize tqminimumSize() const;
+			virtual TQSize minimumSize() const;
 			virtual bool eventFilter( TQObject* o, TQEvent* e );
 			virtual void activeChange();
 			virtual void captionChange();
@@ -190,7 +190,7 @@ namespace Keramik {
 			TQRect          captionRect;
 			TQPixmap        captionBuffer;
 			TQPixmap       *activeIcon, *inactiveIcon;
-			bool           captionBufferDirty:1, tqmaskDirty:1;
+			bool           captionBufferDirty:1, maskDirty:1;
 			bool           largeCaption:1, largeTitlebar:1;
 	}; // class KeramikClient
 
diff --git a/kwin/clients/kwmtheme/cli_installer/main.cpp b/kwin/clients/kwmtheme/cli_installer/main.cpp
index 56de8c9fe..abf2bad3d 100644
--- a/kwin/clients/kwmtheme/cli_installer/main.cpp
+++ b/kwin/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/kwin/clients/kwmtheme/kwmthemeclient.cpp b/kwin/clients/kwmtheme/kwmthemeclient.cpp
index 23f8b73e2..89dc6a564 100644
--- a/kwin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/kwin/clients/kwmtheme/kwmthemeclient.cpp
@@ -46,9 +46,9 @@ namespace KWMTheme {
   p.drawTiledPixmap(0, 0, w2, h2, src);
   p.end();
 
-  srcMask = (TQBitmap*)src.tqmask();
+  srcMask = (TQBitmap*)src.mask();
   if (srcMask){
-    destMask = (TQBitmap*)dest.tqmask();
+    destMask = (TQBitmap*)dest.mask();
     p.begin(destMask);
     p.drawTiledPixmap(0, 0, w2, h2, *srcMask);
     p.end();
@@ -231,7 +231,7 @@ void MyButton::drawButtonLabel(TQPainter *p)
 	int offset = (isDown() && ((pixmap()->width() >= width()) || 
                          (pixmap()->height() >= height()))) ? 1 : 0;
         style().drawItem(p, TQRect( offset, offset, width(), height() ), 
-                         AlignCenter, tqcolorGroup(),
+                         AlignCenter, colorGroup(),
                          true, pixmap(), TQString::null);
     }
 }
@@ -247,28 +247,28 @@ void KWMThemeClient::init()
     widget()->installEventFilter( this );
 
     stickyBtn = maxBtn = mnuBtn = 0;
-    tqlayout = new TQGridLayout(widget());
-    tqlayout->addColSpacing(0, maxExtent);
-    tqlayout->addColSpacing(2, maxExtent);
+    layout = new TQGridLayout(widget());
+    layout->addColSpacing(0, maxExtent);
+    layout->addColSpacing(2, maxExtent);
 
-    tqlayout->addRowSpacing(0, maxExtent);
+    layout->addRowSpacing(0, maxExtent);
 
-    tqlayout->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed,
+    layout->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed,
                                     TQSizePolicy::Expanding));
 
     if( isPreview())
-        tqlayout->addWidget( new TQLabel( i18n( "<center><b>KWMTheme</b></center>" ), widget()), 2, 1);
+        layout->addWidget( new TQLabel( i18n( "<center><b>KWMTheme</b></center>" ), widget()), 2, 1);
     else
-        tqlayout->addItem( new TQSpacerItem( 0, 0 ), 2, 1);
+        layout->addItem( new TQSpacerItem( 0, 0 ), 2, 1);
 
     // Without the next line, shading flickers
-    tqlayout->addItem( new TQSpacerItem(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Expanding) );
-    tqlayout->addRowSpacing(3, maxExtent);
-    tqlayout->setRowStretch(2, 10);
-    tqlayout->setColStretch(1, 10);
+    layout->addItem( new TQSpacerItem(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Expanding) );
+    layout->addRowSpacing(3, maxExtent);
+    layout->setRowStretch(2, 10);
+    layout->setColStretch(1, 10);
     
     TQBoxLayout* hb = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0);
-    tqlayout->addLayout( hb, 1, 1 );
+    layout->addLayout( hb, 1, 1 );
 
     KConfig *config = KGlobal::config();
     config->setGroup("Buttons");
@@ -352,7 +352,7 @@ void KWMThemeClient::init()
 
 void KWMThemeClient::drawTitle(TQPainter &dest)
 {
-    TQRect titleRect = titlebar->tqgeometry();
+    TQRect titleRect = titlebar->geometry();
     TQRect r(0, 0, titleRect.width(), titleRect.height());
     TQPixmap buffer;
 
@@ -364,7 +364,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest)
     p.begin(&buffer);
 
     if(titleSunken){
-        qDrawShadeRect(&p, r, options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()),
+        qDrawShadeRect(&p, r, options()->colorGroup(KDecorationOptions::ColorFrame, isActive()),
                        true, 1, 0);
         r.setRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2);
     }
@@ -384,7 +384,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest)
         p.drawTiledPixmap(r, *fill);
     }
     else{
-        p.fillRect(r, options()->tqcolorGroup(KDecorationOptions::ColorTitleBar, isActive()).
+        p.fillRect(r, options()->colorGroup(KDecorationOptions::ColorTitleBar, isActive()).
                    brush(TQColorGroup::Button));
     }
     p.setFont(options()->font(isActive()));
@@ -402,12 +402,12 @@ void KWMThemeClient::drawTitle(TQPainter &dest)
 void KWMThemeClient::resizeEvent( TQResizeEvent* )
 {
     doShape();
-    widget()->tqrepaint();
+    widget()->repaint();
 }
 
 void KWMThemeClient::captionChange()
 {
-    widget()->tqrepaint( titlebar->tqgeometry(), false );
+    widget()->repaint( titlebar->geometry(), false );
 }
 
 void KWMThemeClient::paintEvent( TQPaintEvent *)
@@ -557,7 +557,7 @@ void KWMThemeClient::paintEvent( TQPaintEvent *)
     }
     drawTitle(p);
 
-    TQColor c = widget()->tqcolorGroup().background();
+    TQColor c = widget()->colorGroup().background();
 
     // KWM evidently had a 1 pixel border around the client window. We
     // emulate it here, but should be removed at some point in order to
@@ -568,7 +568,7 @@ void KWMThemeClient::paintEvent( TQPaintEvent *)
 
     // We fill the area behind the wrapped widget to ensure that
     // shading animation is drawn as smoothly as possible
-    TQRect r(tqlayout->cellGeometry(2, 1));
+    TQRect r(layout->cellGeometry(2, 1));
     p.fillRect( r.x(), r.y(), r.width(), r.height(), c);
     p.end();
 }
@@ -576,10 +576,10 @@ void KWMThemeClient::paintEvent( TQPaintEvent *)
 void KWMThemeClient::doShape()
 {
 
-    TQBitmap tqshapetqmask(width(), height());
-    tqshapetqmask.fill(color0);
+    TQBitmap shapemask(width(), height());
+    shapemask.fill(color0);
     TQPainter p;
-    p.begin(&tqshapetqmask);
+    p.begin(&shapemask);
     p.setBrush(color1);
     p.setPen(color1);
     int x,y;
@@ -588,8 +588,8 @@ void KWMThemeClient::doShape()
     int h1 = framePixmaps[FrameTopLeft]->height();
     if (w1 > width()/2) w1 = width()/2;
     if (h1 > height()/2) h1 = height()/2;
-    if (framePixmaps[FrameTopLeft]->tqmask())
-        p.drawPixmap(0,0,*framePixmaps[FrameTopLeft]->tqmask(),
+    if (framePixmaps[FrameTopLeft]->mask())
+        p.drawPixmap(0,0,*framePixmaps[FrameTopLeft]->mask(),
 		     0,0,w1, h1);
     else
         p.fillRect(0,0,w1,h1,color1);
@@ -597,8 +597,8 @@ void KWMThemeClient::doShape()
     int h2 = framePixmaps[FrameTopRight]->height();
     if (w2 > width()/2) w2 = width()/2;
     if (h2 > height()/2) h2 = height()/2;
-    if (framePixmaps[FrameTopRight]->tqmask())
-        p.drawPixmap(width()-w2,0,*framePixmaps[FrameTopRight]->tqmask(),
+    if (framePixmaps[FrameTopRight]->mask())
+        p.drawPixmap(width()-w2,0,*framePixmaps[FrameTopRight]->mask(),
 		     framePixmaps[FrameTopRight]->width()-w2,0,w2, h2);
     else
         p.fillRect(width()-w2,0,w2, h2,color1);
@@ -607,8 +607,8 @@ void KWMThemeClient::doShape()
     int h3 = framePixmaps[FrameBottomLeft]->height();
     if (w3 > width()/2) w3 = width()/2;
     if (h3 > height()/2) h3 = height()/2;
-    if (framePixmaps[FrameBottomLeft]->tqmask())
-        p.drawPixmap(0,height()-h3,*framePixmaps[FrameBottomLeft]->tqmask(),
+    if (framePixmaps[FrameBottomLeft]->mask())
+        p.drawPixmap(0,height()-h3,*framePixmaps[FrameBottomLeft]->mask(),
 		     0,framePixmaps[FrameBottomLeft]->height()-h3,w3, h3);
     else
         p.fillRect(0,height()-h3,w3,h3,color1);
@@ -617,8 +617,8 @@ void KWMThemeClient::doShape()
     int h4 = framePixmaps[FrameBottomRight]->height();
     if (w4 > width()/2) w4 = width()/2;
     if (h4 > height()/2) h4 = height()/2;
-    if (framePixmaps[FrameBottomRight]->tqmask())
-        p.drawPixmap(width()-w4,height()-h4,*framePixmaps[FrameBottomRight]->tqmask(),
+    if (framePixmaps[FrameBottomRight]->mask())
+        p.drawPixmap(width()-w4,height()-h4,*framePixmaps[FrameBottomRight]->mask(),
 		     framePixmaps[FrameBottomRight]->width()-w4,
 		     framePixmaps[FrameBottomRight]->height()-h4,
 		     w4, h4);
@@ -629,9 +629,9 @@ void KWMThemeClient::doShape()
     TQWMatrix m;
     int n,s,w;
     //top
-    if (framePixmaps[FrameTop]->tqmask())
+    if (framePixmaps[FrameTop]->mask())
     {
-        pm = *framePixmaps[FrameTop]->tqmask();
+        pm = *framePixmaps[FrameTop]->mask();
 
         s = width()-w2-w1;
         n = s/pm.width();
@@ -657,9 +657,9 @@ void KWMThemeClient::doShape()
     }
 
     //bottom
-    if (framePixmaps[FrameBottom]->tqmask())
+    if (framePixmaps[FrameBottom]->mask())
     {
-        pm = *framePixmaps[FrameBottom]->tqmask();
+        pm = *framePixmaps[FrameBottom]->mask();
 
         s = width()-w4-w3;
         n = s/pm.width();
@@ -683,9 +683,9 @@ void KWMThemeClient::doShape()
     }
 
     //left
-    if (framePixmaps[FrameLeft]->tqmask())
+    if (framePixmaps[FrameLeft]->mask())
     {
-        pm = *framePixmaps[FrameLeft]->tqmask();
+        pm = *framePixmaps[FrameLeft]->mask();
 
         s = height()-h3-h1;
         n = s/pm.height();
@@ -712,9 +712,9 @@ void KWMThemeClient::doShape()
     }
 
     //right
-    if (framePixmaps[FrameRight]->tqmask())
+    if (framePixmaps[FrameRight]->mask())
     {
-        pm = *framePixmaps[FrameRight]->tqmask();
+        pm = *framePixmaps[FrameRight]->mask();
 
         s = height()-h4-h2;
         n = s/pm.height();
@@ -740,19 +740,19 @@ void KWMThemeClient::doShape()
         }
     }
     p.fillRect(maxExtent-1, maxExtent-1, width()-2*maxExtent+2, height()-2*maxExtent+2, color1);
-    setMask(tqshapetqmask);
+    setMask(shapemask);
 }
 
 
 void KWMThemeClient::showEvent(TQShowEvent *)
 {
     doShape();
-    widget()->tqrepaint(false);
+    widget()->repaint(false);
 }
 
 void KWMThemeClient::mouseDoubleClickEvent( TQMouseEvent * e )
 {
-    if (e->button() == LeftButton && titlebar->tqgeometry().tqcontains( e->pos() ) )
+    if (e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) )
         titlebarDblClickOperation();
 }
 
@@ -868,9 +868,9 @@ bool KWMThemeClient::eventFilter( TQObject* o, TQEvent* e )
 	}
 }
 
-TQSize KWMThemeClient::tqminimumSize() const
+TQSize KWMThemeClient::minimumSize() const
 {
-    return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 ));
+    return widget()->minimumSize().expandedTo( TQSize( 100, 50 ));
 }
 
 void KWMThemeClient::resize( const TQSize& s )
@@ -903,23 +903,23 @@ KDecoration* KWMThemeFactory::createDecoration( KDecorationBridge* b )
     return new KWMThemeClient( b, this );
 }
 
-bool KWMThemeFactory::reset( unsigned long tqmask )
+bool KWMThemeFactory::reset( unsigned long mask )
 {
     bool needHardReset = false;
 
 TODO
 
     // doesn't obey the Border size setting
-    if( tqmask & ( SettingFont | SettingButtons ))
+    if( mask & ( SettingFont | SettingButtons ))
         needHardReset = true;
 
-    if( tqmask & ( SettingFont | SettingColors )) {
+    if( mask & ( SettingFont | SettingColors )) {
         KWMTheme::delete_pixmaps();
         KWMTheme::create_pixmaps();
     }
     
     if( !needHardReset )
-        resetDecorations( tqmask );
+        resetDecorations( mask );
     return needHardReset;
 }
 
diff --git a/kwin/clients/kwmtheme/kwmthemeclient.h b/kwin/clients/kwmtheme/kwmthemeclient.h
index 704162b6b..13914b2f6 100644
--- a/kwin/clients/kwmtheme/kwmthemeclient.h
+++ b/kwin/clients/kwmtheme/kwmthemeclient.h
@@ -30,7 +30,7 @@ public:
     ~KWMThemeClient(){;}
     void init();
     void resize( const TQSize& s );
-    TQSize tqminimumSize() const;
+    TQSize minimumSize() const;
     void borders( int& left, int& right, int& top, int& bottom ) const;
 protected:
     void doShape();
@@ -56,7 +56,7 @@ private:
     KPixmap *aGradient, *iGradient;
     MyButton *maxBtn, *stickyBtn, *mnuBtn;
     TQSpacerItem *titlebar;
-    TQGridLayout* tqlayout;
+    TQGridLayout* layout;
 };
 
 class KWMThemeFactory : public KDecorationFactory
@@ -65,7 +65,7 @@ public:
     KWMThemeFactory();
     ~KWMThemeFactory();
     KDecoration* createDecoration( KDecorationBridge* b );
-    bool reset( unsigned long tqmask );
+    bool reset( unsigned long mask );
 };
 
 }
diff --git a/kwin/clients/laptop/laptopclient.cpp b/kwin/clients/laptop/laptopclient.cpp
index 46786c1cf..db91cf15d 100644
--- a/kwin/clients/laptop/laptopclient.cpp
+++ b/kwin/clients/laptop/laptopclient.cpp
@@ -117,28 +117,28 @@ static void create_pixmaps()
 
     // titlebar
     TQPainter p;
-    TQPainter tqmaskPainter;
+    TQPainter maskPainter;
     int i, x, y;
     titlePix = new TQPixmap(33, 12);
-    TQBitmap tqmask(33, 12);
-    tqmask.fill(Qt::color0);
+    TQBitmap mask(33, 12);
+    mask.fill(Qt::color0);
 
     p.begin(titlePix);
-    tqmaskPainter.begin(&tqmask);
-    tqmaskPainter.setPen(Qt::color1);
+    maskPainter.begin(&mask);
+    maskPainter.setPen(Qt::color1);
     for(i=0, y=2; i < 3; ++i, y+=4){
         for(x=1; x <= 33; x+=3){
             p.setPen(options()->color(KDecoration::ColorTitleBar, true).light(150));
             p.drawPoint(x, y);
-            tqmaskPainter.drawPoint(x, y);
+            maskPainter.drawPoint(x, y);
             p.setPen(options()->color(KDecoration::ColorTitleBar, true).dark(150));
             p.drawPoint(x+1, y+1);
-            tqmaskPainter.drawPoint(x+1, y+1);
+            maskPainter.drawPoint(x+1, y+1);
         }
     }
     p.end();
-    tqmaskPainter.end();
-    titlePix->setMask(tqmask);
+    maskPainter.end();
+    titlePix->setMask(mask);
 
     if(TQPixmap::defaultDepth() > 8){
         aUpperGradient = new KPixmap;
@@ -157,7 +157,7 @@ static void create_pixmaps()
                                 KPixmapEffect::VerticalGradient);
     }
     // buttons (active/inactive, sunken/unsunken, 2 sizes each)
-    TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true);
+    TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true);
     TQColor c = g.background();
     btnPix1 = new KPixmap;
     btnPix1->resize(btnWidth1, titleHeight);
@@ -184,7 +184,7 @@ static void create_pixmaps()
                                 KPixmapEffect::DiagonalGradient);
         KPixmapEffect::gradient(*btnDownPix2, c.dark(130), c.light(120),
                                 KPixmapEffect::DiagonalGradient);
-        g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
+        g = options()->colorGroup(KDecoration::ColorButtonBg, false);
         c = g.background();
         KPixmapEffect::gradient(*iBtnPix1, c.light(120), c.dark(130),
                                 KPixmapEffect::DiagonalGradient);
@@ -200,27 +200,27 @@ static void create_pixmaps()
         btnDownPix1->fill(c.rgb());
         btnPix2->fill(c.rgb());
         btnDownPix2->fill(c.rgb());
-        g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
+        g = options()->colorGroup(KDecoration::ColorButtonBg, false);
         c = g.background();
         iBtnPix1->fill(c.rgb());
         iBtnDownPix1->fill(c.rgb());
         iBtnPix2->fill(c.rgb());
         iBtnDownPix2->fill(c.rgb());
     }
-    g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true);
+    g = options()->colorGroup(KDecoration::ColorButtonBg, true);
     c = g.background();
     drawButtonFrame(btnPix1, g, false);
     drawButtonFrame(btnDownPix1, g, true);
     drawButtonFrame(btnPix2, g, false);
     drawButtonFrame(btnDownPix2, g, true);
-    g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
+    g = options()->colorGroup(KDecoration::ColorButtonBg, false);
     c = g.background();
     drawButtonFrame(iBtnPix1, g, false);
     drawButtonFrame(iBtnDownPix1, g, true);
     drawButtonFrame(iBtnPix2, g, false);
     drawButtonFrame(iBtnDownPix2, g, true);
 
-    if(tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128)
+    if(qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128)
         btnForeground = Qt::black;
     else
         btnForeground = Qt::white;
@@ -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)
@@ -314,7 +314,7 @@ void LaptopButton::drawButton(TQPainter *p)
         }
     }
     else{
-        TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, decoration()->isActive());
+        TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, decoration()->isActive());
         int w = width();
         int h = height();
         p->fillRect(1, 1, w-2, h-2, isDown() ? g.mid() : g.button());
@@ -380,7 +380,7 @@ bool LaptopClient::decorationBehaviour(DecorationBehaviour behaviour) const
     }
 }
 
-int LaptopClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
+int LaptopClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
 {
     switch (lm) {
         case LM_TitleEdgeLeft:
@@ -425,7 +425,7 @@ int LaptopClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const
             return 0;
 
         default:
-            return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn);
+            return KCommonDecoration::layoutMetric(lm, respectWindowState, btn);
     }
 }
 
@@ -469,7 +469,7 @@ void LaptopClient::captionChange()
 void LaptopClient::paintEvent( TQPaintEvent* )
 {
     TQPainter p(widget());
-    TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive());
+    TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
 
     TQRect r(widget()->rect());
     p.setPen(Qt::black);
@@ -478,10 +478,10 @@ void LaptopClient::paintEvent( TQPaintEvent* )
     // fill mid frame...
     p.setPen(g.background() );
     p.drawLine(r.x()+2, r.y()+2, r.right()-2, r.y()+2);
-    p.drawLine(r.left()+2, r.y()+3, r.left()+2, r.bottom()-tqlayoutMetric(LM_BorderBottom)+1 );
-    p.drawLine(r.right()-2, r.y()+3, r.right()-2, r.bottom()-tqlayoutMetric(LM_BorderBottom)+1 );
-    p.drawLine(r.left()+3, r.y()+3, r.left()+3, r.y()+tqlayoutMetric(LM_TitleEdgeTop)+tqlayoutMetric(LM_TitleHeight)+tqlayoutMetric(LM_TitleEdgeTop) );
-    p.drawLine(r.right()-3, r.y()+3, r.right()-3, r.y()+tqlayoutMetric(LM_TitleEdgeTop)+tqlayoutMetric(LM_TitleHeight)+tqlayoutMetric(LM_TitleEdgeTop) );
+    p.drawLine(r.left()+2, r.y()+3, r.left()+2, r.bottom()-layoutMetric(LM_BorderBottom)+1 );
+    p.drawLine(r.right()-2, r.y()+3, r.right()-2, r.bottom()-layoutMetric(LM_BorderBottom)+1 );
+    p.drawLine(r.left()+3, r.y()+3, r.left()+3, r.y()+layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeTop) );
+    p.drawLine(r.right()-3, r.y()+3, r.right()-3, r.y()+layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeTop) );
     if (!mustDrawHandle() )
         p.drawLine(r.left()+1, r.bottom()-2, r.right()-1, r.bottom()-2);
 
@@ -546,7 +546,7 @@ void LaptopClient::paintEvent( TQPaintEvent* )
 
         p.setFont(options()->font(false, isToolWindow() ));
         TQFontMetrics fm(options()->font(false));
-        g = options()->tqcolorGroup(KDecoration::ColorTitleBar, false);
+        g = options()->colorGroup(KDecoration::ColorTitleBar, false);
         if(iUpperGradient)
             p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4,
                               r.y(), fm.width(caption())+8, r.height()-1,
@@ -564,7 +564,7 @@ void LaptopClient::paintEvent( TQPaintEvent* )
         p.setPen(options()->color(KDecoration::ColorFont, false));
         p.drawText(r.x(), r.y(), r.width(), r.height()-1,
                    AlignCenter, caption() );
-        g = options()->tqcolorGroup(KDecoration::ColorFrame, true);
+        g = options()->colorGroup(KDecoration::ColorFrame, true);
         p.setPen(g.background());
         p.drawPoint(r.x(), r.y());
         p.drawPoint(r.right(), r.y());
@@ -629,7 +629,7 @@ void LaptopClient::updateActiveBuffer( )
 
     p.setFont(options()->font(true, isToolWindow() ));
     TQFontMetrics fm(options()->font(true));
-    TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorTitleBar, true);
+    TQColorGroup g = options()->colorGroup(KDecoration::ColorTitleBar, true);
     if(aUpperGradient)
         p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4,
                           r.y(), fm.width(caption())+8, r.height()-1,
@@ -647,7 +647,7 @@ void LaptopClient::updateActiveBuffer( )
     p.setPen(options()->color(KDecoration::ColorFont, true));
     p.drawText(r.x(), r.y(), r.width(), r.height()-1,
                AlignCenter, caption() );
-    g = options()->tqcolorGroup(KDecoration::ColorFrame, true);
+    g = options()->colorGroup(KDecoration::ColorFrame, true);
     p.setPen(g.background());
     p.drawPoint(r.x(), r.y());
     p.drawPoint(r.right(), r.y());
diff --git a/kwin/clients/laptop/laptopclient.h b/kwin/clients/laptop/laptopclient.h
index 2bdd940fb..3413b490a 100644
--- a/kwin/clients/laptop/laptopclient.h
+++ b/kwin/clients/laptop/laptopclient.h
@@ -38,7 +38,7 @@ public:
     virtual TQString defaultButtonsLeft() const;
     virtual TQString defaultButtonsRight() const;
     virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
-    virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
+    virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
     virtual KCommonDecorationButton *createButton(ButtonType type);
 
     virtual TQRegion cornerShape(WindowCorner corner);
diff --git a/kwin/clients/modernsystem/buttondata.h b/kwin/clients/modernsystem/buttondata.h
index fc01c3840..1af5fb8dd 100644
--- a/kwin/clients/modernsystem/buttondata.h
+++ b/kwin/clients/modernsystem/buttondata.h
@@ -1,8 +1,8 @@
 /* Image bits processed by KPixmap2Bitmaps */
 
-#define lowcolor_tqmask_width 14
-#define lowcolor_tqmask_height 15
-static const unsigned char lowcolor_tqmask_bits[] = {
+#define lowcolor_mask_width 14
+#define lowcolor_mask_height 15
+static const unsigned char lowcolor_mask_bits[] = {
  0xf0,0x03,0xf8,0x07,0xfc,0xcf,0xfe,0x1f,0xfe,0x1f,0xff,0xff,0xff,0xff,0xff,
  0x3f,0xff,0x3f,0xff,0xbf,0xfe,0xdf,0xfe,0x9f,0xfc,0x0f,0xf8,0x07,0xf0,0x03,
  0x00,0x40,0x80,0x00,0x00,0x00,0x29,0x00,0x00,0x00,0x7c,0xfe,0x87,0x40,0x00,
diff --git a/kwin/clients/modernsystem/config/config.cpp b/kwin/clients/modernsystem/config/config.cpp
index 60ef9a3c7..8a94c1748 100644
--- a/kwin/clients/modernsystem/config/config.cpp
+++ b/kwin/clients/modernsystem/config/config.cpp
@@ -35,15 +35,15 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par
 	vbox->setMargin(0);
 
 	handleBox = new TQWidget(mainw);
-        TQGridLayout* tqlayout = new TQGridLayout(handleBox, 0, KDialog::spacingHint());
+        TQGridLayout* layout = new TQGridLayout(handleBox, 0, KDialog::spacingHint());
 
 	cbShowHandle = new TQCheckBox(i18n("&Show window resize handle"), handleBox);
 	TQWhatsThis::add(cbShowHandle,
 			i18n("When selected, all windows are drawn with a resize "
 			"handle at the lower right corner. This makes window resizing "
-			"easier, especially for trackballs and other mouse tqreplacements "
+			"easier, especially for trackballs and other mouse replacements "
 			"on laptops."));
-        tqlayout->addMultiCellWidget(cbShowHandle, 0, 0, 0, 1);
+        layout->addMultiCellWidget(cbShowHandle, 0, 0, 0, 1);
 	connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()));
 
 	sliderBox = new TQVBox(handleBox);
@@ -59,18 +59,18 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par
 
 	bool rtl = kapp->reverseLayout();
 	label1 = new TQLabel(i18n("Small"), hbox);
-	label1->tqsetAlignment(rtl ? AlignRight : AlignLeft);
+	label1->setAlignment(rtl ? AlignRight : AlignLeft);
 	label2 = new TQLabel(i18n("Medium"), hbox);
-	label2->tqsetAlignment(AlignHCenter);
+	label2->setAlignment(AlignHCenter);
 	label3 = new TQLabel(i18n("Large"), hbox);
-	label3->tqsetAlignment(rtl ? AlignLeft : AlignRight);
+	label3->setAlignment(rtl ? AlignLeft : AlignRight);
 	
 	vbox->addWidget(handleBox);
 	vbox->addStretch(1);
 
-//        tqlayout->setColSpacing(0, 30);
-        tqlayout->addItem(new TQSpacerItem(30, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed), 1, 0);
-        tqlayout->addWidget(sliderBox, 1, 1);
+//        layout->setColSpacing(0, 30);
+        layout->addItem(new TQSpacerItem(30, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed), 1, 0);
+        layout->addWidget(sliderBox, 1, 1);
 	
 	load(conf);
 	mainw->show();
diff --git a/kwin/clients/modernsystem/modernsys.cpp b/kwin/clients/modernsystem/modernsys.cpp
index 1bb9f9815..ce7545cdf 100644
--- a/kwin/clients/modernsystem/modernsys.cpp
+++ b/kwin/clients/modernsystem/modernsys.cpp
@@ -65,7 +65,7 @@ static unsigned char shade_on_bits[] = {
 static unsigned char menu_bits[] = {
         0xff, 0x81, 0x81, 0xff, 0x81, 0xff, 0x81, 0xff};
 
-static unsigned char btnhighcolor_tqmask_bits[] = {
+static unsigned char btnhighcolor_mask_bits[] = {
     0xe0,0x41,0xf8,0x07,0xfc,0x0f,0xfe,0xdf,0xfe,0x1f,0xff,0x3f,0xff,0xff,0xff,
     0x3f,0xff,0x3f,0xff,0xff,0xff,0xff,0xfe,0x9f,0xfe,0x1f,0xfc,0x0f,0xf0,0x03,
     0x00,0x40,0x80,0x00,0x00,0x00,0x39,0x00,0x00,0x00,0x20,0x99,0x0f,0x08,0xc4,
@@ -127,7 +127,7 @@ static void make_button_fx(const TQColorGroup &g, TQPixmap *pix, bool light=fals
 
     }
     else{
-        if(!lcDark1->tqmask()){
+        if(!lcDark1->mask()){
             lcDark1->setMask(*lcDark1);
             lcDark2->setMask(*lcDark2);
             lcDark3->setMask(*lcDark3);
@@ -171,20 +171,20 @@ static void create_pixmaps()
                                 KPixmapEffect::VerticalGradient);
     }
     // buttons
-    TQColorGroup btnColor(options()->tqcolorGroup(KDecoration::ColorButtonBg, true));
+    TQColorGroup btnColor(options()->colorGroup(KDecoration::ColorButtonBg, true));
     buttonPix = new TQPixmap(14, 15);
     make_button_fx(btnColor, buttonPix);
     buttonPixDown = new TQPixmap(14, 15);
     make_button_fx(btnColor, buttonPixDown, true);
 
-    btnColor = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
+    btnColor = options()->colorGroup(KDecoration::ColorButtonBg, false);
     iButtonPix = new TQPixmap(14, 15);
     make_button_fx(btnColor, iButtonPix);
     iButtonPixDown = new TQPixmap(14, 15);
     make_button_fx(btnColor, iButtonPixDown, true);
 
 
-    if(tqGray(btnColor.background().rgb()) < 150)
+    if(qGray(btnColor.background().rgb()) < 150)
         buttonFg = new TQColor(Qt::white);
     else
         buttonFg = new TQColor(Qt::black);
@@ -289,11 +289,11 @@ ModernButton::ModernButton(ButtonType type, ModernSys *parent, const char *name)
 {
     setBackgroundMode( NoBackground );
 
-    TQBitmap tqmask(14, 15, TQPixmap::defaultDepth() > 8 ?
-                 btnhighcolor_tqmask_bits : lowcolor_tqmask_bits, true);
+    TQBitmap mask(14, 15, TQPixmap::defaultDepth() > 8 ?
+                 btnhighcolor_mask_bits : lowcolor_mask_bits, true);
     resize(14, 15);
 
-    setMask(tqmask);
+    setMask(mask);
 }
 
 void ModernButton::reset(unsigned long changed)
@@ -410,7 +410,7 @@ bool ModernSys::decorationBehaviour(DecorationBehaviour behaviour) const
     }
 }
 
-int ModernSys::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
+int ModernSys::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
 {
     // bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows();
 
@@ -425,9 +425,9 @@ int ModernSys::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KC
             return border_width + handle_width;
 
         case LM_TitleEdgeLeft:
-            return tqlayoutMetric(LM_BorderLeft,respectWindowState)+3;
+            return layoutMetric(LM_BorderLeft,respectWindowState)+3;
         case LM_TitleEdgeRight:
-            return tqlayoutMetric(LM_BorderRight,respectWindowState)+3;
+            return layoutMetric(LM_BorderRight,respectWindowState)+3;
 
         case LM_TitleEdgeTop:
             return 2;
@@ -454,7 +454,7 @@ int ModernSys::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KC
             return 3;
 
         default:
-            return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn);
+            return KCommonDecoration::layoutMetric(lm, respectWindowState, btn);
     }
 }
 
@@ -515,10 +515,10 @@ void ModernSys::recalcTitleBuffer()
         p.drawTiledPixmap(0, 0, width(), title_height+2, *aUpperGradient);
     else
         p.fillRect(0, 0, width(), title_height+2,
-                   options()->tqcolorGroup(ColorTitleBar, true).
+                   options()->colorGroup(ColorTitleBar, true).
                    brush(TQColorGroup::Button));
 
-    TQRect t = titleRect(); // titlebar->tqgeometry();
+    TQRect t = titleRect(); // titlebar->geometry();
     t.setTop( 2 );
     t.setLeft( t.left() );
     t.setRight( t.right() - 2 );
@@ -554,7 +554,7 @@ void ModernSys::updateCaption()
 void ModernSys::drawRoundFrame(TQPainter &p, int x, int y, int w, int h)
 {
     kDrawRoundButton(&p, x, y, w, h,
-                     options()->tqcolorGroup(ColorFrame, isActive()), false);
+                     options()->colorGroup(ColorFrame, isActive()), false);
 
 }
 
@@ -568,11 +568,11 @@ void ModernSys::paintEvent( TQPaintEvent* )
     int hw = handle_width;
 
     TQPainter p( widget() );
-    TQRect t = titleRect(); // titlebar->tqgeometry();
+    TQRect t = titleRect(); // titlebar->geometry();
 
-    TQBrush fillBrush(widget()->tqcolorGroup().brush(TQColorGroup::Background).pixmap() ?
-                     widget()->tqcolorGroup().brush(TQColorGroup::Background) :
-                     options()->tqcolorGroup(ColorFrame, isActive()).
+    TQBrush fillBrush(widget()->colorGroup().brush(TQColorGroup::Background).pixmap() ?
+                     widget()->colorGroup().brush(TQColorGroup::Background) :
+                     options()->colorGroup(ColorFrame, isActive()).
                      brush(TQColorGroup::Button));
 
     p.fillRect(1, title_height+3, width()-2, height()-(title_height+3), fillBrush);
@@ -586,7 +586,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
     int h = height() - hw;
 
     // titlebar
-    TQColorGroup g = options()->tqcolorGroup(ColorTitleBar, isActive());
+    TQColorGroup g = options()->colorGroup(ColorTitleBar, isActive());
     if(isActive()){
         p.drawPixmap(1, 1, titleBuffer, 0, 0, w-2, title_height+2);
     }
@@ -609,7 +609,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
     p.drawLine(0, title_height+2, w-2, title_height+2);
 
     // frame
-    g = options()->tqcolorGroup(ColorFrame, isActive());
+    g = options()->colorGroup(ColorFrame, isActive());
     p.setPen(g.light());
     p.drawLine(1, title_height+3, 1, h-2);
     p.setPen(g.dark());
@@ -649,22 +649,22 @@ void ModernSys::updateWindowShape()
 {
     int hs = handle_size;
     int hw = handle_width;
-    TQRegion tqmask;
-    tqmask += TQRect(0, 0, width()-hw, height()-hw);
+    TQRegion mask;
+    mask += TQRect(0, 0, width()-hw, height()-hw);
     //single points
-    tqmask -= TQRect(0, 0, 1, 1);
-    tqmask -= TQRect(width()-hw-1, 0, 1, 1);
-    tqmask -= TQRect(0, height()-hw-1, 1, 1);
+    mask -= TQRect(0, 0, 1, 1);
+    mask -= TQRect(width()-hw-1, 0, 1, 1);
+    mask -= TQRect(0, height()-hw-1, 1, 1);
 
     if (show_handle) {
-        tqmask += TQRect(width()-hs, height()-hs, hs-1, hs-1);
-        tqmask -= TQRect(width()-2, height()-2, 1, 1);
-        tqmask -= TQRect(width()-2, height()-hs, 1, 1);
-        tqmask -= TQRect(width()-hs, height()-2, 1, 1);
+        mask += TQRect(width()-hs, height()-hs, hs-1, hs-1);
+        mask -= TQRect(width()-2, height()-2, 1, 1);
+        mask -= TQRect(width()-2, height()-hs, 1, 1);
+        mask -= TQRect(width()-hs, height()-2, 1, 1);
     } else
-        tqmask -= TQRect(width()-1, height()-1, 1, 1);
+        mask -= TQRect(width()-1, height()-1, 1, 1);
 
-    setMask(tqmask);
+    setMask(mask);
 }
 
 ModernSysFactory::ModernSysFactory()
diff --git a/kwin/clients/modernsystem/modernsys.h b/kwin/clients/modernsystem/modernsys.h
index 927e1e32e..3e0cf02fd 100644
--- a/kwin/clients/modernsystem/modernsys.h
+++ b/kwin/clients/modernsystem/modernsys.h
@@ -36,7 +36,7 @@ public:
     virtual TQString defaultButtonsLeft() const;
     virtual TQString defaultButtonsRight() const;
     virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
-    virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
+    virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
     virtual KCommonDecorationButton *createButton(ButtonType type);
 
     virtual void updateWindowShape();
diff --git a/kwin/clients/plastik/config/configdialog.ui b/kwin/clients/plastik/config/configdialog.ui
index 9970bd254..642891b31 100644
--- a/kwin/clients/plastik/config/configdialog.ui
+++ b/kwin/clients/plastik/config/configdialog.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>ConfigDialog</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -115,5 +115,5 @@
     <tabstop>animateButtons</tabstop>
     <tabstop>titleShadow</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kwin/clients/plastik/misc.cpp b/kwin/clients/plastik/misc.cpp
index 1b259d383..43786fe46 100644
--- a/kwin/clients/plastik/misc.cpp
+++ b/kwin/clients/plastik/misc.cpp
@@ -61,9 +61,9 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i
     if(alpha<0) alpha = 0;
     int inv_alpha = 255 - alpha;
 
-    TQColor result  = TQColor( tqRgb(tqRed(rgb_b)*inv_alpha/255 + tqRed(rgb)*alpha/255,
-                                  tqGreen(rgb_b)*inv_alpha/255 + tqGreen(rgb)*alpha/255,
-                                  tqBlue(rgb_b)*inv_alpha/255 + tqBlue(rgb)*alpha/255) );
+    TQColor result  = TQColor( qRgb(qRed(rgb_b)*inv_alpha/255 + qRed(rgb)*alpha/255,
+                                  qGreen(rgb_b)*inv_alpha/255 + qGreen(rgb)*alpha/255,
+                                  qBlue(rgb_b)*inv_alpha/255 + qBlue(rgb)*alpha/255) );
 
     return result;
 }
@@ -73,10 +73,10 @@ TQImage recolorImage(TQImage *img, TQColor color) {
     destImg.setAlphaBuffer(true);
     for (int x = 0; x < img->width(); x++) {
         for (int y = 0; y < img->height(); y++) {
-            if(img->pixel(x,y) == tqRgb(0,0,255) ) {
+            if(img->pixel(x,y) == qRgb(0,0,255) ) {
                 destImg.setPixel(x,y,color.rgb() ); // set to the new color
             } else {
-                destImg.setPixel(x,y,tqRgba(0,0,0,0) ); // set transparent...
+                destImg.setPixel(x,y,qRgba(0,0,0,0) ); // set transparent...
             }
         }
     }
diff --git a/kwin/clients/plastik/plastik.cpp b/kwin/clients/plastik/plastik.cpp
index 8d905e398..a6313cd1c 100644
--- a/kwin/clients/plastik/plastik.cpp
+++ b/kwin/clients/plastik/plastik.cpp
@@ -87,7 +87,7 @@ bool PlastikHandler::reset(unsigned long changed)
             m_borderSize = 4;
     }
 
-    // check if we are in reverse tqlayout mode
+    // check if we are in reverse layout mode
     m_reverse = TQApplication::reverseLayout();
 
     // read in the configuration
@@ -329,7 +329,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
                 painter.drawLine(2,h-1, w-1,h-1);
             }
 
-            // outside the region normally tqmasked by doShape
+            // outside the region normally masked by doShape
             painter.setPen(TQColor(0,0,0) );
             painter.drawLine(0, 0, 1, 0 );
             painter.drawPoint(0, 1);
@@ -361,7 +361,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
                 painter.drawLine(0,h-1, w-3,h-1);
             }
 
-            // outside the region normally tqmasked by doShape
+            // outside the region normally masked by doShape
             painter.setPen(TQColor(0,0,0) );
             painter.drawLine(w-2, 0, w-1, 0 );
             painter.drawPoint(w-1, 1);
diff --git a/kwin/clients/plastik/plastikbutton.cpp b/kwin/clients/plastik/plastikbutton.cpp
index 5a3258004..27a3eb127 100644
--- a/kwin/clients/plastik/plastikbutton.cpp
+++ b/kwin/clients/plastik/plastikbutton.cpp
@@ -140,7 +140,7 @@ void PlastikButton::animate()
         }
     }
 
-    tqrepaint(false);
+    repaint(false);
 }
 
 void PlastikButton::enterEvent(TQEvent *e)
@@ -269,7 +269,7 @@ void PlastikButton::drawButton(TQPainter *painter)
 
         if(!isDown() && Handler()->titleShadow() ) {
             TQColor shadowColor;
-            if (tqGray(Handler()->getColor(TitleFont,active).rgb()) < 100)
+            if (qGray(Handler()->getColor(TitleFont,active).rgb()) < 100)
                 shadowColor = TQColor(255, 255, 255);
             else
                 shadowColor = TQColor(0,0,0);
diff --git a/kwin/clients/plastik/plastikclient.cpp b/kwin/clients/plastik/plastikclient.cpp
index 4fdfe8e17..604c66641 100644
--- a/kwin/clients/plastik/plastikclient.cpp
+++ b/kwin/clients/plastik/plastikclient.cpp
@@ -80,7 +80,7 @@ bool PlastikClient::decorationBehaviour(DecorationBehaviour behaviour) const
     }
 }
 
-int PlastikClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
+int PlastikClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
 {
     bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows();
 
@@ -149,7 +149,7 @@ int PlastikClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, cons
             return 3;
 
         default:
-            return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn);
+            return KCommonDecoration::layoutMetric(lm, respectWindowState, btn);
     }
 }
 
@@ -204,25 +204,25 @@ TQRegion PlastikClient::cornerShape(WindowCorner corner)
 
     switch (corner) {
         case WC_TopLeft:
-            if (tqlayoutMetric(LM_TitleEdgeLeft) > 0)
+            if (layoutMetric(LM_TitleEdgeLeft) > 0)
                 return TQRegion(0, 0, 1, 2) + TQRegion(1, 0, 1, 1);
             else
                 return TQRegion();
 
         case WC_TopRight:
-            if (tqlayoutMetric(LM_TitleEdgeRight) > 0)
+            if (layoutMetric(LM_TitleEdgeRight) > 0)
                 return TQRegion(w-1, 0, 1, 2) + TQRegion(w-2, 0, 1, 1);
             else
                 return TQRegion();
 
         case WC_BottomLeft:
-            if (tqlayoutMetric(LM_BorderBottom) > 0)
+            if (layoutMetric(LM_BorderBottom) > 0)
                 return TQRegion(0, h-1, 1, 1);
             else
                 return TQRegion();
 
         case WC_BottomRight:
-            if (tqlayoutMetric(LM_BorderBottom) > 0)
+            if (layoutMetric(LM_BorderBottom) > 0)
                 return TQRegion(w-1, h-1, 1, 1);
             else
                 return TQRegion();
@@ -254,14 +254,14 @@ void PlastikClient::paintEvent(TQPaintEvent *e)
 //     int r_h = r.height();
     int r_x, r_y, r_x2, r_y2;
     r.coords(&r_x, &r_y, &r_x2, &r_y2);
-    const int borderLeft = tqlayoutMetric(LM_BorderLeft);
-    const int borderRight = tqlayoutMetric(LM_BorderRight);
-    const int borderBottom = tqlayoutMetric(LM_BorderBottom);
-    const int titleHeight = tqlayoutMetric(LM_TitleHeight);
-    const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop);
-    const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom);
-    const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft);
-    const int titleEdgeRight = tqlayoutMetric(LM_TitleEdgeRight);
+    const int borderLeft = layoutMetric(LM_BorderLeft);
+    const int borderRight = layoutMetric(LM_BorderRight);
+    const int borderBottom = layoutMetric(LM_BorderBottom);
+    const int titleHeight = layoutMetric(LM_TitleHeight);
+    const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop);
+    const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom);
+    const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft);
+    const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight);
 
     const int borderBottomTop = r_y2-borderBottom+1;
     const int borderLeftRight = r_x+borderLeft-1;
@@ -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) );
         }
     }
@@ -381,16 +381,16 @@ TQRect PlastikClient::captionRect() const
     const TQPixmap &caption = captionPixmap();
     TQRect r = widget()->rect();
 
-    const int titleHeight = tqlayoutMetric(LM_TitleHeight);
-    const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom);
-    const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop);
-    const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft);
-    const int marginLeft = tqlayoutMetric(LM_TitleBorderLeft);
-    const int marginRight = tqlayoutMetric(LM_TitleBorderRight);
+    const int titleHeight = layoutMetric(LM_TitleHeight);
+    const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom);
+    const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop);
+    const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft);
+    const int marginLeft = layoutMetric(LM_TitleBorderLeft);
+    const int marginRight = layoutMetric(LM_TitleBorderRight);
 
     const int titleLeft = r.left() + titleEdgeLeft + buttonsLeftWidth() + marginLeft;
     const int titleWidth = r.width() -
-            titleEdgeLeft - tqlayoutMetric(LM_TitleEdgeRight) -
+            titleEdgeLeft - layoutMetric(LM_TitleEdgeRight) -
             buttonsLeftWidth() - buttonsRightWidth() -
             marginLeft - marginRight;
 
@@ -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();
     }
@@ -479,7 +479,7 @@ const TQPixmap &PlastikClient::captionPixmap() const
     int captionWidth  = fm.width(c);
     int captionHeight = fm.height();
 
-    const int th  = tqlayoutMetric(LM_TitleHeight, false) + tqlayoutMetric(LM_TitleEdgeBottom, false);
+    const int th  = layoutMetric(LM_TitleHeight, false) + layoutMetric(LM_TitleEdgeBottom, false);
 
     TQPainter painter;
 
@@ -496,7 +496,7 @@ const TQPixmap &PlastikClient::captionPixmap() const
     if(Handler()->titleShadow())
     {
         TQColor shadowColor;
-        if (tqGray(Handler()->getColor(TitleFont,active).rgb()) < 100)
+        if (qGray(Handler()->getColor(TitleFont,active).rgb()) < 100)
             shadowColor = TQColor(255, 255, 255);
         else
             shadowColor = TQColor(0,0,0);
diff --git a/kwin/clients/plastik/plastikclient.h b/kwin/clients/plastik/plastikclient.h
index 6f96664ea..e83bf75a5 100644
--- a/kwin/clients/plastik/plastikclient.h
+++ b/kwin/clients/plastik/plastikclient.h
@@ -41,7 +41,7 @@ public:
     virtual TQString defaultButtonsLeft() const;
     virtual TQString defaultButtonsRight() const;
     virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
-    virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
+    virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
     virtual TQRegion cornerShape(WindowCorner corner);
     virtual KCommonDecorationButton *createButton(ButtonType type);
 
diff --git a/kwin/clients/quartz/config/config.cpp b/kwin/clients/quartz/config/config.cpp
index f6b780eeb..d15eb4da1 100644
--- a/kwin/clients/quartz/config/config.cpp
+++ b/kwin/clients/quartz/config/config.cpp
@@ -1,6 +1,6 @@
 /* 	
  *
- *	This file tqcontains the quartz configuration widget
+ *	This file contains the quartz configuration widget
  *
  *	Copyright (c) 2001
  *		Karol Szwed <gallium@kde.org>
diff --git a/kwin/clients/quartz/config/config.h b/kwin/clients/quartz/config/config.h
index d22313ab7..0a952c4e9 100644
--- a/kwin/clients/quartz/config/config.h
+++ b/kwin/clients/quartz/config/config.h
@@ -1,6 +1,6 @@
 /* 	
  *
- *	This file tqcontains the quartz configuration widget
+ *	This file contains the quartz configuration widget
  *
  *	Copyright (c) 2001
  *		Karol Szwed <gallium@kde.org>
diff --git a/kwin/clients/quartz/quartz.cpp b/kwin/clients/quartz/quartz.cpp
index 489ccd081..82caabb45 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)) {
@@ -291,18 +291,18 @@ void QuartzHandler::drawBlocks( KPixmap *pi, KPixmap &p, const TQColor &c1, cons
 void QuartzHandler::createPixmaps()
 {
     // Obtain titlebar blend colours, and create the block stuff on pixmaps.
-    TQColorGroup g2 = options()->tqcolorGroup(ColorTitleBlend, true);
+    TQColorGroup g2 = options()->colorGroup(ColorTitleBlend, true);
     TQColor c2 = g2.background();
-    g2 = options()->tqcolorGroup(ColorTitleBar, true );
+    g2 = options()->colorGroup(ColorTitleBar, true );
     TQColor c = g2.background().light(130);
 
 	titleBlocks = new KPixmap();
     titleBlocks->resize( normalTitleHeight*25/18, normalTitleHeight );
     drawBlocks( titleBlocks, *titleBlocks, c, c2 );
 
-    g2 = options()->tqcolorGroup(ColorTitleBlend, false);
+    g2 = options()->colorGroup(ColorTitleBlend, false);
     c2 = g2.background();
-    g2 = options()->tqcolorGroup(ColorTitleBar, false );
+    g2 = options()->colorGroup(ColorTitleBar, false );
     c = g2.background().light(130);
 
 	ititleBlocks = new KPixmap();
@@ -313,9 +313,9 @@ void QuartzHandler::createPixmaps()
 	TQColorGroup g;
 	TQPainter p;
 
-	g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true );
+	g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true );
 	c = onAllDesktopsButtonOnLeft ? g.background().light(130) : g.background();
-	g2 = options()->tqcolorGroup( ColorButtonBg, true );
+	g2 = options()->colorGroup( ColorButtonBg, true );
 
 	pinUpPix = new KPixmap();
 	pinUpPix->resize(16, 16);
@@ -335,9 +335,9 @@ void QuartzHandler::createPixmaps()
 
 
 	// Inactive pins
-	g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false );
+	g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false );
 	c = onAllDesktopsButtonOnLeft ? g.background().light(130) : g.background();
-	g2 = options()->tqcolorGroup( ColorButtonBg, false );
+	g2 = options()->colorGroup( ColorButtonBg, false );
 
 	ipinUpPix = new KPixmap();
 	ipinUpPix->resize(16, 16);
@@ -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 );
 	}
 }
 
@@ -540,7 +540,7 @@ bool QuartzClient::decorationBehaviour(DecorationBehaviour behaviour) const
 	}
 }
 
-int QuartzClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
+int QuartzClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
 {
 	bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows();
 
@@ -582,7 +582,7 @@ int QuartzClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const
 			return 3;
 
 		default:
-			return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn);
+			return KCommonDecoration::layoutMetric(lm, respectWindowState, btn);
 	}
 }
 
@@ -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);
@@ -675,9 +675,9 @@ void QuartzClient::paintEvent( TQPaintEvent* )
     // Draw part of the frame that is the title color
 
 	if( coloredFrame )
-    	g = options()->tqcolorGroup(ColorTitleBar, isActive());
+    	g = options()->colorGroup(ColorTitleBar, isActive());
 	else
-		g = options()->tqcolorGroup(ColorFrame, isActive());
+		g = options()->colorGroup(ColorFrame, isActive());
 
     // Draw outer highlights and lowlights
     p.setPen( g.light().light(120) );
@@ -724,11 +724,11 @@ void QuartzClient::paintEvent( TQPaintEvent* )
     // ===================
     int r_x, r_y, r_x2, r_y2;
     widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2);
-    const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft);
-    const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop);
-    const int titleEdgeRight = tqlayoutMetric(LM_TitleEdgeRight);
-    const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom);
-    const int ttlHeight = tqlayoutMetric(LM_TitleHeight);
+    const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft);
+    const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop);
+    const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight);
+    const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom);
+    const int ttlHeight = layoutMetric(LM_TitleHeight);
     const int titleEdgeBottomBottom = r_y+titleEdgeTop+ttlHeight+titleEdgeBottom-1;
     r = TQRect(r_x+titleEdgeLeft+buttonsLeftWidth(), r_y+titleEdgeTop,
               r_x2-titleEdgeRight-buttonsRightWidth()-(r_x+titleEdgeLeft+buttonsLeftWidth()),
diff --git a/kwin/clients/quartz/quartz.h b/kwin/clients/quartz/quartz.h
index 8f357d209..ddb68ced3 100644
--- a/kwin/clients/quartz/quartz.h
+++ b/kwin/clients/quartz/quartz.h
@@ -74,7 +74,7 @@ class QuartzClient : public KCommonDecoration
 		virtual TQString defaultButtonsLeft() const;
 		virtual TQString defaultButtonsRight() const;
 		virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
-		virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
+		virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
 		virtual KCommonDecorationButton *createButton(ButtonType type);
 
 		virtual void init();
diff --git a/kwin/clients/redmond/redmond.cpp b/kwin/clients/redmond/redmond.cpp
index aacbd3812..7f74479ed 100644
--- a/kwin/clients/redmond/redmond.cpp
+++ b/kwin/clients/redmond/redmond.cpp
@@ -149,7 +149,7 @@ static void create_pixmaps ()
     defaultMenuPix = new TQPixmap(kdelogo);
 
     // buttons (active/inactive, sunken/unsunken)
-	TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true);
+	TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true);
     TQColor c = g.background();
     btnPix1->resize(normalTitleHeight, normalTitleHeight-2);
     btnDownPix1->resize(normalTitleHeight, normalTitleHeight-2);
@@ -172,7 +172,7 @@ static void create_pixmaps ()
         KPixmapEffect::gradient(*miniBtnDownPix1, c.dark(130), c.light(130),
                                 KPixmapEffect::VerticalGradient);
 
-        g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
+        g = options()->colorGroup(KDecoration::ColorButtonBg, false);
         c = g.background();
         KPixmapEffect::gradient(*iBtnPix1, c.light(130), c.dark(130),
                                 KPixmapEffect::VerticalGradient);
@@ -188,7 +188,7 @@ static void create_pixmaps ()
         miniBtnPix1->fill(c.rgb());
         miniBtnDownPix1->fill(c.rgb());
 
-        g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
+        g = options()->colorGroup(KDecoration::ColorButtonBg, false);
         c = g.background();
         iBtnPix1->fill(c.rgb());
         iBtnDownPix1->fill(c.rgb());
@@ -196,20 +196,20 @@ static void create_pixmaps ()
         iMiniBtnDownPix1->fill(c.rgb());
     }
 
-    g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true);
+    g = options()->colorGroup(KDecoration::ColorButtonBg, true);
     drawButtonFrame(btnPix1, g, false);
     drawButtonFrame(btnDownPix1, g, true);
     drawButtonFrame(miniBtnPix1, g, false);
     drawButtonFrame(miniBtnDownPix1, g, true);
 
-    g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
+    g = options()->colorGroup(KDecoration::ColorButtonBg, false);
     drawButtonFrame(iBtnPix1, g, false);
     drawButtonFrame(iBtnDownPix1, g, true);
     drawButtonFrame(iMiniBtnPix1, g, false);
     drawButtonFrame(iMiniBtnDownPix1, g, true);
 
     // Make sure button pixmaps contrast with the current colour scheme.
-    if (tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127)
+    if (qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127)
         btnForeground = new TQColor(Qt::black);
     else
         btnForeground = new TQColor(Qt::white);
@@ -294,7 +294,7 @@ void RedmondButton::setPixmap( const TQPixmap &p )
 	deco.resize(0, 0);
 	pix = p;
 
-	tqrepaint(false);
+	repaint(false);
 }
 
 
@@ -380,7 +380,7 @@ bool RedmondDeco::decorationBehaviour(DecorationBehaviour behaviour) const
     }
 }
 
-int RedmondDeco::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
+int RedmondDeco::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
 {
 	bool border = !(maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows());
 
@@ -423,7 +423,7 @@ int RedmondDeco::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const
 			return 2;
 
 		default:
-			return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn);
+			return KCommonDecoration::layoutMetric(lm, respectWindowState, btn);
 	}
 }
 
@@ -485,7 +485,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* )
 
     // Draw part of the frame that is the frame color
     // ==============================================
-    TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive());
+    TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
     p.setPen( g.background() );
     p.drawLine( x, y, x2-1, y );
     p.drawLine( x, y, x, y2-1 );
diff --git a/kwin/clients/redmond/redmond.h b/kwin/clients/redmond/redmond.h
index e827ecfbf..fdc5047bc 100644
--- a/kwin/clients/redmond/redmond.h
+++ b/kwin/clients/redmond/redmond.h
@@ -56,7 +56,7 @@ public:
 	virtual TQString defaultButtonsLeft() const;
 	virtual TQString defaultButtonsRight() const;
 	virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
-	virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
+	virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
 	virtual KCommonDecorationButton *createButton(ButtonType type);
 
 	void init();
diff --git a/kwin/clients/test/test.cpp b/kwin/clients/test/test.cpp
index 3bb759349..a04437067 100644
--- a/kwin/clients/test/test.cpp
+++ b/kwin/clients/test/test.cpp
@@ -93,7 +93,7 @@ void Decoration::resize( const TQSize& s )
     widget()->resize( s );
     }
     
-TQSize Decoration::tqminimumSize() const
+TQSize Decoration::minimumSize() const
     {
     return TQSize( 100, 50 );
     }
@@ -144,7 +144,7 @@ bool Decoration::animateMinimize(bool iconify)
 
         // Go away quick.
         helperShowHide( false );
-        tqApp->syncX();
+        qApp->syncX();
 
         TQRect r = iconGeometry();
 
@@ -153,8 +153,8 @@ bool Decoration::animateMinimize(bool iconify)
 
         // Algorithm taken from Window Maker (http://www.windowmaker.org)
 
-        int sx = tqgeometry().x();
-        int sy = tqgeometry().y();
+        int sx = geometry().x();
+        int sy = geometry().y();
         int sw = width();
         int sh = height();
         int dx = r.x();
@@ -213,7 +213,7 @@ bool Decoration::animateMinimize(bool iconify)
 
           ungrabXServer();
 
-// FRAME          tqApp->processEvents(); // FRAME ???
+// FRAME          qApp->processEvents(); // FRAME ???
 
           cx += xstep;
           cy += ystep;
@@ -236,11 +236,11 @@ bool Decoration::animateMinimize(bool iconify)
         // Go away quick.
         helperShowHide( false );
         
-        tqApp->syncX();
+        qApp->syncX();
 
         int stepCount = 12;
 
-        TQRect r(tqgeometry());
+        TQRect r(geometry());
 
         int dx = r.width() / (stepCount * 2);
         int dy = r.height() / (stepCount * 2);
@@ -263,7 +263,7 @@ bool Decoration::animateMinimize(bool iconify)
 
           ungrabXServer();
 
-// FRAME          tqApp->processEvents();
+// FRAME          qApp->processEvents();
         }
       }
       break;
@@ -276,7 +276,7 @@ bool Decoration::animateMinimize(bool iconify)
         if (!icongeom.isValid())
           return true;
 
-        TQRect wingeom = tqgeometry();
+        TQRect wingeom = geometry();
 
         TQPainter p( workspaceWidget());
 
@@ -298,7 +298,7 @@ bool Decoration::animateMinimize(bool iconify)
 
         p.flush();
 
-        tqApp->syncX();
+        qApp->syncX();
 
         usleep(30000);
 
diff --git a/kwin/clients/test/test.h b/kwin/clients/test/test.h
index e1d3d51a6..bfe36fa7c 100644
--- a/kwin/clients/test/test.h
+++ b/kwin/clients/test/test.h
@@ -22,7 +22,7 @@ class Decoration
 	virtual MousePosition mousePosition( const TQPoint& p ) const;
 	virtual void borders( int& left, int& right, int& top, int& bottom ) const;
 	virtual void resize( const TQSize& s );
-	virtual TQSize tqminimumSize() const;
+	virtual TQSize minimumSize() const;
         virtual void activeChange() {};
         virtual void captionChange() {};
         virtual void maximizeChange() {};
diff --git a/kwin/clients/web/Web.cpp b/kwin/clients/web/Web.cpp
index 1954b960f..43d1b9f42 100644
--- a/kwin/clients/web/Web.cpp
+++ b/kwin/clients/web/Web.cpp
@@ -80,7 +80,7 @@ bool WebClient::decorationBehaviour(DecorationBehaviour behaviour) const
     }
 }
 
-int WebClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
+int WebClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const
 {
 //   bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows();
 
@@ -112,7 +112,7 @@ int WebClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KC
       return 0;
 
     default:
-      return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn);
+      return KCommonDecoration::layoutMetric(lm, respectWindowState, btn);
   }
 }
 
@@ -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("kwinwebrc");
   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);
@@ -217,11 +217,11 @@ WebClient::paintEvent(TQPaintEvent * pe)
 {
   int r_x, r_y, r_x2, r_y2;
   widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2);
-  const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft);
-  const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop);
-  const int titleEdgeRight = tqlayoutMetric(LM_TitleEdgeRight);
-  const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom);
-  const int ttlHeight = tqlayoutMetric(LM_TitleHeight);
+  const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft);
+  const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop);
+  const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight);
+  const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom);
+  const int ttlHeight = layoutMetric(LM_TitleHeight);
   const int titleEdgeBottomBottom = r_y+titleEdgeTop+ttlHeight+titleEdgeBottom-1;
   TQRect titleRect = TQRect(r_x+titleEdgeLeft+buttonsLeftWidth(), r_y+titleEdgeTop,
             r_x2-titleEdgeRight-buttonsRightWidth()-(r_x+titleEdgeLeft+buttonsLeftWidth()),
@@ -231,7 +231,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
   TQPainter p(widget());
 
   p.setPen(Qt::black);
-  p.setBrush(options()->tqcolorGroup(ColorFrame, isActive()).background());
+  p.setBrush(options()->colorGroup(ColorFrame, isActive()).background());
 
   p.setClipRegion(pe->region() - titleRect);
 
@@ -241,12 +241,12 @@ WebClient::paintEvent(TQPaintEvent * pe)
 
   p.fillRect(titleRect, options()->color(ColorTitleBar, isActive()));
 
-  if (tqshape_)
+  if (shape_)
   {
     int r(width());
     int b(height());
 
-    // Draw edge of top-left corner inside the area removed by the tqmask.
+    // Draw edge of top-left corner inside the area removed by the mask.
 
     p.drawPoint(3, 1);
     p.drawPoint(4, 1);
@@ -254,7 +254,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
     p.drawPoint(1, 3);
     p.drawPoint(1, 4);
 
-    // Draw edge of top-right corner inside the area removed by the tqmask.
+    // Draw edge of top-right corner inside the area removed by the mask.
 
     p.drawPoint(r - 5, 1);
     p.drawPoint(r - 4, 1);
@@ -262,7 +262,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
     p.drawPoint(r - 2, 3);
     p.drawPoint(r - 2, 4);
 
-    // Draw edge of bottom-left corner inside the area removed by the tqmask.
+    // Draw edge of bottom-left corner inside the area removed by the mask.
 
     p.drawPoint(1, b - 5);
     p.drawPoint(1, b - 4);
@@ -270,7 +270,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
     p.drawPoint(3, b - 2);
     p.drawPoint(4, b - 2);
 
-    // Draw edge of bottom-right corner inside the area removed by the tqmask.
+    // Draw edge of bottom-right corner inside the area removed by the mask.
 
     p.drawPoint(r - 2, b - 5);
     p.drawPoint(r - 2, b - 4);
@@ -288,43 +288,43 @@ WebClient::paintEvent(TQPaintEvent * pe)
 
 void WebClient::updateWindowShape()
 {
-  if (!tqshape_)
+  if (!shape_)
     return;
 
-  TQRegion tqmask(0, 0, width(), height());
+  TQRegion mask(0, 0, width(), height());
 
   int r(width());
   int b(height());
 
   // Remove top-left corner.
 
-  tqmask -= TQRegion(0, 0, 5, 1);
-  tqmask -= TQRegion(0, 1, 3, 1);
-  tqmask -= TQRegion(0, 2, 2, 1);
-  tqmask -= TQRegion(0, 3, 1, 2);
+  mask -= TQRegion(0, 0, 5, 1);
+  mask -= TQRegion(0, 1, 3, 1);
+  mask -= TQRegion(0, 2, 2, 1);
+  mask -= TQRegion(0, 3, 1, 2);
 
   // Remove top-right corner.
 
-  tqmask -= TQRegion(r - 5, 0, 5, 1);
-  tqmask -= TQRegion(r - 3, 1, 3, 1);
-  tqmask -= TQRegion(r - 2, 2, 2, 1);
-  tqmask -= TQRegion(r - 1, 3, 1, 2);
+  mask -= TQRegion(r - 5, 0, 5, 1);
+  mask -= TQRegion(r - 3, 1, 3, 1);
+  mask -= TQRegion(r - 2, 2, 2, 1);
+  mask -= TQRegion(r - 1, 3, 1, 2);
 
   // Remove bottom-left corner.
 
-  tqmask -= TQRegion(0, b - 5, 1, 3);
-  tqmask -= TQRegion(0, b - 3, 2, 1);
-  tqmask -= TQRegion(0, b - 2, 3, 1);
-  tqmask -= TQRegion(0, b - 1, 5, 1);
+  mask -= TQRegion(0, b - 5, 1, 3);
+  mask -= TQRegion(0, b - 3, 2, 1);
+  mask -= TQRegion(0, b - 2, 3, 1);
+  mask -= TQRegion(0, b - 1, 5, 1);
 
   // Remove bottom-right corner.
 
-  tqmask -= TQRegion(r - 5, b - 1, 5, 1);
-  tqmask -= TQRegion(r - 3, b - 2, 3, 1);
-  tqmask -= TQRegion(r - 2, b - 3, 2, 1);
-  tqmask -= TQRegion(r - 1, b - 5, 1, 2);
+  mask -= TQRegion(r - 5, b - 1, 5, 1);
+  mask -= TQRegion(r - 3, b - 2, 3, 1);
+  mask -= TQRegion(r - 2, b - 3, 2, 1);
+  mask -= TQRegion(r - 1, b - 5, 1, 2);
 
-  setMask(tqmask);
+  setMask(mask);
 }
 
 KDecoration* WebFactory::createDecoration( KDecorationBridge* b )
@@ -382,4 +382,4 @@ TQValueList< WebFactory::BorderSize > WebFactory::borderSizes() const
 
 #include "Web.moc"
 // vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on;
+// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
diff --git a/kwin/clients/web/Web.h b/kwin/clients/web/Web.h
index 4b24d0da6..c8a8fa2db 100644
--- a/kwin/clients/web/Web.h
+++ b/kwin/clients/web/Web.h
@@ -46,7 +46,7 @@ namespace Web
       virtual TQString defaultButtonsLeft() const;
       virtual TQString defaultButtonsRight() const;
       virtual bool decorationBehaviour(DecorationBehaviour behaviour) const;
-      virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
+      virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const;
       virtual KCommonDecorationButton *createButton(ButtonType type);
 
       virtual void updateWindowShape();
@@ -62,7 +62,7 @@ namespace Web
 
       int titleHeight_, borderSize_;
 
-      bool tqshape_;
+      bool shape_;
 
       TQBitmap       _buttonBitmap(ButtonType t) const;
   };
@@ -84,4 +84,4 @@ namespace Web
 
 #endif
 // vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on;
+// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
diff --git a/kwin/clients/web/WebButton.cpp b/kwin/clients/web/WebButton.cpp
index b12d7bd84..61811accc 100644
--- a/kwin/clients/web/WebButton.cpp
+++ b/kwin/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);
 }
 
@@ -145,17 +145,17 @@ WebButton::drawButton(TQPainter *p)
   TQPen highlightPen;
 
   if (isDown() )
-    highlightPen = TQPen(tqcolorGroup().light());
+    highlightPen = TQPen(colorGroup().light());
 
   else
   {
     if (mouseOver_)
-      highlightPen = TQPen(tqcolorGroup().highlight());
+      highlightPen = TQPen(colorGroup().highlight());
     else
       highlightPen = TQPen(NoPen);
   }
 
-  p->fillRect(rect(), tqcolorGroup().background());
+  p->fillRect(rect(), colorGroup().background());
 
   Position position_;
   if (0 == mapToParent(rect().topLeft() ).x() )
@@ -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);
@@ -284,4 +284,4 @@ WebButton::setBitmap(const unsigned char *bitmap)
 }
 
 // vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on;
+// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
diff --git a/kwin/clients/web/WebButton.h b/kwin/clients/web/WebButton.h
index 2e6a54ef1..da94ea3f7 100644
--- a/kwin/clients/web/WebButton.h
+++ b/kwin/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_;
   };
 }
@@ -67,4 +67,4 @@ namespace Web
 #endif
 
 // vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on;
+// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
-- 
cgit v1.2.1