Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 28 insertions, 28 deletions

diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp
index c230c1ee..a7532fc4 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbase.cpp
@@ -92,7 +92,7 @@ void kpToolWidgetBase::finishConstruction (int fallBackRow, int fallBackCol)
                << endl;
 #endif
 
-    retqlayoutOptions ();
+    relayoutOptions ();
 
     const TQPair <int, int> rowColPair = defaultSelectedRowAndCol ();
     if (!setSelected (rowColPair.first, rowColPair.second, false/*don't save*/))
@@ -226,10 +226,10 @@ void kpToolWidgetBase::saveSelectedAsDefault () const
 
 
 // public
-void kpToolWidgetBase::retqlayoutOptions ()
+void kpToolWidgetBase::relayoutOptions ()
 {
 #if DEBUG_KP_TOOL_WIDGET_BASE
-    kdDebug () << "kpToolWidgetBase::retqlayoutOptions()" << endl;
+    kdDebug () << "kpToolWidgetBase::relayoutOptions()" << endl;
 #endif
 
     while (!m_pixmaps.isEmpty () && m_pixmaps.last ().count () == 0)
diff --git a/kolourpaint/widgets/kptoolwidgetbase.h b/kolourpaint/widgets/kptoolwidgetbase.h
index 033f4946..8bef2a67 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.h
+++ b/kolourpaint/widgets/kptoolwidgetbase.h
@@ -70,7 +70,7 @@ public:  // (only have to use these if you don't use finishConstruction())
 
     void saveSelectedAsDefault () const;
 
-    void retqlayoutOptions ();
+    void relayoutOptions ();
 
 public:
     int selectedRow () const;
diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.cpp b/kolourpaint/widgets/kptoolwidgeterasersize.cpp
index effd631f..c4354dea 100644
--- a/kolourpaint/widgets/kptoolwidgeterasersize.cpp
+++ b/kolourpaint/widgets/kptoolwidgeterasersize.cpp
@@ -78,9 +78,9 @@ kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *tqparent, const char *
         TQBitmap tqmask (previewPixmap.width (), previewPixmap.height ());
         tqmask.fill (TQt::color0/*transparent*/);
 
-        TQPainter tqmaskPainter (&tqmask);
-        tqmaskPainter.fillRect (rect, TQt::color1/*opaque*/);
-        tqmaskPainter.end ();
+        TQPainter maskPainter (&tqmask);
+        maskPainter.fillRect (rect, TQt::color1/*opaque*/);
+        maskPainter.end ();
 
         previewPixmap.setMask (tqmask);
 
@@ -130,19 +130,19 @@ TQPixmap kpToolWidgetEraserSize::cursorPixmap (const kpColor &color) const
 
     if (color.isTransparent ())
     {
-        TQBitmap tqmaskBitmap (pixmap.width (), pixmap.height ());
-        tqmaskBitmap.fill (TQt::color0/*transparent*/);
+        TQBitmap maskBitmap (pixmap.width (), pixmap.height ());
+        maskBitmap.fill (TQt::color0/*transparent*/);
 
 
         if (showBorder)
         {
-            TQPainter tqmaskBitmapPainter (&tqmaskBitmap);
-            tqmaskBitmapPainter.setPen (TQt::color1/*opaque*/);
-            tqmaskBitmapPainter.drawRect (tqmaskBitmap.rect ());
+            TQPainter maskBitmapPainter (&maskBitmap);
+            maskBitmapPainter.setPen (TQt::color1/*opaque*/);
+            maskBitmapPainter.drawRect (maskBitmap.rect ());
         }
 
 
-        pixmap.setMask (tqmaskBitmap);
+        pixmap.setMask (maskBitmap);
     }
 
 
diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
index c59b730e..e2a1afce 100644
--- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
+++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
@@ -139,7 +139,7 @@ kpToolWidgetFillStyle::FillStyle kpToolWidgetFillStyle::fillStyle () const
 }
 
 // public static
