Rename old tq methods that no longer need a unique name

(cherry picked from commit f35eb5f602bee29af07ecaffe26cda71cea62b93)

1 files changed, 33 insertions, 33 deletions

diff --git a/kwin-styles/cde/cdeclient.cpp b/kwin-styles/cde/cdeclient.cpp
index d21f4770..f9343c2b 100644
--- a/kwin-styles/cde/cdeclient.cpp
+++ b/kwin-styles/cde/cdeclient.cpp
@@ -114,9 +114,9 @@ static inline const KDecorationOptions* options()
     return KDecoration::options();
 }
 
-static void fixColorGroup(TQColorGroup & tqcolorGroup)
+static void fixColorGroup(TQColorGroup & colorGroup)
 {
-    TQColor light = tqcolorGroup.light();
+    TQColor light = colorGroup.light();
 
     int hue, saturation, value;
 
@@ -125,17 +125,17 @@ static void fixColorGroup(TQColorGroup & tqcolorGroup)
     if (value < 128)
     {
       light.setHsv(hue, saturation, 128);
-      tqcolorGroup.setColor(TQColorGroup::Light, light);
+      colorGroup.setColor(TQColorGroup::Light, light);
     }
 
-    TQColor dark = tqcolorGroup.dark();
+    TQColor dark = colorGroup.dark();
 
     dark.hsv(&hue, &saturation, &value);
 
     if (value < 84)
     {
       dark.setHsv(hue, saturation, 84);
-      tqcolorGroup.setColor(TQColorGroup::Dark, dark);
+      colorGroup.setColor(TQColorGroup::Dark, dark);
     }
 }
 
@@ -420,7 +420,7 @@ void CdeClient::desktopChange()
     // Nothing to do yet
 }
 
-TQSize CdeClient::tqminimumSize() const
+TQSize CdeClient::minimumSize() const
 {
     return TQSize(2 * (s_buttonSize + s_frameWidth),
 	         2 * s_frameWidth + s_buttonSize);
@@ -503,14 +503,14 @@ void CdeClient::paintEvent( TQPaintEvent* )
 {
     TQPainter p(widget());
 
-    TQColorGroup tqcolorGroup;
+    TQColorGroup colorGroup;
 
     if ( coloredFrame )
-	tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorTitleBar, isActive() );
+	colorGroup = options()->colorGroup( KDecoration::ColorTitleBar, isActive() );
     else
-	tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorFrame, isActive() );
+	colorGroup = options()->colorGroup( KDecoration::ColorFrame, isActive() );
 
-    fixColorGroup( tqcolorGroup );
+    fixColorGroup( colorGroup );
 
     TQRect trect = titlebar->tqgeometry();
     TQRect mrect = widget()->rect();
@@ -523,7 +523,7 @@ void CdeClient::paintEvent( TQPaintEvent* )
     }
 
     p.setPen( TQt::NoPen );
-    p.setBrush( tqcolorGroup.background() );
+    p.setBrush( colorGroup.background() );
 
 
     if ( s_frameWidth > 1 )
@@ -546,24 +546,24 @@ void CdeClient::paintEvent( TQPaintEvent* )
 	    // draw left  and right frames:
 	    qDrawShadePanel( &p, 1, longSide + 1,
 		s_frameWidth, mrect.height() - 2 * (longSide + 1),
-		tqcolorGroup );
+		colorGroup );
 
 	    qDrawShadePanel( &p, mrect.width() - s_frameWidth - 1, longSide + 1,
 		s_frameWidth, mrect.height() - 2 * (longSide + 1),
-		tqcolorGroup );
+		colorGroup );
 	}
 
 	// draw top and bottom frames:
 	qDrawShadePanel( &p, longSide + 1, 1,
 	    mrect.width() - 2 * (longSide + 1), s_frameWidth,
-	    tqcolorGroup );
+	    colorGroup );
 
 	qDrawShadePanel( &p, longSide + 1, mrect.height() - s_frameWidth - 1,
 	    mrect.width() - 2 * (longSide + 1), s_frameWidth,
-	    tqcolorGroup );
+	    colorGroup );
 
 	// draw light corner parts:
-	p.setPen( tqcolorGroup.light() );
+	p.setPen( colorGroup.light() );
 
 	// tl corner:
 	p.drawLine( 1, 1, longSide - 1, 1 );
