Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.

59 files changed, 259 insertions, 259 deletions

diff --git a/kolourpaint/BUGS b/kolourpaint/BUGS
index 84f3391f..25814d61 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 shapes (Polygon, Connected Lines,
-      Curve).  They are however updated after shapes' completion.
+      the drawing of multi-segment tqshapes (Polygon, Connected Lines,
+      Curve).  They are however updated after tqshapes' 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 shapes may have the wrong size (usually only a pixel off and
+7. Certain tqshapes 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 6849ebf4..06948815 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::fromLatin1 ("undo"),
+        TQString::tqfromLatin1 ("undo"),
         KStdAccel::shortcut (KStdAccel::Undo),
         this, TQT_SLOT (undo ()),
         ac, KStdAction::name (KStdAction::Undo));
 
     m_actionRedo = new KToolBarPopupAction (redoActionText (),
-        TQString::fromLatin1 ("redo"),
+        TQString::tqfromLatin1 ("redo"),
         KStdAccel::shortcut (KStdAccel::Redo),
         this, TQT_SLOT (redo ()),
         ac, KStdAction::name (KStdAction::Redo));
@@ -763,7 +763,7 @@ void kpCommandHistoryBase::trimCommandLists ()
             -m_documentRestoredPosition > (int) m_undoCommandList.size ())
         {
         #if DEBUG_KP_COMMAND_HISTORY
-            kdDebug () << "\t\t\tinvalidate documentRestoredPosition" << endl;
+            kdDebug () << "\t\t\ttqinvalidate 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 shape - cancel draw" << endl;
+        kdDebug () << "\thas begun tqshape - 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 shape even though the mouse isn't
+        // that s/he's still drawing a tqshape even though the mouse isn't
         // down).
         m_mainWindow->tool ()->cancelShapeInternal ();
     }
diff --git a/kolourpaint/kpcommandhistory.h b/kolourpaint/kpcommandhistory.h
index 0cc18229..da415663 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 shape, it cancels it.
+// If the user is currently drawing a tqshape, 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 shape starts - not after it ends.  But the
+//       as _soon_ as the tqshape starts - not after it ends.  But the
 //       trouble with this solution is that if the user Undoes/cancels
-//       the shape s/he's currently drawing, it would replace a Redo
+//       the tqshape 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/kpdefs.h b/kolourpaint/kpdefs.h
index c509ae0f..d0343f9e 100644
--- a/kolourpaint/kpdefs.h
+++ b/kolourpaint/kpdefs.h
@@ -65,71 +65,71 @@
 // Settings
 //
 
-#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 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 kpSettingsGroupFileSaveAs TQString::fromLatin1 ("File/Save As")
-#define kpSettingsGroupFileExport TQString::fromLatin1 ("File/Export")
-#define kpSettingsGroupEditCopyTo TQString::fromLatin1 ("Edit/Copy To")
+#define kpSettingsGroupFileSaveAs TQString::tqfromLatin1 ("File/Save As")
+#define kpSettingsGroupFileExport TQString::tqfromLatin1 ("File/Export")
+#define kpSettingsGroupEditCopyTo TQString::tqfromLatin1 ("Edit/Copy To")
 
-#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 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 kpSettingLastDocSize TQString::fromLatin1 ("Last Document Size")
+#define kpSettingLastDocSize TQString::tqfromLatin1 ("Last Document Size")
 
-#define kpSettingMoreEffectsLastEffect TQString::fromLatin1 ("More Effects - Last Effect")
+#define kpSettingMoreEffectsLastEffect TQString::tqfromLatin1 ("More Effects - Last Effect")
 
-#define kpSettingResizeScaleLastKeepAspect TQString::fromLatin1 ("Resize Scale - Last Keep Aspect")
+#define kpSettingResizeScaleLastKeepAspect TQString::tqfromLatin1 ("Resize Scale - Last Keep Aspect")
 
 
-#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 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 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 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 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 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 kpSettingsGroupPreviewSave TQString::fromLatin1 ("Save Preview Settings")
-#define kpSettingPreviewSaveGeometry TQString::fromLatin1 ("Geometry")
-#define kpSettingPreviewSaveUpdateDelay TQString::fromLatin1 ("Update Delay")
+#define kpSettingsGroupPreviewSave TQString::tqfromLatin1 ("Save Preview Settings")
+#define kpSettingPreviewSaveGeometry TQString::tqfromLatin1 ("Geometry")
+#define kpSettingPreviewSaveUpdateDelay TQString::tqfromLatin1 ("Update Delay")
 
 
-#define kpSettingsGroupTools TQString::fromLatin1 ("Tool Settings")
-#define kpSettingLastTool TQString::fromLatin1 ("Last Used Tool")
-#define kpSettingToolBoxIconSize TQString::fromLatin1 ("Tool Box Icon Size")
+#define kpSettingsGroupTools TQString::tqfromLatin1 ("Tool Settings")
+#define kpSettingLastTool TQString::tqfromLatin1 ("Last Used Tool")
+#define kpSettingToolBoxIconSize TQString::tqfromLatin1 ("Tool Box Icon Size")
 
 
-#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 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 kpSettingsGroupFlattenEffect TQString::fromLatin1 ("Flatten Effect Settings")
-#define kpSettingFlattenEffectColor1 TQString::fromLatin1 ("Color1")
-#define kpSettingFlattenEffectColor2 TQString::fromLatin1 ("Color2")
+#define kpSettingsGroupFlattenEffect TQString::tqfromLatin1 ("Flatten Effect Settings")
+#define kpSettingFlattenEffectColor1 TQString::tqfromLatin1 ("Color1")
+#define kpSettingFlattenEffectColor2 TQString::tqfromLatin1 ("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::fromLatin1 ("Session Document Url")
+#define kpSessionSettingDocumentUrl TQString::tqfromLatin1 ("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::fromLatin1 ("Session Not-From-Url Document Size")
+#define kpSessionSettingNotFromUrlDocumentSize TQString::tqfromLatin1 ("Session Not-From-Url Document Size")
 
 
 #endif  // __kp_defs_h__
diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp
index f9934bb4..fe91bfee 100644
--- a/kolourpaint/kpdocument.cpp
+++ b/kolourpaint/kpdocument.cpp
@@ -35,7 +35,7 @@
 
 #include <tqcolor.h>
 #include <tqbitmap.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqfile.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
@@ -156,7 +156,7 @@ TQPixmap kpDocument::convertToPixmapAsLosslessAsPossible (
         metaInfo->setDotsPerMeterY (image.dotsPerMeterY ());
         metaInfo->setOffset (image.offset ());
 
-        TQValueList <TQImageTextKeyLang> keyList = image.textList ();
+        TQValueList <TQImageTextKeyLang> keyList = image.tqtextList ();
         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::fromLatin1 ("SaveInLossyMimeTypeDontAskAgain")));
+                TQString::tqfromLatin1 ("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::fromLatin1 ("SaveAtLowColorDepthDontAskAgain")));
+                TQString::tqfromLatin1 ("SaveAtLowColorDepthDontAskAgain")));
     }
 #undef TQUIT_IF_CANCEL
 
