TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

9 files changed, 110 insertions, 106 deletions

diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp
index eaea5194..772eae41 100644
--- a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp
+++ b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp
@@ -20,11 +20,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -54,8 +54,8 @@ KInstance *PcFactory::s_instance = 0;
 KAboutData *PcFactory::s_about = 0;
 
 
-PcFactory::PcFactory( TQObject *parent, const char *name)
-		: KLibFactory(parent,name)
+PcFactory::PcFactory( TQObject *tqparent, const char *name)
+		: KLibFactory(tqparent,name)
 {
 }
 
@@ -75,7 +75,7 @@ PcFactory::~PcFactory()
 }
 
 
-TQObject *PcFactory::createObject( TQObject *parent, const char *name
+TQObject *PcFactory::createObject( TQObject *tqparent, const char *name
 				, const char *classname, const TQStringList &)
 {
 	if(TQCString(classname) != "SearchEngine")
@@ -84,7 +84,7 @@ TQObject *PcFactory::createObject( TQObject *parent, const char *name
 		return 0;
 	}
 	
-	return new TmxCompendium(parent,name);
+	return new TmxCompendium(tqparent,name);
 }
 
 
diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.h b/kbabel/kbabeldict/modules/tmx/pc_factory.h
index 74739e0a..f4337116 100644
--- a/kbabel/kbabeldict/modules/tmx/pc_factory.h
+++ b/kbabel/kbabeldict/modules/tmx/pc_factory.h
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -44,12 +44,13 @@ class KAboutData;
 class PcFactory : public KLibFactory
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	PcFactory( TQObject *parent=0, const char *name=0);
+	PcFactory( TQObject *tqparent=0, const char *name=0);
 	~PcFactory();
 
-	virtual TQObject *createObject( TQObject *parent=0, const char *name=0
-					, const char *classname="TQObject"
+	virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0
+					, const char *classname=TQOBJECT_OBJECT_NAME_STRING
 					, const TQStringList &args = TQStringList());
 
 	static KInstance *instance();
diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
index 85d38294..16200985 100644
--- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -46,14 +46,14 @@
 #include "preferenceswidget.h"
 #include "pwidget.h"
 
-TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *parent, const char* name)
-		: PrefWidget(parent,name)
+TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *tqparent, const char* name)
+		: PrefWidget(tqparent,name)
 		, changed(false)
 {
-	TQVBoxLayout *layout = new TQVBoxLayout(this);
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
 		
 	prefWidget = new TmxCompendiumPWidget(this);
-	layout->addWidget(prefWidget);
+	tqlayout->addWidget(prefWidget);
 
 	connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool))
 					, this, TQT_SLOT(setChanged()));
diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.h b/kbabel/kbabeldict/modules/tmx/preferenceswidget.h
index e2a4b900..a91aff42 100644
--- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.h
+++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.h
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -44,9 +44,10 @@ class TmxCompendiumPWidget;
 class TmxCompendiumPreferencesWidget : public PrefWidget
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	TmxCompendiumPreferencesWidget(TQWidget *parent=0, const char* name=0);
+	TmxCompendiumPreferencesWidget(TQWidget *tqparent=0, const char* name=0);
 	virtual ~TmxCompendiumPreferencesWidget();
 
 	virtual void apply();
diff --git a/kbabel/kbabeldict/modules/tmx/pwidget.ui b/kbabel/kbabeldict/modules/tmx/pwidget.ui
index ef6c9967..15600c7d 100644
--- a/kbabel/kbabeldict/modules/tmx/pwidget.ui
+++ b/kbabel/kbabeldict/modules/tmx/pwidget.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>TmxCompendiumPWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>TMXPWidget</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -46,7 +46,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>ButtonGroup1</cstring>
             </property>
@@ -63,7 +63,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout4</cstring>
                     </property>
@@ -77,7 +77,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QCheckBox" row="0" column="1">
+                        <widget class="TQCheckBox" row="0" column="1">
                             <property name="name">
                                 <cstring>wholeBtn</cstring>
                             </property>
@@ -85,7 +85,7 @@
                                 <string>Onl&amp;y whole words</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="0" column="0">
+                        <widget class="TQCheckBox" row="0" column="0">
                             <property name="name">
                                 <cstring>caseBtn</cstring>
                             </property>