-TQBrush kpToolWidgetFillStyle::tqmaskBrushForFillStyle (FillStyle fs,
+TQBrush kpToolWidgetFillStyle::maskBrushForFillStyle (FillStyle fs,
                                                      const kpColor &foregroundColor,
                                                      const kpColor &backgroundColor)
 {
@@ -152,10 +152,10 @@ TQBrush kpToolWidgetFillStyle::tqmaskBrushForFillStyle (FillStyle fs,
         return Qt::NoBrush;
         break;
     case FillWithBackground:
-        return TQBrush (backgroundColor.tqmaskColor ());
+        return TQBrush (backgroundColor.maskColor ());
         break;
     case FillWithForeground:
-        return TQBrush (foregroundColor.tqmaskColor ());
+        return TQBrush (foregroundColor.maskColor ());
         break;
     default:
         return Qt::NoBrush;
@@ -163,10 +163,10 @@ TQBrush kpToolWidgetFillStyle::tqmaskBrushForFillStyle (FillStyle fs,
     }
 }
 
-TQBrush kpToolWidgetFillStyle::tqmaskBrush (const kpColor &foregroundColor,
+TQBrush kpToolWidgetFillStyle::maskBrush (const kpColor &foregroundColor,
                                          const kpColor &backgroundColor)
 {
-    return tqmaskBrushForFillStyle (fillStyle (), foregroundColor, backgroundColor);
+    return maskBrushForFillStyle (fillStyle (), foregroundColor, backgroundColor);
 }
 
 // public static
diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.h b/kolourpaint/widgets/kptoolwidgetfillstyle.h
index 221d0245..82ee1357 100644
--- a/kolourpaint/widgets/kptoolwidgetfillstyle.h
+++ b/kolourpaint/widgets/kptoolwidgetfillstyle.h
@@ -59,10 +59,10 @@ private:
 public:
     FillStyle fillStyle () const;
 
-    static TQBrush tqmaskBrushForFillStyle (FillStyle fs,
+    static TQBrush maskBrushForFillStyle (FillStyle fs,
                                          const kpColor &foregroundColor,
                                          const kpColor &backgroundColor);
-    TQBrush tqmaskBrush (const kpColor &foregroundColor,
+    TQBrush maskBrush (const kpColor &foregroundColor,
                       const kpColor &backgroundColor);
 
     static TQBrush brushForFillStyle (FillStyle fs,
diff --git a/kolourpaint/widgets/kptoolwidgetlinewidth.cpp b/kolourpaint/widgets/kptoolwidgetlinewidth.cpp
index e7804149..0d419333 100644
--- a/kolourpaint/widgets/kptoolwidgetlinewidth.cpp
+++ b/kolourpaint/widgets/kptoolwidgetlinewidth.cpp
@@ -52,22 +52,22 @@ kpToolWidgetLineWidth::kpToolWidgetLineWidth (TQWidget *tqparent, const char *na
                         (h <= 0 ? height () : h));
         pixmap.fill (TQt::white);
 
-        TQBitmap tqmaskBitmap (pixmap.width (), pixmap.height ());
-        tqmaskBitmap.fill (TQt::color0/*transparent*/);
+        TQBitmap maskBitmap (pixmap.width (), pixmap.height ());
+        maskBitmap.fill (TQt::color0/*transparent*/);
         
         
-        TQPainter painter (&pixmap), tqmaskPainter (&tqmaskBitmap);
-        painter.setPen (TQt::black), tqmaskPainter.setPen (TQt::color1/*opaque*/);
-        painter.setBrush (TQt::black), tqmaskPainter.setBrush (TQt::color1/*opaque*/);
+        TQPainter painter (&pixmap), maskPainter (&maskBitmap);
+        painter.setPen (TQt::black), maskPainter.setPen (TQt::color1/*opaque*/);
+        painter.setBrush (TQt::black), maskPainter.setBrush (TQt::color1/*opaque*/);
 
         TQRect rect = TQRect (0, (pixmap.height () - lineWidths [i]) / 2,
                             pixmap.width (), lineWidths [i]);
-        painter.drawRect (rect), tqmaskPainter.drawRect (rect);
+        painter.drawRect (rect), maskPainter.drawRect (rect);
 
-        painter.end (), tqmaskPainter.end ();
+        painter.end (), maskPainter.end ();
         
         
-        pixmap.setMask (tqmaskBitmap);
+        pixmap.setMask (maskBitmap);
 
         addOption (pixmap, TQString::number (lineWidths [i]));
         startNewOptionRow ();