@@ -628,8 +628,8 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
                << ",overwritePrompt=" << overwritePrompt
                << ",lossyPrompt=" << lossyPrompt
                << ")" << endl;
-    saveOptions.printDebug (TQString::fromLatin1 ("\tsaveOptions"));
-    metaInfo.printDebug (TQString::fromLatin1 ("\tmetaInfo"));
+    saveOptions.printDebug (TQString::tqfromLatin1 ("\tsaveOptions"));
+    metaInfo.printDebug (TQString::tqfromLatin1 ("\tmetaInfo"));
 #endif
 
     if (overwritePrompt && KIO::NetAccess::exists (url, false/*write*/, parent))
@@ -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
-    // shape is merely different to the current tool's (e.g. rectangular
+    // tqshape 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 shapes anyway.
+    //    different tqshapes anyway.
     // 2. Suppose the user is trying out different drags of selection borders
-    //    and then decides to paste a differently shaped selection before continuing
+    //    and then decides to paste a differently tqshaped selection before continuing
     //    to try out different borders.  If the pasting were to switch to
-    //    a differently shaped tool, the borders drawn after the paste would
-    //    be using a new shape rather than the shape before the paste.  This
+    //    a differently tqshaped tool, the borders drawn after the paste would
+    //    be using a new tqshape rather than the tqshape 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 shaped selection tool
+        // Switch to the appropriately tqshaped selection tool
         // _before_ we change the selection
         // (all selection tool's ::end() functions nuke the current selection)
         switch (selection.type ())
diff --git a/kolourpaint/kpdocumentmetainfo.cpp b/kolourpaint/kpdocumentmetainfo.cpp
index 01728efa..f0b9f0f0 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::fromLatin1 (":") :
+                                   prefix + TQString::tqfromLatin1 (":") :
                                    TQString();
 
     kdDebug () << usedPrefix << endl;
diff --git a/kolourpaint/kpdocumentsaveoptions.cpp b/kolourpaint/kpdocumentsaveoptions.cpp
index 6bbb81d4..3c312e42 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::fromLatin1 (": ") :
+                                   prefix + TQString::tqfromLatin1 (": ") :
                                    TQString();
 
     kdDebug () << usedPrefix
@@ -246,7 +246,7 @@ bool kpDocumentSaveOptions::qualityIsInvalid () const
 TQString kpDocumentSaveOptions::defaultMimeType (KConfigBase *config)
 {
     return config->readEntry (kpSettingForcedMimeType,
-                              TQString::fromLatin1 ("image/png"));
+                              TQString::tqfromLatin1 ("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::fromLatin1 ("image/x-eps:32");
+    defaultList << TQString::tqfromLatin1 ("image/x-eps:32");
     
-    defaultList << TQString::fromLatin1 ("image/x-portable-bitmap:1");
+    defaultList << TQString::tqfromLatin1 ("image/x-portable-bitmap:1");
     
     // Greyscale actually (unenforced since depth not set to configurable)
-    defaultList << TQString::fromLatin1 ("image/x-portable-greymap:8");
+    defaultList << TQString::tqfromLatin1 ("image/x-portable-greymap:8");
     
-    defaultList << TQString::fromLatin1 ("image/x-xbm:1");
+    defaultList << TQString::tqfromLatin1 ("image/x-xbm:1");
 
     const TQStringList mimeTypeList = mimeTypesSupportingProperty (
         kpSettingMimeTypeMaximumColorDepth, defaultList);
 
-    const TQString mimeTypeColon = mimeType + TQString::fromLatin1 (":");
+    const TQString mimeTypeColon = mimeType + TQString::tqfromLatin1 (":");
     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::fromLatin1 ("image/png");
-    defaultMimeTypes << TQString::fromLatin1 ("image/x-bmp");
-    defaultMimeTypes << TQString::fromLatin1 ("image/x-pcx");
+    defaultMimeTypes << TQString::tqfromLatin1 ("image/png");
+    defaultMimeTypes << TQString::tqfromLatin1 ("image/x-bmp");
+    defaultMimeTypes << TQString::tqfromLatin1 ("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::fromLatin1 ("image/x-rgb");
+    defaultMimeTypes << TQString::tqfromLatin1 ("image/x-rgb");
   
     // TODO: Only 8 and 24 - no 1.
-    defaultMimeTypes << TQString::fromLatin1 ("image/x-xpm");
+    defaultMimeTypes << TQString::tqfromLatin1 ("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::fromLatin1 ("image/jp2");
-    defaultMimeTypes << TQString::fromLatin1 ("image/jpeg");
+    defaultMimeTypes << TQString::tqfromLatin1 ("image/jp2");
+    defaultMimeTypes << TQString::tqfromLatin1 ("image/jpeg");
 
     return mimeTypeSupportsProperty (mimeType,
         kpSettingMimeTypeHasConfigurableQuality,
diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp
index f08823b9..372743af 100644
--- a/kolourpaint/kpdocumentsaveoptionswidget.cpp
+++ b/kolourpaint/kpdocumentsaveoptionswidget.cpp
@@ -34,7 +34,7 @@
 #include <tqbuffer.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtimer.h>
 
 #include <kcombobox.h>
@@ -712,9 +712,9 @@ void kpDocumentSaveOptionsWidget::setMode (Mode mode)
 void kpDocumentSaveOptionsWidget::repaintLabels ()
 {
     if (mode () != Quality)
-        m_colorDepthLabel->repaint ();
+        m_colorDepthLabel->tqrepaint ();
     if (mode () == Quality)
-        m_qualityLabel->repaint ();
+        m_qualityLabel->tqrepaint ();
 }
 
 
@@ -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 geometry" << endl;
+            kdDebug () << "\tread cfg preview dialog last rel tqgeometry" << 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 () << "\tgeometry after show="
+        kdDebug () << "\ttqgeometry 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 geometry "
+        kdDebug () << "\tsaving preview tqgeometry "
                    << 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 geometry" << endl;
+        kdDebug () << "\tnot visible - ignoring tqgeometry" << endl;
     #endif
     }
 }
diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp
index 439f99c4..3b117803 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
-               << " geometry=" << m_configThumbnailGeometry
+               << " tqgeometry=" << m_configThumbnailGeometry
                << " zoomed=" << m_configZoomedThumbnail
                << " showRectangle=" << d->m_configThumbnailShowRectangle
                << endl;
@@ -731,7 +731,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
         connect (m_document, TQT_SIGNAL (selectionIsTextChanged (bool)),
                  this, TQT_SLOT (slotImageMenuUpdateDueToSelection ()));
 
-        // Status bar
+        // tqStatus bar
         connect (m_document, TQT_SIGNAL (documentOpened ()),
                  this, TQT_SLOT (recalculateStatusBar ()));
 
@@ -808,7 +808,7 @@ void kpMainWindow::setDocument (kpDocument *newDoc)
             #endif
                 slotCreateThumbnail ();
             }
-            // this' geometry is weird ATM
+            // this' tqgeometry is weird ATM
             else
             {
             #if DEBUG_KP_MAIN_WINDOW
diff --git a/kolourpaint/kpmainwindow.h b/kolourpaint/kpmainwindow.h
index 3da1e570..bd0df32b 100644
--- a/kolourpaint/kpmainwindow.h
+++ b/kolourpaint/kpmainwindow.h
@@ -640,7 +640,7 @@ private slots:
 
 
     /*
-     * Status Bar
+     * tqStatus Bar
      */
 
 private:
diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp
index 8d3cdd61..e5156148 100644
--- a/kolourpaint/kpmainwindow_edit.cpp
+++ b/kolourpaint/kpmainwindow_edit.cpp
@@ -28,7 +28,7 @@
 #include <kpmainwindow.h>
 
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqdatetime.h>
 #include <tqfontmetrics.h>
 #include <tqimage.h>
@@ -129,7 +129,7 @@ void kpMainWindow::setupEditMenuActions ()
 
     // Paste should always be enabled, as long as there is something paste
     // (independent of whether we have a document or not)
-    connect (TQApplication::clipboard (), TQT_SIGNAL (dataChanged ()),
+    connect (TQApplication::tqclipboard (), TQT_SIGNAL (dataChanged ()),
              TQT_TQOBJECT(this), TQT_SLOT (slotEnablePaste ()));
     slotEnablePaste ();
 }
@@ -223,7 +223,7 @@ void kpMainWindow::slotCopy ()
     {
         if (!sel.text ().isEmpty ())
         {
-            TQApplication::clipboard ()->setData (new TQTextDrag (sel.text ()),
+            TQApplication::tqclipboard ()->setData (new TQTextDrag (sel.text ()),
                                                  TQClipboard::Clipboard);
 
             // SYNC: Normally, users highlight text and press CTRL+C.
@@ -243,7 +243,7 @@ void kpMainWindow::slotCopy ()
             //       Once we change KolourPaint to support highlighted text
             //       and CTRL+C to copy only the highlighted text, delete
             //       this code.
-            TQApplication::clipboard ()->setData (new TQTextDrag (sel.text ()),
+            TQApplication::tqclipboard ()->setData (new TQTextDrag (sel.text ()),
                                                  TQClipboard::Selection);
         }
     }
@@ -268,7 +268,7 @@ void kpMainWindow::slotCopy ()
                 rawPixmap,
                 TQt::white));  // CONFIG
         
-        TQApplication::clipboard ()->setData (new kpSelectionDrag (sel),
+        TQApplication::tqclipboard ()->setData (new kpSelectionDrag (sel),
                                              TQClipboard::Clipboard);
     }
 
@@ -288,7 +288,7 @@ static bool HasSomethingToPaste (kpMainWindow *mw)
 
     bool hasSomething = false;
 
-    TQMimeSource *ms = TQApplication::clipboard ()->data (TQClipboard::Clipboard);
+    TQMimeSource *ms = TQApplication::tqclipboard ()->data (TQClipboard::Clipboard);
     if (ms)
     {
         // It's faster to test for TQTextDrag::canDecode() first due to the
@@ -311,7 +311,7 @@ static bool HasSomethingToPaste (kpMainWindow *mw)
     return hasSomething;
 }
 
-// HACK: SYNC: Non-TQt apps do not cause TQApplication::tqclipboard() to
+// HACK: SYNC: Non-TQt apps do not cause TQApplication::tqtqclipboard() to
 //             emit dataChanged().  We don't want to have our paste
 //             action disabled when we can actually paste something.
 //
@@ -683,7 +683,7 @@ void kpMainWindow::slotPaste ()
     // Acquire the pixmap
     //
 
-    TQMimeSource *ms = TQApplication::clipboard ()->data (TQClipboard::Clipboard);
+    TQMimeSource *ms = TQApplication::tqclipboard ()->data (TQClipboard::Clipboard);
     if (!ms)
     {
         kdError () << "kpMainWindow::slotPaste() without mimeSource" << endl;
diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp
index c4f339db..9fc82440 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::fromLatin1 ("ToolBarSettingsChanged"));
+        TQString::tqfromLatin1 ("ToolBarSettingsChanged"));
 
     //createGUI();
     //applyMainWindowSettings (kapp->config (), autoSaveGroup ());
diff --git a/kolourpaint/kpmainwindow_text.cpp b/kolourpaint/kpmainwindow_text.cpp
index 44bea619..859e33f0 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::fromLatin1 ("Times")));
+    m_actionTextFontFamily->setFont (cfg->readEntry (kpSettingFontFamily, TQString::tqfromLatin1 ("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 c90479b0..8be4beb8 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 ()->colorGroup ().background ());
+                        m_scrollView->viewport ()->tqcolorGroup ().background ());
         }
     }
 
