Rename old tq methods that no longer need a unique name

(cherry picked from commit 45f529de247fc4b3662f6b474abe03fe904306ec)

29 files changed, 142 insertions, 142 deletions

diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp
index 06948815..186a80fa 100644
--- a/kolourpaint/kpcommandhistory.cpp
+++ b/kolourpaint/kpcommandhistory.cpp
@@ -257,13 +257,13 @@ kpCommandHistoryBase::kpCommandHistoryBase (bool doReadConfig,
     : d (new kpCommandHistoryBasePrivate ())
 {
     m_actionUndo = new KToolBarPopupAction (undoActionText (),
-        TQString::tqfromLatin1 ("undo"),
+        TQString::fromLatin1 ("undo"),
         KStdAccel::shortcut (KStdAccel::Undo),
         this, TQT_SLOT (undo ()),
         ac, KStdAction::name (KStdAction::Undo));
 
     m_actionRedo = new KToolBarPopupAction (redoActionText (),
-        TQString::tqfromLatin1 ("redo"),
+        TQString::fromLatin1 ("redo"),
         KStdAccel::shortcut (KStdAccel::Redo),
         this, TQT_SLOT (redo ()),
         ac, KStdAction::name (KStdAction::Redo));
diff --git a/kolourpaint/kpdefs.h b/kolourpaint/kpdefs.h
index c46ccec9..c9fb4725 100644
--- a/kolourpaint/kpdefs.h
+++ b/kolourpaint/kpdefs.h
@@ -65,71 +65,71 @@
 // Settings
 //
 
-#define kpSettingsGroupGeneral TQString::tqfromLatin1 ("General Settings")
-#define kpSettingFirstTime TQString::tqfromLatin1 ("First Time")
-#define kpSettingShowGrid TQString::tqfromLatin1 ("Show Grid")
-#define kpSettingShowPath TQString::tqfromLatin1 ("Show Path")
-#define kpSettingColorSimilarity TQString::tqfromLatin1 ("Color Similarity")
-#define kpSettingDitherOnOpen TQString::tqfromLatin1 ("Dither on Open if Screen is 15/16bpp and Image Num Colors More Than")
-#define kpSettingPrintImageCenteredOnPage TQString::tqfromLatin1 ("Print Image Centered On Page")
+#define kpSettingsGroupGeneral TQString::fromLatin1 ("General Settings")
+#define kpSettingFirstTime TQString::fromLatin1 ("First Time")
+#define kpSettingShowGrid TQString::fromLatin1 ("Show Grid")
+#define kpSettingShowPath TQString::fromLatin1 ("Show Path")
+#define kpSettingColorSimilarity TQString::fromLatin1 ("Color Similarity")
+#define kpSettingDitherOnOpen TQString::fromLatin1 ("Dither on Open if Screen is 15/16bpp and Image Num Colors More Than")
+#define kpSettingPrintImageCenteredOnPage TQString::fromLatin1 ("Print Image Centered On Page")
 
-#define kpSettingsGroupFileSaveAs TQString::tqfromLatin1 ("File/Save As")
-#define kpSettingsGroupFileExport TQString::tqfromLatin1 ("File/Export")
-#define kpSettingsGroupEditCopyTo TQString::tqfromLatin1 ("Edit/Copy To")
+#define kpSettingsGroupFileSaveAs TQString::fromLatin1 ("File/Save As")
+#define kpSettingsGroupFileExport TQString::fromLatin1 ("File/Export")
+#define kpSettingsGroupEditCopyTo TQString::fromLatin1 ("Edit/Copy To")
 
-#define kpSettingForcedMimeType TQString::tqfromLatin1 ("Forced MimeType")
-#define kpSettingForcedColorDepth TQString::tqfromLatin1 ("Forced Color Depth")
-#define kpSettingForcedDither TQString::tqfromLatin1 ("Forced Dither")
-#define kpSettingForcedQuality TQString::tqfromLatin1 ("Forced Quality")
+#define kpSettingForcedMimeType TQString::fromLatin1 ("Forced MimeType")
+#define kpSettingForcedColorDepth TQString::fromLatin1 ("Forced Color Depth")
+#define kpSettingForcedDither TQString::fromLatin1 ("Forced Dither")
+#define kpSettingForcedQuality TQString::fromLatin1 ("Forced Quality")
 
-#define kpSettingLastDocSize TQString::tqfromLatin1 ("Last Document Size")
+#define kpSettingLastDocSize TQString::fromLatin1 ("Last Document Size")
 
-#define kpSettingMoreEffectsLastEffect TQString::tqfromLatin1 ("More Effects - Last Effect")
+#define kpSettingMoreEffectsLastEffect TQString::fromLatin1 ("More Effects - Last Effect")
 
-#define kpSettingResizeScaleLastKeepAspect TQString::tqfromLatin1 ("Resize Scale - Last Keep Aspect")
+#define kpSettingResizeScaleLastKeepAspect TQString::fromLatin1 ("Resize Scale - Last Keep Aspect")
 
 
-#define kpSettingsGroupMimeTypeProperties TQString::tqfromLatin1 ("MimeType Properties Version 1.2-2")
-#define kpSettingMimeTypeMaximumColorDepth TQString::tqfromLatin1 ("Maximum Color Depth")
-#define kpSettingMimeTypeHasConfigurableColorDepth TQString::tqfromLatin1 ("Configurable Color Depth")
-#define kpSettingMimeTypeHasConfigurableQuality TQString::tqfromLatin1 ("Configurable Quality Setting")
+#define kpSettingsGroupMimeTypeProperties TQString::fromLatin1 ("MimeType Properties Version 1.2-2")
+#define kpSettingMimeTypeMaximumColorDepth TQString::fromLatin1 ("Maximum Color Depth")
+#define kpSettingMimeTypeHasConfigurableColorDepth TQString::fromLatin1 ("Configurable Color Depth")
+#define kpSettingMimeTypeHasConfigurableQuality TQString::fromLatin1 ("Configurable Quality Setting")
 
 
-#define kpSettingsGroupUndoRedo TQString::tqfromLatin1 ("Undo/Redo Settings")
-#define kpSettingUndoMinLimit TQString::tqfromLatin1 ("Min Limit")
-#define kpSettingUndoMaxLimit TQString::tqfromLatin1 ("Max Limit")
-#define kpSettingUndoMaxLimitSizeLimit TQString::tqfromLatin1 ("Max Limit Size Limit")
+#define kpSettingsGroupUndoRedo TQString::fromLatin1 ("Undo/Redo Settings")
+#define kpSettingUndoMinLimit TQString::fromLatin1 ("Min Limit")
+#define kpSettingUndoMaxLimit TQString::fromLatin1 ("Max Limit")
+#define kpSettingUndoMaxLimitSizeLimit TQString::fromLatin1 ("Max Limit Size Limit")
 
 
-#define kpSettingsGroupThumbnail TQString::tqfromLatin1 ("Thumbnail Settings")
-#define kpSettingThumbnailShown TQString::tqfromLatin1 ("Shown")
-#define kpSettingThumbnailGeometry TQString::tqfromLatin1 ("Geometry")
-#define kpSettingThumbnailZoomed TQString::tqfromLatin1 ("Zoomed")
-#define kpSettingThumbnailShowRectangle TQString::tqfromLatin1 ("ShowRectangle")
+#define kpSettingsGroupThumbnail TQString::fromLatin1 ("Thumbnail Settings")
+#define kpSettingThumbnailShown TQString::fromLatin1 ("Shown")
+#define kpSettingThumbnailGeometry TQString::fromLatin1 ("Geometry")
+#define kpSettingThumbnailZoomed TQString::fromLatin1 ("Zoomed")
+#define kpSettingThumbnailShowRectangle TQString::fromLatin1 ("ShowRectangle")
 
 
-#define kpSettingsGroupPreviewSave TQString::tqfromLatin1 ("Save Preview Settings")
-#define kpSettingPreviewSaveGeometry TQString::tqfromLatin1 ("Geometry")
-#define kpSettingPreviewSaveUpdateDelay TQString::tqfromLatin1 ("Update Delay")
+#define kpSettingsGroupPreviewSave TQString::fromLatin1 ("Save Preview Settings")
+#define kpSettingPreviewSaveGeometry TQString::fromLatin1 ("Geometry")
+#define kpSettingPreviewSaveUpdateDelay TQString::fromLatin1 ("Update Delay")
 
 
-#define kpSettingsGroupTools TQString::tqfromLatin1 ("Tool Settings")
-#define kpSettingLastTool TQString::tqfromLatin1 ("Last Used Tool")
-#define kpSettingToolBoxIconSize TQString::tqfromLatin1 ("Tool Box Icon Size")
+#define kpSettingsGroupTools TQString::fromLatin1 ("Tool Settings")
+#define kpSettingLastTool TQString::fromLatin1 ("Last Used Tool")
+#define kpSettingToolBoxIconSize TQString::fromLatin1 ("Tool Box Icon Size")
 
 
-#define kpSettingsGroupText TQString::tqfromLatin1 ("Text Settings")
-#define kpSettingFontFamily TQString::tqfromLatin1 ("Font Family")
-#define kpSettingFontSize TQString::tqfromLatin1 ("Font Size")
-#define kpSettingBold TQString::tqfromLatin1 ("Bold")
-#define kpSettingItalic TQString::tqfromLatin1 ("Italic")
-#define kpSettingUnderline TQString::tqfromLatin1 ("Underline")
-#define kpSettingStrikeThru TQString::tqfromLatin1 ("Strike Thru")
+#define kpSettingsGroupText TQString::fromLatin1 ("Text Settings")
+#define kpSettingFontFamily TQString::fromLatin1 ("Font Family")
+#define kpSettingFontSize TQString::fromLatin1 ("Font Size")
+#define kpSettingBold TQString::fromLatin1 ("Bold")
+#define kpSettingItalic TQString::fromLatin1 ("Italic")
+#define kpSettingUnderline TQString::fromLatin1 ("Underline")
+#define kpSettingStrikeThru TQString::fromLatin1 ("Strike Thru")
 
 
-#define kpSettingsGroupFlattenEffect TQString::tqfromLatin1 ("Flatten Effect Settings")
-#define kpSettingFlattenEffectColor1 TQString::tqfromLatin1 ("Color1")
-#define kpSettingFlattenEffectColor2 TQString::tqfromLatin1 ("Color2")
+#define kpSettingsGroupFlattenEffect TQString::fromLatin1 ("Flatten Effect Settings")
+#define kpSettingFlattenEffectColor1 TQString::fromLatin1 ("Color1")
+#define kpSettingFlattenEffectColor2 TQString::fromLatin1 ("Color2")
 
 
 //
@@ -140,11 +140,11 @@
 //
 // This key only exists if the document does.  If it exists, it can be empty.
 // The URL need not point to a file that exists e.g. "kolourpaint doesnotexist.png".
-#define kpSessionSettingDocumentUrl TQString::tqfromLatin1 ("Session Document Url")
+#define kpSessionSettingDocumentUrl TQString::fromLatin1 ("Session Document Url")
 
 // The size of a document which is not from a URL e.g. "kolourpaint doesnotexist.png".
 // This key does not exist for documents from URLs.
-#define kpSessionSettingNotFromUrlDocumentSize TQString::tqfromLatin1 ("Session Not-From-Url Document Size")
+#define kpSessionSettingNotFromUrlDocumentSize TQString::fromLatin1 ("Session Not-From-Url Document Size")
 
 
 #endif  // __kp_defs_h__
diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp
index fe91bfee..c5a1c442 100644
--- a/kolourpaint/kpdocument.cpp
+++ b/kolourpaint/kpdocument.cpp
@@ -156,7 +156,7 @@ TQPixmap kpDocument::convertToPixmapAsLosslessAsPossible (
         metaInfo->setDotsPerMeterY (image.dotsPerMeterY ());
         metaInfo->setOffset (image.offset ());
 
-        TQValueList <TQImageTextKeyLang> keyList = image.tqtextList ();
+        TQValueList <TQImageTextKeyLang> keyList = image.textList ();
         for (TQValueList <TQImageTextKeyLang>::const_iterator it = keyList.begin ();
              it != keyList.end ();
              it++)
@@ -475,7 +475,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
                 //       low maximum colour depth
                 i18n ("Lossy File Format"),
                 KStdGuiItem::save (),
-                TQString::tqfromLatin1 ("SaveInLossyMimeTypeDontAskAgain")));
+                TQString::fromLatin1 ("SaveInLossyMimeTypeDontAskAgain")));
     }
     else if (lossyType & kpDocumentSaveOptions::ColorDepthLow)
     {
@@ -490,7 +490,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
                     .arg (saveOptions.colorDepth ()),
                 i18n ("Low Color Depth"),
                 KStdGuiItem::save (),
-                TQString::tqfromLatin1 ("SaveAtLowColorDepthDontAskAgain")));
+                TQString::fromLatin1 ("SaveAtLowColorDepthDontAskAgain")));
     }
 #undef TQUIT_IF_CANCEL
 