@@ -95,7 +95,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel3</cstring>
                     </property>
@@ -103,7 +103,7 @@
                         <string>A text matches if:</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout3</cstring>
                     </property>
@@ -117,7 +117,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QCheckBox" row="0" column="0">
+                        <widget class="TQCheckBox" row="0" column="0">
                             <property name="name">
                                 <cstring>equalBtn</cstring>
                             </property>
@@ -125,7 +125,7 @@
                                 <string>E&amp;qual to searched text</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="2" column="1">
+                        <widget class="TQCheckBox" row="2" column="1">
                             <property name="name">
                                 <cstring>hasWordBtn</cstring>
                             </property>
@@ -133,7 +133,7 @@
                                 <string>Contains a &amp;word of searched text</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="1" column="1">
+                        <widget class="TQCheckBox" row="1" column="1">
                             <property name="name">
                                 <cstring>isContainedBtn</cstring>
                             </property>
@@ -141,7 +141,7 @@
                                 <string>Co&amp;ntained in searched text</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="1" column="0">
+                        <widget class="TQCheckBox" row="1" column="0">
                             <property name="name">
                                 <cstring>ngramBtn</cstring>
                             </property>
@@ -149,7 +149,7 @@
                                 <string>&amp;Similar to searched text</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="0" column="1">
+                        <widget class="TQCheckBox" row="0" column="1">
                             <property name="name">
                                 <cstring>containsBtn</cstring>
                             </property>
@@ -171,7 +171,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -209,7 +209,7 @@
 <includes>
     <include location="global" impldecl="in declaration">kseparator.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
 </includehints>
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 415992bf..fd5fcd29 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -58,8 +58,8 @@
 static KStaticDeleter< TQDict<TmxCompendiumData> > compDataDeleter;
 TQDict<TmxCompendiumData> *TmxCompendium::_compDict = 0;
 
-TmxCompendium::TmxCompendium(TQObject *parent, const char *name)
-        : SearchEngine(parent, name)
+TmxCompendium::TmxCompendium(TQObject *tqparent, const char *name)
+        : SearchEngine(tqparent, name)
 {
     prefWidget=0;
     data=0;
@@ -152,9 +152,9 @@ void TmxCompendium::readSettings(KConfigBase *config)
     restoreSettings();
 }
 
-PrefWidget *TmxCompendium::preferencesWidget(TQWidget *parent)
+PrefWidget *TmxCompendium::preferencesWidget(TQWidget *tqparent)
 {
-    prefWidget = new TmxCompendiumPreferencesWidget(parent,"tmxcompendium_prefwidget");
+    prefWidget = new TmxCompendiumPreferencesWidget(tqparent,"tmxcompendium_prefwidget");
     connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings()));
     connect(prefWidget, TQT_SIGNAL(restoreSettings())
                     , this, TQT_SLOT(restoreSettings()));
@@ -240,8 +240,8 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
 
         TranslationInfo *info = new TranslationInfo;
         info->location = directory(realURL,0);
-        info->translator = TQString::null;
-        info->description = TQString::null;
+        info->translator = TQString();
+        info->description = TQString();
         result->descriptions.append(info);
 
         results.append(result);
@@ -267,7 +267,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
         TQValueList<int>::ConstIterator it;
         for( it = indexList->begin(); it != indexList->end(); ++it )
         {
-            if(foundIndices.contains(*it))
+            if(foundIndices.tqcontains(*it))
             {
                 continue;
             }
@@ -294,8 +294,8 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
 
                 TranslationInfo *info = new TranslationInfo;
                 info->location = directory(realURL,0);
-                info->translator = TQString::null;
-                info->description = TQString::null;
+                info->translator = TQString();
+                info->description = TQString();
                 result->descriptions.append(info);
  
                 addResult(result);
@@ -319,12 +319,12 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
                 if(stop)
                     break;
                 
-                if(foundIndices.contains(*it))
+                if(foundIndices.tqcontains(*it))
                 {
                     continue;
                 }
               
-                if(checkedIndices.contains(*it))
+                if(checkedIndices.tqcontains(*it))
                 {
                     continue;
                 }
@@ -365,7 +365,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
                             s=" "+*wit+" ";
                             o=" "+origStr+" ";
                         }
-                        if(o.contains(s))
+                        if(o.tqcontains(s))
                         {
                             found=true;
                         }