@@ -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 geometry=" << rect << endl;
+    kdDebug () << "\tthumbnail relative tqgeometry=" << rect << endl;
 #endif
 
     m_configThumbnailGeometry = mapFromGlobal (rect);
 
 #if DEBUG_KP_MAIN_WINDOW
-    kdDebug () << "\tCONFIG: saving thumbnail geometry "
+    kdDebug () << "\tCONFIG: saving thumbnail tqgeometry "
                 << m_configThumbnailGeometry
                 << endl;
 #endif
@@ -1067,11 +1067,11 @@ void kpMainWindow::updateThumbnail ()
         kdDebug () << "\tcreating thumbnail" << endl;
     #endif
 
-        // Read last saved geometry before creating thumbnail & friends
+        // Read last saved tqgeometry before creating thumbnail & friends
         // in case they call notifyThumbnailGeometryChanged()
         TQRect thumbnailGeometry = m_configThumbnailGeometry;
     #if DEBUG_KP_MAIN_WINDOW
-        kdDebug () << "\t\tlast used geometry=" << thumbnailGeometry << endl;
+        kdDebug () << "\t\tlast used tqgeometry=" << 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 geometry = mapToGlobal (thumbnailGeometry);
-            m_thumbnail->resize (geometry.size ());
-            m_thumbnail->move (geometry.topLeft ());
+            const TQRect tqgeometry = mapToGlobal (thumbnailGeometry);
+            m_thumbnail->resize (tqgeometry.size ());
+            m_thumbnail->move (tqgeometry.topLeft ());
         }
         else
         {
@@ -1101,7 +1101,7 @@ void kpMainWindow::updateThumbnail ()
                                     initialHeight);
 
             #if DEBUG_KP_MAIN_WINDOW
-                kdDebug () << "\t\tcreating geometry=" << geometryRect << endl;
+                kdDebug () << "\t\tcreating tqgeometry=" << geometryRect << endl;
             #endif
 
                 geometryRect = mapToGlobal (geometryRect);
diff --git a/kolourpaint/kpselection.cpp b/kolourpaint/kpselection.cpp
index c5381d7d..43f81984 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.drawPolygon (points, false/*even-odd algo*/);
+        painter.tqdrawPolygon (points, false/*even-odd algo*/);
     }
 
     painter.end ();
@@ -921,7 +921,7 @@ TQString kpSelection::textForTextLines (const TQValueVector <TQString> &textLine
          it != textLines_.end ();
          it++)
     {
-        bigString += TQString::fromLatin1 ("\n");
+        bigString += TQString::tqfromLatin1 ("\n");
         bigString += (*it);
     }
 