@@ -628,8 +628,8 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
                << ",overwritePrompt=" << overwritePrompt
                << ",lossyPrompt=" << lossyPrompt
                << ")" << endl;
-    saveOptions.printDebug (TQString::tqfromLatin1 ("\tsaveOptions"));
-    metaInfo.printDebug (TQString::tqfromLatin1 ("\tmetaInfo"));
+    saveOptions.printDebug (TQString::fromLatin1 ("\tsaveOptions"));
+    metaInfo.printDebug (TQString::fromLatin1 ("\tmetaInfo"));
 #endif
 
     if (overwritePrompt && KIO::NetAccess::exists (url, false/*write*/, parent))
diff --git a/kolourpaint/kpdocumentmetainfo.cpp b/kolourpaint/kpdocumentmetainfo.cpp
index f0b9f0f0..01728efa 100644
--- a/kolourpaint/kpdocumentmetainfo.cpp
+++ b/kolourpaint/kpdocumentmetainfo.cpp
@@ -82,7 +82,7 @@ kpDocumentMetaInfo &kpDocumentMetaInfo::operator= (const kpDocumentMetaInfo &rhs
 void kpDocumentMetaInfo::printDebug (const TQString &prefix) const
 {
     const TQString usedPrefix = !prefix.isEmpty () ?
-                                   prefix + TQString::tqfromLatin1 (":") :
+                                   prefix + TQString::fromLatin1 (":") :
                                    TQString();
 
     kdDebug () << usedPrefix << endl;
diff --git a/kolourpaint/kpdocumentsaveoptions.cpp b/kolourpaint/kpdocumentsaveoptions.cpp
index c217cffb..7f644de1 100644
--- a/kolourpaint/kpdocumentsaveoptions.cpp
+++ b/kolourpaint/kpdocumentsaveoptions.cpp
@@ -114,7 +114,7 @@ kpDocumentSaveOptions &kpDocumentSaveOptions::operator= (const kpDocumentSaveOpt
 void kpDocumentSaveOptions::printDebug (const TQString &prefix) const
 {
     const TQString usedPrefix = !prefix.isEmpty () ?
-                                   prefix + TQString::tqfromLatin1 (": ") :
+                                   prefix + TQString::fromLatin1 (": ") :
                                    TQString();
 
     kdDebug () << usedPrefix
@@ -246,7 +246,7 @@ bool kpDocumentSaveOptions::qualityIsInvalid () const
 TQString kpDocumentSaveOptions::defaultMimeType (KConfigBase *config)
 {
     return config->readEntry (kpSettingForcedMimeType,
-                              TQString::tqfromLatin1 ("image/png"));
+                              TQString::fromLatin1 ("image/png"));
 }
 
 // public static
@@ -445,19 +445,19 @@ int kpDocumentSaveOptions::mimeTypeMaximumColorDepth (const TQString &mimeType)
     // SYNC: update mime info here
     
     // Greyscale actually (unenforced since depth not set to configurable)
-    defaultList << TQString::tqfromLatin1 ("image/x-eps:32");
+    defaultList << TQString::fromLatin1 ("image/x-eps:32");
     
-    defaultList << TQString::tqfromLatin1 ("image/x-portable-bitmap:1");
+    defaultList << TQString::fromLatin1 ("image/x-portable-bitmap:1");
     
     // Greyscale actually (unenforced since depth not set to configurable)
-    defaultList << TQString::tqfromLatin1 ("image/x-portable-greymap:8");
+    defaultList << TQString::fromLatin1 ("image/x-portable-greymap:8");
     
-    defaultList << TQString::tqfromLatin1 ("image/x-xbm:1");
+    defaultList << TQString::fromLatin1 ("image/x-xbm:1");
 
     const TQStringList mimeTypeList = mimeTypesSupportingProperty (
         kpSettingMimeTypeMaximumColorDepth, defaultList);
 
-    const TQString mimeTypeColon = mimeType + TQString::tqfromLatin1 (":");
+    const TQString mimeTypeColon = mimeType + TQString::fromLatin1 (":");
     for (TQStringList::const_iterator it = mimeTypeList.begin ();
          it != mimeTypeList.end ();
          it++)
@@ -488,16 +488,16 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableColorDepth (const TQString &m
     TQStringList defaultMimeTypes;
 
     // SYNC: update mime info here
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/png");
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/x-bmp");
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/x-pcx");
+    defaultMimeTypes << TQString::fromLatin1 ("image/png");
+    defaultMimeTypes << TQString::fromLatin1 ("image/x-bmp");
+    defaultMimeTypes << TQString::fromLatin1 ("image/x-pcx");
     
     // TODO: Only 1, 24 not 8; TQt only sees 32 but "file" cmd realises
     //       it's either 1 or 24.
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/x-rgb");
+    defaultMimeTypes << TQString::fromLatin1 ("image/x-rgb");
   
     // TODO: Only 8 and 24 - no 1.
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/x-xpm");
+    defaultMimeTypes << TQString::fromLatin1 ("image/x-xpm");
 
     return mimeTypeSupportsProperty (mimeType,
         kpSettingMimeTypeHasConfigurableColorDepth,
@@ -517,8 +517,8 @@ bool kpDocumentSaveOptions::mimeTypeHasConfigurableQuality (const TQString &mime
     TQStringList defaultMimeTypes;
 
     // SYNC: update mime info here
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/jp2");
-    defaultMimeTypes << TQString::tqfromLatin1 ("image/jpeg");
+    defaultMimeTypes << TQString::fromLatin1 ("image/jp2");
+    defaultMimeTypes << TQString::fromLatin1 ("image/jpeg");
 
     return mimeTypeSupportsProperty (mimeType,
         kpSettingMimeTypeHasConfigurableQuality,
diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp
index 3b117803..6ec2a944 100644
--- a/kolourpaint/kpmainwindow.cpp
+++ b/kolourpaint/kpmainwindow.cpp
@@ -731,7 +731,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
         connect (m_document, TQT_SIGNAL (selectionIsTextChanged (bool)),
                  this, TQT_SLOT (slotImageMenuUpdateDueToSelection ()));
 
-        // tqStatus bar
+        // Status bar
         connect (m_document, TQT_SIGNAL (documentOpened ()),
                  this, TQT_SLOT (recalculateStatusBar ()));
 
diff --git a/kolourpaint/kpmainwindow.h b/kolourpaint/kpmainwindow.h
index bd0df32b..3da1e570 100644
--- a/kolourpaint/kpmainwindow.h
+++ b/kolourpaint/kpmainwindow.h
@@ -640,7 +640,7 @@ private slots:
 
 
     /*
-     * tqStatus Bar
+     * Status Bar
      */
 
 private:
diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp
index 9fc82440..c4f339db 100644
--- a/kolourpaint/kpmainwindow_settings.cpp
+++ b/kolourpaint/kpmainwindow_settings.cpp
@@ -195,7 +195,7 @@ void kpMainWindow::slotNewToolBarConfig ()
     KMessageBox::information (this,
         i18n ("You have to restart KolourPaint for these changes to take effect."),
         i18n ("Toolbar Settings Changed"),
-        TQString::tqfromLatin1 ("ToolBarSettingsChanged"));
+        TQString::fromLatin1 ("ToolBarSettingsChanged"));
 
     //createGUI();
     //applyMainWindowSettings (kapp->config (), autoSaveGroup ());
diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp
index 859e33f0..44bea619 100644
--- a/kolourpaint/kpmainwindow_text.cpp
+++ b/kolourpaint/kpmainwindow_text.cpp
@@ -80,7 +80,7 @@ void kpMainWindow::readAndApplyTextSettings ()
     KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupText);
     KConfigBase *cfg = cfgGroupSaver.config ();
 
-    m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::tqfromLatin1 ("Times")));
+    m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::fromLatin1 ("Times")));
     m_actionTextFontSize->setFontSize (cfg->readNumEntry (kpSettingFontSize, 14));
     m_actionTextBold->setChecked (cfg->readBoolEntry (kpSettingBold, false));
     m_actionTextItalic->setChecked (cfg->readBoolEntry (kpSettingItalic, false));
diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp
index 8be4beb8..4906b7ba 100644
--- a/kolourpaint/kpmainwindow_view.cpp
+++ b/kolourpaint/kpmainwindow_view.cpp
@@ -289,7 +289,7 @@ void kpMainWindow::zoomTo (int zoomLevel, bool centerUnderCursor)
             // Ordinary flicker is better than the whole view moving
             TQPainter p (m_mainView);
             p.fillRect (m_mainView->rect (),
-                        m_scrollView->viewport ()->tqcolorGroup ().background ());
+                        m_scrollView->viewport ()->colorGroup ().background ());
         }
     }
 