@@ -601,7 +601,7 @@ void CdeClient::paintEvent( TQPaintEvent* )
 	    s_frameWidth + 1, mrect.height() - s_frameWidth - 1 );
 
 	// draw dark corner parts:
-	p.setPen( tqcolorGroup.dark() );
+	p.setPen( colorGroup.dark() );
 
 	// tl corner:
 	if ( !shaded )
@@ -640,14 +640,14 @@ void CdeClient::paintEvent( TQPaintEvent* )
 
     if ( !coloredFrame )
     {
-	tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorTitleBar, isActive() );
-	fixColorGroup( tqcolorGroup );
-	p.setBrush( tqcolorGroup.background() );
+	colorGroup = options()->colorGroup( KDecoration::ColorTitleBar, isActive() );
+	fixColorGroup( colorGroup );
+	p.setBrush( colorGroup.background() );
     }
 
     // draw titlebar:
     p.drawRect( trect );
-    qDrawShadePanel( &p, trect, tqcolorGroup, titlebarPressed );
+    qDrawShadePanel( &p, trect, colorGroup, titlebarPressed );
 
     // draw caption:
     if ( titlebarPressed ) // move the caption right and down if the titlebar is pressed
@@ -672,7 +672,7 @@ void CdeClient::paintEvent( TQPaintEvent* )
 
     // Draw a line behind the wrapped window to prevent having
     // unpainted areas when we're shaded.
-    p.setPen( tqcolorGroup.dark() );
+    p.setPen( colorGroup.dark() );
     p.drawLine(s_frameWidth + 1, mrect.height() - s_frameWidth - 2,
                mrect.width() - s_frameWidth - 2, mrect.height() - s_frameWidth - 2);
 
@@ -805,36 +805,36 @@ void CdeButton::drawButton( TQPainter* p )
     p->setBrush( options()->color( KDecoration::ColorTitleBar, m_parent->isActive() ) );
     p->drawRect( 0, 0, s_buttonSize, s_buttonSize );
 
-    TQColorGroup tqcolorGroup =
-      options()->tqcolorGroup( KDecoration::ColorTitleBar, m_parent->isActive() );
+    TQColorGroup colorGroup =
+      options()->colorGroup( KDecoration::ColorTitleBar, m_parent->isActive() );
 
-    fixColorGroup(tqcolorGroup);
+    fixColorGroup(colorGroup);
 
     qDrawShadePanel( p, 0, 0, s_buttonSize, s_buttonSize,
-		    tqcolorGroup, isDown() );
+		    colorGroup, isDown() );
 
     switch ( m_btnType )
     {
         case (BtnMenu):
-            qDrawShadePanel( p, s_o1, s_o2, s_w1, s_w2, tqcolorGroup );
+            qDrawShadePanel( p, s_o1, s_o2, s_w1, s_w2, colorGroup );
 	break;
 	case (BtnHelp):
-	    p->setPen( tqcolorGroup.light() );
+	    p->setPen( colorGroup.light() );
 	    p->drawLineSegments( TQPointArray(16, helpLLines) );
-	    p->setPen( tqcolorGroup.dark() );
+	    p->setPen( colorGroup.dark() );
 	    p->drawLineSegments( TQPointArray(14, helpDLines) );
 	break;
 	case (BtnIconify):
-	    qDrawShadePanel( p, s_o2, s_o2, s_w2, s_w2, tqcolorGroup );
+	    qDrawShadePanel( p, s_o2, s_o2, s_w2, s_w2, colorGroup );
 	break;
 	case (BtnMax):
-	    qDrawShadePanel( p, s_o1, s_o1, s_w1, s_w1, tqcolorGroup,
+	    qDrawShadePanel( p, s_o1, s_o1, s_w1, s_w1, colorGroup,
 		    m_parent->maximizeMode() == KDecoration::MaximizeFull );
 	break;
 	case (BtnClose):
-	    p->setPen( tqcolorGroup.dark() );
+	    p->setPen( colorGroup.dark() );
 	    p->drawLineSegments( TQPointArray(18, closeDLines) );
-	    p->setPen( tqcolorGroup.light() );
+	    p->setPen( colorGroup.light() );
 	    p->drawLineSegments( TQPointArray(15, closeLLines) );
 	break;
     }