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

This reverts commit 83323aca3ca373b92a44ab247f1b49c39220c60d.

4 files changed, 24 insertions, 24 deletions

diff --git a/src/kio_locate.cpp b/src/kio_locate.cpp
index b846b70..3530af9 100644
--- a/src/kio_locate.cpp
+++ b/src/kio_locate.cpp
@@ -347,7 +347,7 @@ void LocateProtocol::get(const KURL& url)
         if (m_locater.binaryExists()) {
             error(KIO::ERR_IS_DIRECTORY, TQString());
         } else {
-            TQString html = i18n("<h1>\"%1\" could not be started.</h1><p>Please note that kio-locate can't be used on its own. You need an additional program for doing searches. Typically this is the command line tool <i>locate</i> that can be found in many distributions by default. You can check if the correct tool is used by looking at the <a href=\"locater:config\">setting</a> \"Locate Binary\".<p>Besides the mentioned tool <i>locate</i>, kio-locate can use any tool that uses the same syntax. In particular, it was reported to work with <i>slocate</i> and <i>rlocate</i>.").arg(m_locater.binary());
+            TQString html = i18n("<h1>\"%1\" could not be started.</h1><p>Please note that kio-locate can't be used on its own. You need an additional program for doing searches. Typically this is the command line tool <i>locate</i> that can be found in many distributions by default. You can check if the correct tool is used by looking at the <a href=\"locater:config\">setting</a> \"Locate Binary\".<p>Besides the mentioned tool <i>locate</i>, kio-locate can use any tool that uses the same syntax. In particular, it was reported to work with <i>slocate</i> and <i>rlocate</i>.").tqarg(m_locater.binary());
             outputHtml(html);
         }
     } else if (isConfigRequest()) {
@@ -512,7 +512,7 @@ void LocateProtocol::searchRequest()
     m_locateRegExp = LocateRegExp(convertWildcardsToRegExp(m_locatePattern), !isCaseSensitive(m_locatePattern));
 
     // Now perform the search...
-    infoMessage(i18n("Locating %1 ...").arg(display));
+    infoMessage(i18n("Locating %1 ...").tqarg(display));
 
     bool started = m_locater.locate(m_locatePattern, !isCaseSensitive(m_locatePattern), regexp);
     
@@ -725,7 +725,7 @@ TQString LocateProtocol::pathToDisplay(const TQString& path, int subItems)
         display = display.mid(m_locateDirectory.length());
     }
     if (subItems > 0) {
-        // Can't use m_collapsedDisplay.arg(subItems).arg(display); here
+        // Can't use m_collapsedDisplay.tqarg(subItems).tqarg(display); here
         // because user might forget to type %1 or %2, or type it twice.
         // In both cases the result of arg() is undefined.
         TQString output = m_config.m_collapsedDisplay, temp;
diff --git a/src/klocateconfiglocatewidget.ui b/src/klocateconfiglocatewidget.ui
index 705a240..e14f402 100644
--- a/src/klocateconfiglocatewidget.ui
+++ b/src/klocateconfiglocatewidget.ui
@@ -68,7 +68,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout11</cstring>
+                        <cstring>tqlayout11</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -81,7 +81,7 @@
                             <property name="text">
                                 <string>Locate &amp;binary:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -98,7 +98,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>81</width>
                                     <height>20</height>
@@ -117,7 +117,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>200</width>
                                     <height>0</height>
@@ -136,7 +136,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout12</cstring>
+                        <cstring>tqlayout12</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -163,7 +163,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>51</width>
                                     <height>20</height>
@@ -182,7 +182,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>200</width>
                                     <height>0</height>
diff --git a/src/klocateconfigwidget.ui b/src/klocateconfigwidget.ui
index 433512d..776f0a0 100644
--- a/src/klocateconfigwidget.ui
+++ b/src/klocateconfigwidget.ui
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -59,7 +59,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>284</width>
                                     <height>20</height>
@@ -85,7 +85,7 @@
                             <property name="name">
                                 <cstring>kcfg_caseSensitivity</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>150</width>
                                     <height>0</height>
@@ -120,7 +120,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -141,7 +141,7 @@
                             <property name="text">
                                 <string>&amp;Collapse a directory with more hits:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -158,7 +158,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>141</width>
                                     <height>20</height>
@@ -177,7 +177,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -198,7 +198,7 @@
                             <property name="text">
                                 <string>Text of a collapsed &amp;directory:</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -215,7 +215,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>100</width>
                                     <height>20</height>
@@ -234,7 +234,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>200</width>
                                     <height>0</height>
@@ -253,7 +253,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -280,7 +280,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>161</width>
                                     <height>20</height>
@@ -347,7 +347,7 @@
                             <property name="name">
                                 <cstring>kcfg_collapsedIcon</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>150</width>
                                     <height>0</height>
diff --git a/src/locater.cpp b/src/locater.cpp
index 93d4bc0..a160673 100644
--- a/src/locater.cpp
+++ b/src/locater.cpp
@@ -23,7 +23,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kdebug.h>
 #include <kstandarddirs.h>