diff --git a/kolourpaint/kpselection.cpp b/kolourpaint/kpselection.cpp
index 43f81984..c5381d7d 100644
--- a/kolourpaint/kpselection.cpp
+++ b/kolourpaint/kpselection.cpp
@@ -373,7 +373,7 @@ TQBitmap kpSelection::maskForOwnType (bool nullForRectangular) const
         points.detach ();
         points.translate (-m_rect.x (), -m_rect.y ());
 
-        painter.tqdrawPolygon (points, false/*even-odd algo*/);
+        painter.drawPolygon (points, false/*even-odd algo*/);
     }
 
     painter.end ();
@@ -921,7 +921,7 @@ TQString kpSelection::textForTextLines (const TQValueVector <TQString> &textLine
          it != textLines_.end ();
          it++)
     {
-        bigString += TQString::tqfromLatin1 ("\n");
+        bigString += TQString::fromLatin1 ("\n");
         bigString += (*it);
     }
 
@@ -1049,7 +1049,7 @@ int kpSelection::minimumHeightForTextStyle (const kpTextStyle &)
 }
 
 // public static
-TQSize kpSelection::tqminimumSizeForTextStyle (const kpTextStyle &textStyle)
+TQSize kpSelection::minimumSizeForTextStyle (const kpTextStyle &textStyle)
 {
     return TQSize (minimumWidthForTextStyle (textStyle),
                   minimumHeightForTextStyle (textStyle));
@@ -1061,7 +1061,7 @@ int kpSelection::preferredMinimumWidthForTextStyle (const kpTextStyle &textStyle
 {
     const int about15CharsWidth =
         textStyle.fontMetrics ().width (
-            TQString::tqfromLatin1 ("1234567890abcde"));
+            TQString::fromLatin1 ("1234567890abcde"));
 
     const int preferredMinWidth =
         TQMAX (150,
@@ -1108,7 +1108,7 @@ int kpSelection::minimumHeight () const
 }
 
 // public
-TQSize kpSelection::tqminimumSize () const
+TQSize kpSelection::minimumSize () const
 {
     return TQSize (minimumWidth (), minimumHeight ());
 }
diff --git a/kolourpaint/kpselection.h b/kolourpaint/kpselection.h
index 24b1ba39..a227fef2 100644
--- a/kolourpaint/kpselection.h
+++ b/kolourpaint/kpselection.h
@@ -169,7 +169,7 @@ public:
     //       Be more robust when external enforcement fails.
     static int minimumWidthForTextStyle (const kpTextStyle &);
     static int minimumHeightForTextStyle (const kpTextStyle &);
-    static TQSize tqminimumSizeForTextStyle (const kpTextStyle &);
+    static TQSize minimumSizeForTextStyle (const kpTextStyle &);
 
     static int preferredMinimumWidthForTextStyle (const kpTextStyle &textStyle);
     static int preferredMinimumHeightForTextStyle (const kpTextStyle &textStyle);
@@ -177,7 +177,7 @@ public:
 
     int minimumWidth () const;
     int minimumHeight () const;
-    TQSize tqminimumSize () const;
+    TQSize minimumSize () const;
 
     int textRowForPoint (const TQPoint &globalPoint) const;
     int textColForPoint (const TQPoint &globalPoint) const;
diff --git a/kolourpaint/kpselectiondrag.cpp b/kolourpaint/kpselectiondrag.cpp
index 22cdeb4a..9c680abb 100644
--- a/kolourpaint/kpselectiondrag.cpp
+++ b/kolourpaint/kpselectiondrag.cpp
@@ -143,10 +143,10 @@ bool kpSelectionDrag::provides (const char *mimeType) const
 }
 
 // public virtual [base TQMimeSource]
-TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
+TQByteArray kpSelectionDrag::encodedData (const char *mimeType) const
 {
 #if DEBUG_KP_SELECTION_DRAG
-    kdDebug () << "kpSelectionDrag::tqencodedData(" << mimeType << ")" << endl;
+    kdDebug () << "kpSelectionDrag::encodedData(" << mimeType << ")" << endl;
 #endif
 
     if (!mimeType)
@@ -192,7 +192,7 @@ TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
             }
             else
             {
-                kdError () << "kpSelectionDrag::tqencodedData(" << mimeType << ")"
+                kdError () << "kpSelectionDrag::encodedData(" << mimeType << ")"
                            << " kpSelectionDrag(TQImage) could not decode data into TQImage"
                            << endl;
                 stream << kpSelection ();
@@ -207,7 +207,7 @@ TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
         kdDebug () << "\twant it as TQImage in TQByteArray" << endl;
     #endif
 
-        return TQImageDrag::tqencodedData (mimeType);
+        return TQImageDrag::encodedData (mimeType);
     }
 }
 
@@ -255,7 +255,7 @@ bool kpSelectionDrag::decode (const TQMimeSource *e, kpSelection &sel,
     #if DEBUG_KP_SELECTION_DRAG
         kdDebug () << "\tmimeSource provides selection - just return it in TQByteArray" << endl;
     #endif
-        TQByteArray data = e->tqencodedData (kpSelectionDrag::selectionMimeType);
+        TQByteArray data = e->encodedData (kpSelectionDrag::selectionMimeType);
         TQDataStream stream (data, IO_ReadOnly);
 
         // (no need for wali as kpSelection's by definition only support TQPixmap's)
diff --git a/kolourpaint/kpselectiondrag.h b/kolourpaint/kpselectiondrag.h
index 93473509..4ed90d7f 100644
--- a/kolourpaint/kpselectiondrag.h
+++ b/kolourpaint/kpselectiondrag.h
@@ -56,7 +56,7 @@ protected:
 public:
     virtual const char *format (int which = 0) const;
     virtual bool provides (const char *mimeType) const;
-    virtual TQByteArray tqencodedData (const char *mimeType) const;
+    virtual TQByteArray encodedData (const char *mimeType) const;
 
     static bool canDecode (const TQMimeSource *e);
     static bool decode (const TQMimeSource *e, TQImage &img);
diff --git a/kolourpaint/kpthumbnail.cpp b/kolourpaint/kpthumbnail.cpp
index 84923c1d..06949f24 100644
--- a/kolourpaint/kpthumbnail.cpp
+++ b/kolourpaint/kpthumbnail.cpp
@@ -63,12 +63,12 @@ kpThumbnail::kpThumbnail (kpMainWindow *parent, const char *name)
     }
 
 
-    TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ();
+    TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->minimumSize () : TQSize ();
 #if DEBUG_KP_THUMBNAIL
     kdDebug () << "\ttqlayout=" << tqlayout ()
-               << " minSize=" << (tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ()) << endl;
+               << " minSize=" << (tqlayout () ? tqlayout ()->minimumSize () : TQSize ()) << endl;
     kdDebug () << "\tboxLayout=" << boxLayout ()
-               << " minSize=" << (boxLayout () ? boxLayout ()->tqminimumSize () : TQSize ())
+               << " minSize=" << (boxLayout () ? boxLayout ()->minimumSize () : TQSize ())
                << endl;
 #endif
     if (tqlayout ())
diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp
index da240492..a5da9c5a 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -153,7 +153,7 @@ void kpTool::createAction ()
     m_action = new kpToolAction (text (), iconName (), shortcutForKey (m_key),
                                  this, TQT_SLOT (slotActionActivated ()),
                                  m_mainWindow->actionCollection (), name ());
-    m_action->setExclusiveGroup (TQString::tqfromLatin1 ("Tool Box Actions"));
+    m_action->setExclusiveGroup (TQString::fromLatin1 ("Tool Box Actions"));
     m_action->setWhatsThis (description ());
 
     connect (m_action, TQT_SIGNAL (toolTipChanged (const TQString &)),
@@ -1046,7 +1046,7 @@ void kpTool::mouseMoveEvent (TQMouseEvent *e)
                << " viewUnderCursorTQt=" << (v1 ? v1->name () : "(none)")
                << " viewUnderStartPoint=" << (v2 ? v2->name () : "(none)")
                << endl;
-    kdDebug () << "\ttqfocusWidget=" << kapp->tqfocusWidget () << endl;
+    kdDebug () << "\tfocusWidget=" << kapp->focusWidget () << endl;
 #endif
 
     TQt::ButtonState buttonState = e->stateAfter ();
@@ -1652,7 +1652,7 @@ bool kpTool::warnIfBigImageSize (int oldWidth, int oldHeight,
             text,
             caption,
             continueButtonText,
-            TQString::tqfromLatin1 ("BigImageDontAskAgain"));
+            TQString::fromLatin1 ("BigImageDontAskAgain"));
 
         return (accept == KMessageBox::Continue);
     }
diff --git a/kolourpaint/kptool.h b/kolourpaint/kptool.h
index 03bedb0a..b5555d64 100644
--- a/kolourpaint/kptool.h
+++ b/kolourpaint/kptool.h
@@ -341,7 +341,7 @@ protected:
 
 
     /*
-     * User Notifications (tqStatus Bar)
+     * User Notifications (Status Bar)
      */
 
 public:
diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp
index e8ea5a5d..c632b814 100644
--- a/kolourpaint/kpviewscrollablecontainer.cpp
+++ b/kolourpaint/kpviewscrollablecontainer.cpp
@@ -184,7 +184,7 @@ void kpGrip::updatePixmap ()
         return;
 
     TQPixmap pixmap (width (), height ());
-    pixmap.fill (tqcolorGroup ().highlight ());
+    pixmap.fill (colorGroup ().highlight ());
     kpPixmapFX::ensureTransparentAt (&pixmap, pixmap.rect ());
     const TQRect hr = hotRect ();
 #if DEBUG_KP_VIEW_SCROLLABLE_CONTAINER
diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp
index 946814d5..1906ab7f 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->tqsetAlignment (m_gammaLabel->tqalignment () | TQt::AlignRight);
+    m_gammaLabel->setAlignment (m_gammaLabel->tqalignment () | TQt::AlignRight);
     TQPushButton *gammaResetPushButton = new TQPushButton (i18n ("Rese&t"), this);
 
 
diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
index 098e0396..ce39de75 100644
--- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp
+++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
@@ -255,11 +255,11 @@ void kpEffectsDialog::selectEffect (int which)
         // Don't resize the preview when showing the widget:
         // TODO: actually work
 
-        TQSize previewGroupBoxMinSize = m_previewGroupBox->tqminimumSize ();
-        TQSize previewGroupBoxMaxSize = m_previewGroupBox->tqmaximumSize ();
+        TQSize previewGroupBoxMinSize = m_previewGroupBox->minimumSize ();
+        TQSize previewGroupBoxMaxSize = m_previewGroupBox->maximumSize ();
         TQLayout::ResizeMode previewGroupBoxResizeMode = 
             m_previewGroupBox->tqlayout () ?
-                m_previewGroupBox->tqlayout ()->tqresizeMode () :
+                m_previewGroupBox->tqlayout ()->resizeMode () :
                 TQLayout::Auto;
     #if DEBUG_KP_EFFECTS_DIALOG
         kdDebug () << "\tpreviewGroupBox: minSize=" << previewGroupBoxMinSize
diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp
index 5b281606..2543f962 100644
--- a/kolourpaint/pixmapfx/kppixmapfx.cpp
+++ b/kolourpaint/pixmapfx/kppixmapfx.cpp
@@ -1403,12 +1403,12 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_,
     painter.setWorldMatrix (transformMatrix);
 #if DEBUG_KP_PIXMAP_FX && 0
     kdDebug () << "\ttranslate top=" << painter.xForm (TQPoint (0, 0)) << endl;
-    kdDebug () << "\tmatrix: m11=" << painter.tqworldMatrix ().m11 ()
-               << " m12=" << painter.tqworldMatrix ().m12 ()
-               << " m21=" << painter.tqworldMatrix ().m21 ()
-               << " m22=" << painter.tqworldMatrix ().m22 ()
-               << " dx=" << painter.tqworldMatrix ().dx ()
-               << " dy=" << painter.tqworldMatrix ().dy ()
+    kdDebug () << "\tmatrix: m11=" << painter.worldMatrix ().m11 ()
+               << " m12=" << painter.worldMatrix ().m12 ()
+               << " m21=" << painter.worldMatrix ().m21 ()
+               << " m22=" << painter.worldMatrix ().m22 ()
+               << " dx=" << painter.worldMatrix ().dx ()
+               << " dy=" << painter.worldMatrix ().dy ()
                << endl;
 #endif
     painter.drawPixmap (TQPoint (0, 0), pm);
diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp
index 40270e1f..27d8ab15 100644
--- a/kolourpaint/tools/kptoolresizescale.cpp
+++ b/kolourpaint/tools/kptoolresizescale.cpp
@@ -665,17 +665,17 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget)
     // TODO: ALT+R doesn't select the button.
     m_resizeButton = new TQToolButton (m_operationGroupBox);
     toolButtonSetLook (m_resizeButton,
-                       TQString::tqfromLatin1 ("resize"),
+                       TQString::fromLatin1 ("resize"),
                        i18n ("&Resize"));
 
     m_scaleButton = new TQToolButton (m_operationGroupBox);
     toolButtonSetLook (m_scaleButton,
-                       TQString::tqfromLatin1 ("scale"),
+                       TQString::fromLatin1 ("scale"),
                        i18n ("&Scale"));
 
     m_smoothScaleButton = new TQToolButton (m_operationGroupBox);
     toolButtonSetLook (m_smoothScaleButton,
-                       TQString::tqfromLatin1 ("smooth_scale"),
+                       TQString::fromLatin1 ("smooth_scale"),
                        i18n ("S&mooth Scale"));
 
 
