Rename a number of old tq methods that are no longer tq specific

2 files changed, 33 insertions, 33 deletions

diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp
index a676a02a..1204c388 100644
--- a/twin-styles/system/systemclient.cpp
+++ b/twin-styles/system/systemclient.cpp
@@ -1,6 +1,6 @@
 #include "systemclient.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdrawutil.h>
 #include <tqbitmap.h>
 #include <tqtooltip.h>
@@ -13,7 +13,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 
-// Default button tqlayout
+// Default button layout
 const char default_left[]  = "X";
 const char default_right[] = "HSIA";
 
@@ -78,7 +78,7 @@ static void create_pixmaps()
         aUpperGradient->resize(32, 18);
         iUpperGradient = new KPixmap;
         iUpperGradient->resize(32, 18);
-        TQColor bgColor = kapp->tqpalette().active().background();
+        TQColor bgColor = kapp->palette().active().background();
         KPixmapEffect::gradient(*aUpperGradient,
                                 KDecoration::options()->color(KDecorationOptions::ColorFrame, true).light(130),
                                 bgColor,
@@ -124,12 +124,12 @@ static void create_pixmaps()
         btnPix = new KPixmap;
         btnPix->resize(14, 14);
         bitBlt(TQT_TQPAINTDEVICE(btnPix), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true);
-        drawButtonFrame(btnPix, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, true));
+        drawButtonFrame(btnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, true));
 
         iBtnPix = new KPixmap;
         iBtnPix->resize(14, 14);
         bitBlt(TQT_TQPAINTDEVICE(iBtnPix), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true);
-        drawButtonFrame(iBtnPix, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, false));
+        drawButtonFrame(iBtnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, false));
 
 
         // pressed buttons
@@ -158,13 +158,13 @@ static void create_pixmaps()
         btnPixDown = new KPixmap;
         btnPixDown->resize(14, 14);
         bitBlt(TQT_TQPAINTDEVICE(btnPixDown), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true);
-        drawButtonFrame(btnPixDown, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame,
+        drawButtonFrame(btnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame,
                                                         true));
 
         iBtnPixDown = new KPixmap;
         iBtnPixDown->resize(14, 14);
         bitBlt(TQT_TQPAINTDEVICE(iBtnPixDown), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true);
-        drawButtonFrame(iBtnPixDown, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame,
+        drawButtonFrame(iBtnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame,
                                                          false));
     }
     if(tqGray(KDecoration::options()->color(KDecorationOptions::ColorButtonBg, true).rgb()) > 128)
@@ -211,21 +211,21 @@ void SystemButton::setTipText(const TQString &tip)
 }
 
 
-TQSize SystemButton::tqsizeHint() const
+TQSize SystemButton::sizeHint() const
 {
     return(TQSize(14, 14));
 }
 
 void SystemButton::reset()
 {
-   tqrepaint(false);
+   repaint(false);
 }
 
 void SystemButton::setBitmap(const unsigned char *bitmap)
 {
     deco = TQBitmap(8, 8, bitmap, true);
     deco.setMask(deco);
-    tqrepaint();
+    repaint();
 }
 
 void SystemButton::drawButton(TQPainter *p)
@@ -237,7 +237,7 @@ void SystemButton::drawButton(TQPainter *p)
             p->drawPixmap(0, 0, isDown() ? *iBtnPixDown : *iBtnPix);
     }
     else{
-        TQColorGroup g = KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame,
+        TQColorGroup g = KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame,
                                             client->isActive());
         int x2 = width()-1;
         int y2 = height()-1;
@@ -251,7 +251,7 @@ void SystemButton::drawButton(TQPainter *p)
         p->setPen(g.dark());
         p->drawRect(1, 1, width()-2, height()-2);
         // inner frame
-        g = KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorButtonBg, client->isActive());
+        g = KDecoration::options()->colorGroup(KDecorationOptions::ColorButtonBg, client->isActive());
         p->fillRect(3, 3, width()-6, height()-6, g.background());
         p->setPen(isDown() ? g.mid() : g.light());
         p->drawLine(2, 2, x2-2, 2);
