1 files changed, 10 insertions, 10 deletions

diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp
index b6e7cda01..9508ab840 100644
--- a/twin/clients/modernsystem/modernsys.cpp
+++ b/twin/clients/modernsystem/modernsys.cpp
@@ -4,7 +4,7 @@
 #include <kconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdrawutil.h>
 #include <kpixmapeffect.h>
 #include <kdrawutil.h>
@@ -171,13 +171,13 @@ static void create_pixmaps()
                                 KPixmapEffect::VerticalGradient);
     }
     // buttons
-    TQColorGroup btnColor(options()->tqcolorGroup(KDecoration::ColorButtonBg, true));
+    TQColorGroup btnColor(options()->colorGroup(KDecoration::ColorButtonBg, true));
     buttonPix = new TQPixmap(14, 15);
     make_button_fx(btnColor, buttonPix);
     buttonPixDown = new TQPixmap(14, 15);
     make_button_fx(btnColor, buttonPixDown, true);
 
-    btnColor = options()->tqcolorGroup(KDecoration::ColorButtonBg, false);
+    btnColor = options()->colorGroup(KDecoration::ColorButtonBg, false);
     iButtonPix = new TQPixmap(14, 15);
     make_button_fx(btnColor, iButtonPix);
     iButtonPixDown = new TQPixmap(14, 15);
@@ -515,7 +515,7 @@ void ModernSys::recalcTitleBuffer()
         p.drawTiledPixmap(0, 0, width(), title_height+2, *aUpperGradient);
     else
         p.fillRect(0, 0, width(), title_height+2,
-                   options()->tqcolorGroup(ColorTitleBar, true).
+                   options()->colorGroup(ColorTitleBar, true).
                    brush(TQColorGroup::Button));
 
     TQRect t = titleRect(); // titlebar->geometry();
@@ -554,7 +554,7 @@ void ModernSys::updateCaption()
 void ModernSys::drawRoundFrame(TQPainter &p, int x, int y, int w, int h)
 {
     kDrawRoundButton(&p, x, y, w, h,
-                     options()->tqcolorGroup(ColorFrame, isActive()), false);
+                     options()->colorGroup(ColorFrame, isActive()), false);
 
 }
 
@@ -570,9 +570,9 @@ void ModernSys::paintEvent( TQPaintEvent* )
     TQPainter p( widget() );
     TQRect t = titleRect(); // titlebar->geometry();
 
-    TQBrush fillBrush(widget()->tqcolorGroup().tqbrush(TQColorGroup::Background).pixmap() ?
-                     widget()->tqcolorGroup().brush(TQColorGroup::Background) :
-                     options()->tqcolorGroup(ColorFrame, isActive()).
+    TQBrush fillBrush(widget()->colorGroup().brush(TQColorGroup::Background).pixmap() ?
+                     widget()->colorGroup().brush(TQColorGroup::Background) :
+                     options()->colorGroup(ColorFrame, isActive()).
                      brush(TQColorGroup::Button));
 
     p.fillRect(1, title_height+3, width()-2, height()-(title_height+3), fillBrush);
@@ -586,7 +586,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
     int h = height() - hw;
 
     // titlebar
-    TQColorGroup g = options()->tqcolorGroup(ColorTitleBar, isActive());
+    TQColorGroup g = options()->colorGroup(ColorTitleBar, isActive());
     if(isActive()){
         p.drawPixmap(1, 1, titleBuffer, 0, 0, w-2, title_height+2);
     }
@@ -609,7 +609,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
     p.drawLine(0, title_height+2, w-2, title_height+2);
 
     // frame
-    g = options()->tqcolorGroup(ColorFrame, isActive());
+    g = options()->colorGroup(ColorFrame, isActive());
     p.setPen(g.light());
     p.drawLine(1, title_height+3, 1, h-2);
     p.setPen(g.dark());