@@ -684,9 +684,9 @@ void kpToolResizeScaleDialog::createOperationGroupBox (TQWidget *baseWidget)
     //m_smoothScaleLabel = new TQLabel (i18n ("S&mooth scale"), m_operationGroupBox);
 
 
-    //m_resizeLabel->tqsetAlignment (m_resizeLabel->tqalignment () | TQt::ShowPrefix);
-    //m_scaleLabel->tqsetAlignment (m_scaleLabel->tqalignment () | TQt::ShowPrefix);
-    //m_smoothScaleLabel->tqsetAlignment (m_smoothScaleLabel->tqalignment () | TQt::ShowPrefix);
+    //m_resizeLabel->setAlignment (m_resizeLabel->tqalignment () | TQt::ShowPrefix);
+    //m_scaleLabel->setAlignment (m_scaleLabel->tqalignment () | TQt::ShowPrefix);
+    //m_smoothScaleLabel->setAlignment (m_smoothScaleLabel->tqalignment () | 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->tqsetAlignment (widthLabel->tqalignment () | TQt::AlignHCenter);
+    widthLabel->setAlignment (widthLabel->tqalignment () | TQt::AlignHCenter);
     TQLabel *heightLabel = new TQLabel (i18n ("Height:"), m_dimensionsGroupBox);
-    heightLabel->tqsetAlignment (heightLabel->tqalignment () | TQt::AlignHCenter);
+    heightLabel->setAlignment (heightLabel->tqalignment () | TQt::AlignHCenter);
 
     TQLabel *originalLabel = new TQLabel (i18n ("Original:"), m_dimensionsGroupBox);
     m_originalWidthInput = new KIntNumInput (
diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.cpp b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
index b2f3441a..edea872e 100644
--- a/kolourpaint/widgets/kpcolorsimilaritycube.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
@@ -138,7 +138,7 @@ void kpColorSimilarityCube::setColorSimilarity (double similarity)
 
 
 // protected virtual [base TQWidget]
-TQSize kpColorSimilarityCube::tqsizeHint () const
+TQSize kpColorSimilarityCube::sizeHint () const
 {
     return TQSize (52, 52);
 }
@@ -247,8 +247,8 @@ void kpColorSimilarityCube::drawFace (TQPainter *p,
     #if DEBUG_KP_COLOR_SIMILARITY_CUBE
         kdDebug () << "\tnot enabled - making us grey" << endl;
     #endif
-        colors [0] = tqcolorGroup ().background ();
-        colors [1] = tqcolorGroup ().background ();
+        colors [0] = colorGroup ().background ();
+        colors [1] = colorGroup ().background ();
     }
 
 #if DEBUG_KP_COLOR_SIMILARITY_CUBE
@@ -274,7 +274,7 @@ void kpColorSimilarityCube::drawContents (TQPainter *p)
     TQRect cr (contentsRect ());
 
     TQPixmap backBuffer (cr.width (), cr.height ());
-    backBuffer.fill (tqcolorGroup ().background ());
+    backBuffer.fill (colorGroup ().background ());
 
     TQPainter backBufferPainter (&backBuffer);
 
diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.h b/kolourpaint/widgets/kpcolorsimilaritycube.h
index 0cf9f92a..a5f1db9f 100644
--- a/kolourpaint/widgets/kpcolorsimilaritycube.h
+++ b/kolourpaint/widgets/kpcolorsimilaritycube.h
@@ -55,7 +55,7 @@ public:
     double colorSimilarity () const;
     void setColorSimilarity (double similarity);
 
-    virtual TQSize tqsizeHint () const;
+    virtual TQSize sizeHint () const;
 
 protected:
     TQColor color (int redOrGreenOrBlue, int baseBrightness, int similarityDirection) const;
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index cfdb6820..c66cedb4 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -150,7 +150,7 @@ kpColor kpDualColorButton::oldBackgroundColor () const
 
 
 // public virtual [base TQWidget]
-TQSize kpDualColorButton::tqsizeHint () const
+TQSize kpDualColorButton::sizeHint () const
 {
     return TQSize (52, 52);
 }
@@ -318,14 +318,14 @@ void kpDualColorButton::drawContents (TQPainter *p)
     else
     {
         backBufferPainter.fillRect (m_backBuffer->rect (),
-                                    tqcolorGroup ().color (TQColorGroup::Background));
+                                    colorGroup ().color (TQColorGroup::Background));
     }
 
     TQPixmap swapPixmap = UserIcon ("colorbutton_swap_16x16");
     if (!isEnabled ())
     {
         // swapPixmap has a mask after all
-        swapPixmap.fill (tqcolorGroup ().color (TQColorGroup::Dark));
+        swapPixmap.fill (colorGroup ().color (TQColorGroup::Dark));
     }
     backBufferPainter.drawPixmap (swapPixmapRect ().topLeft (), swapPixmap);
 
@@ -346,8 +346,8 @@ void kpDualColorButton::drawContents (TQPainter *p)
             backBufferPainter.drawPixmap (bgRectInside, UserIcon ("color_transparent_26x26"));
     }
     else
-        backBufferPainter.fillRect (bgRectInside, tqcolorGroup ().color (TQColorGroup::Button));
-    qDrawShadePanel (&backBufferPainter, bgRect, tqcolorGroup (),
+        backBufferPainter.fillRect (bgRectInside, colorGroup ().color (TQColorGroup::Button));
+    qDrawShadePanel (&backBufferPainter, bgRect, colorGroup (),
                      false/*not sunken*/, 2/*lineWidth*/,
                      0/*never fill*/);
 
@@ -366,8 +366,8 @@ void kpDualColorButton::drawContents (TQPainter *p)
             backBufferPainter.drawPixmap (fgRectInside, UserIcon ("color_transparent_26x26"));
     }
     else