@@ -1049,7 +1049,7 @@ int kpSelection::minimumHeightForTextStyle (const kpTextStyle &)
 }
 
 // public static
-TQSize kpSelection::minimumSizeForTextStyle (const kpTextStyle &textStyle)
+TQSize kpSelection::tqminimumSizeForTextStyle (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::fromLatin1 ("1234567890abcde"));
+            TQString::tqfromLatin1 ("1234567890abcde"));
 
     const int preferredMinWidth =
         TQMAX (150,
@@ -1108,7 +1108,7 @@ int kpSelection::minimumHeight () const
 }
 
 // public
-TQSize kpSelection::minimumSize () const
+TQSize kpSelection::tqminimumSize () const
 {
     return TQSize (minimumWidth (), minimumHeight ());
 }
diff --git a/kolourpaint/kpselection.h b/kolourpaint/kpselection.h
index a227fef2..24b1ba39 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 minimumSizeForTextStyle (const kpTextStyle &);
+    static TQSize tqminimumSizeForTextStyle (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 minimumSize () const;
+    TQSize tqminimumSize () const;
 
     int textRowForPoint (const TQPoint &globalPoint) const;
     int textColForPoint (const TQPoint &globalPoint) const;
diff --git a/kolourpaint/kpselectiondrag.cpp b/kolourpaint/kpselectiondrag.cpp
index 9c680abb..22cdeb4a 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::encodedData (const char *mimeType) const
+TQByteArray kpSelectionDrag::tqencodedData (const char *mimeType) const
 {
 #if DEBUG_KP_SELECTION_DRAG
-    kdDebug () << "kpSelectionDrag::encodedData(" << mimeType << ")" << endl;
+    kdDebug () << "kpSelectionDrag::tqencodedData(" << mimeType << ")" << endl;
 #endif
 
     if (!mimeType)
@@ -192,7 +192,7 @@ TQByteArray kpSelectionDrag::encodedData (const char *mimeType) const
             }
             else
             {
-                kdError () << "kpSelectionDrag::encodedData(" << mimeType << ")"
+                kdError () << "kpSelectionDrag::tqencodedData(" << mimeType << ")"
                            << " kpSelectionDrag(TQImage) could not decode data into TQImage"
                            << endl;
                 stream << kpSelection ();
@@ -207,7 +207,7 @@ TQByteArray kpSelectionDrag::encodedData (const char *mimeType) const
         kdDebug () << "\twant it as TQImage in TQByteArray" << endl;
     #endif
 
-        return TQImageDrag::encodedData (mimeType);
+        return TQImageDrag::tqencodedData (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->encodedData (kpSelectionDrag::selectionMimeType);
+        TQByteArray data = e->tqencodedData (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 4ed90d7f..93473509 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 encodedData (const char *mimeType) const;
+    virtual TQByteArray tqencodedData (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 a1de8556..84923c1d 100644
--- a/kolourpaint/kpthumbnail.cpp
+++ b/kolourpaint/kpthumbnail.cpp
@@ -63,16 +63,16 @@ kpThumbnail::kpThumbnail (kpMainWindow *parent, const char *name)
     }
 
 
-    TQSize layoutMinimumSize = layout () ? layout ()->minimumSize () : TQSize ();
+    TQSize layoutMinimumSize = tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ();
 #if DEBUG_KP_THUMBNAIL
-    kdDebug () << "\tlayout=" << layout ()
-               << " minSize=" << (layout () ? layout ()->minimumSize () : TQSize ()) << endl;
+    kdDebug () << "\ttqlayout=" << tqlayout ()
+               << " minSize=" << (tqlayout () ? tqlayout ()->tqminimumSize () : TQSize ()) << endl;
     kdDebug () << "\tboxLayout=" << boxLayout ()
-               << " minSize=" << (boxLayout () ? boxLayout ()->minimumSize () : TQSize ())
+               << " minSize=" << (boxLayout () ? boxLayout ()->tqminimumSize () : TQSize ())
                << endl;
 #endif
-    if (layout ())
-        layout ()->setResizeMode (TQLayout::FreeResize);
+    if (tqlayout ())
+        tqlayout ()->setResizeMode (TQLayout::FreeResize);
     setMinimumSize (TQMAX (layoutMinimumSize.width (), 64),
                     TQMAX (layoutMinimumSize.height (), 64));
 
diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp
index 1cdb1323..da240492 100644
--- a/kolourpaint/kptool.cpp
+++ b/kolourpaint/kptool.cpp
@@ -34,10 +34,10 @@
 #include <limits.h>
 
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcursor.h>
 #include <tqevent.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
 
@@ -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::fromLatin1 ("Tool Box Actions"));
+    m_action->setExclusiveGroup (TQString::tqfromLatin1 ("Tool Box Actions"));
     m_action->setWhatsThis (description ());
 
     connect (m_action, TQT_SIGNAL (toolTipChanged (const TQString &)),
@@ -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 shape*/);
+    endDrawInternal (thisPoint, normalizedRect, true/*end tqshape*/);
 }
 
 // virtual
@@ -944,7 +944,7 @@ void kpTool::mousePressEvent (TQMouseEvent *e)
 
     if (m_mainWindow && e->button () == Qt::MidButton)
     {
-        const TQString text = TQApplication::clipboard ()->text (TQClipboard::Selection);
+        const TQString text = TQApplication::tqclipboard ()->text (TQClipboard::Selection);
     #if DEBUG_KP_TOOL && 1
         kdDebug () << "\tMMB pasteText='" << text << "'" << endl;
     #endif
@@ -1046,7 +1046,7 @@ void kpTool::mouseMoveEvent (TQMouseEvent *e)
                << " viewUnderCursorTQt=" << (v1 ? v1->name () : "(none)")
                << " viewUnderStartPoint=" << (v2 ? v2->name () : "(none)")
                << endl;
-    kdDebug () << "\tfocusWidget=" << kapp->focusWidget () << endl;
+    kdDebug () << "\ttqfocusWidget=" << kapp->tqfocusWidget () << endl;
 #endif
 
     TQt::ButtonState buttonState = e->stateAfter ();
@@ -1154,7 +1154,7 @@ void kpTool::wheelEvent (TQWheelEvent *e)
     if ((e->state () & TQt::ControlButton) == 0)
         return;
     
-    // If drawing, bye; don't care if a shape in progress though.
+    // If drawing, bye; don't care if a tqshape in progress though.
     if (hasBegunDraw ())
         return;
         
@@ -1652,7 +1652,7 @@ bool kpTool::warnIfBigImageSize (int oldWidth, int oldHeight,
             text,
             caption,
             continueButtonText,
-            TQString::fromLatin1 ("BigImageDontAskAgain"));
+            TQString::tqfromLatin1 ("BigImageDontAskAgain"));
 
         return (accept == KMessageBox::Continue);
     }
diff --git a/kolourpaint/kptool.h b/kolourpaint/kptool.h
index b5555d64..03bedb0a 100644
--- a/kolourpaint/kptool.h
+++ b/kolourpaint/kptool.h
@@ -341,7 +341,7 @@ protected:
 
 
     /*
-     * User Notifications (Status Bar)
+     * User Notifications (tqStatus Bar)
      */
 
 public:
diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp
index c130c0d9..5b68a7b2 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.rects ();
+    TQMemArray <TQRect> rects = selResizeHandlesRegion.tqrects ();
     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.rects ();
+    TQMemArray <TQRect> rects = viewRegion.tqrects ();
 #if DEBUG_KP_VIEW_RENDERER && 1
     kdDebug () << "\t#rects = " << rects.count () << endl;
 #endif
diff --git a/kolourpaint/kpviewmanager.cpp b/kolourpaint/kpviewmanager.cpp
index 71b58a2c..3586a173 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->repaint (viewRect, false/*no erase*/);
+            v->tqrepaint (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->repaint (viewRegion, false/*no erase*/);
+            v->tqrepaint (viewRegion, false/*no erase*/);
         else
             v->update (viewRegion.boundingRect ());
     }
diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp
index 80e9d9e7..e8ea5a5d 100644
--- a/kolourpaint/kpviewscrollablecontainer.cpp
+++ b/kolourpaint/kpviewscrollablecontainer.cpp
@@ -184,7 +184,7 @@ void kpGrip::updatePixmap ()
         return;
 
     TQPixmap pixmap (width (), height ());
-    pixmap.fill (colorGroup ().highlight ());
+    pixmap.fill (tqcolorGroup ().highlight ());
     kpPixmapFX::ensureTransparentAt (&pixmap, pixmap.rect ());
     const TQRect hr = hotRect ();
 #if DEBUG_KP_VIEW_SCROLLABLE_CONTAINER
@@ -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->repaint (redrawWidgetRect, erase);
+        widget->tqrepaint (redrawWidgetRect, erase);
     }
 }
 
@@ -1269,7 +1269,7 @@ bool kpViewScrollableContainer::slotDragScroll (bool *didSomething)
 
             // Repaint newly exposed region immediately to reduce tearing
             // of scrollView.
-            m_view->repaint (region, false/*no erase*/);
+            m_view->tqrepaint (region, false/*no erase*/);
         }
     }
 
diff --git a/kolourpaint/patches/doc_resize_no_flicker.diff b/kolourpaint/patches/doc_resize_no_flicker.diff
index 3832fbff..20f4828c 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->repaint (redrawWidgetRect, erase);
-+        widget->repaint (redrawWidgetRegion, erase);
+-        widget->tqrepaint (redrawWidgetRect, erase);
++        widget->tqrepaint (redrawWidgetRegion, erase);
      }
  }
  
diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp
index d66f6c91..946814d5 100644
--- a/kolourpaint/pixmapfx/kpeffectbalance.cpp
+++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp
@@ -35,7 +35,7 @@
 #include <tqfontmetrics.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 
@@ -275,9 +275,9 @@ kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection,
     // TODO: This is what should be shown in the m_gammaInput spinbox
     m_gammaLabel = new TQLabel (this);
     // TODO: This doesn't seem to be wide enough with some fonts so the
-    //       whole layout moves when we drag the gamma slider.
+    //       whole tqlayout moves when we drag the gamma slider.
     m_gammaLabel->setMinimumWidth (m_gammaLabel->fontMetrics ().width (" 10.00 "));
-    m_gammaLabel->setAlignment (m_gammaLabel->alignment () | TQt::AlignRight);
+    m_gammaLabel->tqsetAlignment (m_gammaLabel->tqalignment () | TQt::AlignRight);
     TQPushButton *gammaResetPushButton = new TQPushButton (i18n ("Rese&t"), this);
 
 
@@ -438,7 +438,7 @@ void kpEffectBalanceWidget::recalculateGammaLabel ()
                          'f'/*[-]9.9*/,
                          2/*precision*/) +
         " ");
-    m_gammaLabel->repaint ();
+    m_gammaLabel->tqrepaint ();
 }
 
 
diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
index 5d1ba4b1..e1feaaa3 100644
--- a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
+++ b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
@@ -32,7 +32,7 @@
 
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 
diff --git a/kolourpaint/pixmapfx/kpeffectemboss.cpp b/kolourpaint/pixmapfx/kpeffectemboss.cpp
index 7de6a6ac..0783021d 100644
--- a/kolourpaint/pixmapfx/kpeffectemboss.cpp
+++ b/kolourpaint/pixmapfx/kpeffectemboss.cpp
@@ -33,7 +33,7 @@
 #include <tqcheckbox.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 
diff --git a/kolourpaint/pixmapfx/kpeffectflatten.cpp b/kolourpaint/pixmapfx/kpeffectflatten.cpp
index a0fd8506..1768aa96 100644
--- a/kolourpaint/pixmapfx/kpeffectflatten.cpp
+++ b/kolourpaint/pixmapfx/kpeffectflatten.cpp
@@ -32,7 +32,7 @@
 
 #include <tqcheckbox.h>
 #include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqvbox.h>
 
diff --git a/kolourpaint/pixmapfx/kpeffectinvert.cpp b/kolourpaint/pixmapfx/kpeffectinvert.cpp
index 6ad04905..ad05d013 100644
--- a/kolourpaint/pixmapfx/kpeffectinvert.cpp
+++ b/kolourpaint/pixmapfx/kpeffectinvert.cpp
@@ -32,7 +32,7 @@
 
 #include <tqcheckbox.h>
 #include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 
 #include <kdebug.h>
diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
index 0b764683..83dd997d 100644
--- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
+++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
@@ -33,7 +33,7 @@
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 #include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqradiobutton.h>
 
diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
index d7624775..098e0396 100644
--- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp
+++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
@@ -33,7 +33,7 @@
 #include <tqgroupbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtimer.h>
 
 #include <kapplication.h>
@@ -255,23 +255,23 @@ void kpEffectsDialog::selectEffect (int which)
         // Don't resize the preview when showing the widget:
         // TODO: actually work
 
-        TQSize previewGroupBoxMinSize = m_previewGroupBox->minimumSize ();
-        TQSize previewGroupBoxMaxSize = m_previewGroupBox->maximumSize ();
+        TQSize previewGroupBoxMinSize = m_previewGroupBox->tqminimumSize ();
+        TQSize previewGroupBoxMaxSize = m_previewGroupBox->tqmaximumSize ();
         TQLayout::ResizeMode previewGroupBoxResizeMode = 
-            m_previewGroupBox->layout () ?
-                m_previewGroupBox->layout ()->resizeMode () :
+            m_previewGroupBox->tqlayout () ?
+                m_previewGroupBox->tqlayout ()->tqresizeMode () :
                 TQLayout::Auto;
     #if DEBUG_KP_EFFECTS_DIALOG
         kdDebug () << "\tpreviewGroupBox: minSize=" << previewGroupBoxMinSize
                    << " maxSize=" << previewGroupBoxMaxSize
                    << " size=" << m_previewGroupBox->size ()