@@ -440,7 +440,7 @@ void SystemClient::reset(unsigned long)
 {
    titleBuffer.resize(0, 0);
    recalcTitleBuffer();
-   widget()->tqrepaint();
+   widget()->repaint();
    if (button[ButtonClose])
        button[ButtonClose]->reset();
    if (button[ButtonSticky])
@@ -466,7 +466,7 @@ void SystemClient::resizeEvent( TQResizeEvent* )
     /*
     if ( isVisibleToTLW() && !testWFlags( WStaticContents )) {
         TQPainter p( this );
-	TQRect t = titlebar->tqgeometry();
+	TQRect t = titlebar->geometry();
 	t.setTop( 0 );
 	TQRegion r = rect();
 	r = r.subtract( t );
@@ -481,9 +481,9 @@ void SystemClient::resize( const TQSize& s )
 }
 
 
-TQSize SystemClient::tqminimumSize() const
+TQSize SystemClient::minimumSize() const
 {
-   return widget()->tqminimumSize();
+   return widget()->minimumSize();
 }
 
 
@@ -499,10 +499,10 @@ void SystemClient::recalcTitleBuffer()
         p.drawTiledPixmap(0, 0, width(), 18, *aUpperGradient);
     else
         p.fillRect(0, 0, width(), 18,
-                   options()->tqcolorGroup(KDecorationOptions::ColorFrame, true).
+                   options()->colorGroup(KDecorationOptions::ColorFrame, true).
                    brush(TQColorGroup::Button));
 
-    TQRect t = titlebar->tqgeometry();
+    TQRect t = titlebar->geometry();
     t.setTop( 2 );
     t.setLeft( t.left() + 4 );
     t.setRight( t.right() - 2 );
@@ -532,24 +532,24 @@ void SystemClient::recalcTitleBuffer()
 void SystemClient::captionChange()
 {
    recalcTitleBuffer();
-   widget()->tqrepaint(titlebar->tqgeometry(), false);
+   widget()->repaint(titlebar->geometry(), false);
 }
 
 void SystemClient::drawRoundFrame(TQPainter &p, int x, int y, int w, int h)
 {
    kDrawRoundButton(&p, x, y, w, h,
-                    options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()), false);
+                    options()->colorGroup(KDecorationOptions::ColorFrame, isActive()), false);
 
 }
 
 void SystemClient::paintEvent( TQPaintEvent* )
 {
     TQPainter p(widget());
-    TQRect t = titlebar->tqgeometry();
+    TQRect t = titlebar->geometry();
 
-    TQBrush fillBrush(TQBrush(widget()->tqcolorGroup().brush(TQColorGroup::Background)).pixmap() ?
-                     widget()->tqcolorGroup().brush(TQColorGroup::Background) :
-                     options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()).
+    TQBrush fillBrush(TQBrush(widget()->colorGroup().brush(TQColorGroup::Background)).pixmap() ?
+                     widget()->colorGroup().brush(TQColorGroup::Background) :
+                     options()->colorGroup(KDecorationOptions::ColorFrame, isActive()).
                      brush(TQColorGroup::Button));
 
     p.fillRect(1, 18, width()-2, height()-19, fillBrush);
@@ -570,10 +570,10 @@ void SystemClient::paintEvent( TQPaintEvent* )
         p.drawText(t, AlignCenter, caption() );
     }
 
-    p.setPen(options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()).light());
+    p.setPen(options()->colorGroup(KDecorationOptions::ColorFrame, isActive()).light());
     p.drawLine(width()-20, height()-7, width()-10,  height()-7);
     p.drawLine(width()-20, height()-5, width()-10,  height()-5);
-    p.setPen(options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()).dark());
+    p.setPen(options()->colorGroup(KDecorationOptions::ColorFrame, isActive()).dark());
     p.drawLine(width()-20, height()-6, width()-10,  height()-6);
     p.drawLine(width()-20, height()-4, width()-10,  height()-4);
 
@@ -597,7 +597,7 @@ void SystemClient::showEvent(TQShowEvent *)
 //    Client::showEvent(ev);
     doShape();
     widget()->show();
-//    widget()->tqrepaint();
+//    widget()->repaint();
 }
 
 /*void SystemClient::windowWrapperShowEvent( TQShowEvent* )
@@ -607,13 +607,13 @@ void SystemClient::showEvent(TQShowEvent *)
 
 void SystemClient::mouseDoubleClickEvent( TQMouseEvent * e )
 {
-   if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) )
+   if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) )
       titlebarDblClickOperation();
 }
 
 void SystemClient::wheelEvent( TQWheelEvent *e )
 {
-    if (isSetShade() || TQRect( 0, 0, width(), titlebar->tqgeometry().height() ).contains( e->pos() ) )
+    if (isSetShade() || TQRect( 0, 0, width(), titlebar->geometry().height() ).contains( e->pos() ) )
         titlebarMouseWheelOperation( e->delta());
 }
 
@@ -633,7 +633,7 @@ void SystemClient::maximizeChange()
 
 void SystemClient::activeChange()
 {
-    widget()->tqrepaint(false);
+    widget()->repaint(false);
     if (button[ButtonClose])
         button[ButtonClose]->reset();
     if (button[ButtonSticky])
@@ -649,7 +649,7 @@ void SystemClient::activeChange()
 void SystemClient::iconChange()
 {
 //   if (button[BtnMenu] && button[BtnMenu]->isVisible())
-//      button[BtnMenu]->tqrepaint(false);
+//      button[BtnMenu]->repaint(false);
 }
 
 void SystemClient::desktopChange()
diff --git a/twin-styles/system/systemclient.h b/twin-styles/system/systemclient.h
index ecaf25ee..bb409642 100644
--- a/twin-styles/system/systemclient.h
+++ b/twin-styles/system/systemclient.h
@@ -45,7 +45,7 @@ class SystemClient : public KDecoration
       virtual void iconChange();
       virtual void desktopChange();
       virtual void activeChange();
-      virtual TQSize tqminimumSize() const;
+      virtual TQSize minimumSize() const;
       virtual void borders(int&, int&, int&, int&) const;
       virtual void reset( unsigned long changed );
       void drawRoundFrame(TQPainter &p, int x, int y, int w, int h);
@@ -75,7 +75,7 @@ class SystemButton : public TQButton
                    const unsigned char *bitmap=NULL, const TQString& tip=NULL);
       void setBitmap(const unsigned char *bitmap);
       void reset();
-      TQSize tqsizeHint() const;
+      TQSize sizeHint() const;
       void setTipText(const TQString &tip);
       ButtonState last_button;
    protected: