Remove additional unneeded tq method conversions

(cherry picked from commit 74c05bbf9d92e43a6cf3799355b5f3598884409e)

27 files changed, 80 insertions, 80 deletions

diff --git a/kolourpaint/BUGS b/kolourpaint/BUGS
index 25814d61..84f3391f 100644
--- a/kolourpaint/BUGS
+++ b/kolourpaint/BUGS
@@ -27,8 +27,8 @@ This file lists known bugs in this version that are not considered
    manifestations of the current QSpinBox behaviour.
 
 6. a) The undo history and document modified state are not updated during
-      the drawing of multi-segment tqshapes (Polygon, Connected Lines,
-      Curve).  They are however updated after tqshapes' completion.
+      the drawing of multi-segment shapes (Polygon, Connected Lines,
+      Curve).  They are however updated after shapes' completion.
 
    b) The text and brush-like tools set the document modified flag even if
       user cancels the draw operation.
@@ -37,7 +37,7 @@ This file lists known bugs in this version that are not considered
       still marked as modified (because 2 commands - the create selection
       and the move - were added but only one was undone).
 
-7. Certain tqshapes may have the wrong size (usually only a pixel off and
+7. Certain shapes may have the wrong size (usually only a pixel off and
    only in extreme cases) e.g. an ellipse of height 1 always has a width 1
    pixel less than it should be.  This is a Qt bug.
 
diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp
index 186a80fa..6849ebf4 100644
--- a/kolourpaint/kpcommandhistory.cpp
+++ b/kolourpaint/kpcommandhistory.cpp
@@ -763,7 +763,7 @@ void kpCommandHistoryBase::trimCommandLists ()
             -m_documentRestoredPosition > (int) m_undoCommandList.size ())
         {
         #if DEBUG_KP_COMMAND_HISTORY
-            kdDebug () << "\t\t\ttqinvalidate documentRestoredPosition" << endl;
+            kdDebug () << "\t\t\tinvalidate documentRestoredPosition" << endl;
         #endif
             m_documentRestoredPosition = INT_MAX;
         }
@@ -911,7 +911,7 @@ void kpCommandHistory::undo ()
     if (m_mainWindow && m_mainWindow->toolHasBegunShape ())
     {
     #if DEBUG_KP_COMMAND_HISTORY
-        kdDebug () << "\thas begun tqshape - cancel draw" << endl;
+        kdDebug () << "\thas begun shape - cancel draw" << endl;
     #endif
         m_mainWindow->tool ()->cancelShapeInternal ();
     }
@@ -928,7 +928,7 @@ void kpCommandHistory::redo ()
         //
         // Ignoring the request would not be intuitive for tools like
         // Polygon & Polyline (where it's not always apparent to the user
-        // that s/he's still drawing a tqshape even though the mouse isn't
+        // that s/he's still drawing a shape even though the mouse isn't
         // down).
         m_mainWindow->tool ()->cancelShapeInternal ();
     }
diff --git a/kolourpaint/kpcommandhistory.h b/kolourpaint/kpcommandhistory.h
index da415663..0cc18229 100644
--- a/kolourpaint/kpcommandhistory.h
+++ b/kolourpaint/kpcommandhistory.h
@@ -222,16 +222,16 @@ private:
 
 // Intercepts Undo/Redo requests:
 //
-// If the user is currently drawing a tqshape, it cancels it.
+// If the user is currently drawing a shape, it cancels it.
 // Else it passes on the Undo/Redo request to kpCommandHistoryBase.
 //
 // TODO: This is wrong.  It won't work if the Undo action is disabled,
 //       for instance.
 //
 //       Maybe the real solution is to call kpCommandHistoryBase::addCommand()
-//       as _soon_ as the tqshape starts - not after it ends.  But the
+//       as _soon_ as the shape starts - not after it ends.  But the
 //       trouble with this solution is that if the user Undoes/cancels
-//       the tqshape s/he's currently drawing, it would replace a Redo
+//       the shape s/he's currently drawing, it would replace a Redo
 //       slot in the history.  Arguably you shouldn't be able to Redo
 //       something you never finished drawing.
 //
diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp
index c5a1c442..d427b598 100644
--- a/kolourpaint/kpdocument.cpp
+++ b/kolourpaint/kpdocument.cpp
@@ -1109,22 +1109,22 @@ void kpDocument::setSelection (const kpSelection &selection)
                                 (selection.type () == kpSelection::Text));
 
     // We don't change the Selection Tool if the new selection's
-    // tqshape is merely different to the current tool's (e.g. rectangular
+    // shape is merely different to the current tool's (e.g. rectangular
     // vs elliptical) because:
     //
     // 1. All image selection tools support editing selections of all the
-    //    different tqshapes anyway.
+    //    different shapes anyway.
     // 2. Suppose the user is trying out different drags of selection borders
-    //    and then decides to paste a differently tqshaped selection before continuing
+    //    and then decides to paste a differently shaped selection before continuing
     //    to try out different borders.  If the pasting were to switch to
-    //    a differently tqshaped tool, the borders drawn after the paste would
-    //    be using a new tqshape rather than the tqshape before the paste.  This
+    //    a differently shaped tool, the borders drawn after the paste would
+    //    be using a new shape rather than the shape before the paste.  This
     //    could get irritating so we don't do the switch.
     //
     if (m_mainWindow &&
         (!m_mainWindow->toolIsASelectionTool () || isTextChanged))
     {
-        // Switch to the appropriately tqshaped selection tool
+        // Switch to the appropriately shaped selection tool
         // _before_ we change the selection
         // (all selection tool's ::end() functions nuke the current selection)
         switch (selection.type ())
diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp
index 372743af..219d65ca 100644
--- a/kolourpaint/kpdocumentsaveoptionswidget.cpp
+++ b/kolourpaint/kpdocumentsaveoptionswidget.cpp
@@ -712,9 +712,9 @@ void kpDocumentSaveOptionsWidget::setMode (Mode mode)
 void kpDocumentSaveOptionsWidget::repaintLabels ()
 {
     if (mode () != Quality)
-        m_colorDepthLabel->tqrepaint ();
+        m_colorDepthLabel->repaint ();
     if (mode () == Quality)
-        m_qualityLabel->tqrepaint ();
+        m_qualityLabel->repaint ();
 }
 
 
@@ -767,7 +767,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
         if (m_previewDialogLastRelativeGeometry.isEmpty ())
         {
         #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
-            kdDebug () << "\tread cfg preview dialog last rel tqgeometry" << endl;
+            kdDebug () << "\tread cfg preview dialog last rel geometry" << endl;
         #endif
             KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupPreviewSave);
             KConfigBase *cfg = cfgGroupSaver.config ();
@@ -826,7 +826,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
 
 
     #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
-        kdDebug () << "\ttqgeometry after show="
+        kdDebug () << "\tgeometry after show="
                    << TQRect (m_previewDialog->x (), m_previewDialog->y (),
                               m_previewDialog->width (), m_previewDialog->height ())
                    << endl;
@@ -852,7 +852,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
         cfg->sync ();
 
     #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
-        kdDebug () << "\tsaving preview tqgeometry "
+        kdDebug () << "\tsaving preview geometry "
                    << m_previewDialogLastRelativeGeometry
                    << " (TQt would have us believe "
                    << kpWidgetMapper::fromGlobal (m_visualParent,
@@ -942,7 +942,7 @@ void kpDocumentSaveOptionsWidget::updatePreviewDialogLastRelativeGeometry ()
     else
     {
     #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
-        kdDebug () << "\tnot visible - ignoring tqgeometry" << endl;
+        kdDebug () << "\tnot visible - ignoring geometry" << endl;
     #endif
     }
 }
diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp
index 6ec2a944..439f99c4 100644
--- a/kolourpaint/kpmainwindow.cpp
+++ b/kolourpaint/kpmainwindow.cpp
@@ -157,7 +157,7 @@ void kpMainWindow::readThumbnailSettings ()
 
 #if DEBUG_KP_MAIN_WINDOW
     kdDebug () << "\t\tThumbnail Settings: shown=" << m_configThumbnailShown
-               << " tqgeometry=" << m_configThumbnailGeometry
+               << " geometry=" << m_configThumbnailGeometry
                << " zoomed=" << m_configZoomedThumbnail
                << " showRectangle=" << d->m_configThumbnailShowRectangle
                << endl;
@@ -808,7 +808,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
             #endif
                 slotCreateThumbnail ();
             }
-            // this' tqgeometry is weird ATM
+            // this' geometry is weird ATM
             else
             {
             #if DEBUG_KP_MAIN_WINDOW
diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp
index 4906b7ba..c90479b0 100644
--- a/kolourpaint/kpmainwindow_view.cpp
+++ b/kolourpaint/kpmainwindow_view.cpp
@@ -842,13 +842,13 @@ void kpMainWindow::slotSaveThumbnailGeometry ()
     TQRect rect (m_thumbnail->x (), m_thumbnail->y (),
                 m_thumbnail->width (), m_thumbnail->height ());
 #if DEBUG_KP_MAIN_WINDOW
-    kdDebug () << "\tthumbnail relative tqgeometry=" << rect << endl;
+    kdDebug () << "\tthumbnail relative geometry=" << rect << endl;
 #endif
 
     m_configThumbnailGeometry = mapFromGlobal (rect);
 
 #if DEBUG_KP_MAIN_WINDOW
-    kdDebug () << "\tCONFIG: saving thumbnail tqgeometry "
+    kdDebug () << "\tCONFIG: saving thumbnail geometry "
                 << m_configThumbnailGeometry
                 << endl;
 #endif
@@ -1067,11 +1067,11 @@ void kpMainWindow::updateThumbnail ()
         kdDebug () << "\tcreating thumbnail" << endl;
     #endif
 
-        // Read last saved tqgeometry before creating thumbnail & friends
+        // Read last saved geometry before creating thumbnail & friends
         // in case they call notifyThumbnailGeometryChanged()
         TQRect thumbnailGeometry = m_configThumbnailGeometry;
     #if DEBUG_KP_MAIN_WINDOW
-        kdDebug () << "\t\tlast used tqgeometry=" << thumbnailGeometry << endl;
+        kdDebug () << "\t\tlast used geometry=" << thumbnailGeometry << endl;
     #endif
 
         m_thumbnail = new kpThumbnail (this, "thumbnail");
@@ -1084,9 +1084,9 @@ void kpMainWindow::updateThumbnail ()
         if (!thumbnailGeometry.isEmpty () &&
             TQRect (0, 0, width (), height ()).intersects (thumbnailGeometry))
         {
-            const TQRect tqgeometry = mapToGlobal (thumbnailGeometry);
-            m_thumbnail->resize (tqgeometry.size ());
-            m_thumbnail->move (tqgeometry.topLeft ());
+            const TQRect geometry = mapToGlobal (thumbnailGeometry);
+            m_thumbnail->resize (geometry.size ());
+            m_thumbnail->move (geometry.topLeft ());
         }
         else
         {
@@ -1101,7 +1101,7 @@ void kpMainWindow::updateThumbnail ()
                                     initialHeight);
 
             #if DEBUG_KP_MAIN_WINDOW
-                kdDebug () << "\t\tcreating tqgeometry=" << geometryRect << endl;
+                kdDebug () << "\t\tcreating geometry=" << geometryRect << endl;
             #endif
 
                 geometryRect = mapToGlobal (geometryRect);
diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp
index a5da9c5a..dc28e2a9 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -744,7 +744,7 @@ void kpTool::endDrawInternal (const TQPoint &thisPoint, const TQRect &normalized
 // private
 void kpTool::endShapeInternal (const TQPoint &thisPoint, const TQRect &normalizedRect)
 {
-    endDrawInternal (thisPoint, normalizedRect, true/*end tqshape*/);
+    endDrawInternal (thisPoint, normalizedRect, true/*end shape*/);
 }
 
 // virtual
@@ -1154,7 +1154,7 @@ void kpTool::wheelEvent (TQWheelEvent *e)
     if ((e->state () & TQt::ControlButton) == 0)
         return;
     
-    // If drawing, bye; don't care if a tqshape in progress though.
+    // If drawing, bye; don't care if a shape in progress though.
     if (hasBegunDraw ())
         return;
         
diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp
index 5b68a7b2..c130c0d9 100644
--- a/kolourpaint/kpview.cpp
+++ b/kolourpaint/kpview.cpp
@@ -1568,7 +1568,7 @@ void kpView::paintEventDrawSelectionResizeHandles (TQPainter *painter, const TQR
         painter->setRasterOp (TQt::XorROP);
     }
 
-    TQMemArray <TQRect> rects = selResizeHandlesRegion.tqrects ();
+    TQMemArray <TQRect> rects = selResizeHandlesRegion.rects ();
     for (TQMemArray <TQRect>::ConstIterator it = rects.begin ();
          it != rects.end ();
          it++)
@@ -1888,7 +1888,7 @@ void kpView::paintEvent (TQPaintEvent *e)
 
 
     TQRegion viewRegion = clipRegion ().intersect (e->region ());
-    TQMemArray <TQRect> rects = viewRegion.tqrects ();
+    TQMemArray <TQRect> rects = viewRegion.rects ();
 #if DEBUG_KP_VIEW_RENDERER && 1
     kdDebug () << "\t#rects = " << rects.count () << endl;
 #endif
diff --git a/kolourpaint/kpviewmanager.cpp b/kolourpaint/kpviewmanager.cpp
index 3586a173..71b58a2c 100644
--- a/kolourpaint/kpviewmanager.cpp
+++ b/kolourpaint/kpviewmanager.cpp
@@ -628,7 +628,7 @@ void kpViewManager::updateView (kpView *v, const TQRect &viewRect)
     if (!queueUpdates ())
     {
         if (fastUpdates ())
-            v->tqrepaint (viewRect, false/*no erase*/);
+            v->repaint (viewRect, false/*no erase*/);
         else
             v->update (viewRect);
     }
@@ -646,7 +646,7 @@ void kpViewManager::updateView (kpView *v, const TQRegion &viewRegion)
     if (!queueUpdates ())
     {
         if (fastUpdates ())
-            v->tqrepaint (viewRegion, false/*no erase*/);
+            v->repaint (viewRegion, false/*no erase*/);
         else
             v->update (viewRegion.boundingRect ());
     }
diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp
index c632b814..80e9d9e7 100644
--- a/kolourpaint/kpviewscrollablecontainer.cpp
+++ b/kolourpaint/kpviewscrollablecontainer.cpp
@@ -663,7 +663,7 @@ void kpViewScrollableContainer::repaintWidgetAtResizeLineViewRect (
         // TODO: should be "!widget->testWFlags (TQt::WRepaintNoErase)"
         //       but for some reason, doesn't work for viewport().
         const bool erase = !dynamic_cast <kpView *> (widget);
-        widget->tqrepaint (redrawWidgetRect, erase);
+        widget->repaint (redrawWidgetRect, erase);
     }
 }
 
@@ -1269,7 +1269,7 @@ bool kpViewScrollableContainer::slotDragScroll (bool *didSomething)
 
             // Repaint newly exposed region immediately to reduce tearing
             // of scrollView.
-            m_view->tqrepaint (region, false/*no erase*/);
+            m_view->repaint (region, false/*no erase*/);
         }
     }
 
diff --git a/kolourpaint/patches/doc_resize_no_flicker.diff b/kolourpaint/patches/doc_resize_no_flicker.diff
index 821d418e..db699585 100644
--- a/kolourpaint/patches/doc_resize_no_flicker.diff
+++ b/kolourpaint/patches/doc_resize_no_flicker.diff
@@ -147,8 +147,8 @@ diff -u -p -r1.7 kpviewscrollablecontainer.cpp
          // TODO: should be "!widget->testWFlags (Qt::WRepaintNoErase)"
          //       but for some reason, doesn't work for viewport().
          const bool erase = !dynamic_cast <kpView *> (widget);
--        widget->tqrepaint (redrawWidgetRect, erase);
-+        widget->tqrepaint (redrawWidgetRegion, erase);
+-        widget->repaint (redrawWidgetRect, erase);
++        widget->repaint (redrawWidgetRegion, erase);
      }
  }
  
diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp
index 1906ab7f..9fb07cf1 100644
--- a/kolourpaint/pixmapfx/kpeffectbalance.cpp
+++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp
@@ -277,7 +277,7 @@ kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection,
     // TODO: This doesn't seem to be wide enough with some fonts so the
     //       whole tqlayout moves when we drag the gamma slider.
     m_gammaLabel->setMinimumWidth (m_gammaLabel->fontMetrics ().width (" 10.00 "));
-    m_gammaLabel->setAlignment (m_gammaLabel->tqalignment () | TQt::AlignRight);
+    m_gammaLabel->setAlignment (m_gammaLabel->alignment () | TQt::AlignRight);
     TQPushButton *gammaResetPushButton = new TQPushButton (i18n ("Rese&t"), this);
 
 
@@ -438,7 +438,7 @@ void kpEffectBalanceWidget::recalculateGammaLabel ()
                          'f'/*[-]9.9*/,
                          2/*precision*/) +
         " ");
-    m_gammaLabel->tqrepaint ();
+    m_gammaLabel->repaint ();
 }
 
 
diff --git a/kolourpaint/tools/kptoolautocrop.cpp b/kolourpaint/tools/kptoolautocrop.cpp
index 41aeb398..c294b1d0 100644
--- a/kolourpaint/tools/kptoolautocrop.cpp
+++ b/kolourpaint/tools/kptoolautocrop.cpp
@@ -70,7 +70,7 @@ kpToolAutoCropBorder::kpToolAutoCropBorder (const TQPixmap *pixmapPtr,
     : m_pixmapPtr (pixmapPtr),
       m_processedColorSimilarity (processedColorSimilarity)
 {
-    tqinvalidate ();
+    invalidate ();
 }
 
 
@@ -280,7 +280,7 @@ bool kpToolAutoCropBorder::exists () const
 }
 
 // public
-void kpToolAutoCropBorder::tqinvalidate ()
+void kpToolAutoCropBorder::invalidate ()
 {
     m_rect = TQRect ();
     m_referenceColor = kpColor::invalid;
@@ -374,7 +374,7 @@ bool kpToolAutoCrop (kpMainWindow *mainWindow)
     //       and regression testing.
     //
     // TODO: e.g. When the top fills entire rect but bot doesn't we could
-    //       tqinvalidate top and continue autocrop.
+    //       invalidate top and continue autocrop.
     int numRegions = 0;
     if (!leftBorder.calculate (true/*x*/, +1/*going right*/) ||
         leftBorder.fillsEntirePixmap () ||
@@ -439,7 +439,7 @@ bool kpToolAutoCrop (kpMainWindow *mainWindow)
         #if DEBUG_KP_TOOL_AUTO_CROP
             kdDebug () << "\tignoring left border" << endl;
         #endif
-            leftBorder.tqinvalidate ();
+            leftBorder.invalidate ();
         }
     }
 
@@ -454,7 +454,7 @@ bool kpToolAutoCrop (kpMainWindow *mainWindow)
         #if DEBUG_KP_TOOL_AUTO_CROP
             kdDebug () << "\tignoring top border" << endl;
         #endif
-            topBorder.tqinvalidate ();
+            topBorder.invalidate ();
         }
     }
 
diff --git a/kolourpaint/tools/kptoolautocrop.h b/kolourpaint/tools/kptoolautocrop.h
index 886b4223..bb1a5d4a 100644
--- a/kolourpaint/tools/kptoolautocrop.h
+++ b/kolourpaint/tools/kptoolautocrop.h
@@ -69,7 +69,7 @@ public:
 
     bool fillsEntirePixmap () const;
     bool exists () const;
-    void tqinvalidate ();
+    void invalidate ();
 
 private:
     const TQPixmap *m_pixmapPtr;
diff --git a/kolourpaint/tools/kptoolbrush.cpp b/kolourpaint/tools/kptoolbrush.cpp
index 30c68aee..a5122805 100644
--- a/kolourpaint/tools/kptoolbrush.cpp
+++ b/kolourpaint/tools/kptoolbrush.cpp
@@ -32,7 +32,7 @@
 kpToolBrush::kpToolBrush (kpMainWindow *mainWindow)
     : kpToolPen (kpToolPen::Brush,
                  i18n ("Brush"),
-                 i18n ("Draw using brushes of different tqshapes and sizes"),
+                 i18n ("Draw using brushes of different shapes and sizes"),
                  TQt::Key_B,
                  mainWindow, "tool_brush")
 {
diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp
index eade158b..634a8ea3 100644
--- a/kolourpaint/tools/kptoolpolygon.cpp
+++ b/kolourpaint/tools/kptoolpolygon.cpp
@@ -479,7 +479,7 @@ void kpToolPolygon::beginDraw ()
             break;
 
         default:
-            kdError () << "kpToolPolygon::beginDraw() tqshape" << endl;
+            kdError () << "kpToolPolygon::beginDraw() shape" << endl;
             break;
         }
     }
diff --git a/kolourpaint/tools/kptoolpreviewdialog.cpp b/kolourpaint/tools/kptoolpreviewdialog.cpp
index 2136e02d..30e223e3 100644
--- a/kolourpaint/tools/kptoolpreviewdialog.cpp
+++ b/kolourpaint/tools/kptoolpreviewdialog.cpp
@@ -389,7 +389,7 @@ void kpToolPreviewDialog::updatePreview ()
         m_previewPixmapLabel->setPixmap (previewPixmap);
 
         // immediate update esp. for expensive previews
-        m_previewPixmapLabel->tqrepaint (false/*no erase*/);
+        m_previewPixmapLabel->repaint (false/*no erase*/);
 
 #if DEBUG_KP_TOOL_PREVIEW_DIALOG
     kdDebug () << "\tafter TQLabel::setPixmap() previewPixmapLabel: w="
diff --git a/kolourpaint/tools/kptoolrectangle.cpp b/kolourpaint/tools/kptoolrectangle.cpp
index df560ea2..a0699d7b 100644
--- a/kolourpaint/tools/kptoolrectangle.cpp
+++ b/kolourpaint/tools/kptoolrectangle.cpp
@@ -108,7 +108,7 @@ static TQPixmap pixmap (const kpToolRectangle::Mode mode,
     if (startPoint != endPoint)
     {
     #if DEBUG_KP_TOOL_RECTANGLE && 1
-        kdDebug () << "\tdraw tqshape" << endl;
+        kdDebug () << "\tdraw shape" << endl;
     #endif
 
         // TODO: Rectangle of pen width 1, height 1 and width X is rendered
diff --git a/kolourpaint/tools/kptoolrectangle.h b/kolourpaint/tools/kptoolrectangle.h
index e41b5d47..d1b28275 100644
--- a/kolourpaint/tools/kptoolrectangle.h
+++ b/kolourpaint/tools/kptoolrectangle.h
@@ -53,7 +53,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    // it turns out that these tqshapes are all really the same thing
+    // it turns out that these shapes are all really the same thing
     // (same options, same feel) - the only real difference is the
     // drawing functions (a one line change)
     enum Mode {Rectangle, RoundedRectangle, Ellipse};
diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp
index 27d8ab15..80962c77 100644
--- a/kolourpaint/tools/kptoolresizescale.cpp
+++ b/kolourpaint/tools/kptoolresizescale.cpp
@@ -684,9 +684,9 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget)
     //m_smoothScaleLabel = new TQLabel (i18n ("S&mooth scale"), m_operationGroupBox);
 
 
-    //m_resizeLabel->setAlignment (m_resizeLabel->tqalignment () | TQt::ShowPrefix);
-    //m_scaleLabel->setAlignment (m_scaleLabel->tqalignment () | TQt::ShowPrefix);
-    //m_smoothScaleLabel->setAlignment (m_smoothScaleLabel->tqalignment () | TQt::ShowPrefix);
+    //m_resizeLabel->setAlignment (m_resizeLabel->alignment () | TQt::ShowPrefix);
+    //m_scaleLabel->setAlignment (m_scaleLabel->alignment () | TQt::ShowPrefix);
+    //m_smoothScaleLabel->setAlignment (m_smoothScaleLabel->alignment () | TQt::ShowPrefix);
 
 
     TQButtonGroup *resizeScaleButtonGroup = new TQButtonGroup (baseWidget);
@@ -727,9 +727,9 @@ void kpToolResizeScaleDialog::createDimensionsGroupBox (TQWidget *baseWidget)
     m_dimensionsGroupBox = new TQGroupBox (i18n ("Dimensions"), baseWidget);
 
     TQLabel *widthLabel = new TQLabel (i18n ("Width:"), m_dimensionsGroupBox);
-    widthLabel->setAlignment (widthLabel->tqalignment () | TQt::AlignHCenter);
+    widthLabel->setAlignment (widthLabel->alignment () | TQt::AlignHCenter);
     TQLabel *heightLabel = new TQLabel (i18n ("Height:"), m_dimensionsGroupBox);
-    heightLabel->setAlignment (heightLabel->tqalignment () | TQt::AlignHCenter);
+    heightLabel->setAlignment (heightLabel->alignment () | TQt::AlignHCenter);
 
     TQLabel *originalLabel = new TQLabel (i18n ("Original:"), m_dimensionsGroupBox);
     m_originalWidthInput = new KIntNumInput (
diff --git a/kolourpaint/views/kpthumbnailview.cpp b/kolourpaint/views/kpthumbnailview.cpp
index 54281ba4..970663b5 100644
--- a/kolourpaint/views/kpthumbnailview.cpp
+++ b/kolourpaint/views/kpthumbnailview.cpp
@@ -77,7 +77,7 @@ void kpThumbnailView::resizeEvent (TQResizeEvent *e)
                << endl;
 #endif
 
-    // For TQResizeEvent's, TQt already throws an entire widget tqrepaint into
+    // For TQResizeEvent's, TQt already throws an entire widget repaint into
     // the event loop.  So eat useless update() calls that can only slow
     // things down.
     // TODO: this doesn't seem to work.
diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.cpp b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
index edea872e..4d06d46e 100644
--- a/kolourpaint/widgets/kpcolorsimilaritycube.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
@@ -133,7 +133,7 @@ void kpColorSimilarityCube::setColorSimilarity (double similarity)
 
     m_colorSimilarity = similarity;
 
-    tqrepaint (false/*no erase*/);
+    repaint (false/*no erase*/);
 }
 
 
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index ba048d5c..2ba8d816 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -199,7 +199,7 @@ int kpToolToolBar::defaultIconSize ()
 
     if (m_defaultIconSize <= 0)
     {
-        // Adapt according to screen tqgeometry
+        // Adapt according to screen geometry
         const TQRect desktopSize = KGlobalSettings::desktopGeometry (this);
     #if DEBUG_KP_TOOL_TOOL_BAR
         kdDebug () << "\tadapting to screen size=" << desktopSize << endl;
diff --git a/kolourpaint/widgets/kptoolwidgetbrush.cpp b/kolourpaint/widgets/kptoolwidgetbrush.cpp
index 0c583126..57986b63 100644
--- a/kolourpaint/widgets/kptoolwidgetbrush.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbrush.cpp
@@ -59,7 +59,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name)
 
     TQPixmap *pm = m_brushBitmaps;
     
-    for (int tqshape = 0; tqshape < BRUSH_SIZE_NUM_ROWS; tqshape++)
+    for (int shape = 0; shape < BRUSH_SIZE_NUM_ROWS; shape++)
     {
         for (int i = 0; i < BRUSH_SIZE_NUM_COLS; i++)
         {
@@ -68,7 +68,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name)
             pm->resize ((w <= 0 ? width () : w),
                         (h <= 0 ? height () : h));
 
-            const int s = brushSize [tqshape][i];
+            const int s = brushSize [shape][i];
             TQRect rect;
             
             if (s >= pm->width () || s >= pm->height ())
@@ -92,7 +92,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name)
             painter.setBrush (TQt::black);
 
             // sync: <brushes>
-            switch (tqshape)
+            switch (shape)
             {
             case 0:
                 painter.drawEllipse (rect);
@@ -110,7 +110,7 @@ kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name)
             painter.end ();
 
             pm->setMask (pm->createHeuristicMask ());
-            addOption (*pm, brushName (tqshape, i)/*tooltip*/);
+            addOption (*pm, brushName (shape, i)/*tooltip*/);
 
             pm++;
         }
@@ -127,38 +127,38 @@ kpToolWidgetBrush::~kpToolWidgetBrush ()
 
 
 // private
-TQString kpToolWidgetBrush::brushName (int tqshape, int whichSize)
+TQString kpToolWidgetBrush::brushName (int shape, int whichSize)
 {
-    int s = brushSize [tqshape][whichSize];
+    int s = brushSize [shape][whichSize];
     
     if (s == 1)
         return i18n ("1x1");
     
-    TQString tqshapeName;
+    TQString shapeName;
 
     // sync: <brushes>
-    switch (tqshape)
+    switch (shape)
     {
     case 0:
-        tqshapeName = i18n ("Circle");
+        shapeName = i18n ("Circle");
         break;
     case 1:
-        tqshapeName = i18n ("Square");
+        shapeName = i18n ("Square");
         break;
     case 2:
-        // TODO: is this really the name of a tqshape? :)
-        tqshapeName = i18n ("Slash");
+        // TODO: is this really the name of a shape? :)
+        shapeName = i18n ("Slash");
         break;
     case 3:
-        // TODO: is this really the name of a tqshape? :)
-        tqshapeName = i18n ("Backslash");
+        // TODO: is this really the name of a shape? :)
+        shapeName = i18n ("Backslash");
         break;
     }
     
-    if (tqshapeName.isEmpty ())
+    if (shapeName.isEmpty ())
         return TQString();
     
-    return i18n ("%1x%2 %3").arg (s).arg (s).arg (tqshapeName);
+    return i18n ("%1x%2 %3").arg (s).arg (s).arg (shapeName);
 }
 
 TQPixmap kpToolWidgetBrush::brush () const
diff --git a/kolourpaint/widgets/kptoolwidgetbrush.h b/kolourpaint/widgets/kptoolwidgetbrush.h
index 0fd2f46a..c67db05e 100644
--- a/kolourpaint/widgets/kptoolwidgetbrush.h
+++ b/kolourpaint/widgets/kptoolwidgetbrush.h
@@ -43,7 +43,7 @@ public:
     virtual ~kpToolWidgetBrush ();
 
 private:
-    TQString brushName (int tqshape, int whichSize);
+    TQString brushName (int shape, int whichSize);
     
 public:
     TQPixmap brush () const;
diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
index 503cecd2..24569a21 100644
--- a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
+++ b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
@@ -54,7 +54,7 @@ kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *parent, const char
     for (int i = 0; i < int (sizeof (spraycanSizes) / sizeof (spraycanSizes [0])); i++)
     {
         int s = spraycanSizes [i];
-        TQString iconName = TQString ("tool_spraycan_%1x%1").tqarg (s).tqarg(s);
+        TQString iconName = TQString ("tool_spraycan_%1x%1").arg (s).arg(s);
         
     #if DEBUG_KP_TOOL_WIDGET_SPRAYCAN_SIZE
         kdDebug () << "\ticonName=" << iconName << endl;