-                   << " layout=" << m_previewGroupBox->layout ()
+                   << " tqlayout=" << m_previewGroupBox->tqlayout ()
                    << " resizeMode=" << previewGroupBoxResizeMode
                    << endl;
     #endif
 
-        if (m_previewGroupBox->layout ())
-            m_previewGroupBox->layout ()->setResizeMode (TQLayout::FreeResize);
+        if (m_previewGroupBox->tqlayout ())
+            m_previewGroupBox->tqlayout ()->setResizeMode (TQLayout::FreeResize);
     #if DEBUG_KP_EFFECTS_DIALOG
         kdDebug () << "\tafter set resizeMode, previewGroupBox.size="
                    << m_previewGroupBox->size () << endl;
@@ -300,8 +300,8 @@ void kpEffectsDialog::selectEffect (int which)
         kdDebug () << "\tafter set fixedSize, previewGroupBox.size="
                    << m_previewGroupBox->size () << endl;
     #endif
-        if (m_previewGroupBox->layout ())
-            m_previewGroupBox->layout ()->setResizeMode (previewGroupBoxResizeMode);
+        if (m_previewGroupBox->tqlayout ())
+            m_previewGroupBox->tqlayout ()->setResizeMode (previewGroupBoxResizeMode);
     #if DEBUG_KP_EFFECTS_DIALOG
         kdDebug () << "\tafter restore resizeMode, previewGroupBox.size="
                    << m_previewGroupBox->size () << endl;
diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp
index 2543f962..5b281606 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.worldMatrix ().m11 ()
-               << " m12=" << painter.worldMatrix ().m12 ()
-               << " m21=" << painter.worldMatrix ().m21 ()
-               << " m22=" << painter.worldMatrix ().m22 ()
-               << " dx=" << painter.worldMatrix ().dx ()
-               << " dy=" << painter.worldMatrix ().dy ()
+    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 ()
                << endl;
 #endif
     painter.drawPixmap (TQPoint (0, 0), pm);
diff --git a/kolourpaint/tools/kptoolautocrop.cpp b/kolourpaint/tools/kptoolautocrop.cpp
index c294b1d0..41aeb398 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)
 {
-    invalidate ();
+    tqinvalidate ();
 }
 
 
@@ -280,7 +280,7 @@ bool kpToolAutoCropBorder::exists () const
 }
 
 // public
-void kpToolAutoCropBorder::invalidate ()
+void kpToolAutoCropBorder::tqinvalidate ()
 {
     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
-    //       invalidate top and continue autocrop.
+    //       tqinvalidate 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.invalidate ();
+            leftBorder.tqinvalidate ();
         }
     }
 
@@ -454,7 +454,7 @@ bool kpToolAutoCrop (kpMainWindow *mainWindow)
         #if DEBUG_KP_TOOL_AUTO_CROP
             kdDebug () << "\tignoring top border" << endl;
         #endif
-            topBorder.invalidate ();
+            topBorder.tqinvalidate ();
         }
     }
 
diff --git a/kolourpaint/tools/kptoolautocrop.h b/kolourpaint/tools/kptoolautocrop.h
index bb1a5d4a..886b4223 100644
--- a/kolourpaint/tools/kptoolautocrop.h
+++ b/kolourpaint/tools/kptoolautocrop.h
@@ -69,7 +69,7 @@ public:
 
     bool fillsEntirePixmap () const;
     bool exists () const;
-    void invalidate ();
+    void tqinvalidate ();
 
 private:
     const TQPixmap *m_pixmapPtr;
diff --git a/kolourpaint/tools/kptoolbrush.cpp b/kolourpaint/tools/kptoolbrush.cpp
index a5122805..30c68aee 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 shapes and sizes"),
+                 i18n ("Draw using brushes of different tqshapes and sizes"),
                  TQt::Key_B,
                  mainWindow, "tool_brush")
 {
diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp
index 158bd339..eade158b 100644
--- a/kolourpaint/tools/kptoolpolygon.cpp
+++ b/kolourpaint/tools/kptoolpolygon.cpp
@@ -35,7 +35,7 @@
 
 #include <tqbitmap.h>
 #include <tqcursor.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqpoint.h>
 #include <tqpushbutton.h>
@@ -479,7 +479,7 @@ void kpToolPolygon::beginDraw ()
             break;
 
         default:
-            kdError () << "kpToolPolygon::beginDraw() shape" << endl;
+            kdError () << "kpToolPolygon::beginDraw() tqshape" << endl;
             break;
         }
     }
diff --git a/kolourpaint/tools/kptoolpolygon.h b/kolourpaint/tools/kptoolpolygon.h
index 4478157e..50129be3 100644
--- a/kolourpaint/tools/kptoolpolygon.h
+++ b/kolourpaint/tools/kptoolpolygon.h
@@ -29,7 +29,7 @@
 #ifndef __kptoolpolygon_h__
 #define __kptoolpolygon_h__
 
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqpen.h>
 #include <tqobject.h>
 #include <tqpixmap.h>
diff --git a/kolourpaint/tools/kptoolpreviewdialog.cpp b/kolourpaint/tools/kptoolpreviewdialog.cpp
index 6212d7af..2136e02d 100644
--- a/kolourpaint/tools/kptoolpreviewdialog.cpp
+++ b/kolourpaint/tools/kptoolpreviewdialog.cpp
@@ -30,7 +30,7 @@
 #include <kptoolpreviewdialog.h>
 
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
@@ -389,7 +389,7 @@ void kpToolPreviewDialog::updatePreview ()
         m_previewPixmapLabel->setPixmap (previewPixmap);
 
         // immediate update esp. for expensive previews
-        m_previewPixmapLabel->repaint (false/*no erase*/);
+        m_previewPixmapLabel->tqrepaint (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 a0699d7b..df560ea2 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 shape" << endl;
+        kdDebug () << "\tdraw tqshape" << 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 dc147fc9..e41b5d47 100644
--- a/kolourpaint/tools/kptoolrectangle.h
+++ b/kolourpaint/tools/kptoolrectangle.h
@@ -29,7 +29,7 @@
 #ifndef __kptoolrectangle_h__
 #define __kptoolrectangle_h__
 
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqpen.h>
 #include <tqpixmap.h>
 #include <tqpoint.h>
@@ -53,7 +53,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    // it turns out that these shapes are all really the same thing
+    // it turns out that these tqshapes 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 3a59ed75..40270e1f 100644
--- a/kolourpaint/tools/kptoolresizescale.cpp
+++ b/kolourpaint/tools/kptoolresizescale.cpp
@@ -40,7 +40,7 @@
 #include <tqgroupbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpoint.h>
 #include <tqpointarray.h>
 #include <tqpushbutton.h>
@@ -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::fromLatin1 ("resize"),
+                       TQString::tqfromLatin1 ("resize"),
                        i18n ("&Resize"));
 
     m_scaleButton = new TQToolButton (m_operationGroupBox);
     toolButtonSetLook (m_scaleButton,
-                       TQString::fromLatin1 ("scale"),
+                       TQString::tqfromLatin1 ("scale"),
                        i18n ("&Scale"));
 
     m_smoothScaleButton = new TQToolButton (m_operationGroupBox);
     toolButtonSetLook (m_smoothScaleButton,
-                       TQString::fromLatin1 ("smooth_scale"),
+                       TQString::tqfromLatin1 ("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->setAlignment (m_resizeLabel->alignment () | TQt::ShowPrefix);
-    //m_scaleLabel->setAlignment (m_scaleLabel->alignment () | TQt::ShowPrefix);
-    //m_smoothScaleLabel->setAlignment (m_smoothScaleLabel->alignment () | TQt::ShowPrefix);
+    //m_resizeLabel->tqsetAlignment (m_resizeLabel->tqalignment () | TQt::ShowPrefix);
+    //m_scaleLabel->tqsetAlignment (m_scaleLabel->tqalignment () | TQt::ShowPrefix);
+    //m_smoothScaleLabel->tqsetAlignment (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->setAlignment (widthLabel->alignment () | TQt::AlignHCenter);
+    widthLabel->tqsetAlignment (widthLabel->tqalignment () | TQt::AlignHCenter);
     TQLabel *heightLabel = new TQLabel (i18n ("Height:"), m_dimensionsGroupBox);
-    heightLabel->setAlignment (heightLabel->alignment () | TQt::AlignHCenter);
+    heightLabel->tqsetAlignment (heightLabel->tqalignment () | TQt::AlignHCenter);
 
     TQLabel *originalLabel = new TQLabel (i18n ("Original:"), m_dimensionsGroupBox);
     m_originalWidthInput = new KIntNumInput (
diff --git a/kolourpaint/tools/kptoolrotate.cpp b/kolourpaint/tools/kptoolrotate.cpp
index 4b015916..5def33ca 100644
--- a/kolourpaint/tools/kptoolrotate.cpp
+++ b/kolourpaint/tools/kptoolrotate.cpp
@@ -34,7 +34,7 @@
 #include <tqbuttongroup.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqwmatrix.h>
diff --git a/kolourpaint/tools/kptoolskew.cpp b/kolourpaint/tools/kptoolskew.cpp
index e2c0deae..eec804d7 100644
--- a/kolourpaint/tools/kptoolskew.cpp
+++ b/kolourpaint/tools/kptoolskew.cpp
@@ -34,7 +34,7 @@
 #include <tqapplication.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqwmatrix.h>
 
diff --git a/kolourpaint/views/kpthumbnailview.cpp b/kolourpaint/views/kpthumbnailview.cpp
index 970663b5..54281ba4 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 repaint into
+    // For TQResizeEvent's, TQt already throws an entire widget tqrepaint 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 4d06d46e..b2f3441a 100644
--- a/kolourpaint/widgets/kpcolorsimilaritycube.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
@@ -133,12 +133,12 @@ void kpColorSimilarityCube::setColorSimilarity (double similarity)
 
     m_colorSimilarity = similarity;
 
-    repaint (false/*no erase*/);
+    tqrepaint (false/*no erase*/);
 }
 
 
 // protected virtual [base TQWidget]
-TQSize kpColorSimilarityCube::sizeHint () const
+TQSize kpColorSimilarityCube::tqsizeHint () 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] = colorGroup ().background ();
-        colors [1] = colorGroup ().background ();
+        colors [0] = tqcolorGroup ().background ();
+        colors [1] = tqcolorGroup ().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 (colorGroup ().background ());
+    backBuffer.fill (tqcolorGroup ().background ());
 
     TQPainter backBufferPainter (&backBuffer);
 
diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.h b/kolourpaint/widgets/kpcolorsimilaritycube.h
index a5f1db9f..0cf9f92a 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 sizeHint () const;
+    virtual TQSize tqsizeHint () const;
 
 protected:
     TQColor color (int redOrGreenOrBlue, int baseBrightness, int similarityDirection) const;
diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
index 7f0f621d..d71ac501 100644
--- a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
@@ -30,7 +30,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 #include <klocale.h>
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index 7510d87c..cfdb6820 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -34,7 +34,7 @@
 #include <tqbitmap.h>
 #include <tqdrawutil.h>
 #include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqsize.h>
 #include <tqtooltip.h>
@@ -150,7 +150,7 @@ kpColor kpDualColorButton::oldBackgroundColor () const
 
 
 // public virtual [base TQWidget]
-TQSize kpDualColorButton::sizeHint () const
+TQSize kpDualColorButton::tqsizeHint () const
 {
     return TQSize (52, 52);
 }
@@ -318,14 +318,14 @@ void kpDualColorButton::drawContents (TQPainter *p)
     else
     {
         backBufferPainter.fillRect (m_backBuffer->rect (),
-                                    colorGroup ().color (TQColorGroup::Background));
+                                    tqcolorGroup ().color (TQColorGroup::Background));
     }
 
     TQPixmap swapPixmap = UserIcon ("colorbutton_swap_16x16");
     if (!isEnabled ())
     {
         // swapPixmap has a mask after all
-        swapPixmap.fill (colorGroup ().color (TQColorGroup::Dark));
+        swapPixmap.fill (tqcolorGroup ().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, colorGroup ().color (TQColorGroup::Button));
-    qDrawShadePanel (&backBufferPainter, bgRect, colorGroup (),
+        backBufferPainter.fillRect (bgRectInside, tqcolorGroup ().color (TQColorGroup::Button));
+    qDrawShadePanel (&backBufferPainter, bgRect, tqcolorGroup (),
                      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, colorGroup ().color (TQColorGroup::Button));
-    qDrawShadePanel (&backBufferPainter, fgRect, colorGroup (),
+        backBufferPainter.fillRect (fgRectInside, tqcolorGroup ().color (TQColorGroup::Button));
+    qDrawShadePanel (&backBufferPainter, fgRect, tqcolorGroup (),
                      false/*not sunken*/, 2/*lineWidth*/,
                      0/*never fill*/);
 
@@ -768,7 +768,7 @@ kpTransparentColorCell::~kpTransparentColorCell ()
 
 
 // public virtual [base TQWidget]
-TQSize kpTransparentColorCell::sizeHint () const
+TQSize kpTransparentColorCell::tqsizeHint () 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->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_transparentColorCell->tqsetSizePolicy (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->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_dualColorButton->tqsetSizePolicy (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->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    m_colorSimilarityToolBarItem->tqsetSizePolicy (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 7c005441..59f13fb7 100644
--- a/kolourpaint/widgets/kpcolortoolbar.h
+++ b/kolourpaint/widgets/kpcolortoolbar.h
@@ -91,7 +91,7 @@ public:
     kpColor oldBackgroundColor () const;
 
 public:
-    virtual TQSize sizeHint () const;
+    virtual TQSize tqsizeHint () const;
 
 protected:
     TQRect swapPixmapRect () const;
@@ -163,7 +163,7 @@ public:
     kpTransparentColorCell (TQWidget *parent, const char *name = 0);
     virtual ~kpTransparentColorCell ();
 
-    virtual TQSize sizeHint () const;
+    virtual TQSize tqsizeHint () const;
 
 signals:
     void transparentColorSelected (int mouseButton);
diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.cpp b/kolourpaint/widgets/kpsqueezedtextlabel.cpp
index dc500b12..6e7386ec 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::minimumSizeHint () const
+TQSize kpSqueezedTextLabel::tqminimumSizeHint () const
 {
 #if DEBUG_KP_STQUEEZED_TEXT_LABEL && 1
-    kdDebug () << "kpSqueezedTextLabel::minimumSizeHint() qLabel prefers"
-               << TQLabel::minimumSizeHint () << endl;
+    kdDebug () << "kpSqueezedTextLabel::tqminimumSizeHint() qLabel prefers"
+               << TQLabel::tqminimumSizeHint () << endl;
 #endif
     return TQSize (-1/*no minimum width*/, TQLabel::minimumHeight ());
 }
diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.h b/kolourpaint/widgets/kpsqueezedtextlabel.h
index e4828b54..4697af8a 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 minimumSizeHint () const;
+    virtual TQSize tqminimumSizeHint () const;
 
     // TODO: maybe text() should return the full text?
     TQString fullText () const;
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index c1f73ea5..ba048d5c 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -32,7 +32,7 @@
 #include <kptooltoolbar.h>
 
 #include <tqbuttongroup.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdatetime.h>
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
@@ -144,7 +144,7 @@ kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, i
     setOrientation (orientation ());
 
 #if DEBUG_KP_TOOL_TOOL_BAR
-    kdDebug () << "kpToolToolBar::<ctor> layout tool widgets msec="
+    kdDebug () << "kpToolToolBar::<ctor> tqlayout tool widgets msec="
                << timer.elapsed () << endl;
 #endif
 
@@ -199,7 +199,7 @@ int kpToolToolBar::defaultIconSize ()
 
     if (m_defaultIconSize <= 0)
     {
-        // Adapt according to screen geometry
+        // Adapt according to screen tqgeometry
         const TQRect desktopSize = KGlobalSettings::desktopGeometry (this);
     #if DEBUG_KP_TOOL_TOOL_BAR
         kdDebug () << "\tadapting to screen size=" << desktopSize << endl;
diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp
index 18177804..3d1d3cff 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::fromLatin1 (name ());
+        TQString nameString = TQString::tqfromLatin1 (name ());
 
-        row = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Row"), -1);
-        col = cfg->readNumEntry (nameString + TQString::fromLatin1 (" Col"), -1);
+        row = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" Row"), -1);
+        col = cfg->readNumEntry (nameString + TQString::tqfromLatin1 (" 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::fromLatin1 (name ());
-    cfg->writeEntry (nameString + TQString::fromLatin1 (" Row"), m_selectedRow);
-    cfg->writeEntry (nameString + TQString::fromLatin1 (" Col"), m_selectedCol);
+    TQString nameString = TQString::tqfromLatin1 (name ());
+    cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Row"), m_selectedRow);
+    cfg->writeEntry (nameString + TQString::tqfromLatin1 (" Col"), m_selectedCol);
     cfg->sync ();
 }
 
diff --git a/kolourpaint/widgets/kptoolwidgetbrush.cpp b/kolourpaint/widgets/kptoolwidgetbrush.cpp
index 57986b63..0c583126 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 shape = 0; shape < BRUSH_SIZE_NUM_ROWS; shape++)
+    for (int tqshape = 0; tqshape < BRUSH_SIZE_NUM_ROWS; tqshape++)
     {
         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 [shape][i];
+            const int s = brushSize [tqshape][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 (shape)
+            switch (tqshape)
             {
             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 (shape, i)/*tooltip*/);
+            addOption (*pm, brushName (tqshape, i)/*tooltip*/);
 
             pm++;
         }
@@ -127,38 +127,38 @@ kpToolWidgetBrush::~kpToolWidgetBrush ()
 
 
 // private
-TQString kpToolWidgetBrush::brushName (int shape, int whichSize)
+TQString kpToolWidgetBrush::brushName (int tqshape, int whichSize)
 {
-    int s = brushSize [shape][whichSize];
+    int s = brushSize [tqshape][whichSize];
     
     if (s == 1)
         return i18n ("1x1");
     
-    TQString shapeName;
+    TQString tqshapeName;
 
     // sync: <brushes>
-    switch (shape)
+    switch (tqshape)
     {
     case 0:
-        shapeName = i18n ("Circle");
+        tqshapeName = i18n ("Circle");
         break;
     case 1:
-        shapeName = i18n ("Square");
+        tqshapeName = i18n ("Square");
         break;
     case 2:
-        // TODO: is this really the name of a shape? :)
-        shapeName = i18n ("Slash");
+        // TODO: is this really the name of a tqshape? :)
+        tqshapeName = i18n ("Slash");
         break;
     case 3:
-        // TODO: is this really the name of a shape? :)
-        shapeName = i18n ("Backslash");
+        // TODO: is this really the name of a tqshape? :)
+        tqshapeName = i18n ("Backslash");
         break;
     }
     
-    if (shapeName.isEmpty ())
+    if (tqshapeName.isEmpty ())
         return TQString();
     
-    return i18n ("%1x%2 %3").arg (s).arg (s).arg (shapeName);
+    return i18n ("%1x%2 %3").arg (s).arg (s).arg (tqshapeName);
 }
 
 TQPixmap kpToolWidgetBrush::brush () const
diff --git a/kolourpaint/widgets/kptoolwidgetbrush.h b/kolourpaint/widgets/kptoolwidgetbrush.h
index c67db05e..0fd2f46a 100644
--- a/kolourpaint/widgets/kptoolwidgetbrush.h
+++ b/kolourpaint/widgets/kptoolwidgetbrush.h
@@ -43,7 +43,7 @@ public:
     virtual ~kpToolWidgetBrush ();
 
 private:
-    TQString brushName (int shape, int whichSize);
+    TQString brushName (int tqshape, int whichSize);
     
 public:
     TQPixmap brush () const;
diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.cpp b/kolourpaint/widgets/kptoolwidgeterasersize.cpp
index 90167fd2..d27965a6 100644
--- a/kolourpaint/widgets/kptoolwidgeterasersize.cpp
+++ b/kolourpaint/widgets/kptoolwidgeterasersize.cpp
@@ -66,7 +66,7 @@ kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *parent, const char *na
         TQPixmap previewPixmap (s, s);
         if (i < 3)
         {
-            // HACK: kpToolWidgetBase's layout code sucks and gives uneven spacing
+            // HACK: kpToolWidgetBase's tqlayout code sucks and gives uneven spacing
             previewPixmap.resize ((width () - 4) / 3, 9);
         }
 
diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
index f3d2cd2e..a87714c5 100644
--- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
+++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
@@ -31,7 +31,7 @@
 #include <kptoolwidgetfillstyle.h>
 
 #include <tqbitmap.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqpainter.h>
 
 #include <kdebug.h>
diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
index 24569a21..503cecd2 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").arg (s).arg(s);
+        TQString iconName = TQString ("tool_spraycan_%1x%1").tqarg (s).tqarg(s);
         
     #if DEBUG_KP_TOOL_WIDGET_SPRAYCAN_SIZE
         kdDebug () << "\ticonName=" << iconName << endl;