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

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.

4 files changed, 12 insertions, 12 deletions

diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
index d346bcf5..e6565e54 100644
--- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
@@ -79,7 +79,7 @@ bool CompendiumData::load(KURL url)
     emit progressStarts(i18n("Loading PO compendium"));
     connect(_catalog, TQT_SIGNAL(signalProgress(int)), this, TQT_SIGNAL(progress(int)));
 
-    ConversionStatus stat=_catalog->openURL(url);
+    ConversiontqStatus stat=_catalog->openURL(url);
         
     disconnect(_catalog, TQT_SIGNAL(signalProgress(int))
             , this, TQT_SIGNAL(progress(int)));
@@ -91,7 +91,7 @@ bool CompendiumData::load(KURL url)
                 
         _error = true;
         _errorMsg = i18n("Error while trying to read file for PO Compendium module:\n%1")
-            .arg(url.prettyURL());
+            .tqarg(url.prettyURL());
 
         emit progressEnds();
 
@@ -109,7 +109,7 @@ bool CompendiumData::load(KURL url)
         if( (100*(i+1))%total < 100 )
         {
             emit progress((100*(i+1))/total);
-            kapp->processEvents(100);
+            kapp->tqprocessEvents(100);
         }
 
 	// FIXME: shoudl care about plural forms
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index fb9171ed..60de6a4f 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -42,7 +42,7 @@
 #include <kio/netaccess.h>
 
 #include <tqregexp.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqtimer.h>
 
 #include "resources.h"
@@ -369,7 +369,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr
                     emit progress( (50*checkCounter+1)/catalogInfo.total);
                 }
             
-                kapp->processEvents(100);
+                kapp->tqprocessEvents(100);
 
                 TQString origStr = data->catalog()->msgid(*it).first();
                 origStr = CompendiumData::simplify(origStr);
@@ -537,7 +537,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr
             continue;
         }
        
-        kapp->processEvents(100);
+        kapp->tqprocessEvents(100);
 
         TQString origStr = data->catalog()->msgid(i).first();
         origStr = CompendiumData::simplify(origStr);
diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
index 0c4064fc..74321121 100644
--- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
@@ -32,7 +32,7 @@
 **************************************************************************** */
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kfiledialog.h>
 #include <tqpushbutton.h>
@@ -48,10 +48,10 @@ CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *parent, const
 		: PrefWidget(parent,name)
 		, changed(false)
 {
-	TQVBoxLayout *layout = new TQVBoxLayout(this);
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
 		
 	prefWidget = new CompendiumPWidget(this);
-	layout->addWidget(prefWidget);
+	tqlayout->addWidget(prefWidget);
 
 	connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool))
 					, this, TQT_SLOT(setChanged()));
diff --git a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
index db8de91e..f9558dc3 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
+++ b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui
@@ -8,7 +8,7 @@
         <cstring>PWidget</cstring>
     </property>
     <property stdset="1">
-        <name>geometry</name>
+        <name>tqgeometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -236,14 +236,14 @@
                 <enum>Expanding</enum>
             </property>
             <property>
-                <name>sizeHint</name>
+                <name>tqsizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
             <property>
-                <name>sizeHint</name>
+                <name>tqsizeHint</name>
                 <size>
                     <width>20</width>
                     <height>20</height>