From 56160bf4dfe503631ef6373367b281f081bab2b4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:13 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77.
---
 kspell2/broker.cpp                           | 4 ++--
 kspell2/plugins/aspell/kspell_aspelldict.cpp | 2 +-
 kspell2/plugins/hspell/kspell_hspelldict.cpp | 2 +-
 kspell2/plugins/ispell/ispell_checker.h      | 4 ++--
 kspell2/plugins/ispell/makedent.cpp          | 2 +-
 kspell2/tests/test_highlighter.cpp           | 2 +-
 kspell2/ui/configwidget.cpp                  | 2 +-
 kspell2/ui/highlighter.cpp                   | 2 +-
 kspell2/ui/kspell2ui.ui                      | 4 ++--
 9 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'kspell2')

diff --git a/kspell2/broker.cpp b/kspell2/broker.cpp
index 7f572bb01..0149dace1 100644
--- a/kspell2/broker.cpp
+++ b/kspell2/broker.cpp
@@ -189,8 +189,8 @@ void Broker::loadPlugin( const TQString& pluginId )
     kdDebug()<<"Loading plugin " << pluginId << endl;
 
     Client *client = KParts::ComponentFactory::createInstanceFromQuery<Client>(
-        TQString::fromLatin1( "KSpell/Client" ),
-        TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ),
+        TQString::tqfromLatin1( "KSpell/Client" ),
+        TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ),
         this, 0, TQStringList(), &error );
 
     if ( client )
diff --git a/kspell2/plugins/aspell/kspell_aspelldict.cpp b/kspell2/plugins/aspell/kspell_aspelldict.cpp
index b829e9bf4..6687f2106 100644
--- a/kspell2/plugins/aspell/kspell_aspelldict.cpp
+++ b/kspell2/plugins/aspell/kspell_aspelldict.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 using namespace KSpell2;
 
diff --git a/kspell2/plugins/hspell/kspell_hspelldict.cpp b/kspell2/plugins/hspell/kspell_hspelldict.cpp
index 5ece8811c..04f055e86 100644
--- a/kspell2/plugins/hspell/kspell_hspelldict.cpp
+++ b/kspell2/plugins/hspell/kspell_hspelldict.cpp
@@ -23,7 +23,7 @@
 #include "kspell_hspelldict.h"
 #include <kdebug.h>
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 using namespace KSpell2;
 
diff --git a/kspell2/plugins/ispell/ispell_checker.h b/kspell2/plugins/ispell/ispell_checker.h
index 00c6d0268..df72fe7b4 100644
--- a/kspell2/plugins/ispell/ispell_checker.h
+++ b/kspell2/plugins/ispell/ispell_checker.h
@@ -36,7 +36,7 @@
 
 #include <tqstringlist.h>
 #include <tqvaluelist.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqstring.h>
 
 
@@ -112,7 +112,7 @@ private:
 
 	/*
 		HACK: macros replaced with function implementations
-		so we could do a side-effect-free check for unicode
+		so we could do a side-effect-free check for tqunicode
 		characters which aren't in hashheader
 	*/
 	char myupper(ichar_t c);
diff --git a/kspell2/plugins/ispell/makedent.cpp b/kspell2/plugins/ispell/makedent.cpp
index 9c168dc17..0aeba8a1c 100644
--- a/kspell2/plugins/ispell/makedent.cpp
+++ b/kspell2/plugins/ispell/makedent.cpp
@@ -903,7 +903,7 @@ ISpellChecker::findfiletype (const char *name, int searchnames, int *deformatter
 
 /*
 	HACK: macros replaced with function implementations 
-	so we could do a side-effect-free check for unicode
+	so we could do a side-effect-free check for tqunicode
 	characters which aren't in hashheader
 
 	TODO: this is just a workaround to keep us from crashing. 
diff --git a/kspell2/tests/test_highlighter.cpp b/kspell2/tests/test_highlighter.cpp
index d49834a0e..ce5c64501 100644
--- a/kspell2/tests/test_highlighter.cpp
+++ b/kspell2/tests/test_highlighter.cpp
@@ -25,7 +25,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 
-#include <textedit.h>
+#include <tqtextedit.h>
 
 int main( int argc, char** argv )
 {
diff --git a/kspell2/ui/configwidget.cpp b/kspell2/ui/configwidget.cpp
index c9cce08a3..6d98955ae 100644
--- a/kspell2/ui/configwidget.cpp
+++ b/kspell2/ui/configwidget.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 using namespace KSpell2;
 
diff --git a/kspell2/ui/highlighter.cpp b/kspell2/ui/highlighter.cpp
index 231e8be1e..2d185462d 100644
--- a/kspell2/ui/highlighter.cpp
+++ b/kspell2/ui/highlighter.cpp
@@ -27,7 +27,7 @@
 #include <kconfig.h>
 #include <kdebug.h>
 
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqtimer.h>
 #include <tqcolor.h>
 #include <tqdict.h>
diff --git a/kspell2/ui/kspell2ui.ui b/kspell2/ui/kspell2ui.ui
index e221c69ba..c196c3807 100644
--- a/kspell2/ui/kspell2ui.ui
+++ b/kspell2/ui/kspell2ui.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>430</width>
             <height>300</height>
@@ -87,7 +87,7 @@
             <property name="text">
                 <string>... the &lt;b&gt;misspelled&lt;/b&gt; word shown in context ...</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
             <property name="toolTip" stdset="0">
-- 
cgit v1.2.1