Rename old tq methods that no longer need a unique name

3 files changed, 18 insertions, 18 deletions

diff --git a/twin-styles/smooth-blend/client/config/configdialog.ui b/twin-styles/smooth-blend/client/config/configdialog.ui
index 09af45f6..89347781 100644
--- a/twin-styles/smooth-blend/client/config/configdialog.ui
+++ b/twin-styles/smooth-blend/client/config/configdialog.ui
@@ -124,7 +124,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
@@ -172,7 +172,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>180</width>
                             <height>140</height>
@@ -348,7 +348,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>231</width>
                             <height>71</height>
diff --git a/twin-styles/smooth-blend/client/smoothblend.cc b/twin-styles/smooth-blend/client/smoothblend.cc
index e012fbc2..8f0cf6a9 100644
--- a/twin-styles/smooth-blend/client/smoothblend.cc
+++ b/twin-styles/smooth-blend/client/smoothblend.cc
@@ -184,11 +184,11 @@ smoothblendButton::~smoothblendButton() {
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// tqsizeHint()
+// sizeHint()
 // ----------
 // Return size hint
 
-TQSize smoothblendButton::tqsizeHint() const {
+TQSize smoothblendButton::sizeHint() const {
     return TQSize(::factory->buttonSize(), ::factory->buttonSize());
 }
 
@@ -407,7 +407,7 @@ void smoothblendButton::drawButton( TQPainter *painter ) {
     TQColor redColor(red);
     bool active = client_->isActive();
     TQPixmap backgroundTile = client_->getTitleBarTile(active);
-    group = KDecoration::options()->tqcolorGroup(KDecoration::ColorTitleBar, active);
+    group = KDecoration::options()->colorGroup(KDecoration::ColorTitleBar, active);
 
     //draw the titlebar behind the buttons and app icons
     if ((client_->maximizeMode()==client_->MaximizeFull) && !KDecoration::options()->moveResizeMaximizedWindows())
@@ -508,8 +508,8 @@ void smoothblendClient::create_pixmaps() {
     TQColorGroup group,widgetGroup;
     int FRAMESIZE = ::factory->frameSize();
     // Get the color groups we need for the gradients
-    group = options()->tqcolorGroup(KDecoration::ColorTitleBar, true);
-    widgetGroup = widget()->tqcolorGroup();
+    group = options()->colorGroup(KDecoration::ColorTitleBar, true);
+    widgetGroup = widget()->colorGroup();
     
     // active top title bar tile
     tempPixmap.resize(1, TOPMARGIN);
@@ -525,7 +525,7 @@ void smoothblendClient::create_pixmaps() {
     painter.end();
     
     // inactive top title bar tile
-    group = options()->tqcolorGroup(KDecoration::ColorTitleBar, false);
+    group = options()->colorGroup(KDecoration::ColorTitleBar, false);
     tempPixmap = KPixmapEffect::unbalancedGradient(tempPixmap,
                                                    group.background(),
                                                    widgetGroup.background(),
@@ -539,7 +539,7 @@ void smoothblendClient::create_pixmaps() {
     
     // active title bar tile
     tempPixmap.resize(1, s_titleHeight+FRAMESIZE);
-    group = options()->tqcolorGroup(KDecoration::ColorTitleBar, true);
+    group = options()->colorGroup(KDecoration::ColorTitleBar, true);
     tempPixmap = KPixmapEffect::unbalancedGradient(tempPixmap,
                                                    group.background(),
                                                    widgetGroup.background(),
@@ -552,7 +552,7 @@ void smoothblendClient::create_pixmaps() {
     painter.end();
     
     // inactive title bar tile
-    group = options()->tqcolorGroup(KDecoration::ColorTitleBar, false);
+    group = options()->colorGroup(KDecoration::ColorTitleBar, false);
     tempPixmap = KPixmapEffect::unbalancedGradient(tempPixmap,
                                                    group.background(),
                                                    widgetGroup.background(),
@@ -971,12 +971,12 @@ void smoothblendClient::resize(const TQSize &size) {
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// tqminimumSize()
+// minimumSize()
 // -------------
 // Return the minimum allowable size for this window
 
-TQSize smoothblendClient::tqminimumSize() const {
-    return widget()->tqminimumSize();
+TQSize smoothblendClient::minimumSize() const {
+    return widget()->minimumSize();
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -1117,8 +1117,8 @@ void smoothblendClient::paintEvent(TQPaintEvent*) {
     TQPainter painter(widget());
     bool active = isActive();
     //get group information first
-    group = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive());
-    widgetGroup = widget()->tqcolorGroup();
+    group = options()->colorGroup(KDecoration::ColorTitleBar, isActive());
+    widgetGroup = widget()->colorGroup();
 
     TQRect topRect( topSpacer_->tqgeometry() );
     TQRect titleRect( titleLayout_->tqgeometry() );
diff --git a/twin-styles/smooth-blend/client/smoothblend.h b/twin-styles/smooth-blend/client/smoothblend.h
index 4abd32cb..bf789440 100644
--- a/twin-styles/smooth-blend/client/smoothblend.h
+++ b/twin-styles/smooth-blend/client/smoothblend.h
@@ -135,7 +135,7 @@ public:
     ~smoothblendButton();
 
     void setBitmap(const unsigned char *bitmap);
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
     ButtonState lastMousePress() const;
     void reset();
     TQImage getButtonImage(ButtonType type);
@@ -195,7 +195,7 @@ public:
 
     virtual void borders(int &l, int &r, int &t, int &b) const;
     virtual void resize(const TQSize &size);
-    virtual TQSize tqminimumSize() const;
+    virtual TQSize minimumSize() const;
     virtual Position mousePosition(const TQPoint &point) const;
 
     TQPixmap getTitleBarTile(bool active) const