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

This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.

1 files changed, 12 insertions, 12 deletions

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 ())