Rename old tq methods that no longer need a unique name

18 files changed, 81 insertions, 81 deletions

diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index c5786146a..28ebc9c76 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -419,7 +419,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++) {
@@ -635,7 +635,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
@@ -859,7 +859,7 @@ void B2Client::activeChange()
     widget()->tqrepaint(false);
     titlebar->tqrepaint(false);
 
-    TQColor c = options()->tqcolorGroup(
+    TQColor c = options()->colorGroup(
 	    KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button);
 
     for (int i = 0; i < BtnCount; i++)
@@ -881,7 +881,7 @@ void B2Client::shadeChange()
     }
 }
 
-TQSize B2Client::tqminimumSize() const
+TQSize B2Client::minimumSize() const
 {
     int left, right, top, bottom;
     borders(left, right, top, bottom);
@@ -960,8 +960,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);
@@ -1222,7 +1222,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent,
 }
 
 
-TQSize B2Button::tqsizeHint() const
+TQSize B2Button::sizeHint() const
 {
     return TQSize(buttonSize, buttonSize);
 }
@@ -1363,7 +1363,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,
diff --git a/twin/clients/b2/b2client.h b/twin/clients/b2/b2client.h
index d1062348e..30220b175 100644
--- a/twin/clients/b2/b2client.h
+++ b/twin/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);
@@ -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/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp
index f3b8fa2ba..987e80ee2 100644
--- a/twin/clients/default/kdedefault.cpp
+++ b/twin/clients/default/kdedefault.cpp
@@ -328,7 +328,7 @@ 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 );
@@ -346,7 +346,7 @@ void KDEDefaultHandler::createPixmaps()
 	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 );
@@ -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 );
@@ -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/twin/clients/keramik/embedtool.cpp b/twin/clients/keramik/embedtool.cpp
index d1cbd78fd..a635c4ee2 100644
--- a/twin/clients/keramik/embedtool.cpp
+++ b/twin/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" );
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index e514e3a20..ce137cd20 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -832,14 +832,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
@@ -1280,7 +1280,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
@@ -1289,7 +1289,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() );
@@ -1349,7 +1349,7 @@ void KeramikClient::calculateCaptionRect()
 		cw += 16 + 4; // icon width + space
 
 	cw = QMIN( cw, titlebar->geometry().width() );
-	captionRect = TQStyle::tqvisualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY),
+	captionRect = TQStyle::visualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY),
 				cw, clientHandler->titleBarHeight(largeCaption) ),
 				titlebar->geometry() );
 }
@@ -1794,9 +1794,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/twin/clients/keramik/keramik.h b/twin/clients/keramik/keramik.h
index 8e4a98518..59f9960c5 100644
--- a/twin/clients/keramik/keramik.h
+++ b/twin/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();
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index 5d5e462f7..1a1316dc1 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -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);
     }
 }
@@ -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()));
@@ -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
@@ -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 )
diff --git a/twin/clients/kwmtheme/kwmthemeclient.h b/twin/clients/kwmtheme/kwmthemeclient.h
index e51bfe6d1..58db3d14f 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.h
+++ b/twin/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();
diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp
index db37feae6..3b0a1c7ef 100644
--- a/twin/clients/laptop/laptopclient.cpp
+++ b/twin/clients/laptop/laptopclient.cpp
@@ -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,20 +200,20 @@ 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);
@@ -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());
@@ -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);
@@ -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/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp
index 136ff3492..a1e417cc7 100644
--- a/twin/clients/modernsystem/config/config.cpp
+++ b/twin/clients/modernsystem/config/config.cpp
@@ -59,11 +59,11 @@ 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);
diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp
index b6e7cda01..cbe17099e 100644
--- a/twin/clients/modernsystem/modernsys.cpp
+++ b/twin/clients/modernsystem/modernsys.cpp
@@ -171,13 +171,13 @@ 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);
@@ -515,7 +515,7 @@ 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->geometry();
@@ -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);
 
 }
 
@@ -570,9 +570,9 @@ void ModernSys::paintEvent( TQPaintEvent* )
     TQPainter p( widget() );
     TQRect t = titleRect(); // titlebar->geometry();
 
-    TQBrush fillBrush(widget()->tqcolorGroup().tqbrush(TQColorGroup::Background).pixmap() ?
-                     widget()->tqcolorGroup().brush(TQColorGroup::Background) :
-                     options()->tqcolorGroup(ColorFrame, isActive()).
+    TQBrush fillBrush(widget()->colorGroup().tqbrush(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());
diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp
index 9faf73df0..76d643904 100644
--- a/twin/clients/plastik/plastik.cpp
+++ b/twin/clients/plastik/plastik.cpp
@@ -290,7 +290,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
             } else {
                 pm = new TQPixmap(1, titleBarTileHeight);
                 painter.begin(pm);
-                painter.tqdrawPixmap(0, 0, gradient, 0,2);
+                painter.drawPixmap(0, 0, gradient, 0,2);
                 if (m_coloredBorder) {
                     painter.setPen(getColor(TitleGradient3, active).dark(110) );
                 } else {
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index d0b8974cf..7530adc84 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -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 ? TQColor(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 ? TQColor(g.background().light(130)) : g.background();
-	g2 = options()->tqcolorGroup( ColorButtonBg, false );
+	g2 = options()->colorGroup( ColorButtonBg, false );
 
 	ipinUpPix = new KPixmap();
 	ipinUpPix->resize(16, 16);
@@ -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) );
diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp
index 9fd625dde..e4127adaa 100644
--- a/twin/clients/redmond/redmond.cpp
+++ b/twin/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,13 +196,13 @@ 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);
@@ -491,7 +491,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/twin/clients/test/test.cpp b/twin/clients/test/test.cpp
index 02fd5b1d3..2e26a7c41 100644
--- a/twin/clients/test/test.cpp
+++ b/twin/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 );
     }
diff --git a/twin/clients/test/test.h b/twin/clients/test/test.h
index e1d3d51a6..bfe36fa7c 100644
--- a/twin/clients/test/test.h
+++ b/twin/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/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp
index 793b406af..0f3b9c70b 100644
--- a/twin/clients/web/Web.cpp
+++ b/twin/clients/web/Web.cpp
@@ -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);
 
diff --git a/twin/clients/web/WebButton.cpp b/twin/clients/web/WebButton.cpp
index bf1f54af4..3c96cac2d 100644
--- a/twin/clients/web/WebButton.cpp
+++ b/twin/clients/web/WebButton.cpp
@@ -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() )