@@ -389,7 +389,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
 
                 if(!found && matchContains && !wholeWords)
                 {
-                    TQString s=maskString(searchStr);
+                    TQString s=tqmaskString(searchStr);
                     TQRegExp searchReg(s);
 
                     if(searchReg.search(origStr) >= 0)
@@ -398,7 +398,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
             
                 if(!found && matchIsContained && !wholeWords)
                 {
-                    TQString s=maskString(origStr);
+                    TQString s=tqmaskString(origStr);
                     TQRegExp reg(s);
 
                     if(reg.search(searchStr) >= 0)
@@ -413,7 +413,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
                     for ( TQStringList::Iterator wit2 = list.begin()
                        ; wit2 != list.end(); ++wit2 ) 
                     {
-                        TQString s=maskString(*wit2);
+                        TQString s=tqmaskString(*wit2);
                         TQRegExp reg(s);
 
                         if(reg.search(origStr) >= 0)
@@ -436,8 +436,8 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
 
                     TranslationInfo *info = new TranslationInfo;
                     info->location = directory(realURL,0);
-                    info->translator = TQString::null;
-                    info->description = TQString::null;
+                    info->translator = TQString();
+                    info->description = TQString();
                     result->descriptions.append(info);
  
                     addResult(result);
@@ -454,7 +454,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
         TQRegExp searchReg;
         if(matchContains)
         {
-            TQString s=maskString(searchStr);
+            TQString s=tqmaskString(searchStr);
             searchReg.setPattern(s);
         }
 
@@ -471,7 +471,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
 
             i++;
             
-            if(checkedIndices.contains(i))
+            if(checkedIndices.tqcontains(i))
             {
                 continue;
             }
@@ -479,7 +479,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
             checkedIndices.append(i);
             checkCounter++;
   
-            if(foundIndices.contains(i))
+            if(foundIndices.tqcontains(i))
             {
                  continue;
             }
@@ -523,7 +523,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
                     
             if(!found && matchIsContained)
             {
-                TQString s=maskString(origStr);
+                TQString s=tqmaskString(origStr);
                 TQRegExp reg(s);
 
                 if(reg.search(searchStr) >= 0)
@@ -538,7 +538,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
                 for ( TQStringList::Iterator wit2 = list.begin()
                    ; wit2 != list.end(); ++wit2 ) 
                 {
-                    TQString s=maskString(*wit2);
+                    TQString s=tqmaskString(*wit2);
 
                     if(wholeWords)
                     {
@@ -577,8 +577,8 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea
 
                  TranslationInfo *info = new TranslationInfo;
                  info->location = directory(realURL,0);
-                 info->translator = TQString::null;
-                 info->description = TQString::null;
+                 info->translator = TQString();
+                 info->description = TQString();
                  result->descriptions.append(info);
     
                  addResult(result);
@@ -687,9 +687,9 @@ void TmxCompendium::slotLoadCompendium()
 
     TQString path=url;
    
-    if(path.contains("@LANG@"))
+    if(path.tqcontains("@LANG@"))
     {
-        path.replace("@LANG@",langCode);
+        path.tqreplace("@LANG@",langCode);
     }
     KURL u=KCmdLineArgs::makeURL(path.local8Bit());
     realURL = u.url();
@@ -746,21 +746,21 @@ void TmxCompendium::recheckData()
     loading=false;
 }
 
-TQString TmxCompendium::maskString(TQString s) const
+TQString TmxCompendium::tqmaskString(TQString s) const
 {
-    s.replace('\\',"\\\\");
-    s.replace('?',"\\?");
-    s.replace('[',"\\[");
-    s.replace('.',"\\.");
-    s.replace('*',"\\*");
-    s.replace('+',"\\+");
-    s.replace('^',"\\^");
-    s.replace('$',"\\$");
-    s.replace('(',"\\(");
-    s.replace(')',"\\)");
-    s.replace('{',"\\{");
-    s.replace('}',"\\}");
-    s.replace('|',"\\|");
+    s.tqreplace('\\',"\\\\");
+    s.tqreplace('?',"\\?");
+    s.tqreplace('[',"\\[");
+    s.tqreplace('.',"\\.");
+    s.tqreplace('*',"\\*");
+    s.tqreplace('+',"\\+");
+    s.tqreplace('^',"\\^");
+    s.tqreplace('$',"\\$");
+    s.tqreplace('(',"\\(");
+    s.tqreplace(')',"\\)");
+    s.tqreplace('{',"\\{");
+    s.tqreplace('}',"\\}");
+    s.tqreplace('|',"\\|");
     
     return s;
 }
@@ -797,7 +797,7 @@ void TmxCompendium::addResult(SearchResult *result)
 
 void TmxCompendium::setLanguageCode(const TQString& lang)
 {   
-    if(initialized && url.contains("@LANG@") && lang!=langCode 
+    if(initialized && url.tqcontains("@LANG@") && lang!=langCode 
             && !loadTimer->isActive() )
     {
         initialized=false;
@@ -818,7 +818,7 @@ TQString TmxCompendium::translate(const TQString& text, uint pluralForm)
     
     if(error || !data || data->active())
     {
-        return TQString::null;
+        return TQString();
     }
    
 
@@ -829,7 +829,7 @@ TQString TmxCompendium::translate(const TQString& text, uint pluralForm)
         return data->msgstr(*index);
     }
    
-    return TQString::null;
+    return TQString();
 }
 
 TQString TmxCompendium::fuzzyTranslation(const TQString& text, int &score, uint pluralForm)
@@ -844,7 +844,7 @@ TQString TmxCompendium::fuzzyTranslation(const TQString& text, int &score, uint
     
   if(error || !data || data->active())
     {
-      return TQString::null;
+      return TQString();
     }
     
   // try to find fuzzy string
@@ -907,7 +907,7 @@ TQString TmxCompendium::fuzzyTranslation(const TQString& text, int &score, uint
     return data->msgstr(best_matching);
   }
  
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -943,7 +943,7 @@ void TmxCompendium::unregisterData()
 
 void TmxCompendium::registerData()
 {
-    data = compendiumDict()->find(realURL);
+    data = compendiumDict()->tqfind(realURL);
     if(!data)
     {
         data = new TmxCompendiumData;
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h
index d09e81c9..e6b76f53 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions  
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions  
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -50,9 +50,10 @@ class TQTimer;
 class TmxCompendium : public SearchEngine
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	TmxCompendium(TQObject *parent=0, const char *name=0);
+	TmxCompendium(TQObject *tqparent=0, const char *name=0);
 	virtual ~TmxCompendium();
 
 	virtual bool isReady() const;
@@ -65,7 +66,7 @@ public:
 	virtual void saveSettings(KConfigBase *config);
 	virtual void readSettings(KConfigBase *config);
 
-	virtual PrefWidget *preferencesWidget(TQWidget *parent);
+	virtual PrefWidget *preferencesWidget(TQWidget *tqparent);
 
 	virtual const KAboutData *about() const;
 
@@ -96,7 +97,7 @@ protected slots:
 protected:
 	void loadCompendium();
     void addResult(SearchResult *);
-    TQString maskString(TQString string) const;
+    TQString tqmaskString(TQString string) const;
 
     void registerData();
     void unregisterData();
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index 7893e837..739379e1 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -47,8 +47,8 @@
 
 using namespace KBabel;
 
-TmxCompendiumData::TmxCompendiumData(TQObject *parent)
-            : TQObject(parent)
+TmxCompendiumData::TmxCompendiumData(TQObject *tqparent)
+            : TQObject(tqparent)
             , _active(false)
             , _error(false)
             , _initialized(false)
@@ -117,7 +117,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language)
         _errorMsg = i18n("Error while trying to read file for TMX Compendium module:\n"
 	    "%1\n"
 	    "Reason: %2")
-            .arg(url.prettyURL()).arg(_errorMsg);
+            .tqarg(url.prettyURL()).tqarg(_errorMsg);
 
         kdDebug(KBABEL_SEARCH) << "Error:  " << _errorMsg << endl;
 
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h
index ce2692a1..325fb9b5 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h
@@ -22,11 +22,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -44,12 +44,13 @@
 #include <tqvaluevector.h>
 #include <tqptrlist.h>
 
-class TmxCompendiumData : public QObject
+class TmxCompendiumData : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TmxCompendiumData(TQObject *parent=0);
+    TmxCompendiumData(TQObject *tqparent=0);
 
     bool load(const KURL& url, const TQString& language);