-        backBufferPainter.fillRect (fgRectInside, tqcolorGroup ().color (TQColorGroup::Button));
-    qDrawShadePanel (&backBufferPainter, fgRect, tqcolorGroup (),
+        backBufferPainter.fillRect (fgRectInside, colorGroup ().color (TQColorGroup::Button));
+    qDrawShadePanel (&backBufferPainter, fgRect, colorGroup (),
                      false/*not sunken*/, 2/*lineWidth*/,
                      0/*never fill*/);
 
@@ -768,7 +768,7 @@ kpTransparentColorCell::~kpTransparentColorCell ()
 
 
 // public virtual [base TQWidget]
-TQSize kpTransparentColorCell::tqsizeHint () const
+TQSize kpTransparentColorCell::sizeHint () const
 {
     return TQSize (m_pixmap.width () + frameWidth () * 2,
                   m_pixmap.height () + frameWidth () * 2);
@@ -829,7 +829,7 @@ kpColorPalette::kpColorPalette (TQWidget *parent,
 #endif
 
     m_transparentColorCell = new kpTransparentColorCell (this);
-    m_transparentColorCell->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_transparentColorCell->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     connect (m_transparentColorCell, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
              this, TQT_SIGNAL (foregroundColorChanged (const kpColor &)));
     connect (m_transparentColorCell, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
@@ -964,7 +964,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
                                   5/*margin*/, (10 * 4)/*spacing*/);
 
     m_dualColorButton = new kpDualColorButton (mainWindow, base);
-    m_dualColorButton->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_dualColorButton->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     connect (m_dualColorButton, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)),
              this, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)));
     connect (m_dualColorButton, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
@@ -981,7 +981,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
     m_boxLayout->addWidget (m_colorPalette, 0/*stretch*/);
 
     m_colorSimilarityToolBarItem = new kpColorSimilarityToolBarItem (mainWindow, base);
-    m_colorSimilarityToolBarItem->tqsetSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_colorSimilarityToolBarItem->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
     connect (m_colorSimilarityToolBarItem, TQT_SIGNAL (colorSimilarityChanged (double, int)),
              this, TQT_SIGNAL (colorSimilarityChanged (double, int)));
     m_boxLayout->addWidget (m_colorSimilarityToolBarItem, 0/*stretch*/);
diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h
index 59f13fb7..7c005441 100644
--- a/kolourpaint/widgets/kpcolortoolbar.h
+++ b/kolourpaint/widgets/kpcolortoolbar.h
@@ -91,7 +91,7 @@ public:
     kpColor oldBackgroundColor () const;
 
 public:
-    virtual TQSize tqsizeHint () const;
+    virtual TQSize sizeHint () const;
 
 protected:
     TQRect swapPixmapRect () const;
@@ -163,7 +163,7 @@ public:
     kpTransparentColorCell (TQWidget *parent, const char *name = 0);
     virtual ~kpTransparentColorCell ();
 
-    virtual TQSize tqsizeHint () const;
+    virtual TQSize sizeHint () const;
 
 signals:
     void transparentColorSelected (int mouseButton);
diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.cpp b/kolourpaint/widgets/kpsqueezedtextlabel.cpp
index 6e7386ec..dc500b12 100644
--- a/kolourpaint/widgets/kpsqueezedtextlabel.cpp
+++ b/kolourpaint/widgets/kpsqueezedtextlabel.cpp
@@ -53,11 +53,11 @@ kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *parent
 
 
 // public virtual
-TQSize kpSqueezedTextLabel::tqminimumSizeHint () const
+TQSize kpSqueezedTextLabel::minimumSizeHint () const
 {
 #if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
-    kdDebug () << "kpSqueezedTextLabel::tqminimumSizeHint() qLabel prefers"
-               << TQLabel::tqminimumSizeHint () << endl;
+    kdDebug () << "kpSqueezedTextLabel::minimumSizeHint() qLabel prefers"
+               << TQLabel::minimumSizeHint () << endl;
 #endif
     return TQSize (-1/*no minimum width*/, TQLabel::minimumHeight ());
 }
diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.h b/kolourpaint/widgets/kpsqueezedtextlabel.h
index 4697af8a..e4828b54 100644
--- a/kolourpaint/widgets/kpsqueezedtextlabel.h
+++ b/kolourpaint/widgets/kpsqueezedtextlabel.h
@@ -43,7 +43,7 @@ public:
     kpSqueezedTextLabel (TQWidget *parent, const char *name = 0);
     kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name = 0);
 
-    virtual TQSize tqminimumSizeHint () const;
+    virtual TQSize minimumSizeHint () const;
 
     // TODO: maybe text() should return the full text?
     TQString fullText () const;
diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp
index 3d1d3cff..18177804 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbase.cpp
@@ -175,10 +175,10 @@ TQPair <int, int> kpToolWidgetBase::defaultSelectedRowAndCol () const
         KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
         KConfigBase *cfg = cfgGroupSaver.config ();
 
-        TQString nameString = TQString::tqfromLatin1 (name ());
+        TQString nameString = TQString::fromLatin1 (name ());
 
-        row = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Row"), -1);
-        col = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Col"), -1);
+        row = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Row"), -1);
+        col = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Col"), -1);
     }
 
 #if DEBUG_KP_TOOL_WIDGET_BASE
@@ -218,9 +218,9 @@ void kpToolWidgetBase::saveSelectedAsDefault () const
     KConfigGroupSaver cfgGroupSaver (kapp->config (), kpSettingsGroupTools);
     KConfigBase *cfg = cfgGroupSaver.config ();
 
-    TQString nameString = TQString::tqfromLatin1 (name ());
-    cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Row"), m_selectedRow);
-    cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Col"), m_selectedCol);
+    TQString nameString = TQString::fromLatin1 (name ());
+    cfg->writeEntry (nameString + TQString::fromLatin1 (" Row"), m_selectedRow);
+    cfg->writeEntry (nameString + TQString::fromLatin1 (" Col"), m_selectedCol);
     cfg->sync ();
 }