1 files changed, 8 insertions, 8 deletions

diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp
index 7e9a3b39..50be9f1d 100644
--- a/kommander/editor/formwindow.cpp
+++ b/kommander/editor/formwindow.cpp
@@ -212,7 +212,7 @@ void FormWindow::paintGrid(TQWidget *w, TQPaintEvent *e)
   grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y());
   if(!TQPixmapCache::find(grid_name, grid)) {
     grid = TQPixmap(350 + (350 % mainWindow()->grid().x()), 350 + (350 % mainWindow()->grid().y()));
-    grid.fill(tqcolorGroup().color(TQColorGroup::Foreground));
+    grid.fill(colorGroup().color(TQColorGroup::Foreground));
     TQBitmap mask(grid.width(), grid.height());
     mask.fill(color0);
     TQPainter p(&mask);
@@ -267,7 +267,7 @@ TQPoint FormWindow::gridPoint(const TQPoint &p)
 void FormWindow::drawSizePreview(const TQPoint &pos, const TQString& text)
 {
   unclippedPainter->save();
-  unclippedPainter->setPen(TQPen(tqcolorGroup().foreground(), 1 ));
+  unclippedPainter->setPen(TQPen(colorGroup().foreground(), 1 ));
   unclippedPainter->setRasterOp(CopyROP);
   if (!sizePreviewPixmap.isNull())
     unclippedPainter->drawPixmap(sizePreviewPos, sizePreviewPixmap);
@@ -345,8 +345,8 @@ void FormWindow::insertWidget()
   r = TQRect(p, r.size());
   if (useSizeHint)
   {
-    r.setWidth(w->tqsizeHint().width());
-    r.setHeight(w->tqsizeHint().height());
+    r.setWidth(w->sizeHint().width());
+    r.setHeight(w->sizeHint().height());
   }
 
   if (r.width() < 2 * grid().x())
@@ -753,7 +753,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
               targetContainer = wa;
               hadOwnPalette = wa->ownPalette();
               restorePalette = wa->palette();
-              wa->setPaletteBackgroundColor(wa->tqcolorGroup().midlight());
+              wa->setPaletteBackgroundColor(wa->colorGroup().midlight());
             }
           }
           else if (targetContainer)
@@ -1820,11 +1820,11 @@ void FormWindow::checkAccels()
       {
         TQWidget *w = (TQWidget *) o;
         const TQMetaProperty *text =
-            w->tqmetaObject()->property(w->tqmetaObject()->findProperty("text", true), true);
+            w->metaObject()->property(w->metaObject()->findProperty("text", true), true);
         const TQMetaProperty *title =
-            w->tqmetaObject()->property(w->tqmetaObject()->findProperty("title", true), true);
+            w->metaObject()->property(w->metaObject()->findProperty("title", true), true);
         const TQMetaProperty *pageTitle =
-            w->tqmetaObject()->property(w->tqmetaObject()->findProperty("pageTitle", true), true);
+            w->metaObject()->property(w->metaObject()->findProperty("pageTitle", true), true);
         if (text)
           find_accel(w->property("text").toString(), accels, w);
         if (title)