Rename old tq methods that no longer need a unique name

2 files changed, 12 insertions, 12 deletions

diff --git a/twin-styles/kde1/kde1client.cpp b/twin-styles/kde1/kde1client.cpp
index c6a7db98..9b802535 100644
--- a/twin-styles/kde1/kde1client.cpp
+++ b/twin-styles/kde1/kde1client.cpp
@@ -55,8 +55,8 @@ void create_pixmaps()
     if ( pixmaps_created )
         return;
     pixmaps_created = true;
-    TQColorGroup aGrp = options()->tqcolorGroup(KDecorationOptions::ColorButtonBg, true);
-    TQColorGroup iGrp = options()->tqcolorGroup(KDecorationOptions::ColorButtonBg, false);
+    TQColorGroup aGrp = options()->colorGroup(KDecorationOptions::ColorButtonBg, true);
+    TQColorGroup iGrp = options()->colorGroup(KDecorationOptions::ColorButtonBg, false);
 
     TQPainter aPainter, iPainter;
     close_pix = new TQPixmap(16, 16);
@@ -465,7 +465,7 @@ void StdClient::paintEvent( TQPaintEvent* )
     TQRegion r = widget()->rect();
     r = r.subtract( t );
     p.setClipRegion( r );
-    qDrawWinPanel( &p, widget()->rect(), widget()->tqcolorGroup() );
+    qDrawWinPanel( &p, widget()->rect(), widget()->colorGroup() );
 //     t.setTop( 1 );
 //     p.setClipRegion( t );
 //     t.setTop( 0 );
@@ -480,7 +480,7 @@ void StdClient::paintEvent( TQPaintEvent* )
 //     p.drawLine(t.left(), t.top()+1,  t.right(), t.top()+1);
     if ( isActive() )
 	qDrawShadePanel( &p2, 0, 0, titleRect.width(), titleRect.height(),
-			 widget()->tqcolorGroup(), true, 1 );
+			 widget()->colorGroup(), true, 1 );
     titleRect.setLeft( 4 );
     titleRect.setWidth( titleRect.width() - 2 );
     p2.setPen(options()->color(KDecorationOptions::ColorFont, isActive()));
@@ -572,9 +572,9 @@ bool StdClient::eventFilter( TQObject* o, TQEvent* e )
     }
 }
 
-TQSize StdClient::tqminimumSize() const
+TQSize StdClient::minimumSize() const
 {
-    return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 ));
+    return widget()->minimumSize().expandedTo( TQSize( 100, 50 ));
 }
 
 void StdClient::borders( int& left, int& right, int& top, int& bottom ) const
@@ -649,9 +649,9 @@ void StdToolClient::paintEvent( TQPaintEvent* )
     TQPainter p( widget() );
     TQRect t = titlebar->tqgeometry();
     TQRect r = widget()->rect();
-    qDrawWinPanel( &p, r, widget()->tqcolorGroup() );
+    qDrawWinPanel( &p, r, widget()->colorGroup() );
     r.setTop( t.bottom()+1 );
-    qDrawWinPanel( &p, r, widget()->tqcolorGroup() );
+    qDrawWinPanel( &p, r, widget()->colorGroup() );
     p.fillRect( TQRect( TQPoint(t.topLeft() ), TQPoint( width() - t.left(), t.bottom() ) ),
 		options()->color(KDecorationOptions::ColorTitleBar, isActive()));
     p.setPen( options()->color(KDecorationOptions::ColorTitleBar, isActive()).light() );
@@ -721,9 +721,9 @@ bool StdToolClient::eventFilter( TQObject* o, TQEvent* e )
     }
 }
 
-TQSize StdToolClient::tqminimumSize() const
+TQSize StdToolClient::minimumSize() const
 {
-    return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 ));
+    return widget()->minimumSize().expandedTo( TQSize( 100, 50 ));
 }
 
 void StdToolClient::borders( int& left, int& right, int& top, int& bottom ) const
diff --git a/twin-styles/kde1/kde1client.h b/twin-styles/kde1/kde1client.h
index adedfaaf..b52f20a7 100644
--- a/twin-styles/kde1/kde1client.h
+++ b/twin-styles/kde1/kde1client.h
@@ -33,7 +33,7 @@ public:
     StdClient( KDecorationBridge* b, KDecorationFactory* f );
     ~StdClient();
     void init();
-    TQSize tqminimumSize() const;
+    TQSize minimumSize() const;
     void borders( int& left, int& right, int& top, int& bottom ) const;
     void reset( unsigned long mask );
     void resize( const TQSize& s );
@@ -72,7 +72,7 @@ public:
     StdToolClient( KDecorationBridge* b, KDecorationFactory* f );
     ~StdToolClient();
     void init();
-    TQSize tqminimumSize() const;
+    TQSize minimumSize() const;
     void borders( int& left, int& right, int& top, int& bottom ) const;
     void reset( unsigned long mask );
     void resize( const TQSize& s );