1 files changed, 12 insertions, 12 deletions

diff --git a/kwin/clients/redmond/redmond.cpp b/kwin/clients/redmond/redmond.cpp
index 7f74479ed..b6161d9ce 100644
--- a/kwin/clients/redmond/redmond.cpp
+++ b/kwin/clients/redmond/redmond.cpp
@@ -108,7 +108,7 @@ static void drawButtonFrame( KPixmap *pix, const TQColorGroup &g, bool sunken )
     p.begin(pix);
 
     // titlebar button frame
-    p.setPen( sunken ? g.dark().dark(155) : g.light());
+    p.setPen( sunken ? TQColor(g.dark().dark(155)) : g.light());
     p.drawLine(0, 0, x2-1, 0);
     p.drawLine(0, 0, 0, y2-1);
 
@@ -119,11 +119,11 @@ static void drawButtonFrame( KPixmap *pix, const TQColorGroup &g, bool sunken )
        p.drawLine(1, 1, 1, y2-2);
     }
 
-    p.setPen( sunken ? g.light() : g.mid().dark(135));
+    p.setPen( sunken ? g.light() : TQColor(g.mid().dark(135)));
     p.drawLine(1, y2-1, x2-1, y2-1);
     p.drawLine(x2-1, 1, x2-1, y2-1);
 
-    p.setPen( sunken ? g.light() : g.dark().dark(155));
+    p.setPen( sunken ? g.light() : TQColor(g.dark().dark(155)));
     p.drawLine(0, y2, x2, y2);
     p.drawLine(x2, 0, x2, y2);
 }
@@ -149,7 +149,7 @@ static void create_pixmaps ()
     defaultMenuPix = new TQPixmap(kdelogo);
 
     // buttons (active/inactive, sunken/unsunken)
-	TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true);
+	TQColorGroup g = options()->tqcolorGroup(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()->colorGroup(KDecoration::ColorButtonBg, false);
+        g = options()->tqcolorGroup(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()->colorGroup(KDecoration::ColorButtonBg, false);
+        g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
         c = g.background();
         iBtnPix1->fill(c.rgb());
         iBtnDownPix1->fill(c.rgb());
@@ -196,20 +196,20 @@ static void create_pixmaps ()
         iMiniBtnDownPix1->fill(c.rgb());
     }
 
-    g = options()->colorGroup(KDecoration::ColorButtonBg, true);
+    g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true);
     drawButtonFrame(btnPix1, g, false);
     drawButtonFrame(btnDownPix1, g, true);
     drawButtonFrame(miniBtnPix1, g, false);
     drawButtonFrame(miniBtnDownPix1, g, true);
 
-    g = options()->colorGroup(KDecoration::ColorButtonBg, false);
+    g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
     drawButtonFrame(iBtnPix1, g, false);
     drawButtonFrame(iBtnDownPix1, g, true);
     drawButtonFrame(iMiniBtnPix1, g, false);
     drawButtonFrame(iMiniBtnDownPix1, g, true);
 
     // Make sure button pixmaps contrast with the current colour scheme.
-    if (qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127)
+    if (tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127)
         btnForeground = new TQColor(Qt::black);
     else
         btnForeground = new TQColor(Qt::white);
@@ -294,7 +294,7 @@ void RedmondButton::setPixmap( const TQPixmap &p )
 	deco.resize(0, 0);
 	pix = p;
 
-	repaint(false);
+	tqrepaint(false);
 }
 
 
@@ -331,7 +331,7 @@ void RedmondButton::drawButton(TQPainter *p)
 
 		 // Smooth scale the menu button pixmap
 			tmpPix.convertFromImage(
-					pix.convertToImage().smoothScale(height(), height() ));
+					TQImage(pix.convertToImage()).smoothScale(height(), height() ));
 
 			p->drawPixmap( 0, 0, tmpPix );
 		} else {
@@ -485,7 +485,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* )
 
     // Draw part of the frame that is the frame color
     // ==============================================
-    TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
+    TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive());
     p.setPen( g.background() );
     p.drawLine( x, y, x2-1, y );
     p.drawLine( x, y, x, y2-1 );