TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

20 files changed, 691 insertions, 683 deletions

diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp
index df44daa8..2639301e 100644
--- a/tools/converter/koconverter.cpp
+++ b/tools/converter/koconverter.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <qfile.h>
+#include <tqfile.h>
 
 #include <kaboutdata.h>
 #include <kimageio.h>
@@ -46,17 +46,17 @@ static const KCmdLineOptions options[]=
 	KCmdLineLastOption
 };
 
-bool convert( const KURL & uIn, const QString & /*inputFormat*/, const KURL & uOut, const QString & outputFormat, const bool batch )
+bool convert( const KURL & uIn, const TQString & /*inputFormat*/, const KURL & uOut, const TQString & outputFormat, const bool batch )
 {
     KoFilterManager* manager = new KoFilterManager( uIn.path() );
 
     ProgressObject progressObj;
-    QObject::connect(manager, SIGNAL(sigProgress(int)), &progressObj, SLOT(slotProgress(int)));
+    TQObject::connect(manager, TQT_SIGNAL(sigProgress(int)), &progressObj, TQT_SLOT(slotProgress(int)));
 
     manager->setBatchMode( batch );
 
-    QCString mime( outputFormat.latin1() );
-    KoFilter::ConversionStatus status = manager->exp0rt( uOut.path(), mime );
+    TQCString mime( outputFormat.latin1() );
+    KoFilter::ConversiontqStatus status = manager->exp0rt( uOut.path(), mime );
     progressObj.slotProgress(-1);
 
     delete manager;
@@ -117,17 +117,17 @@ int main( int argc, char **argv )
         KMimeType::Ptr inputMimetype = KMimeType::findByURL( uIn );
         if ( inputMimetype->name() == KMimeType::defaultMimeType() )
         {
-            kdError() << i18n("Mimetype for input file %1 not found!").arg(uIn.prettyURL()) << endl;
+            kdError() << i18n("Mimetype for input file %1 not found!").tqarg(uIn.prettyURL()) << endl;
             return 1;
         }
         KMimeType::Ptr outputMimetype;
         if ( args->isSet("mimetype") )
         {
-            QString mime = QString::fromLatin1( args->getOption("mimetype") );
+            TQString mime = TQString::tqfromLatin1( args->getOption("mimetype") );
             outputMimetype = KMimeType::mimeType( mime );
             if ( outputMimetype->name() == KMimeType::defaultMimeType() )
             {
-                kdError() << i18n("Mimetype not found %1").arg(mime) << endl;
+                kdError() << i18n("Mimetype not found %1").tqarg(mime) << endl;
                 return 1;
             }
         }
@@ -141,9 +141,9 @@ int main( int argc, char **argv )
             }
         }
 
-        QApplication::setOverrideCursor( Qt::waitCursor );
+        TQApplication::setOverrideCursor( TQt::waitCursor );
         bool ok = convert( uIn, inputMimetype->name(), uOut, outputMimetype->name(), batch );
-        QApplication::restoreOverrideCursor();
+        TQApplication::restoreOverrideCursor();
         if ( ok )
         {
             return 0;
diff --git a/tools/converter/koconverter.h b/tools/converter/koconverter.h
index ce21ac74..4a02e7a7 100644
--- a/tools/converter/koconverter.h
+++ b/tools/converter/koconverter.h
@@ -20,13 +20,14 @@
 #ifndef koconverter_h
 #define koconverter_h
 
-#include <qobject.h>
+#include <tqobject.h>
 
-class ProgressObject : public QObject
+class ProgressObject : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    ProgressObject() : QObject( 0, 0 ) { }
+    ProgressObject() : TQObject( 0, 0 ) { }
 public slots:
     void slotProgress(int);
 };
diff --git a/tools/kfile-plugins/abiword/kfile_abiword.cpp b/tools/kfile-plugins/abiword/kfile_abiword.cpp
index 2b1b0cad..f643a649 100644
--- a/tools/kfile-plugins/abiword/kfile_abiword.cpp
+++ b/tools/kfile-plugins/abiword/kfile_abiword.cpp
@@ -24,19 +24,19 @@
 #include <kgenericfactory.h>
 #include <kfilterdev.h>
 
-#include <qdom.h>
-#include <qfile.h>
-#include <qdatetime.h>
+#include <tqdom.h>
+#include <tqfile.h>
+#include <tqdatetime.h>
 #include <kdebug.h>
 
 typedef KGenericFactory<AbiwordPlugin> AbiwordFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_abiword, AbiwordFactory( "kfile_abiword" ))
 
-AbiwordPlugin::AbiwordPlugin(QObject *parent, const char *name,
-                       const QStringList &args)
+AbiwordPlugin::AbiwordPlugin(TQObject *tqparent, const char *name,
+                       const TQStringList &args)
 
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     init();
 }
@@ -51,11 +51,11 @@ void AbiwordPlugin::init()
 
     KFileMimeTypeInfo::ItemInfo* item;
 
-    item = addItemInfo(group, "Author", i18n("Author"), QVariant::String);
+    item = addItemInfo(group, "Author", i18n("Author"), TQVariant::String);
     setHint(item, KFileMimeTypeInfo::Author);
-    item = addItemInfo(group, "Title", i18n("Title"), QVariant::String);
+    item = addItemInfo(group, "Title", i18n("Title"), TQVariant::String);
     setHint(item, KFileMimeTypeInfo::Name);
-    item = addItemInfo(group, "Abstract", i18n("Abstract"), QVariant::String);
+    item = addItemInfo(group, "Abstract", i18n("Abstract"), TQVariant::String);
     setHint(item, KFileMimeTypeInfo::Description);
 }
 
@@ -65,13 +65,13 @@ bool AbiwordPlugin::readInfo( KFileMetaInfo& info, uint what)
         return false;
 
     //Find the last extension
-    QString strExt;
-    const int result=info.path().findRev('.');
+    TQString strExt;
+    const int result=info.path().tqfindRev('.');
     if (result>=0)
     {
         strExt=info.path().mid(result);
     }
-    QString strMime; // Mime type of the compressor (default: unknown)
+    TQString strMime; // Mime type of the compressor (default: unknown)
     if ((strExt==".gz")||(strExt==".GZ")        //in case of .abw.gz (logical extension)
         ||(strExt==".zabw")||(strExt==".ZABW")) //in case of .zabw (extension used prioritary with AbiWord)
     {
@@ -88,7 +88,7 @@ bool AbiwordPlugin::readInfo( KFileMetaInfo& info, uint what)
     }
 
     KFileMetaInfoGroup group = appendGroup(info, "DocumentInfo");
-    QIODevice* in = KFilterDev::deviceForFile(info.path(),strMime);
+    TQIODevice* in = KFilterDev::deviceForFile(info.path(),strMime);
     if ( !in )
     {
         kdError() << "Cannot create device for uncompressing! Aborting!" << endl;
@@ -101,21 +101,21 @@ bool AbiwordPlugin::readInfo( KFileMetaInfo& info, uint what)
         delete in;
         return false;
     }
-    QDomDocument doc;
+    TQDomDocument doc;
     doc.setContent( in );
     in->close();
-    QDomElement docElem = doc.documentElement();
-    QDomNode summary  = docElem.namedItem("metadata");
-    QDomNode m_item = summary.namedItem("m");
+    TQDomElement docElem = doc.documentElement();
+    TQDomNode summary  = docElem.namedItem("metadata");
+    TQDomNode m_item = summary.namedItem("m");
 
-    QString author;
-    QString title;
-    QString abstract;
+    TQString author;
+    TQString title;
+    TQString abstract;
 
     while( !m_item.isNull() )
     {
         kdDebug()<<" m_item.toElement().text: "<<m_item.toElement().text()<<endl;
-        QString key = m_item.toElement().attribute( "key" );
+        TQString key = m_item.toElement().attribute( "key" );
         if ( key.isEmpty() )
             continue;
         else if ( key=="dc.creator" )
@@ -136,7 +136,7 @@ bool AbiwordPlugin::readInfo( KFileMetaInfo& info, uint what)
     return true;
 }
 
-QString AbiwordPlugin::stringItem( const QString &name )
+TQString AbiwordPlugin::stringItem( const TQString &name )
 {
     return name.isEmpty() ? i18n("*Unknown*") : name;
 }
diff --git a/tools/kfile-plugins/abiword/kfile_abiword.h b/tools/kfile-plugins/abiword/kfile_abiword.h
index 33ee9c63..4aa3a837 100644
--- a/tools/kfile-plugins/abiword/kfile_abiword.h
+++ b/tools/kfile-plugins/abiword/kfile_abiword.h
@@ -22,21 +22,22 @@
 
 #include <kfilemetainfo.h>
 
-class QStringList;
-class QDomNode;
+class TQStringList;
+class TQDomNode;
 
 class AbiwordPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    AbiwordPlugin( QObject *parent, const char *name, const QStringList& args );
+    AbiwordPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
 
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 
 private:
     void init();
-    QString stringItem( const QString &name );
+    TQString stringItem( const TQString &name );
 };
 
 #endif
diff --git a/tools/kfile-plugins/gnumeric/kfile_gnumeric.cpp b/tools/kfile-plugins/gnumeric/kfile_gnumeric.cpp
index 8d4b7928..ad29c130 100644
--- a/tools/kfile-plugins/gnumeric/kfile_gnumeric.cpp
+++ b/tools/kfile-plugins/gnumeric/kfile_gnumeric.cpp
@@ -24,19 +24,19 @@
 #include <kgenericfactory.h>
 #include <kfilterdev.h>
 
-#include <qdom.h>
-#include <qfile.h>
-#include <qdatetime.h>
+#include <tqdom.h>
+#include <tqfile.h>
+#include <tqdatetime.h>
 #include <kdebug.h>
 
 typedef KGenericFactory<GnumericPlugin> GnumericFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_gnumeric, GnumericFactory( "kfile_gnumeric" ))
 
-GnumericPlugin::GnumericPlugin(QObject *parent, const char *name,
-                       const QStringList &args)
+GnumericPlugin::GnumericPlugin(TQObject *tqparent, const char *name,
+                       const TQStringList &args)
 
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     init();
 }
@@ -51,11 +51,11 @@ void GnumericPlugin::init()
 
     KFileMimeTypeInfo::ItemInfo* item;
 
-    item = addItemInfo(group, "Author", i18n("Author"), QVariant::String);
+    item = addItemInfo(group, "Author", i18n("Author"), TQVariant::String);
     setHint(item, KFileMimeTypeInfo::Author);
-    item = addItemInfo(group, "Title", i18n("Title"), QVariant::String);
+    item = addItemInfo(group, "Title", i18n("Title"), TQVariant::String);
     setHint(item, KFileMimeTypeInfo::Name);
-    item = addItemInfo(group, "Abstract", i18n("Abstract"), QVariant::String);
+    item = addItemInfo(group, "Abstract", i18n("Abstract"), TQVariant::String);
     setHint(item, KFileMimeTypeInfo::Description);
 }
 
@@ -65,7 +65,7 @@ bool GnumericPlugin::readInfo( KFileMetaInfo& info, uint what)
         return false;
 
     KFileMetaInfoGroup group = appendGroup(info, "DocumentInfo");
-    QIODevice* in = KFilterDev::deviceForFile(info.path(),"application/x-gzip");
+    TQIODevice* in = KFilterDev::deviceForFile(info.path(),"application/x-gzip");
     if ( !in )
     {
         kdError() << "Cannot create device for uncompressing! Aborting!" << endl;
@@ -78,20 +78,20 @@ bool GnumericPlugin::readInfo( KFileMetaInfo& info, uint what)
         delete in;
         return false;
     }
-    QDomDocument doc;
+    TQDomDocument doc;
     doc.setContent( in );
     in->close();
-    QDomElement docElem = doc.documentElement();
-    QDomNode summary  = docElem.namedItem("gmr:Summary");
-    QDomNode gmr_item = summary.namedItem("gmr:Item");
-    QString author;
-    QString title;
-    QString abstract;
+    TQDomElement docElem = doc.documentElement();
+    TQDomNode summary  = docElem.namedItem("gmr:Summary");
+    TQDomNode gmr_item = summary.namedItem("gmr:Item");
+    TQString author;
+    TQString title;
+    TQString abstract;
 
     while( !gmr_item.isNull() )
     {
-        QDomNode gmr_name  = gmr_item.namedItem("gmr:name");
-        QDomNode gmr_value = gmr_item.namedItem("gmr:val-string");
+        TQDomNode gmr_name  = gmr_item.namedItem("gmr:name");
+        TQDomNode gmr_value = gmr_item.namedItem("gmr:val-string");
         if (gmr_name.toElement().text() == "title")
         {
             title=gmr_value.toElement().text();
@@ -114,7 +114,7 @@ bool GnumericPlugin::readInfo( KFileMetaInfo& info, uint what)
     return true;
 }
 
-QString GnumericPlugin::stringItem( const QString &name )
+TQString GnumericPlugin::stringItem( const TQString &name )
 {
     return name.isEmpty() ? i18n("*Unknown*") : name;
 }
diff --git a/tools/kfile-plugins/gnumeric/kfile_gnumeric.h b/tools/kfile-plugins/gnumeric/kfile_gnumeric.h
index 2df2d200..deeb773c 100644
--- a/tools/kfile-plugins/gnumeric/kfile_gnumeric.h
+++ b/tools/kfile-plugins/gnumeric/kfile_gnumeric.h
@@ -22,21 +22,22 @@
 
 #include <kfilemetainfo.h>
 
-class QStringList;
-class QDomNode;
+class TQStringList;
+class TQDomNode;
 
 class GnumericPlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    GnumericPlugin( QObject *parent, const char *name, const QStringList& args );
+    GnumericPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
 
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 
 private:
     void init();
-    QString stringItem( const QString &name );
+    TQString stringItem( const TQString &name );
 };
 
 #endif
diff --git a/tools/kfile-plugins/koffice/kfile_koffice.cpp b/tools/kfile-plugins/koffice/kfile_koffice.cpp
index 03274251..2ca0b31e 100644
--- a/tools/kfile-plugins/koffice/kfile_koffice.cpp
+++ b/tools/kfile-plugins/koffice/kfile_koffice.cpp
@@ -25,18 +25,18 @@
 #include <KoStore.h>
 #include <KoStoreDevice.h>
 
-#include <qdom.h>
-#include <qfile.h>
-#include <qdatetime.h>
+#include <tqdom.h>
+#include <tqfile.h>
+#include <tqdatetime.h>
 
 typedef KGenericFactory<KOfficePlugin> KOfficeFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_koffice, KOfficeFactory( "kfile_koffice" ))
 
-KOfficePlugin::KOfficePlugin(QObject *parent, const char *name,
-                       const QStringList &args)
+KOfficePlugin::KOfficePlugin(TQObject *tqparent, const char *name,
+                       const TQStringList &args)
 
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
     makeMimeTypeInfo( "application/x-kword" );
     makeMimeTypeInfo( "application/x-kpresenter" );
@@ -55,7 +55,7 @@ KOfficePlugin::KOfficePlugin(QObject *parent, const char *name,
     makeMimeTypeInfo( "application/vnd.kde.kontour" );*/
 }
 
-void KOfficePlugin::makeMimeTypeInfo(const QString& mimeType)
+void KOfficePlugin::makeMimeTypeInfo(const TQString& mimeType)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( mimeType );
 
@@ -65,11 +65,11 @@ void KOfficePlugin::makeMimeTypeInfo(const QString& mimeType)
 
     KFileMimeTypeInfo::ItemInfo* item;
 
-    item = addItemInfo(group, "Author", i18n("Author"), QVariant::String);
+    item = addItemInfo(group, "Author", i18n("Author"), TQVariant::String);
     setHint(item, KFileMimeTypeInfo::Author);
-    item = addItemInfo(group, "Title", i18n("Title"), QVariant::String);
+    item = addItemInfo(group, "Title", i18n("Title"), TQVariant::String);
     setHint(item, KFileMimeTypeInfo::Name);
-    item = addItemInfo(group, "Abstract", i18n("Abstract"), QVariant::String);
+    item = addItemInfo(group, "Abstract", i18n("Abstract"), TQVariant::String);
     setHint(item, KFileMimeTypeInfo::Description);
 }
 
@@ -81,18 +81,18 @@ bool KOfficePlugin::readInfo( KFileMetaInfo& info, uint what)
     KFileMetaInfoGroup group = appendGroup(info, "DocumentInfo");
 
     KoStore* store = KoStore::createStore(info.path(), KoStore::Read);
-    if ( store && store->open( QString("documentinfo.xml") ) )
+    if ( store && store->open( TQString("documentinfo.xml") ) )
     {
         KoStoreDevice dev( store );
-        QDomDocument doc;
+        TQDomDocument doc;
         doc.setContent( &dev );
 
-        QDomNode authorNode = doc.namedItem("document-info").namedItem("author");
-        QDomNode aboutNode = doc.namedItem("document-info").namedItem("about");
+        TQDomNode authorNode = doc.namedItem("document-info").namedItem("author");
+        TQDomNode aboutNode = doc.namedItem("document-info").namedItem("about");
 
-        QString author = stringFromNode(authorNode, "full-name");
-        QString title = stringFromNode(aboutNode, "title");
-        QString abstract = stringFromNode(aboutNode, "abstract");
+        TQString author = stringFromNode(authorNode, "full-name");
+        TQString title = stringFromNode(aboutNode, "title");
+        TQString abstract = stringFromNode(aboutNode, "abstract");
 
         appendItem(group, "Author", author);
         appendItem(group, "Title", title);
@@ -106,9 +106,9 @@ bool KOfficePlugin::readInfo( KFileMetaInfo& info, uint what)
     return false;
 }
 
-QString KOfficePlugin::stringFromNode(const QDomNode &node, const QString &name)
+TQString KOfficePlugin::stringFromNode(const TQDomNode &node, const TQString &name)
 {
-    QString value = node.namedItem(name).toElement().text();
+    TQString value = node.namedItem(name).toElement().text();
     return value.isEmpty() ? i18n("*Unknown*") : value;
 }
 
diff --git a/tools/kfile-plugins/koffice/kfile_koffice.h b/tools/kfile-plugins/koffice/kfile_koffice.h
index e5a60c1a..6139570f 100644
--- a/tools/kfile-plugins/koffice/kfile_koffice.h
+++ b/tools/kfile-plugins/koffice/kfile_koffice.h
@@ -22,21 +22,22 @@
 
 #include <kfilemetainfo.h>
 
-class QStringList;
-class QDomNode;
+class TQStringList;
+class TQDomNode;
 
 class KOfficePlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KOfficePlugin( QObject *parent, const char *name, const QStringList& args );
+    KOfficePlugin( TQObject *tqparent, const char *name, const TQStringList& args );
 
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 
 private:
-    void makeMimeTypeInfo(const QString& mimeType);
-    QString stringFromNode(const QDomNode &node, const QString &name);
+    void makeMimeTypeInfo(const TQString& mimeType);
+    TQString stringFromNode(const TQDomNode &node, const TQString &name);
 };
 
 #endif
diff --git a/tools/kfile-plugins/ooo/kfile_ooo.cpp b/tools/kfile-plugins/ooo/kfile_ooo.cpp
index 4f16a0af..ee3a5bcc 100644
--- a/tools/kfile-plugins/ooo/kfile_ooo.cpp
+++ b/tools/kfile-plugins/ooo/kfile_ooo.cpp
@@ -45,12 +45,12 @@
 #include <KoStoreDevice.h>
 #include <kzip.h>
 #include <ktempfile.h>
-#include <qptrstack.h>
+#include <tqptrstack.h>
 
-#include <qdom.h>
-#include <qfile.h>
-#include <qdatetime.h>
-#include <qvalidator.h>
+#include <tqdom.h>
+#include <tqfile.h>
+#include <tqdatetime.h>
+#include <tqvalidator.h>
 #include <kdebug.h>
 #include <kio/netaccess.h>
 
@@ -123,22 +123,22 @@ static const char * metadocstat   = "meta:document-statistic";
 static const char * metaname      = "meta:name"    ;
 static const char * metauserdef   = "meta:user-defined";
 static const char * metafile      = "meta.xml"     ;
-KOfficePlugin::KOfficePlugin(QObject *parent, const char *name,
-                       const QStringList &args)
+KOfficePlugin::KOfficePlugin(TQObject *tqparent, const char *name,
+                       const TQStringList &args)
 
-    : KFilePlugin(parent, name, args)
+    : KFilePlugin(tqparent, name, args)
 {
    int i = 0;
    while (mimetypes[i])
     makeMimeTypeInfo( mimetypes[i++] );
 }
 
-void KOfficePlugin::makeMimeTypeInfo(const QString& mimeType)
+void KOfficePlugin::makeMimeTypeInfo(const TQString& mimeType)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( mimeType );
 
     userdefined = addGroupInfo(info, UserDefined, i18n("User Defined"));
-    addVariableInfo(userdefined, QVariant::String,
+    addVariableInfo(userdefined, TQVariant::String,
 		    KFileMimeTypeInfo::Addable   |
 		    KFileMimeTypeInfo::Removable |
 		    KFileMimeTypeInfo::Modifiable);
@@ -149,7 +149,7 @@ void KOfficePlugin::makeMimeTypeInfo(const QString& mimeType)
     int i = 0;
     for (i = 0; Information[i]; i+=2){
       item = addItemInfo(group, Information[i], i18n(Information[i+1]),
-		      QVariant::String);
+		      TQVariant::String);
       setAttributes(item, KFileMimeTypeInfo::Modifiable);
       switch (i){
 	      case 0:
@@ -165,18 +165,18 @@ void KOfficePlugin::makeMimeTypeInfo(const QString& mimeType)
     }
 
     item = addItemInfo(group, metakeyword, i18n("Keywords"),
-		       QVariant::String);
+		       TQVariant::String);
     setHint(item, KFileMimeTypeInfo::Description);
     setAttributes(item, KFileMimeTypeInfo::Modifiable);
 
     group = addGroupInfo(info, DocAdvanced, i18n("Document Advanced"));
     for (i = 0; Advanced[i]; i+=2){
       // I should add the isDate property instead of testing the index, but it works well, who cares ? :-)
-    QVariant::Type typ = QVariant::String;
+    TQVariant::Type typ = TQVariant::String;
     if (i > 1 && i < 8)
-	    typ = QVariant::DateTime;
+	    typ = TQVariant::DateTime;
     if (i == 14)
-	    typ = QVariant::String;
+	    typ = TQVariant::String;
       item = addItemInfo(group, Advanced[i], i18n(Advanced[i+1]), typ);
       setHint(item, KFileMimeTypeInfo::Description);
     }
@@ -184,7 +184,7 @@ void KOfficePlugin::makeMimeTypeInfo(const QString& mimeType)
     group = addGroupInfo(info, DocStatistics, i18n("Document Statistics"));
     for (i = 0; Statistics[i]; i+=2){
       item = addItemInfo(group, Statistics[i], i18n(Statistics[i+1]),
-		         QVariant::Int);
+		         TQVariant::Int);
       setHint(item, KFileMimeTypeInfo::Length);
     }
 }
@@ -196,7 +196,7 @@ void KOfficePlugin::makeMimeTypeInfo(const QString& mimeType)
  * @param the position to start to, updated to the next character NAN
  * @return the number parsed, 0 if number was not valid
  */
-int getNumber(QString &str, int * pos){
+int getNumber(TQString &str, int * pos){
 	int k = *pos;
 	for (int len = str.length() ;
 	     str.at(k).isNumber() && k < len ;
@@ -210,8 +210,8 @@ int getNumber(QString &str, int * pos){
 }
 
 void KOfficePlugin::getEditingTime(KFileMetaInfoGroup group1,
-		                   const char * labelid, QString & txt){
-	QString t;
+		                   const char * labelid, TQString & txt){
+	TQString t;
 	int days = 0;
 	int hours = 0;
 	int minutes = 0;
@@ -241,7 +241,7 @@ void KOfficePlugin::getEditingTime(KFileMetaInfoGroup group1,
 		int res = getNumber(txt, &pos);
 		if (pos >= len)
 			return;
-		switch (txt.at(pos).latin1()){
+		switch (txt.tqat(pos).latin1()) {
 			case 'H':
 				hours = res;
 				break;
@@ -259,13 +259,13 @@ void KOfficePlugin::getEditingTime(KFileMetaInfoGroup group1,
 	}
 	hours += days * 24;
 	appendItem(group1, labelid,
-		   i18n("%1:%2.%3").arg(hours).arg(minutes, 2).arg(seconds,2 ));
+		   i18n("%1:%2.%3").tqarg(hours).tqarg(minutes, 2).tqarg(seconds,2 ));
 }
 
 void KOfficePlugin::getDateTime(KFileMetaInfoGroup group1,
-		                const char * labelid, QString & txt)
+		                const char * labelid, TQString & txt)
 {
-	QDateTime dt = QDateTime::fromString( txt, Qt::ISODate);
+	TQDateTime dt = TQDateTime::fromString( txt, Qt::ISODate);
 	appendItem( group1, labelid, dt);
 }
 
@@ -275,20 +275,20 @@ bool KOfficePlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
         return false;
 
     KFileMetaInfoGroup group = appendGroup(info, DocumentInfo);
-    QDomDocument doc = getMetaDocument(info.path());
+    TQDomDocument doc = getMetaDocument(info.path());
     if (doc.isNull())
 	    return false;
-    QDomElement base = getBaseNode(doc).toElement();
+    TQDomElement base = getBaseNode(doc).toElement();
     if (base.isNull())
 	    return false;
     for (int i = 0; Information[i]; i+=2)
 	    appendItem(group, Information[i],
 		       stringFromNode(base, Information[i]));
     // Special case for keyword
-    QDomNodeList keywordList = base.elementsByTagName( metakeyword );
-    QString allKeywords;
+    TQDomNodeList keywordList = base.elementsByTagName( metakeyword );
+    TQString allKeywords;
     for (uint i = 0; i < keywordList.length(); i++){
-      QDomNode node = keywordList.item(i);
+      TQDomNode node = keywordList.item(i);
       if (node.isElement()){
 	if (i>0)
 		allKeywords += ", ";
@@ -300,7 +300,7 @@ bool KOfficePlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
 
     KFileMetaInfoGroup group1 = appendGroup(info, DocAdvanced);
     for (int i = 0; Advanced[i]; i+=2){
-	    QString txt = stringFromNode(base, Advanced[i]);
+	    TQString txt = stringFromNode(base, Advanced[i]);
 	    if (!txt.isEmpty()){
 		    // A silly way to do it...
 		    switch (i){
@@ -317,66 +317,66 @@ bool KOfficePlugin::readInfo( KFileMetaInfo& info, uint /*what*/)
 		   }
 	    }
 
-    QDomNode dstat = base.namedItem(metadocstat);
+    TQDomNode dstat = base.namedItem(metadocstat);
 
     KFileMetaInfoGroup group2 = appendGroup(info, DocStatistics);
     if (!dstat.isNull() && dstat.isElement()){
-	    QDomElement dinfo = dstat.toElement();
+	    TQDomElement dinfo = dstat.toElement();
     	    for (int i = 0; Statistics[i]; i+=2)
 		    addAttributeInfo(dinfo, group2, Statistics[i] );
     }
 
 
-    QDomNodeList userList = base.elementsByTagName( metauserdef );
+    TQDomNodeList userList = base.elementsByTagName( metauserdef );
 
     KFileMetaInfoGroup groupuser = appendGroup(info, UserDefined);
 
     for (uint i = 0; i < userList.length(); i++){
-      QDomNode node = userList.item(i);
+      TQDomNode node = userList.item(i);
       if (node.isElement()){
 	appendItem(groupuser,
 		   node.toElement().attribute(metaname,
-					      QString("User %1").arg(i)),
+					      TQString("User %1").tqarg(i)),
 		   node.toElement().text());
       }
     }
     return true;
 }
 
-QString KOfficePlugin::stringFromNode(const QDomNode &node, const QString &name)
+TQString KOfficePlugin::stringFromNode(const TQDomNode &node, const TQString &name)
 {
-    QString value = node.namedItem(name).toElement().text();
-    return value.isEmpty() ? QString::null : value;
+    TQString value = node.namedItem(name).toElement().text();
+    return value.isEmpty() ? TQString() : value;
 }
 
-void KOfficePlugin::addAttributeInfo(const QDomElement & elem, KFileMetaInfoGroup & group, const QString &attributeName)
+void KOfficePlugin::addAttributeInfo(const TQDomElement & elem, KFileMetaInfoGroup & group, const TQString &attributeName)
 {
   if (!elem.hasAttribute(attributeName)){
   	return;
   }
-  QString m_attribute = elem.attribute(attributeName, "0");
+  TQString m_attribute = elem.attribute(attributeName, "0");
   if (m_attribute == "0")
 	  return;
   appendItem(group, attributeName, m_attribute);
 }
 
-bool KOfficePlugin::writeTextNode(QDomDocument & doc,
-				  QDomNode & parentNode,
-				  const QString  &nodeName,
-				  const QString  &value) const
+bool KOfficePlugin::writeTextNode(TQDomDocument & doc,
+				  TQDomNode & tqparentNode,
+				  const TQString  &nodeName,
+				  const TQString  &value) const
 {
-  if (parentNode.toElement().isNull()){
+  if (tqparentNode.toElement().isNull()){
     kdDebug(7034) << "Parent node is Null or not an Element, cannot write node "
 		  << nodeName << endl;
     return false;
   }
 
   // If the node does not exist, we create it...
-  if (parentNode.namedItem(nodeName).isNull())
-    QDomNode ex = parentNode.appendChild(doc.createElement(nodeName));
+  if (tqparentNode.namedItem(nodeName).isNull())
+    TQDomNode ex = tqparentNode.appendChild(doc.createElement(nodeName));
 
   // Now, we are sure we have a node
-  QDomElement nodeA = parentNode.namedItem(nodeName).toElement();
+  TQDomElement nodeA = tqparentNode.namedItem(nodeName).toElement();
 
   // Ooops... existing node were not of the good type...
   if (nodeA.isNull()){
@@ -385,21 +385,21 @@ bool KOfficePlugin::writeTextNode(QDomDocument & doc,
     return false;
   }
 
-  QDomText txtNode = doc.createTextNode(value);
+  TQDomText txtNode = doc.createTextNode(value);
 
   // If the node has already Text Child, we replace it.
   if (nodeA.firstChild().isNull())
     nodeA.appendChild(txtNode);
   else
-    nodeA.replaceChild( txtNode, nodeA.firstChild());
+    nodeA.tqreplaceChild( txtNode, nodeA.firstChild());
   return true;
 }
 
 bool KOfficePlugin::writeInfo( const KFileMetaInfo& info) const
 {
   bool no_errors = true;
-  QDomDocument doc = getMetaDocument(info.path());
-  QDomElement base = getBaseNode(doc).toElement();
+  TQDomDocument doc = getMetaDocument(info.path());
+  TQDomElement base = getBaseNode(doc).toElement();
   if (base.isNull())
     return false;
   for (int i = 0; Information[i]; i+=2)
@@ -409,34 +409,34 @@ bool KOfficePlugin::writeInfo( const KFileMetaInfo& info) const
   // If we need a meta:keywords container, we create it.
   if (base.namedItem(metakeywords).isNull())
     base.appendChild(doc.createElement(metakeywords));
-  QDomNode metaKeyNode = base.namedItem(metakeywords);
+  TQDomNode metaKeyNode = base.namedItem(metakeywords);
 
-  QDomNodeList childs = doc.elementsByTagName(metakeyword);
+  TQDomNodeList childs = doc.elementsByTagName(metakeyword);
   for (int i = childs.length(); i >= 0; --i){
 	  metaKeyNode.removeChild( childs.item(i) );
   }
-  QStringList keywordList = QStringList::split(",", info[DocumentInfo][metakeyword].value().toString().stripWhiteSpace(), false);
-  for ( QStringList::Iterator it = keywordList.begin(); it != keywordList.end(); ++it ) {
-	QDomElement elem = doc.createElement(metakeyword);
+  TQStringList keywordList = TQStringList::split(",", info[DocumentInfo][metakeyword].value().toString().stripWhiteSpace(), false);
+  for ( TQStringList::Iterator it = keywordList.begin(); it != keywordList.end(); ++it ) {
+	TQDomElement elem = doc.createElement(metakeyword);
 	metaKeyNode.appendChild(elem);
 	elem.appendChild(doc.createTextNode((*it).stripWhiteSpace()));
     }
 
   // Now, we store the user-defined data
-  QDomNodeList theElements = base.elementsByTagName(metauserdef);
+  TQDomNodeList theElements = base.elementsByTagName(metauserdef);
   for (uint i = 0; i < theElements.length(); i++)
     {
-      QDomElement el = theElements.item(i).toElement();
+      TQDomElement el = theElements.item(i).toElement();
       if (el.isNull()){
 	kdDebug(7034) << metauserdef << " is not an Element" << endl;
 	no_errors = false;
       }
 
-      QString s = info[UserDefined][el.attribute(metaname)].value().toString();
+      TQString s = info[UserDefined][el.attribute(metaname)].value().toString();
       if (s != el.text()){
-	QDomText txt = doc.createTextNode(s);
+	TQDomText txt = doc.createTextNode(s);
 	if (!el.firstChild().isNull())
-	  el.replaceChild(txt, el.firstChild());
+	  el.tqreplaceChild(txt, el.firstChild());
 	else
 	  el.appendChild(txt);
       }
@@ -460,12 +460,12 @@ bool copyZipToZip( const KZip * src, KZip * dest)
 {
   KArchiveDirectory * src_dir;
   KArchiveFile * input_file;
-  QPtrStack<KArchiveDirectory> src_dirStack ;
-  QStringList dirEntries;
-  QStringList curDirName;
-  QStringList::Iterator it;
+  TQPtrStack<KArchiveDirectory> src_dirStack ;
+  TQStringList dirEntries;
+  TQStringList curDirName;
+  TQStringList::Iterator it;
   KArchiveEntry* curEntry;
-  QString filename = QString::null;
+  TQString filename = TQString();
 
   src_dirStack.push ( src->directory()  );
 
@@ -482,13 +482,13 @@ bool copyZipToZip( const KZip * src, KZip * dest)
 
       if (curEntry->isFile()) {
         input_file = dynamic_cast<KArchiveFile*>( curEntry );
-	QByteArray b = input_file->data();
+	TQByteArray b = input_file->data();
 	if (curDirName.isEmpty() || src_dir->name()=="/"){
 		filename = *it;
 	} else {
 		filename = curDirName.join("/") + "/" + *it;
 	}
-	dest->writeFile(filename , QString::null, QString::null, b.count(), b.data() );
+	dest->writeFile(filename , TQString(), TQString(), b.count(), b.data() );
       } else
         if (curEntry->isDirectory()) {
           src_dirStack.push( dynamic_cast<KArchiveDirectory*>( curEntry ) );
@@ -503,8 +503,8 @@ bool copyZipToZip( const KZip * src, KZip * dest)
   return true;
 }
 
-bool KOfficePlugin::writeMetaData(const QString & path,
-				  const QDomDocument &doc) const
+bool KOfficePlugin::writeMetaData(const TQString & path,
+				  const TQDomDocument &doc) const
 {
     KTempFile tmp_file;
     tmp_file.setAutoDelete(true);
@@ -513,11 +513,11 @@ bool KOfficePlugin::writeMetaData(const QString & path,
     /* To correct problem with OOo 1.1, we have to recreate the file from scratch */
     if (!m_zip->open(IO_WriteOnly) || !current->open(IO_ReadOnly) )
 	    return false;
-    QCString text = doc.toCString();
+    TQCString text = doc.toCString();
     m_zip->setCompression(KZip::DeflateCompression);
     if (!copyZipToZip(current, m_zip))
 	    return false;
-    m_zip->writeFile(metafile, QString::null, QString::null,text.length(),
+    m_zip->writeFile(metafile, TQString(), TQString(),text.length(),
 		     text);
     delete current;
     delete m_zip;
@@ -531,7 +531,7 @@ bool KOfficePlugin::writeMetaData(const QString & path,
 }
 
 
-QIODevice* KOfficePlugin::getData(KArchive &m_zip, int fileMode) const
+TQIODevice* KOfficePlugin::getData(KArchive &m_zip, int fileMode) const
 {
 
     if ( !m_zip.open(fileMode) || !m_zip.directory())
@@ -547,14 +547,14 @@ QIODevice* KOfficePlugin::getData(KArchive &m_zip, int fileMode) const
     return f->device();
 }
 
-QDomDocument KOfficePlugin::getMetaDocument(const QString &path) const
+TQDomDocument KOfficePlugin::getMetaDocument(const TQString &path) const
 {
-    QDomDocument doc;
+    TQDomDocument doc;
     KZip m_zip(path);
-    QIODevice * io = getData(m_zip, IO_ReadOnly);
+    TQIODevice * io = getData(m_zip, IO_ReadOnly);
     if (!io || !io->isReadable())
 	    return doc;
-    QString errorMsg;
+    TQString errorMsg;
     int errorLine, errorColumn;
     if ( !doc.setContent( io, &errorMsg, &errorLine, &errorColumn ) ){
       kdDebug(7034) << "Error " << errorMsg.latin1()
@@ -567,21 +567,21 @@ QDomDocument KOfficePlugin::getMetaDocument(const QString &path) const
     return doc;
 }
 
-QDomNode KOfficePlugin::getBaseNode(const QDomDocument &doc) const
+TQDomNode KOfficePlugin::getBaseNode(const TQDomDocument &doc) const
 {
     return
 	doc.namedItem("office:document-meta").namedItem("office:meta");
 }
 
-QValidator * KOfficePlugin::createValidator(const QString &,      /* mimetype */
-					    const QString & ,     /* group */
-					    const QString &key,
-					    QObject * parent,
+TQValidator * KOfficePlugin::createValidator(const TQString &,      /* mimetype */
+					    const TQString & ,     /* group */
+					    const TQString &key,
+					    TQObject * tqparent,
 					    const char * name ) const
 {
 	if (key == dclanguage)
-		return new QRegExpValidator(QRegExp("[a-zA-Z-]{1,5}"),
-					    parent, name);
+		return new TQRegExpValidator(TQRegExp("[a-zA-Z-]{1,5}"),
+					    tqparent, name);
 	return 0;
 }
 
diff --git a/tools/kfile-plugins/ooo/kfile_ooo.h b/tools/kfile-plugins/ooo/kfile_ooo.h
index 11bff4ac..9c2c3213 100644
--- a/tools/kfile-plugins/ooo/kfile_ooo.h
+++ b/tools/kfile-plugins/ooo/kfile_ooo.h
@@ -21,21 +21,22 @@
 #define __KFILE_OOO_H__
 
 #include <kfilemetainfo.h>
-#include <qiodevice.h>
-#include <qdom.h>
+#include <tqiodevice.h>
+#include <tqdom.h>
 #include <karchive.h>
-class QStringList;
-class QDomNode;
-class QDomElement;
+class TQStringList;
+class TQDomNode;
+class TQDomElement;
 
 class KOfficePlugin: public KFilePlugin
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
      * Constructor */
-    KOfficePlugin( QObject *parent, const char *name, const QStringList& args );
+    KOfficePlugin( TQObject *tqparent, const char *name, const TQStringList& args );
     /**
      * Read informations from files and store info in KFileMetaInfo.
      * We currently only parse meta.xml in OOo files.
@@ -51,27 +52,27 @@ public:
     /**
      * We need a validator, for the langage
      */
-    virtual QValidator* createValidator( const QString& mimetype,
-                                         const QString &group,
-					 const QString &key,
-					 QObject* parent,
+    virtual TQValidator* createValidator( const TQString& mimetype,
+                                         const TQString &group,
+					 const TQString &key,
+					 TQObject* tqparent,
 					 const char* name) const;
 private:
-    bool writeTextNode(QDomDocument & doc,
-		       QDomNode & parentNode,
-		       const QString  &nodeName,
-		       const QString  &value) const;
+    bool writeTextNode(TQDomDocument & doc,
+		       TQDomNode & tqparentNode,
+		       const TQString  &nodeName,
+		       const TQString  &value) const;
     KFileMimeTypeInfo::GroupInfo* userdefined;
-    void addAttributeInfo(const QDomElement & elem, KFileMetaInfoGroup & group,
-		          const QString &attributeName);
-    QIODevice* getData(KArchive &m_zip, int fileMode) const;
-    bool writeMetaData(const QString & path, const QDomDocument &doc) const;
-    QDomDocument getMetaDocument(const QString &path) const;
-    QDomNode getBaseNode(const QDomDocument &doc) const;
-    void makeMimeTypeInfo(const QString& mimeType);
-    QString stringFromNode(const QDomNode &node, const QString &name);
-    void getEditingTime(KFileMetaInfoGroup group1, const char *, QString & txt);
-    void getDateTime(KFileMetaInfoGroup group1, const char *, QString & txt);
+    void addAttributeInfo(const TQDomElement & elem, KFileMetaInfoGroup & group,
+		          const TQString &attributeName);
+    TQIODevice* getData(KArchive &m_zip, int fileMode) const;
+    bool writeMetaData(const TQString & path, const TQDomDocument &doc) const;
+    TQDomDocument getMetaDocument(const TQString &path) const;
+    TQDomNode getBaseNode(const TQDomDocument &doc) const;
+    void makeMimeTypeInfo(const TQString& mimeType);
+    TQString stringFromNode(const TQDomNode &node, const TQString &name);
+    void getEditingTime(KFileMetaInfoGroup group1, const char *, TQString & txt);
+    void getDateTime(KFileMetaInfoGroup group1, const char *, TQString & txt);
 };
 
 #endif
diff --git a/tools/kthesaurus/main.cc b/tools/kthesaurus/main.cc
index 6b50a81b..a7e74822 100644
--- a/tools/kthesaurus/main.cc
+++ b/tools/kthesaurus/main.cc
@@ -16,7 +16,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qstring.h>
+#include <tqstring.h>
 
 #include <kaboutdata.h>
 #include <kapplication.h>
@@ -59,22 +59,22 @@ extern "C" KOFFICETOOLS_EXPORT int kdemain(int argc, char **argv)
 	}
 
 /* TODO: get selection(), not only clipboard!
-	QClipboard *cb = QApplication::clipboard();
-	QString text = cb->text();
+	TQClipboard *cb = TQApplication::tqclipboard();
+	TQString text = cb->text();
 	if( text.isNull() || text.length() > 50 ) {
 		// long texts are probably not supposed to be searched for
 		text = "";
 	}
 */
-	QString text = "";
+	TQString text = "";
 	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 	if ( args->count() > 0 ) {
 		text = args->arg(0);
 	}
 
-	QString command = "thesaurus_standalone";	// 'standalone' will give us different buttons
-	QString mimetype = "text/plain";
-	QString datatype = "QString";
+	TQString command = "thesaurus_standalone";	// 'standalone' will give us different buttons
+	TQString mimetype = "text/plain";
+	TQString datatype = TQSTRING_OBJECT_NAME_STRING;
 
 	//kdDebug() << "KThesaurus command=" << command
 	//		<< " dataType=" << info->dataType() << endl;
diff --git a/tools/spell/main.cc b/tools/spell/main.cc
index 166b8a9e..275e3ee9 100644
--- a/tools/spell/main.cc
+++ b/tools/spell/main.cc
@@ -45,12 +45,12 @@ K_EXPORT_COMPONENT_FACTORY( libkspelltool, KGenericFactory<SpellChecker> )
  *
  ***************************************************/
 
-SpellChecker::SpellChecker( QObject* parent, const char* name, const QStringList & )
-    : KDataTool( parent, name )
+SpellChecker::SpellChecker( TQObject* tqparent, const char* name, const TQStringList & )
+    : KDataTool( tqparent, name )
 {
 }
 
-bool SpellChecker::run( const QString& command, void* data, const QString& datatype, const QString& mimetype )
+bool SpellChecker::run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype )
 {
     if ( command != "spellcheck" )
     {
@@ -60,9 +60,9 @@ bool SpellChecker::run( const QString& command, void* data, const QString& datat
     }
 
     // Check wether we can accept the data
-    if ( datatype != "QString" )
+    if ( datatype != TQSTRING_OBJECT_NAME_STRING )
     {
-	kdDebug(31000) << "SpellChecker only accepts datatype QString" << endl;
+	kdDebug(31000) << "SpellChecker only accepts datatype TQString" << endl;
 	return FALSE;
     }
 
@@ -73,15 +73,15 @@ bool SpellChecker::run( const QString& command, void* data, const QString& datat
     }
 
     // Get data
-    QString buffer = *((QString *)data);
+    TQString buffer = *((TQString *)data);
     buffer = buffer.stripWhiteSpace();
 
     if ( instance() )
     {
         KConfig * config = instance()->config();
-        QCString gn( "KSpell " );
+        TQCString gn( "KSpell " );
         gn += instance()->instanceName(); // for compat reasons, and to avoid finding the group in kdeglobals (hmm...)
-        QString groupName = QString::fromLatin1( gn );
+        TQString groupName = TQString::tqfromLatin1( gn );
         //kdDebug() << "Group: " << groupName << endl;
         if ( config->hasGroup( groupName ) )
         {
@@ -110,11 +110,11 @@ bool SpellChecker::run( const QString& command, void* data, const QString& datat
 #if 0 //PORT to kspell2
     // Call the spell checker
     KOSpell::modalCheck( buffer, &kosconfig );
-    *((QString*)data) = buffer;
+    *((TQString*)data) = buffer;
 #endif
 #if 0 //fixme
     // Call the spell checker
-    KSpell::spellStatus status=(KSpell::spellStatus)KSpell::modalCheck( buffer, &ksconfig );
+    KSpell::spelltqStatus status=(KSpell::spelltqStatus)KSpell::modalCheck( buffer, &ksconfig );
 
     if (status == KSpell::Error)
     {
@@ -128,7 +128,7 @@ bool SpellChecker::run( const QString& command, void* data, const QString& datat
     else
     {
         // Set data
-        *((QString*)data) = buffer;
+        *((TQString*)data) = buffer;
     }
 #endif
     return TRUE;
diff --git a/tools/spell/main.h b/tools/spell/main.h
index b096d08a..7f0c4fe4 100644
--- a/tools/spell/main.h
+++ b/tools/spell/main.h
@@ -20,17 +20,18 @@
 #ifndef __main_h__
 #define __main_h__
 
-#include <qobject.h>
+#include <tqobject.h>
 #include <kdatatool.h>
 #include <klibloader.h>
 
 class SpellChecker : public KDataTool
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SpellChecker( QObject* parent, const char* name, const QStringList & );
-    virtual bool run( const QString& command, void* data, const QString& datatype, const QString& mimetype);
+    SpellChecker( TQObject* tqparent, const char* name, const TQStringList & );
+    virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype);
 };
 
 #endif
diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc
index f12ed071..e7edffa7 100644
--- a/tools/thesaurus/main.cc
+++ b/tools/thesaurus/main.cc
@@ -33,7 +33,7 @@ TODO:
 -Maybe remove more uncommon words. However, the "polysemy/familiarity
  count" is sometimes very low for quite common word, e.g. "sky".
 
--Fix "no mimesource" warning of QTextBrowser? Seems really harmless.
+-Fix "no mimesource" warning of TQTextBrowser? Seems really harmless.
 
 NOT TODO:
 -Add part of speech information -- I think this would blow up the 
@@ -42,8 +42,8 @@ NOT TODO:
 
 #include "main.h"
 
-#include <qfile.h>
-#include <qtoolbutton.h>
+#include <tqfile.h>
+#include <tqtoolbutton.h>
 #include <kiconloader.h>
 #include <kfiledialog.h>
 #include <kdeversion.h>
@@ -62,13 +62,13 @@ K_EXPORT_COMPONENT_FACTORY( libthesaurustool, ThesaurusFactory("thesaurus_tool")
  * Thesaurus *
  ***************************************************/
 
-Thesaurus::Thesaurus(QObject* parent, const char* name, const QStringList &)
-    : KDataTool(parent, name)
+Thesaurus::Thesaurus(TQObject* tqparent, const char* name, const TQStringList &)
+    : KDataTool(tqparent, name)
 {
     
-    m_dialog = new KDialogBase(KJanusWidget::Plain, QString::null,
+    m_dialog = new KDialogBase(KJanusWidget::Plain, TQString(),
         KDialogBase::Help|KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok);
-    m_dialog->setHelp(QString::null, "thesaurus");
+    m_dialog->setHelp(TQString(), "thesaurus");
     m_dialog->resize(600, 400);
 
     m_config = new KConfig("kthesaurusrc");
@@ -85,110 +85,110 @@ Thesaurus::Thesaurus(QObject* parent, const char* name, const QStringList &)
     m_history_pos = 1;
     
     m_page = m_dialog->plainPage();
-    QVBoxLayout *m_top_layout = new QVBoxLayout(m_page, KDialog::marginHint(), KDialog::spacingHint());
+    TQVBoxLayout *m_top_layout = new TQVBoxLayout(m_page, KDialog::marginHint(), KDialog::spacingHint());
 
-    QHBoxLayout *row1 = new QHBoxLayout(m_top_layout);
+    TQHBoxLayout *row1 = new TQHBoxLayout(m_top_layout);
     m_edit = new KHistoryCombo(m_page);
-    m_edit_label = new QLabel(m_edit, i18n("&Search for:"), m_page);
+    m_edit_label = new TQLabel(m_edit, i18n("&Search for:"), m_page);
     m_search = new KPushButton(i18n("S&earch"), m_page);
-    connect(m_search, SIGNAL(clicked()),
-        this, SLOT(slotFindTerm()));
+    connect(m_search, TQT_SIGNAL(clicked()),
+        this, TQT_SLOT(slotFindTerm()));
     row1->addWidget(m_edit_label, 0);
     row1->addWidget(m_edit, 1);
     row1->addWidget(m_search, 0);
-    m_back = new QToolButton(m_page);
-    m_back->setIconSet(BarIconSet(QString::fromLatin1("back")));
-    QToolTip::add(m_back, i18n("Back"));
+    m_back = new TQToolButton(m_page);
+    m_back->setIconSet(BarIconSet(TQString::tqfromLatin1("back")));
+    TQToolTip::add(m_back, i18n("Back"));
     row1->addWidget(m_back, 0);
-    m_forward = new QToolButton(m_page);
-    m_forward->setIconSet(BarIconSet(QString::fromLatin1("forward")));
-    QToolTip::add(m_forward, i18n("Forward"));
+    m_forward = new TQToolButton(m_page);
+    m_forward->setIconSet(BarIconSet(TQString::tqfromLatin1("forward")));
+    TQToolTip::add(m_forward, i18n("Forward"));
     row1->addWidget(m_forward, 0);
     m_lang = new KPushButton(i18n("Change Language..."), m_page);
-    connect(m_lang, SIGNAL(clicked()), this, SLOT(slotChangeLanguage()));
+    connect(m_lang, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChangeLanguage()));
     row1->addWidget(m_lang, 0);
 
-    connect(m_back, SIGNAL(clicked()), this, SLOT(slotBack()));
-    connect(m_forward, SIGNAL(clicked()), this, SLOT(slotForward()));
+    connect(m_back, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBack()));
+    connect(m_forward, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotForward()));
     
-    m_tab = new QTabWidget(m_page);
+    m_tab = new TQTabWidget(m_page);
     m_top_layout->addWidget(m_tab);
 
     //
     // Thesaurus Tab
     //
     
-    vbox = new QVBox(m_tab);
+    vbox = new TQVBox(m_tab);
     m_tab->addTab(vbox, i18n("&Thesaurus"));
     vbox->setMargin(KDialog::marginHint());
     vbox->setSpacing(KDialog::spacingHint());
     
-    QHBox *hbox = new QHBox(vbox);
+    TQHBox *hbox = new TQHBox(vbox);
     hbox->setSpacing(KDialog::spacingHint());
 
-    grpbox_syn = new QGroupBox( 1, Qt::Horizontal, i18n("Synonyms"), hbox);
-    m_thes_syn = new QListBox(grpbox_syn);
+    grpbox_syn = new TQGroupBox( 1, Qt::Horizontal, i18n("Synonyms"), hbox);
+    m_thes_syn = new TQListBox(grpbox_syn);
     
-    grpbox_hyper = new QGroupBox( 1, Qt::Horizontal, i18n("More General Words"), hbox);
-    m_thes_hyper = new QListBox(grpbox_hyper);
+    grpbox_hyper = new TQGroupBox( 1, Qt::Horizontal, i18n("More General Words"), hbox);
+    m_thes_hyper = new TQListBox(grpbox_hyper);
 
-    grpbox_hypo = new QGroupBox( 1, Qt::Horizontal, i18n("More Specific Words"), hbox);
-    m_thes_hypo = new QListBox(grpbox_hypo);
+    grpbox_hypo = new TQGroupBox( 1, Qt::Horizontal, i18n("More Specific Words"), hbox);
+    m_thes_hypo = new TQListBox(grpbox_hypo);
 
     // single click -- keep display unambiguous by removing other selections:
     
-    connect(m_thes_syn, SIGNAL(clicked(QListBoxItem *)), m_thes_hyper, SLOT(clearSelection()));
-    connect(m_thes_syn, SIGNAL(clicked(QListBoxItem *)), m_thes_hypo, SLOT(clearSelection()));
-    connect(m_thes_syn, SIGNAL(selectionChanged(QListBoxItem *)),
-        this, SLOT(slotSetReplaceTerm(QListBoxItem *)));
+    connect(m_thes_syn, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_hyper, TQT_SLOT(clearSelection()));
+    connect(m_thes_syn, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_hypo, TQT_SLOT(clearSelection()));
+    connect(m_thes_syn, TQT_SIGNAL(selectionChanged(TQListBoxItem *)),
+        this, TQT_SLOT(slotSetReplaceTerm(TQListBoxItem *)));
 
-    connect(m_thes_hyper, SIGNAL(clicked(QListBoxItem *)), m_thes_syn, SLOT(clearSelection()));
-    connect(m_thes_hyper, SIGNAL(clicked(QListBoxItem *)), m_thes_hypo, SLOT(clearSelection()));
-    connect(m_thes_hyper, SIGNAL(selectionChanged(QListBoxItem *)),
-        this, SLOT(slotSetReplaceTerm(QListBoxItem *)));
+    connect(m_thes_hyper, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_syn, TQT_SLOT(clearSelection()));
+    connect(m_thes_hyper, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_hypo, TQT_SLOT(clearSelection()));
+    connect(m_thes_hyper, TQT_SIGNAL(selectionChanged(TQListBoxItem *)),
+        this, TQT_SLOT(slotSetReplaceTerm(TQListBoxItem *)));
 
-    connect(m_thes_hypo, SIGNAL(clicked(QListBoxItem *)), m_thes_syn, SLOT(clearSelection()));
-    connect(m_thes_hypo, SIGNAL(clicked(QListBoxItem *)), m_thes_hyper, SLOT(clearSelection()));
-    connect(m_thes_hypo, SIGNAL(selectionChanged(QListBoxItem *)),
-        this, SLOT(slotSetReplaceTerm(QListBoxItem *)));
+    connect(m_thes_hypo, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_syn, TQT_SLOT(clearSelection()));
+    connect(m_thes_hypo, TQT_SIGNAL(clicked(TQListBoxItem *)), m_thes_hyper, TQT_SLOT(clearSelection()));
+    connect(m_thes_hypo, TQT_SIGNAL(selectionChanged(TQListBoxItem *)),
+        this, TQT_SLOT(slotSetReplaceTerm(TQListBoxItem *)));
 
     // double click:
-    connect(m_thes_syn, SIGNAL(selected(const QString &)),
-        this, SLOT(slotFindTerm(const QString &)));
-    connect(m_thes_hyper, SIGNAL(selected(const QString &)),
-        this, SLOT(slotFindTerm(const QString &)));
-    connect(m_thes_hypo, SIGNAL(selected(const QString &)),
-        this, SLOT(slotFindTerm(const QString &)));
+    connect(m_thes_syn, TQT_SIGNAL(selected(const TQString &)),
+        this, TQT_SLOT(slotFindTerm(const TQString &)));
+    connect(m_thes_hyper, TQT_SIGNAL(selected(const TQString &)),
+        this, TQT_SLOT(slotFindTerm(const TQString &)));
+    connect(m_thes_hypo, TQT_SIGNAL(selected(const TQString &)),
+        this, TQT_SLOT(slotFindTerm(const TQString &)));
 
     //
     // WordNet Tab
     //
 
-    vbox2 = new QVBox(m_tab);
+    vbox2 = new TQVBox(m_tab);
     m_tab->addTab(vbox2, i18n("&WordNet"));
     vbox2->setMargin(KDialog::marginHint());    
     vbox2->setSpacing(KDialog::spacingHint());    
 
-    m_combobox = new QComboBox(vbox2);
+    m_combobox = new TQComboBox(vbox2);
     m_combobox->setEditable(false);
-    connect(m_combobox, SIGNAL(activated(int)), this, SLOT(slotFindTerm()));
+    connect(m_combobox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotFindTerm()));
 
-    m_resultbox = new QTextBrowser(vbox2);
-    m_resultbox->setTextFormat(Qt::RichText);
+    m_resultbox = new TQTextBrowser(vbox2);
+    m_resultbox->setTextFormat(TQt::RichText);
     // TODO?: m_resultbox->setMimeSourceFactory(...); to avoid warning
-    connect(m_resultbox, SIGNAL(linkClicked(const QString &)),
-        this, SLOT(slotFindTerm(const QString &)));
+    connect(m_resultbox, TQT_SIGNAL(linkClicked(const TQString &)),
+        this, TQT_SLOT(slotFindTerm(const TQString &)));
 
     // Connect for the history box
     m_edit->setTrapReturnKey(true);        // Do not use Return as default key...
-    connect(m_edit, SIGNAL(returnPressed(const QString&)), this, SLOT(slotFindTerm(const QString&)));
-    connect(m_edit, SIGNAL(activated(int)), this, SLOT(slotGotoHistory(int)));
+    connect(m_edit, TQT_SIGNAL(returnPressed(const TQString&)), this, TQT_SLOT(slotFindTerm(const TQString&)));
+    connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotGotoHistory(int)));
 
-    QHBoxLayout *row2 = new QHBoxLayout( m_top_layout );
-    m_replace = new KLineEdit(m_page);
-    m_replace_label = new QLabel(m_replace, i18n("&Replace with:"), m_page);
+    TQHBoxLayout *row2 = new TQHBoxLayout( m_top_layout );
+    m_tqreplace = new KLineEdit(m_page);
+    m_replace_label = new TQLabel(m_tqreplace, i18n("&Replace with:"), m_page);
     row2->addWidget(m_replace_label, 0);
-    row2->addWidget(m_replace, 1);
+    row2->addWidget(m_tqreplace, 1);
 
     // Set focus
     m_edit->setFocus();
@@ -200,19 +200,19 @@ Thesaurus::Thesaurus(QObject* parent, const char* name, const QStringList &)
     
     // calling the 'wn' binary
     m_wnproc = new KProcess;
-    connect(m_wnproc, SIGNAL(processExited(KProcess*)), this, SLOT(wnExited(KProcess*)));
-    connect(m_wnproc, SIGNAL(receivedStdout(KProcess*,char*,int)),
-        this, SLOT(receivedWnStdout(KProcess*, char*, int)));
-    connect(m_wnproc, SIGNAL(receivedStderr(KProcess*,char*,int)),
-        this, SLOT(receivedWnStderr(KProcess*, char*, int)));
+    connect(m_wnproc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(wnExited(KProcess*)));
+    connect(m_wnproc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
+        this, TQT_SLOT(receivedWnStdout(KProcess*, char*, int)));
+    connect(m_wnproc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
+        this, TQT_SLOT(receivedWnStderr(KProcess*, char*, int)));
 
     // grep'ing the text file
     m_thesproc = new KProcess;
-    connect(m_thesproc, SIGNAL(processExited(KProcess*)), this, SLOT(thesExited(KProcess*)));
-    connect(m_thesproc, SIGNAL(receivedStdout(KProcess*,char*,int)),
-        this, SLOT(receivedThesStdout(KProcess*, char*, int)));
-    connect(m_thesproc, SIGNAL(receivedStderr(KProcess*,char*,int)),
-        this, SLOT(receivedThesStderr(KProcess*, char*, int)));
+    connect(m_thesproc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(thesExited(KProcess*)));
+    connect(m_thesproc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
+        this, TQT_SLOT(receivedThesStdout(KProcess*, char*, int)));
+    connect(m_thesproc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
+        this, TQT_SLOT(receivedThesStderr(KProcess*, char*, int)));
 
 }
 
@@ -225,19 +225,19 @@ Thesaurus::~Thesaurus()
     // FIXME?: this hopefully fixes the problem of a wrong cursor
     // and a crash (when closing e.g. konqueror) when the thesaurus dialog 
     // gets close while it was still working and showing the wait cursor
-    QApplication::restoreOverrideCursor();
+    TQApplication::restoreOverrideCursor();
     delete m_thesproc;
     delete m_wnproc;
     delete m_dialog;
 }
 
 
-bool Thesaurus::run(const QString& command, void* data, const QString& datatype, const QString& mimetype)
+bool Thesaurus::run(const TQString& command, void* data, const TQString& datatype, const TQString& mimetype)
 {
 
     // Check whether we can accept the data
-    if ( datatype != "QString" ) {
-        kdDebug(31000) << "Thesaurus only accepts datatype QString" << endl;
+    if ( datatype != TQSTRING_OBJECT_NAME_STRING ) {
+        kdDebug(31000) << "Thesaurus only accepts datatype TQString" << endl;
         return FALSE;
     }
     if ( mimetype != "text/plain" ) {
@@ -255,7 +255,7 @@ bool Thesaurus::run(const QString& command, void* data, const QString& datatype,
         m_replacement = false;
         m_dialog->showButtonOK(false);
         m_dialog->setButtonCancelText(i18n("&Close"));
-        m_replace->setEnabled(false);
+        m_tqreplace->setEnabled(false);
         m_replace_label->setEnabled(false);
     } else {
         kdDebug(31000) << "Thesaurus does only accept the command 'thesaurus' or 'thesaurus_standalone'" << endl;
@@ -264,9 +264,9 @@ bool Thesaurus::run(const QString& command, void* data, const QString& datatype,
     }
 
     // Get data and clean it up:
-    QString buffer = *((QString *)data);
+    TQString buffer = *((TQString *)data);
     buffer = buffer.stripWhiteSpace();
-    QRegExp re("[.,;!?\"'()\\[\\]]");
+    TQRegExp re("[.,;!?\"'()\\[\\]]");
     buffer.remove(re);
     buffer = buffer.left(100);        // limit maximum length
 
@@ -280,8 +280,8 @@ bool Thesaurus::run(const QString& command, void* data, const QString& datatype,
         slotFindTerm(buffer);
     }
 
-    if( m_dialog->exec() == QDialog::Accepted ) {    // "Replace"
-        *((QString*)data) = m_replace->text();
+    if( m_dialog->exec() == TQDialog::Accepted ) {    // "Replace"
+        *((TQString*)data) = m_tqreplace->text();
     }
 
     return TRUE;
@@ -290,7 +290,7 @@ bool Thesaurus::run(const QString& command, void* data, const QString& datatype,
 
 void Thesaurus::slotChangeLanguage()
 {
-    QString filename = KFileDialog::getOpenFileName(
+    TQString filename = KFileDialog::getOpenFileName(
         KGlobal::dirs()->findResourceDir("data", "thesaurus/")+"thesaurus/");
     if( !filename.isNull() ) {
         m_data_file = filename;
@@ -302,7 +302,7 @@ void Thesaurus::setCaption()
 {
     KURL url = KURL();
     url.setPath(m_data_file);
-    m_dialog->setCaption(i18n("Related Words - %1").arg(url.fileName()));
+    m_dialog->setCaption(i18n("Related Words - %1").tqarg(url.fileName()));
 }
 
 // Enbale or disable back and forward button
@@ -346,17 +346,17 @@ void Thesaurus::slotForward()
 }
 
 // Triggered when a word is selected in the list box.
-void Thesaurus::slotSetReplaceTerm(QListBoxItem *item)
+void Thesaurus::slotSetReplaceTerm(TQListBoxItem *item)
 {
     if( ! item )
         return;
-    m_replace->setText(item->text());
+    m_tqreplace->setText(item->text());
 }
 
-void Thesaurus::slotSetReplaceTerm(const QString &term)
+void Thesaurus::slotSetReplaceTerm(const TQString &term)
 {
     if( m_replacement && term != m_no_match ) {
-        m_replace->setText(term);
+        m_tqreplace->setText(term);
     }
 }
 
@@ -367,7 +367,7 @@ void Thesaurus::slotFindTerm()
 }
 
 // Triggered when a word is clicked / a list item is double-clicked.
-void Thesaurus::slotFindTerm(const QString &term, bool add_to_history)
+void Thesaurus::slotFindTerm(const TQString &term, bool add_to_history)
 {
     slotSetReplaceTerm(term);
     if( term.startsWith("http://") ) {
@@ -383,7 +383,7 @@ void Thesaurus::slotFindTerm(const QString &term, bool add_to_history)
     }
 }
 
-void Thesaurus::findTerm(const QString &term)
+void Thesaurus::findTerm(const TQString &term)
 {
     findTermThesaurus(term);
     findTermWordnet(term);
@@ -393,31 +393,31 @@ void Thesaurus::findTerm(const QString &term)
 //
 // Thesaurus
 //
-void Thesaurus::findTermThesaurus(const QString &term)
+void Thesaurus::findTermThesaurus(const TQString &term)
 {
 
-    if( !QFile::exists(m_data_file) ) {
+    if( !TQFile::exists(m_data_file) ) {
         KMessageBox::error(0, i18n("The thesaurus file '%1' was not found. "
             "Please use 'Change Language...' to select a thesaurus file.").
             arg(m_data_file));
         return;
     }
 
-    QApplication::setOverrideCursor(KCursor::waitCursor());
+    TQApplication::setOverrideCursor(KCursor::waitCursor());
 
     m_thesproc_stdout = "";
     m_thesproc_stderr = "";
     
     // Find only whole words. Looks clumsy, but this way we don't have to rely on
     // features that might only be in certain versions of grep:
-    QString term_tmp = ";" + term.stripWhiteSpace() + ";";
+    TQString term_tmp = ";" + term.stripWhiteSpace() + ";";
     m_thesproc->clearArguments();
     *m_thesproc << "grep" << "-i" << term_tmp;
     *m_thesproc << m_data_file;
 
     if( !m_thesproc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) {
         KMessageBox::error(0, i18n("Failed to execute grep."));
-        QApplication::restoreOverrideCursor();
+        TQApplication::restoreOverrideCursor();
         return;
     }
 }
@@ -429,49 +429,49 @@ void Thesaurus::thesExited(KProcess *)
 
     if( !m_thesproc_stderr.isEmpty() ) {
         KMessageBox::error(0, i18n("<b>Error:</b> Failed to execute grep. "
-          "Output:<br>%1").arg(m_thesproc_stderr));
-        QApplication::restoreOverrideCursor();
+          "Output:<br>%1").tqarg(m_thesproc_stderr));
+        TQApplication::restoreOverrideCursor();
         return;
     }
 
-    QString search_term = m_edit->currentText().stripWhiteSpace();
+    TQString search_term = m_edit->currentText().stripWhiteSpace();
     
-    QStringList syn;
-    QStringList hyper;
-    QStringList hypo;
+    TQStringList syn;
+    TQStringList hyper;
+    TQStringList hypo;
 
-    QStringList lines = lines.split(QChar('\n'), m_thesproc_stdout, false);
-    for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) {
-        QString line = (*it);
+    TQStringList lines = lines.split(TQChar('\n'), m_thesproc_stdout, false);
+    for ( TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) {
+        TQString line = (*it);
         if( line.startsWith("  ") ) {  // ignore license (two spaces)
             continue;
         }
-        int sep_pos = line.find("#");
-        QString syn_part = line.left(sep_pos);
-        QString hyper_part = line.right(line.length()-sep_pos-1);
-        QStringList syn_tmp = QStringList::split(QChar(';'), syn_part);
-        QStringList hyper_tmp = QStringList::split(QChar(';'), hyper_part);
+        int sep_pos = line.tqfind("#");
+        TQString syn_part = line.left(sep_pos);
+        TQString hyper_part = line.right(line.length()-sep_pos-1);
+        TQStringList syn_tmp = TQStringList::split(TQChar(';'), syn_part);
+        TQStringList hyper_tmp = TQStringList::split(TQChar(';'), hyper_part);
         if( syn_tmp.grep(search_term, false).size() > 0 ) {
             // match on the left side of the '#' -- synonyms
-            for ( QStringList::Iterator it2 = syn_tmp.begin(); it2 != syn_tmp.end(); ++it2 ) {
+            for ( TQStringList::Iterator it2 = syn_tmp.begin(); it2 != syn_tmp.end(); ++it2 ) {
                 // add if it's not the term itself and if it's not yet in the list
-                QString term = (*it2);
-                if( term.lower() != search_term.lower() && syn.contains(term) == 0 ) {
+                TQString term = (*it2);
+                if( term.lower() != search_term.lower() && syn.tqcontains(term) == 0 ) {
                     syn.append(term);
                 }
             }
-            for ( QStringList::Iterator it2 = hyper_tmp.begin(); it2 != hyper_tmp.end(); ++it2 ) {
-                QString term = (*it2);
-                if( term.lower() != search_term.lower() && hyper.contains(term) == 0 ) {
+            for ( TQStringList::Iterator it2 = hyper_tmp.begin(); it2 != hyper_tmp.end(); ++it2 ) {
+                TQString term = (*it2);
+                if( term.lower() != search_term.lower() && hyper.tqcontains(term) == 0 ) {
                     hyper.append(term);
                 }
             }
         }
         if( hyper_tmp.grep(search_term, false).size() > 0 ) {
             // match on the right side of the '#' -- hypernyms
-            for ( QStringList::Iterator it2 = syn_tmp.begin(); it2 != syn_tmp.end(); ++it2 ) {
-                QString term = (*it2);
-                if( term.lower() != search_term && hypo.contains(term) == 0 ) {
+            for ( TQStringList::Iterator it2 = syn_tmp.begin(); it2 != syn_tmp.end(); ++it2 ) {
+                TQString term = (*it2);
+                if( term.lower() != search_term && hypo.tqcontains(term) == 0 ) {
                     hypo.append(term);
                 }
             }
@@ -480,7 +480,7 @@ void Thesaurus::thesExited(KProcess *)
 
     m_thes_syn->clear();
     if( syn.size() > 0 ) {
-        syn = sortQStringList(syn);
+        syn = sortTQStringList(syn);
         m_thes_syn->insertStringList(syn);
         m_thes_syn->setEnabled(true);
     } else {
@@ -490,7 +490,7 @@ void Thesaurus::thesExited(KProcess *)
     
     m_thes_hyper->clear();
     if( hyper.size() > 0 ) {
-        hyper = sortQStringList(hyper);
+        hyper = sortTQStringList(hyper);
         m_thes_hyper->insertStringList(hyper);
         m_thes_hyper->setEnabled(true);
     } else {
@@ -500,7 +500,7 @@ void Thesaurus::thesExited(KProcess *)
 
     m_thes_hypo->clear();
     if( hypo.size() > 0 ) {
-        hypo = sortQStringList(hypo);
+        hypo = sortTQStringList(hypo);
         m_thes_hypo->insertStringList(hypo);
         m_thes_hypo->setEnabled(true);
     } else {
@@ -508,26 +508,26 @@ void Thesaurus::thesExited(KProcess *)
         m_thes_hypo->setEnabled(false);
     }
 
-    QApplication::restoreOverrideCursor();
+    TQApplication::restoreOverrideCursor();
 }
 
 void Thesaurus::receivedThesStdout(KProcess *, char *result, int len)
 {
-    m_thesproc_stdout += QString::fromLocal8Bit( QCString(result, len+1) );
+    m_thesproc_stdout += TQString::fromLocal8Bit( TQCString(result, len+1) );
 }
 
 void Thesaurus::receivedThesStderr(KProcess *, char *result, int len)
 {
-    m_thesproc_stderr += QString::fromLocal8Bit( QCString(result, len+1) );
+    m_thesproc_stderr += TQString::fromLocal8Bit( TQCString(result, len+1) );
 }
 
 
 //
 // WordNet
 //
-void Thesaurus::findTermWordnet(const QString &term)
+void Thesaurus::findTermWordnet(const TQString &term)
 {
-    QApplication::setOverrideCursor(KCursor::waitCursor());
+    TQApplication::setOverrideCursor(KCursor::waitCursor());
 
     m_wnproc_stdout = "";
     m_wnproc_stderr = "";
@@ -590,10 +590,10 @@ void Thesaurus::findTermWordnet(const QString &term)
     m_combobox->insertItem(i18n("Synonyms/Hypernyms - Ordered by Frequency"));
     m_combobox->insertItem(i18n("Synonyms - Ordered by Similarity of Meaning (verbs only)"));
     m_combobox->insertItem(i18n("Antonyms - Words with Opposite Meanings"));
-    m_combobox->insertItem(i18n("Hyponyms - ... is a (kind of) %1").arg(m_edit->currentText()));
-    m_combobox->insertItem(i18n("Meronyms - %1 has a ...").arg(m_edit->currentText()));
+    m_combobox->insertItem(i18n("Hyponyms - ... is a (kind of) %1").tqarg(m_edit->currentText()));
+    m_combobox->insertItem(i18n("Meronyms - %1 has a ...").tqarg(m_edit->currentText()));
     // 5:
-    m_combobox->insertItem(i18n("Holonyms - ... has a %1").arg(m_edit->currentText()));
+    m_combobox->insertItem(i18n("Holonyms - ... has a %1").tqarg(m_edit->currentText()));
     m_combobox->insertItem(i18n("Attributes"));
     m_combobox->insertItem(i18n("Cause To (for some verbs only)"));
     m_combobox->insertItem(i18n("Verb Entailment (for some verbs only)"));
@@ -604,7 +604,7 @@ void Thesaurus::findTermWordnet(const QString &term)
     m_combobox->insertItem(i18n("Overview of Senses"));
 
     /** NOT todo:
-      * -Hypernym tree: layout is difficult, you can get the same information
+      * -Hypernym tree: tqlayout is difficult, you can get the same information
       *  by following links
       * -Coordinate terms (sisters): just go to synset and then use hyponyms
       * -Has Part Meronyms, Has Substance Meronyms, Has Member Meronyms,
@@ -624,7 +624,7 @@ void Thesaurus::findTermWordnet(const QString &term)
     if( m_wnproc->isRunning() ) {
         // should never happen
         kdDebug(31000) << "Warning: findTerm(): process is already running?!" << endl;
-        QApplication::restoreOverrideCursor();
+        TQApplication::restoreOverrideCursor();
         return;
     }
 
@@ -636,48 +636,48 @@ void Thesaurus::findTermWordnet(const QString &term)
             "http://www.cogsci.princeton.edu/~wn/</a>. Note that WordNet only supports "
             "the English language."));
         m_combobox->setEnabled(false);
-        QApplication::restoreOverrideCursor();
+        TQApplication::restoreOverrideCursor();
         return;
     }
 
 }
 
-// The process has ended, so parse its result and display it as Qt richtext.
+// The process has ended, so parse its result and display it as TQt richtext.
 void Thesaurus::wnExited(KProcess *)
 {
     
     if( !m_wnproc_stderr.isEmpty() ) {
         m_resultbox->setText(i18n("<b>Error:</b> Failed to execute WordNet program 'wn'. "
-          "Output:<br>%1").arg(m_wnproc_stderr));
-        QApplication::restoreOverrideCursor();
+          "Output:<br>%1").tqarg(m_wnproc_stderr));
+        TQApplication::restoreOverrideCursor();
         return;
     }
 
     if( m_wnproc_stdout.isEmpty() ) {
-        m_resultbox->setText(i18n("No match for '%1'.").arg(m_edit->currentText()));
+        m_resultbox->setText(i18n("No match for '%1'.").tqarg(m_edit->currentText()));
     } else {
         // render in a table, each line one row:
-        QStringList lines = lines.split(QChar('\n'), m_wnproc_stdout, false);
-        QString result = "<qt><table>\n";
-        // TODO in Qt > 3.01: try without the following line (it's necessary to ensure the
+        TQStringList lines = lines.split(TQChar('\n'), m_wnproc_stdout, false);
+        TQString result = "<qt><table>\n";
+        // TODO in TQt > 3.01: try without the following line (it's necessary to ensure the
         // first column is really always quite small):
         result += "<tr><td width=\"10%\"></td><td width=\"90%\"></td></tr>\n";
         uint ct = 0;
-        for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) {
-            QString l = (*it);
+        for ( TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) {
+            TQString l = (*it);
             // Remove some lines:
-            QRegExp re("^\\d+( of \\d+)? senses? of \\w+");
+            TQRegExp re("^\\d+( of \\d+)? senses? of \\w+");
             if( re.search(l) != -1 ) {
                 continue;
             }
             // Escape XML:
-            l = l.replace('&', "&amp;");
-            l = l.replace('<', "&lt;");
-            l = l.replace('>', "&gt;");
+            l = l.tqreplace('&', "&amp;");
+            l = l.tqreplace('<', "&lt;");
+            l = l.tqreplace('>', "&gt;");
             // TODO?: 
             // move "=>" in own column?
             l = formatLine(l);
-            // Table layout:
+            // Table tqlayout:
             result += "<tr>";
             if( l.startsWith(" ") ) {
                 result += "\t<td width=\"15\"></td>";
@@ -696,17 +696,17 @@ void Thesaurus::wnExited(KProcess *)
         //kdDebug() << result << endl;
     }
     
-    QApplication::restoreOverrideCursor();
+    TQApplication::restoreOverrideCursor();
 }
 
 void Thesaurus::receivedWnStdout(KProcess *, char *result, int len)
 {
-    m_wnproc_stdout += QString::fromLocal8Bit( QCString(result, len+1) );
+    m_wnproc_stdout += TQString::fromLocal8Bit( TQCString(result, len+1) );
 }
 
 void Thesaurus::receivedWnStderr(KProcess *, char *result, int len)
 {
-    m_wnproc_stderr += QString::fromLocal8Bit( QCString(result, len+1) );
+    m_wnproc_stderr += TQString::fromLocal8Bit( TQCString(result, len+1) );
 }
 
 
@@ -714,15 +714,15 @@ void Thesaurus::receivedWnStderr(KProcess *, char *result, int len)
 // Tools
 //
 
-// Format lines using Qt's simple richtext.
-QString Thesaurus::formatLine(QString l)
+// Format lines using TQt's simple richtext.
+TQString Thesaurus::formatLine(TQString l)
 {
     
     if( l == "--------------" ) {
-        return QString("<hr>");
+        return TQString("<hr>");
     }
     
-    QRegExp re;
+    TQRegExp re;
 
     re.setPattern("^(\\d+\\.)(.*)$");
     if( re.search(l) != -1 ) {
@@ -738,7 +738,7 @@ QString Thesaurus::formatLine(QString l)
 
     if( m_mode == grep ) {
         l = l.stripWhiteSpace();
-        return QString("<a href=\"" +l+ "\">" +l+ "</a>");
+        return TQString("<a href=\"" +l+ "\">" +l+ "</a>");
     }
 
     re.setPattern("^(Sense \\d+)");
@@ -752,14 +752,14 @@ QString Thesaurus::formatLine(QString l)
     if( re.search(l) != -1 ) {
         l = re.cap(1);
         l += re.cap(2);
-        QStringList links = links.split(QChar(';'), re.cap(3), false);
-        for ( QStringList::Iterator it = links.begin(); it != links.end(); ++it ) {
-            QString link = (*it);
+        TQStringList links = links.split(TQChar(';'), re.cap(3), false);
+        for ( TQStringList::Iterator it = links.begin(); it != links.end(); ++it ) {
+            TQString link = (*it);
             if( it != links.begin() ) {
                 l += ", ";
             }
             link = link.stripWhiteSpace();
-            link = link.remove(QRegExp("#\\d+"));
+            link = link.remove(TQRegExp("#\\d+"));
             l += "<a href=\"" +link+ "\">" +link+ "</a>";
         }
         l.prepend (' ');        // indent in table
@@ -768,13 +768,13 @@ QString Thesaurus::formatLine(QString l)
     re.setPattern("(.*)(=&gt;|HAS \\w+:|PART OF:)(.*) --");
     re.setMinimal(true);    // non-greedy
     if( re.search(l) != -1 ) {
-        int dash_pos = l.find("--");
-        QString line_end = l.mid(dash_pos+2, l.length()-dash_pos);
+        int dash_pos = l.tqfind("--");
+        TQString line_end = l.mid(dash_pos+2, l.length()-dash_pos);
         l = re.cap(1);
         l += re.cap(2) + " ";
-        QStringList links = links.split(QChar(','), re.cap(3), false);
-        for ( QStringList::Iterator it = links.begin(); it != links.end(); ++it ) {
-            QString link = (*it);
+        TQStringList links = links.split(TQChar(','), re.cap(3), false);
+        for ( TQStringList::Iterator it = links.begin(); it != links.end(); ++it ) {
+            TQString link = (*it);
             if( it != links.begin() ) {
                 l += ", ";
             }
@@ -795,18 +795,18 @@ QString Thesaurus::formatLine(QString l)
  * Be careful: @p list is modified
  * TODO: use ksortablevaluelist?
  */
-QStringList Thesaurus::sortQStringList(QStringList list)
+TQStringList Thesaurus::sortTQStringList(TQStringList list)
 {
-    // Sort list case-insensitive. This looks strange but using a QMap
-    // is even suggested by the Qt documentation.
-    QMap<QString,QString> map_list;
-    for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
-        QString str = *it;
+    // Sort list case-insensitive. This looks strange but using a TQMap
+    // is even suggested by the TQt documentation.
+    TQMap<TQString,TQString> map_list;
+    for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+        TQString str = *it;
         map_list[str.lower()] = str;
     }
     list.clear();
-    QMap<QString,QString>::Iterator it;
-    // Qt doc: "the items are alphabetically sorted [by key] when iterating over the map":
+    TQMap<TQString,TQString>::Iterator it;
+    // TQt doc: "the items are alphabetically sorted [by key] when iterating over the map":
     for( it = map_list.begin(); it != map_list.end(); ++it ) {
         list.append(it.data());
     }
diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h
index 7354bf73..9225bb55 100644
--- a/tools/thesaurus/main.h
+++ b/tools/thesaurus/main.h
@@ -23,22 +23,22 @@
 #ifndef __main_h__
 #define __main_h__
 
-#include <qapplication.h>
-#include <qcombobox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlistbox.h>
-#include <qobject.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qtabdialog.h>
-#include <qtabwidget.h>
-#include <qtextbrowser.h>
-#include <qtooltip.h>
-#include <qwidget.h>
-#include <qvbox.h>
+#include <tqapplication.h>
+#include <tqcombobox.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlistbox.h>
+#include <tqobject.h>
+#include <tqregexp.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqtabdialog.h>
+#include <tqtabwidget.h>
+#include <tqtextbrowser.h>
+#include <tqtooltip.h>
+#include <tqwidget.h>
+#include <tqvbox.h>
 
 #include <kapplication.h>
 #include <kcombobox.h>
@@ -58,29 +58,30 @@
 #include <kstandarddirs.h>
 #include <kurl.h>
 
-class QToolButton;
+class TQToolButton;
 
 class Thesaurus : public KDataTool
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    Thesaurus(QObject* parent, const char* name, const QStringList &);
+    Thesaurus(TQObject* tqparent, const char* name, const TQStringList &);
     ~Thesaurus();
-    virtual bool run(const QString& command, void* data,
-        const QString& datatype, const QString& mimetype);
+    virtual bool run(const TQString& command, void* data,
+        const TQString& datatype, const TQString& mimetype);
 
 protected slots:
     void slotChangeLanguage();
 
     void slotFindTerm();
-    void slotFindTerm(const QString &term, bool add_to_history = true);
+    void slotFindTerm(const TQString &term, bool add_to_history = true);
 
     void slotUpdateNavButtons();
     void slotGotoHistory(int index);
 
-    void slotSetReplaceTerm(QListBoxItem *item);
-    void slotSetReplaceTerm(const QString &term);
+    void slotSetReplaceTerm(TQListBoxItem *item);
+    void slotSetReplaceTerm(const TQString &term);
 
     void slotBack();
     void slotForward();
@@ -95,20 +96,20 @@ protected slots:
 
 protected:
     enum Mode {grep, other};
-    void findTerm(const QString &term);
-    void findTermThesaurus(const QString &term);
-    void findTermWordnet(const QString &term);
-    QString formatLine(QString l);
+    void findTerm(const TQString &term);
+    void findTermThesaurus(const TQString &term);
+    void findTermWordnet(const TQString &term);
+    TQString formatLine(TQString l);
 
 /** 
  * Sort a list case insensitively.
  * Be careful: @p list is modified
  * TODO: use ksortablevaluelist?
  */
-    QStringList sortQStringList(QStringList list);
+    TQStringList sortTQStringList(TQStringList list);
     void setCaption();
 
-    QString m_no_match;
+    TQString m_no_match;
 
     int m_history_pos;
 
@@ -117,47 +118,47 @@ protected:
     KConfig *m_config;
 
     KProcess *m_thesproc;
-    QString m_thesproc_stdout;
-    QString m_thesproc_stderr;
+    TQString m_thesproc_stdout;
+    TQString m_thesproc_stderr;
 
     KProcess *m_wnproc;
-    QString m_wnproc_stdout;
-    QString m_wnproc_stderr;
+    TQString m_wnproc_stdout;
+    TQString m_wnproc_stderr;
 
     Mode m_mode;
 
-    QFrame *m_page;
-    QVBoxLayout *m_top_layout;
+    TQFrame *m_page;
+    TQVBoxLayout *m_top_layout;
 
     KDialogBase *m_dialog;
-    QTabWidget *m_tab;
-    QVBox *vbox;
-    QVBox *vbox2;
+    TQTabWidget *m_tab;
+    TQVBox *vbox;
+    TQVBox *vbox2;
 
-    QToolButton *m_back;
-    QToolButton *m_forward;
+    TQToolButton *m_back;
+    TQToolButton *m_forward;
     KPushButton *m_lang;
 
     KPushButton *m_search;
     KHistoryCombo *m_edit;
-    QLabel *m_edit_label;
+    TQLabel *m_edit_label;
 
-    QLabel *m_replace_label;
-    KLineEdit *m_replace;
+    TQLabel *m_replace_label;
+    KLineEdit *m_tqreplace;
 
-    QString m_data_file;
+    TQString m_data_file;
 
     // WordNet:
-    QTextBrowser *m_resultbox;
-    QComboBox *m_combobox;
+    TQTextBrowser *m_resultbox;
+    TQComboBox *m_combobox;
 
     // Thesaurus:
-    QGroupBox *grpbox_syn;
-    QListBox *m_thes_syn;
-    QGroupBox *grpbox_hyper;
-    QListBox *m_thes_hyper;
-    QGroupBox *grpbox_hypo;
-    QListBox *m_thes_hypo;
+    TQGroupBox *grpbox_syn;
+    TQListBox *m_thes_syn;
+    TQGroupBox *grpbox_hyper;
+    TQListBox *m_thes_hyper;
+    TQGroupBox *grpbox_hypo;
+    TQListBox *m_thes_hypo;
 };
 
 #endif
diff --git a/tools/thesaurus/thesaurus.txt b/tools/thesaurus/thesaurus.txt
index 46a84ea7..b5fe7799 100644
--- a/tools/thesaurus/thesaurus.txt
+++ b/tools/thesaurus/thesaurus.txt
@@ -567,9 +567,9 @@
 ;commercial;#;commercialized;commercialised;mercantile;business;mercantile;mercenary;moneymaking;technical;technical;trade;
 ;technical;#;commercial;
 ;technical;#;commercial;
-;common;#;average;ordinary;democratic;popular;demotic;frequent;general;grassroots;standard;
+;common;#;average;ordinary;detqmocratic;popular;demotic;frequent;general;grassroots;standard;
 ;average;ordinary;#;common;
-;democratic;popular;#;common;
+;detqmocratic;popular;#;common;
 ;frequent;#;common;
 ;general;#;common;
 ;standard;#;common;
@@ -844,13 +844,13 @@
 ;clamant;crying;exigent;insistent;instant;#;imperative;
 ;desperate;#;imperative;
 ;pressing;urgent;#;imperative;
-;democratic;#;antiauthoritarian;classless;egalitarian;direct;parliamentary;parliamentary;participatory;popular;representative;republican;
-;direct;#;democratic;
-;parliamentary;#;democratic;
-;parliamentary;#;democratic;
-;popular;#;democratic;
-;representative;#;democratic;
-;republican;#;democratic;
+;detqmocratic;#;antiauthoritarian;classless;egalitarian;direct;parliamentary;parliamentary;participatory;popular;representative;republican;
+;direct;#;detqmocratic;
+;parliamentary;#;detqmocratic;
+;parliamentary;#;detqmocratic;
+;popular;#;detqmocratic;
+;representative;#;detqmocratic;
+;republican;#;detqmocratic;
 ;arbitrary;#;absolute;capricious;impulsive;whimsical;discretionary;discretional;
 ;absolute;#;arbitrary;
 ;effusive;emotional;gushing;gushy;#;demonstrative;
@@ -1127,7 +1127,7 @@
 ;expensive;#;big-ticket;high-ticket;costly;dear;high-priced;pricey;pricy;dearly-won;costly;overpriced;
 ;costly;dear;high-priced;pricey;pricy;#;expensive;
 ;dearly-won;costly;#;expensive;
-;cheap;inexpensive;#;bargain;cut-rate;cut-price;bargain-priced;cut-rate;cut-price;democratization;democratisation;dirt cheap;low-cost;low-priced;affordable;nickel-and-dime;sixpenny;threepenny;twopenny;tuppeny;two-a-penny;twopenny-halfpenny;
+;cheap;inexpensive;#;bargain;cut-rate;cut-price;bargain-priced;cut-rate;cut-price;detqmocratization;detqmocratisation;dirt cheap;low-cost;low-priced;affordable;nickel-and-dime;sixpenny;threepenny;twopenny;tuppeny;two-a-penny;twopenny-halfpenny;
 ;bargain;cut-rate;cut-price;#;cheap;inexpensive;
 ;experienced;#;full-fledged;fully fledged;initiate;initiated;intimate;intimate with;knowledgeable;knowledgeable about;old;older;practiced;practised;seasoned;veteran;
 ;initiate;initiated;#;experienced;
@@ -1877,9 +1877,9 @@
 ;hushed;muted;subdued;quiet;#;soft;
 ;little;small;#;soft;
 ;low;low-toned;#;soft;
-;full;#;booming;stentorian;grumbling;rumbling;plangent;rich;orotund;rotund;round;pear-shaped;sounding;heavy;sonorous;
+;full;#;booming;stentorian;grumbling;rumbling;plangent;rich;orotund;rotund;round;pear-tqshaped;sounding;heavy;sonorous;
 ;rich;#;full;
-;orotund;rotund;round;pear-shaped;#;full;
+;orotund;rotund;round;pear-tqshaped;#;full;
 ;heavy;sonorous;#;full;
 ;thin;#;pale;
 ;pale;#;thin;
@@ -2035,7 +2035,7 @@
 ;at rest;inactive;motionless;static;still;#;nonmoving;unmoving;
 ;fixed;set;rigid;#;nonmoving;unmoving;
 ;mown;cut;#
-;continental;#;phragmocone;phragmacone;transcontinental;
+;continental;#;phragtqmocone;phragmacone;transcontinental;
 ;worldwide;#;intercontinental;
 ;national;#;nationalist;nationalistic;
 ;nationalist;nationalistic;#;national;
@@ -2115,8 +2115,8 @@
 ;subjective;#;personal;prejudiced;unobjective;unverifiable;
 ;personal;#;subjective;
 ;bound;compelled;constrained;obligate;#;obligated;
-;obvious;#;apparent;evident;manifest;patent;plain;axiomatic;self-evident;taken for granted;demonstrable;provable;frank;open-and-shut;self-explanatory;transparent;under one's nose;under my nose;under his nose;under her nose;under your nose;under our noses;writ large;
-;apparent;evident;manifest;patent;plain;#;obvious;
+;obvious;#;aptqparent;evident;manifest;patent;plain;axiomatic;self-evident;taken for granted;demonstrable;provable;frank;open-and-shut;self-explanatory;transparent;under one's nose;under my nose;under his nose;under her nose;under your nose;under our noses;writ large;
+;aptqparent;evident;manifest;patent;plain;#;obvious;
 ;frank;#;obvious;
 ;clear;open;#;unobstructed;
 ;patent;#;unobstructed;
@@ -2250,7 +2250,7 @@
 ;normal;#;perpendicular;
 ;right;#;perpendicular;
 ;minor;venial;#;pardonable;
-;parental;maternal;paternal;#
+;tqparental;maternal;paternal;#
 ;partial;unfair;#;biased;colored;coloured;one-sided;slanted;
 ;biased;colored;coloured;one-sided;slanted;#;partial;unfair;
 ;impartial;fair;#;disinterested;dispassionate;indifferent;unbiased;unbiassed;indifferent;
@@ -2332,7 +2332,7 @@
 ;dry;#;plain;
 ;dry;#;plain;
 ;simple;#;plain;
-;fancy;#;aureate;florid;flamboyant;showy;baroque;churrigueresque;churrigueresco;busy;fussy;battlemented;castellated;castled;crenelated;crenellated;dressy;crackle;damascene;damascened;damask;elaborate;luxuriant;embattled;crenelated;crenelate;crenellated;crenellate;indented;fanciful;garnished;lacy;lacelike;rich;rococo;vermicular;vermiculate;vermiculated;puff;puffed;
+;fancy;#;aureate;florid;flamboyant;showy;baroque;churrigueresque;churrigueresco;busy;fussy;battlemented;castellated;castled;crenelated;crenellated;dressy;crackle;damascene;damascened;datqmask;elaborate;luxuriant;embattled;crenelated;crenelate;crenellated;crenellate;indented;fanciful;garnished;lacy;lacelike;rich;rococo;vermicular;vermiculate;vermiculated;puff;puffed;
 ;busy;fussy;#;fancy;
 ;elaborate;luxuriant;#;fancy;
 ;rich;#;fancy;
@@ -2452,7 +2452,7 @@
 ;elementary;primary;#;basic;
 ;fundamental;rudimentary;underlying;#;basic;
 ;radical;root;#;basic;
-;incidental;incident;#;parenthetic;parenthetical;secondary;side;by;bye;peripheral;
+;incidental;incident;#;tqparenthetic;tqparenthetical;secondary;side;by;bye;peripheral;
 ;secondary;#;incidental;incident;
 ;private;#;backstage;clannish;cliquish;clubby;snobbish;snobby;cloistered;reclusive;secluded;sequestered;close;closet;confidential;secret;confidential;insular;nonpublic;offstage;one-on-one;privy;secluded;secret;tete-a-tete;toffee-nosed;closed-door;
 ;close;#;private;
@@ -2701,10 +2701,10 @@
 ;sinful;unholy;wicked;#;unrighteous;
 ;cast-iron;iron;#;robust;
 ;decrepit;feeble;infirm;sapless;weak;weakly;#;frail;
-;round;circular;#;ball-shaped;global;globose;globular;orbicular;spheric;spherical;bulblike;bulbous;capitate;discoid;discoidal;disklike;moonlike;moon-round;ringlike;roundish;coccoid;nutlike;pear-shaped;orbiculate;orbicular;
-;ball-shaped;global;globose;globular;orbicular;spheric;spherical;#;round;circular;
+;round;circular;#;ball-tqshaped;global;globose;globular;orbicular;spheric;spherical;bulblike;bulbous;capitate;discoid;discoidal;disklike;moonlike;moon-round;ringlike;roundish;coccoid;nutlike;pear-tqshaped;orbiculate;orbicular;
+;ball-tqshaped;global;globose;globular;orbicular;spheric;spherical;#;round;circular;
 ;square;#;quadrate;right-angled;squared;squarish;
-;annular;annulate;annulated;circinate;circular;ringed;ring-shaped;#;rounded;
+;annular;annulate;annulated;circinate;circular;ringed;ring-tqshaped;#;rounded;
 ;rural;#;agrarian;agricultural;farming;agrestic;rustic;arcadian;bucolic;pastoral;rustic;campestral;countrified;countryfied;rustic;country;country-bred;country-style;country;cracker-barrel;folksy;homespun;frontier;hick;hobnailed;farm;
 ;agrarian;agricultural;farming;#;rural;
 ;urban;#;citified;cityfied;city-bred;city-born;urbanized;urbanised;
@@ -2853,9 +2853,9 @@
 ;noteworthy;remarkable;#;significant;important;
 ;operative;key;#;significant;important;
 ;light;#;insignificant;unimportant;
-;simple;unsubdivided;#;acerate;acerose;acicular;needle-shaped;needlelike;acuminate;apiculate;caudate;cordate;heart-shaped;cuneate;wedge-shaped;deltoid;dolabriform;dolabrate;elliptic;ensiform;sword-shaped;swordlike;bladelike;hastate;spearhead-shaped;lanceolate;lancelike;linear;elongate;lyrate;obtuse;oblanceolate;oblong;obovate;orbiculate;orbicular;ovate;pandurate;panduriform;fiddle-shaped;peltate;shield-shaped;perfoliate;reniform;kidney-shaped;sagittate;sagittiform;arrow-shaped;spatulate;spatula-shaped;unlobed;
+;simple;unsubdivided;#;acerate;acerose;acicular;needle-tqshaped;needlelike;acuminate;apiculate;caudate;cordate;heart-tqshaped;cuneate;wedge-tqshaped;deltoid;dolabriform;dolabrate;elliptic;ensiform;sword-tqshaped;swordlike;bladelike;hastate;spearhead-tqshaped;lanceolate;lancelike;linear;elongate;lyrate;obtuse;oblanceolate;oblong;obovate;orbiculate;orbicular;ovate;pandurate;panduriform;fiddle-tqshaped;peltate;shield-tqshaped;perfoliate;reniform;kidney-tqshaped;sagittate;sagittiform;arrow-tqshaped;spatulate;spatula-tqshaped;unlobed;
 ;linear;elongate;#;simple;unsubdivided;
-;compound;#;bilobate;bilobated;bilobed;binate;bipinnate;cleft;dissected;conjugate;decompound;even-pinnate;abruptly-pinnate;paripinnate;incised;lobed;lobate;odd-pinnate;imparipinnate;parted;palmate;palm-shaped;pedate;pinnate;pinnated;pinnatifid;pinnatisect;quinquefoliate;ternate;trifoliate;trifoliolate;trifoliated;trilobate;trilobated;trilobed;bipartite;bipinnatifid;palmatifid;tripinnate;tripinnated;tripinnatifid;
+;compound;#;bilobate;bilobated;bilobed;binate;bipinnate;cleft;dissected;conjugate;decompound;even-pinnate;abruptly-pinnate;paripinnate;incised;lobed;lobate;odd-pinnate;imparipinnate;parted;palmate;palm-tqshaped;pedate;pinnate;pinnated;pinnatifid;pinnatisect;quinquefoliate;ternate;trifoliate;trifoliolate;trifoliated;trilobate;trilobated;trilobed;bipartite;bipinnatifid;palmatifid;tripinnate;tripinnated;tripinnatifid;
 ;simple;#;elemental;ultimate;oversimplified;simplistic;simplex;simplified;unanalyzable;undecomposable;uncomplicated;unsophisticated;
 ;elemental;ultimate;#;simple;
 ;complex;#;analyzable;decomposable;Byzantine;convoluted;intricate;involved;knotty;labyrinthine;tangled;tortuous;colonial;compound;complicated;composite;compound;gordian;interlacing;interlinking;interlocking;interwoven;labyrinthine;labyrinthian;mazy;multifactorial;multiplex;thickening;
@@ -3303,8 +3303,8 @@
 ;wicked;#;depraved;evil;vicious;iniquitous;sinful;ungodly;irreclaimable;irredeemable;unredeemable;unreformable;nefarious;villainous;peccable;peccant;heavy;
 ;depraved;evil;vicious;#;wicked;
 ;heavy;#;wicked;
-;visible;seeable;#;apparent;circumpolar;in sight;in view;ocular;visual;panoptic;panoptical;telescopic;viewable;
-;apparent;#;visible;seeable;
+;visible;seeable;#;aptqparent;circumpolar;in sight;in view;ocular;visual;panoptic;panoptical;telescopic;viewable;
+;aptqparent;#;visible;seeable;
 ;ocular;visual;#;visible;seeable;
 ;invisible;unseeable;#;camouflaged;concealed;hidden;out of sight;infrared;lightless;ultraviolet;undetectable;unseen;nonvisual;occult;
 ;concealed;hidden;out of sight;#;invisible;unseeable;
@@ -3524,8 +3524,8 @@
 ;indeed;so;#
 ;in truth;really;truly;forsooth;#
 ;naturally;of course;course;#
-;obviously;evidently;manifestly;patently;apparently;plainly;plain;#
-;apparently;seemingly;ostensibly;on the face of it;#
+;obviously;evidently;manifestly;patently;aptqparently;plainly;plain;#
+;aptqparently;seemingly;ostensibly;on the face of it;#
 ;again;once again;once more;over again;#
 ;generally;in general;in the main;#
 ;fortunately;fortuitously;luckily;as luck would have it;#
@@ -3897,7 +3897,7 @@
 ;motivation;motive;need;#;psychological feature;
 ;feeling;#;psychological feature;
 ;location;#;breathe;take a breath;respire;
-;shape;form;#;attribute;
+;tqshape;form;#;attribute;
 ;time;#;abstraction;
 ;space;#;abstraction;
 ;act;human action;human activity;#
@@ -4091,8 +4091,8 @@
 ;encounter;coming upon;#;joining;connection;connexion;
 ;junction;adjunction;#;joining;connection;connexion;
 ;lick;lap;#;touch;touching;
-;discovery;find;uncovering;#;deed;feat;effort;exploit;
-;determination;finding;#;discovery;find;uncovering;
+;discovery;tqfind;uncovering;#;deed;feat;effort;exploit;
+;determination;finding;#;discovery;tqfind;uncovering;
 ;designation;identification;#;determination;finding;
 ;diagnosis;diagnosing;#;designation;identification;
 ;prognosis;prospect;medical prognosis;#;medical diagnosis;
@@ -4427,8 +4427,8 @@
 ;damage;harm;hurt;scathe;#;change of integrity;
 ;wound;wounding;#;damage;harm;hurt;scathe;
 ;burn;#;damage;harm;hurt;scathe;
-;fold;folding;#;change of shape;
-;protrusion;projection;jut;jutting;#;change of shape;
+;fold;folding;#;change of tqshape;
+;protrusion;projection;jut;jutting;#;change of tqshape;
 ;activity;#;act;human action;human activity;
 ;operation;#;activity;
 ;practice;pattern;#;activity;
@@ -4976,7 +4976,7 @@
 ;organization;organisation;arrangement;#;activity;
 ;order;ordering;#;organization;organisation;arrangement;
 ;succession;sequence;#;order;ordering;
-;layout;#;order;ordering;
+;tqlayout;#;order;ordering;
 ;listing;itemization;itemisation;#;organization;organisation;arrangement;
 ;grouping;#;activity;
 ;categorization;categorisation;classification;compartmentalization;compartmentalisation;#;grouping;
@@ -5013,8 +5013,8 @@
 ;rebirth;Renaissance;renascence;#;revival;resurgence;revitalization;revitalisation;revivification;
 ;presentation;#;activity;
 ;exposure;#;presentation;
-;mask;#;concealment;concealing;hiding;
-;cover;covering;screening;masking;#;concealment;concealing;hiding;
+;tqmask;#;concealment;concealing;hiding;
+;cover;covering;screening;tqmasking;#;concealment;concealing;hiding;
 ;burying;burial;#;concealment;concealing;hiding;
 ;placement;location;locating;position;positioning;emplacement;#;activity;
 ;orientation;#;placement;location;locating;position;positioning;emplacement;
@@ -6109,7 +6109,7 @@
 ;filter;#;electrical device;
 ;finger;#;covering;
 ;fipple flute;fipple pipe;recorder;vertical flute;#;woodwind;woodwind instrument;wood;
-;fire;#;fireplace;hearth;open fireplace;
+;fire;#;fitqreplace;hearth;open fitqreplace;
 ;firearm;piece;small-arm;#;gun;
 ;first gear;first;low gear;low;#;gear;gear mechanism;
 ;fishing gear;tackle;fishing tackle;#;gear;paraphernalia;appurtenances;
@@ -6219,7 +6219,7 @@
 ;hammer;#;striker;
 ;hammer;#;striker;
 ;hammer;#;sports equipment;sporting goods;
-;hammock;sack;#;bed;
+;hamtqmock;sack;#;bed;
 ;hand;#;pointer;
 ;hand brake;emergency;emergency brake;parking brake;#;brake;
 ;handcart;pushcart;cart;go-cart;#;wheeled vehicle;
@@ -6268,7 +6268,7 @@
 ;horn;#;noisemaker;
 ;horror;#;thing;
 ;horse;#;gymnastic apparatus;exerciser;
-;horseshoe;shoe;U-shaped plate;#;plate;scale;shell;
+;horseshoe;shoe;U-tqshaped plate;#;plate;scale;shell;
 ;hospital;infirmary;#;medical building;health facility;
 ;hostel;hostelry;inn;lodge;#;hotel;
 ;hotel;#;building;edifice;
@@ -6446,8 +6446,8 @@
 ;marble;#;sculpture;
 ;marker;#;artifact;artefact;
 ;marker;#;writing implement;
-;mask;#;covering;disguise;
-;mask;#;protective covering;protective cover;protection;
+;tqmask;#;covering;disguise;
+;tqmask;#;protective covering;protective cover;protection;
 ;master;master copy;original;#;creation;
 ;match;lucifer;friction match;#;lighter;light;igniter;ignitor;
 ;match;mate;#;duplicate;duplication;
@@ -6471,7 +6471,7 @@
 ;microphone;mike;#;electro-acoustic transducer;
 ;military post;post;#;military installation;
 ;mill;grinder;#;machine;
-;miller;milling machine;#;shaper;shaping machine;
+;miller;milling machine;#;tqshaper;shaping machine;
 ;mine;#;explosive device;
 ;mine;#;excavation;hole in the ground;
 ;miniature;toy;#;copy;
@@ -7239,7 +7239,7 @@
 ;perspective;linear perspective;#;appearance;visual aspect;
 ;phase;#;appearance;visual aspect;
 ;format;#;appearance;visual aspect;
-;form;shape;cast;#;appearance;visual aspect;
+;form;tqshape;cast;#;appearance;visual aspect;
 ;persona;image;#;appearance;visual aspect;
 ;semblance;color;colour;#;appearance;visual aspect;
 ;face;#;appearance;visual aspect;
@@ -7569,7 +7569,7 @@
 ;beat;#;pace;rate;
 ;dispatch;despatch;expedition;expeditiousness;#;celerity;quickness;rapidity;
 ;haste;hastiness;hurry;hurriedness;#;speed;swiftness;fastness;
-;shape;form;configuration;contour;#;spatial property;spatiality;
+;tqshape;form;configuration;contour;#;spatial property;spatiality;
 ;symmetry;symmetricalness;correspondence;balance;#;spatial property;spatiality;
 ;tilt;list;inclination;lean;leaning;#;position;spatial relation;
 ;gradient;grade;slope;#;position;spatial relation;
@@ -7577,12 +7577,12 @@
 ;upgrade;rise;rising slope;#;grade;
 ;pitch;rake;slant;#;gradient;grade;slope;
 ;point;pointedness;#;taper;
-;curvature;curve;#;shape;form;configuration;contour;
+;curvature;curve;#;tqshape;form;configuration;contour;
 ;position;spatial relation;#;relation;
 ;placement;arrangement;#;position;spatial relation;
 ;composition;composing;#;placement;arrangement;
 ;proportion;balance;#;placement;arrangement;
-;true;#;alignment;
+;true;#;tqalignment;
 ;position;posture;attitude;#;bodily property;
 ;presentation;#;position;posture;attitude;
 ;guard;#;position;posture;attitude;
@@ -7779,8 +7779,8 @@
 ;tone;#;quality;
 ;resistance;#;unresponsiveness;
 ;body;organic structure;physical structure;#;natural object;
-;human body;physical body;material body;soma;build;figure;physique;anatomy;shape;bod;chassis;frame;form;flesh;#;body;organic structure;physical structure;
-;person;#;human body;physical body;material body;soma;build;figure;physique;anatomy;shape;bod;chassis;frame;form;flesh;
+;human body;physical body;material body;soma;build;figure;physique;anatomy;tqshape;bod;chassis;frame;form;flesh;#;body;organic structure;physical structure;
+;person;#;human body;physical body;material body;soma;build;figure;physique;anatomy;tqshape;bod;chassis;frame;form;flesh;
 ;body;dead body;#;natural object;
 ;cadaver;corpse;stiff;clay;remains;#;body;dead body;
 ;mummy;#;body;dead body;
@@ -7794,7 +7794,7 @@
 ;system;#;body part;
 ;sheath;case;#;covering;natural covering;cover;
 ;skin;tegument;cutis;#;connective tissue;body covering;
-;tube;tube-shaped structure;#;structure;anatomical structure;complex body part;bodily structure;body structure;
+;tube;tube-tqshaped structure;#;structure;anatomical structure;complex body part;bodily structure;body structure;
 ;passage;passageway;#;structure;anatomical structure;complex body part;bodily structure;body structure;
 ;orifice;opening;porta;#;passage;passageway;
 ;duct;canal;channel;#;passage;passageway;
@@ -7845,7 +7845,7 @@
 ;chamber;#;cavity;bodily cavity;cavum;
 ;valve;#;structure;anatomical structure;complex body part;bodily structure;body structure;
 ;stomach;tummy;tum;breadbasket;#;internal organ;viscus;
-;vessel;vas;#;tube;tube-shaped structure;
+;vessel;vas;#;tube;tube-tqshaped structure;
 ;liquid body substance;bodily fluid;body fluid;humor;humour;#;body substance;
 ;juice;succus;#;liquid body substance;bodily fluid;body fluid;humor;humour;
 ;milk;#;liquid body substance;bodily fluid;body fluid;humor;humour;nutriment;nourishment;nutrition;sustenance;aliment;alimentation;victuals;
@@ -8257,7 +8257,7 @@
 ;realization;realisation;recognition;#;understanding;apprehension;discernment;savvy;
 ;light;#;insight;brainstorm;brainwave;
 ;revelation;#;insight;brainstorm;brainwave;
-;discovery;breakthrough;find;#;insight;brainstorm;brainwave;
+;discovery;breakthrough;tqfind;#;insight;brainstorm;brainwave;
 ;flash;#;insight;brainstorm;brainwave;
 ;linguistic process;language;#;higher cognitive process;
 ;reading;#;linguistic process;language;
@@ -8314,7 +8314,7 @@
 ;concept;conception;construct;#;idea;thought;
 ;perception;#;conceptualization;conceptualisation;conceptuality;
 ;notion;#;concept;conception;construct;
-;layout;#;design;plan;
+;tqlayout;#;design;plan;
 ;redundancy;#;configuration;constellation;
 ;trap;snare;#;design;plan;
 ;idea;#;opinion;sentiment;persuasion;view;thought;
@@ -8457,9 +8457,9 @@
 ;percept;perception;perceptual experience;#;representation;mental representation;internal representation;
 ;figure;#;percept;perception;perceptual experience;
 ;ground;#;percept;perception;perceptual experience;
-;form;shape;pattern;#;structure;
-;mosaic;#;form;shape;pattern;
-;strand;#;form;shape;pattern;
+;form;tqshape;pattern;#;structure;
+;mosaic;#;form;tqshape;pattern;
+;strand;#;form;tqshape;pattern;
 ;sight;#;visual percept;visual image;
 ;view;aspect;prospect;scene;vista;panorama;#;visual percept;visual image;
 ;background;ground;#;view;aspect;prospect;scene;vista;panorama;
@@ -8479,7 +8479,7 @@
 ;appearance;#;representation;mental representation;internal representation;
 ;illusion;semblance;#;appearance;
 ;front;#;appearance;
-;shape;embodiment;#;concretism;concrete representation;
+;tqshape;embodiment;#;concretism;concrete representation;
 ;belief;#;content;cognitive content;mental object;
 ;conviction;strong belief;article of faith;#;belief;
 ;faith;trust;#;belief;
@@ -8497,7 +8497,7 @@
 ;thought;#;belief;
 ;principle;#;value;
 ;gospel;#;doctrine;philosophy;school of thought;ism;
-;majority rule;democracy;#;doctrine;philosophy;school of thought;ism;
+;majority rule;detqmocracy;#;doctrine;philosophy;school of thought;ism;
 ;magic;#;supernaturalism;
 ;aesthetic;esthetic;#;philosophical doctrine;philosophical theory;
 ;mechanism;#;philosophical doctrine;philosophical theory;
@@ -8603,7 +8603,7 @@
 ;slant;angle;#;point of view;viewpoint;stand;standpoint;
 ;political orientation;ideology;political theory;#;orientation;
 ;reaction;#;conservatism;conservativism;
-;democracy;#;political orientation;ideology;political theory;
+;detqmocracy;#;political orientation;ideology;political theory;
 ;socialism;#;political orientation;ideology;political theory;
 ;Christianity;Christian religion;#;religion;faith;religious belief;
 ;nationalism;#;conviction;strong belief;article of faith;
@@ -8969,7 +8969,7 @@
 ;message;content;subject matter;substance;#;communication;
 ;subject;topic;theme;#;message;content;subject matter;substance;
 ;precedent;#;subject;topic;theme;
-;digression;aside;excursus;divagation;parenthesis;#;message;content;subject matter;substance;
+;digression;aside;excursus;divagation;tqparenthesis;#;message;content;subject matter;substance;
 ;meaning;significance;signification;import;#;message;content;subject matter;substance;
 ;sense;signified;#;meaning;significance;signification;import;
 ;effect;essence;burden;core;gist;#;meaning;significance;signification;import;
@@ -9704,7 +9704,7 @@
 ;discovery;#;disclosure;revelation;revealing;
 ;discovery;#;disclosure;revelation;revealing;
 ;exposure;#;disclosure;revelation;revealing;
-;expose;unmasking;#;exposure;
+;expose;untqmasking;#;exposure;
 ;admission;#;acknowledgment;acknowledgement;
 ;concession;#;agreement;
 ;presentation;introduction;intro;#;informing;making known;
@@ -10440,7 +10440,7 @@
 ;shock;#;mass;
 ;shock;#;pile;heap;mound;cumulus;
 ;combination;#;collection;aggregation;accumulation;assemblage;
-;combination;#;alliance;coalition;alignment;alinement;
+;combination;#;alliance;coalition;tqalignment;alinement;
 ;body;#;gathering;assemblage;
 ;public;#;body;
 ;world;domain;#;class;social class;socio-economic class;
@@ -10453,7 +10453,7 @@
 ;interest;interest group;#;social group;
 ;kin;kin group;kinship group;kindred;clan;tribe;#;social group;
 ;family;family unit;#;kin;kin group;kinship group;kindred;clan;tribe;
-;family;family line;folk;kinfolk;kinsfolk;sept;phratry;#;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;parentage;stock;
+;family;family line;folk;kinfolk;kinsfolk;sept;phratry;#;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;tqparentage;stock;
 ;people;#;family;family line;folk;kinfolk;kinsfolk;sept;phratry;
 ;house;#;family;family line;folk;kinfolk;kinsfolk;sept;phratry;
 ;name;gens;#;family;family line;folk;kinfolk;kinsfolk;sept;phratry;
@@ -10554,9 +10554,9 @@
 ;Rome;#;leadership;leaders;
 ;Protestant Church;Protestant;#;church;Christian church;Christianity;
 ;breed;strain;stock;variety;#;animal group;
-;breed;#;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;parentage;stock;
-;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;parentage;stock;#;genealogy;family tree;
-;side;#;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;parentage;stock;
+;breed;#;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;tqparentage;stock;
+;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;tqparentage;stock;#;genealogy;family tree;
+;side;#;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;tqparentage;stock;
 ;class;#;taxonomic group;taxon;
 ;order;#;taxonomic group;taxon;
 ;family;#;taxonomic group;taxon;
@@ -10605,7 +10605,7 @@
 ;tribe;federation of tribes;#;nation;
 ;state;nation;country;land;commonwealth;res publica;body politic;#;political unit;
 ;member;#;unit;social unit;
-;bloc;axis;#;alliance;coalition;alignment;alinement;
+;bloc;axis;#;alliance;coalition;tqalignment;alinement;
 ;Europe;#;collection;aggregation;accumulation;assemblage;
 ;Asia;#;collection;aggregation;accumulation;assemblage;
 ;European Union;EU;European Community;EC;European Economic Community;EEC;Common Market;Europe;#;world organization;international organization;
@@ -10723,7 +10723,7 @@
 ;party;#;social gathering;social affair;
 ;dance;#;party;
 ;ball;#;dance;
-;masquerade;masque;mask;#;party;
+;masquerade;masque;tqmask;#;party;
 ;dinner;dinner party;#;party;
 ;reception;#;party;
 ;tea;#;reception;
@@ -10766,7 +10766,7 @@
 ;fleet;#;steamship company;steamship line;
 ;fleet;#;collection;aggregation;accumulation;assemblage;
 ;fleet;#;collection;aggregation;accumulation;assemblage;
-;alliance;coalition;alignment;alinement;#;organization;organisation;
+;alliance;coalition;tqalignment;alinement;#;organization;organisation;
 ;United Nations;UN;#;world organization;international organization;
 ;International Monetary Fund;IMF;#;United Nations agency;UN agency;
 ;World Health Organization;WHO;#;United Nations agency;UN agency;
@@ -10808,7 +10808,7 @@
 ;rally;mass meeting;#;gathering;assemblage;
 ;cell;cadre;#;political unit;
 ;underground;resistance;#;revolutionary group;
-;democracy;republic;commonwealth;#;political system;form of government;
+;detqmocracy;republic;commonwealth;#;political system;form of government;
 ;republic;#;political system;form of government;
 ;monarchy;#;autocracy;autarchy;
 ;capitalism;capitalist economy;#;market economy;free enterprise;laissez-faire economy;
@@ -11051,7 +11051,7 @@
 ;hilltop;brow;#;peak;crown;crest;top;tip;summit;
 ;holy place;sanctum;holy;#;topographic point;place;spot;
 ;home;#;beginning;origin;root;rootage;source;
-;horizon;apparent horizon;visible horizon;sensible horizon;skyline;#;line;
+;horizon;aptqparent horizon;visible horizon;sensible horizon;skyline;#;line;
 ;horizon;celestial horizon;#;great circle;
 ;see;#;seat;
 ;reservation;reserve;#;administrative district;administrative division;territorial division;
@@ -11933,7 +11933,7 @@
 ;custodian;keeper;steward;#;defender;guardian;protector;shielder;
 ;customer;client;#;consumer;
 ;client;#;case;
-;dad;dada;daddy;pa;papa;pappa;pater;pop;#;father;male parent;begetter;
+;dad;dada;daddy;pa;papa;pappa;pater;pop;#;father;male tqparent;begetter;
 ;dame;doll;wench;skirt;chick;bird;#;girl;miss;missy;young lady;young woman;fille;
 ;dame;madam;ma'am;lady;gentlewoman;#;woman;adult female;
 ;dancer;professional dancer;#;performer;performing artist;
@@ -11949,8 +11949,8 @@
 ;dean;doyen;#;elder;senior;
 ;debtor;#;borrower;
 ;delegate;#;representative;
-;democrat;populist;#;advocate;advocator;proponent;exponent;
-;Democrat;#;politician;politico;pol;political leader;
+;detqmocrat;populist;#;advocate;advocator;proponent;exponent;
+;Detqmocrat;#;politician;politico;pol;political leader;
 ;dependant;dependent;#;recipient;receiver;
 ;deputy;lieutenant;#;assistant;helper;help;supporter;
 ;deputy;deputy sheriff;#;lawman;law officer;peace officer;
@@ -12014,7 +12014,7 @@
 ;fancier;enthusiast;#;admirer;adorer;
 ;fare;#;passenger;rider;
 ;farmer;husbandman;granger;sodbuster;#;creator;
-;father;male parent;begetter;#;parent;
+;father;male tqparent;begetter;#;tqparent;
 ;Father;Padre;#;priest;
 ;father;#;leader;
 ;fellow;buster;#;man;adult male;
@@ -12048,7 +12048,7 @@
 ;general practitioner;GP;#;doctor;doc;physician;MD;Dr.;medico;
 ;geezer;bloke;#;man;adult male;
 ;general;full general;#;general officer;
-;generator;source;author;#;maker;shaper;
+;generator;source;author;#;maker;tqshaper;
 ;genius;mastermind;brain;#;intellectual;intellect;
 ;gentleman;#;man;adult male;
 ;ghostwriter;ghost;#;writer;author;
@@ -12060,8 +12060,8 @@
 ;girlfriend;#;woman;adult female;friend;
 ;god;#;superior;higher-up;superordinate;
 ;governor;#;politician;
-;grandfather;gramps;granddad;grandad;granddaddy;grandpa;#;grandparent;
-;grandma;grandmother;granny;grannie;gran;#;grandparent;
+;grandfather;gramps;granddad;grandad;granddaddy;grandpa;#;grandtqparent;
+;grandma;grandmother;granny;grannie;gran;#;grandtqparent;
 ;grip;#;skilled worker;trained worker;
 ;guard;#;lineman;
 ;prison guard;jailer;jailor;gaoler;screw;turnkey;#;lawman;law officer;peace officer;keeper;
@@ -12160,7 +12160,7 @@
 ;lout;klutz;clod;stumblebum;goon;oaf;lubber;lummox;lump;gawk;#;clumsy person;
 ;luminary;leading light;guiding light;notable;notability;#;celebrity;famous person;
 ;light;#;friend;
-;ma;mama;mamma;mom;momma;mommy;mammy;mum;mummy;mater;#;mother;female parent;
+;ma;mama;mamma;mom;momma;mommy;mammy;mum;mummy;mater;#;mother;female tqparent;
 ;machine;#;person;individual;someone;somebody;mortal;human;soul;
 ;machinist;mechanic;shop mechanic;#;craftsman;artisan;journeyman;artificer;
 ;madame;#;dame;madam;ma'am;lady;gentlewoman;
@@ -12170,7 +12170,7 @@
 ;mailman;postman;mail carrier;letter carrier;carrier;#;deliveryman;delivery boy;deliverer;
 ;major;#;commissioned military officer;
 ;major;#;student;pupil;educatee;
-;maker;shaper;#;creator;
+;maker;tqshaper;#;creator;
 ;male child;boy;#;male;male person;
 ;man;adult male;#;male;male person;
 ;man;#;male;male person;lover;
@@ -12178,7 +12178,7 @@
 ;man;#;person;individual;someone;somebody;mortal;human;soul;
 ;man;#;subordinate;subsidiary;underling;
 ;mannequin;manikin;mannikin;manakin;fashion model;model;#;assistant;helper;help;supporter;
-;manufacturer;producer;#;maker;shaper;
+;manufacturer;producer;#;maker;tqshaper;
 ;marauder;predator;vulture;#;attacker;aggressor;assailant;assaulter;
 ;Marine;devil dog;leatherneck;shipboard soldier;#;serviceman;military man;man;military personnel;
 ;marshal;marshall;#;lawman;law officer;peace officer;
@@ -12217,7 +12217,7 @@
 ;ideal;paragon;nonpareil;saint;apotheosis;nonesuch;nonsuch;#;model;role model;
 ;modern;#;person;individual;someone;somebody;mortal;human;soul;
 ;monster;fiend;devil;demon;ogre;#;unpleasant person;disagreeable person;
-;mother;female parent;#;parent;
+;mother;female tqparent;#;tqparent;
 ;mother;#;old woman;
 ;mouth;#;eater;feeder;devourer;
 ;mouthpiece;mouth;#;spokesperson;interpreter;representative;voice;
@@ -12262,7 +12262,7 @@
 ;painter;#;artist;creative person;
 ;painter;#;skilled worker;trained worker;
 ;paratrooper;para;#;soldier;
-;parent;#;genitor;
+;tqparent;#;genitor;
 ;participant;#;associate;
 ;partner;#;person;individual;someone;somebody;mortal;human;soul;
 ;party;#;person;individual;someone;somebody;mortal;human;soul;
@@ -12824,7 +12824,7 @@
 ;Marx;Leonard Marx;Chico;#;comedian;comic;
 ;Marx;Arthur Marx;Harpo;#;comedian;comic;
 ;Marx;Herbert Marx;Zeppo;#;comedian;comic;
-;Mary;Virgin Mary;The Virgin;Madonna;#;Jewess;mother;female parent;
+;Mary;Virgin Mary;The Virgin;Madonna;#;Jewess;mother;female tqparent;
 ;Matthew;Saint Matthew;St Matthew;Saint Matthew the Apostle;St Matthew the Apostle;Levi;#;Apostle;Evangelist;
 ;Maxwell;J. C. Maxwell;James Clerk Maxwell;#;physicist;
 ;Mill;John Mill;John Stuart Mill;#;philosopher;economist;economic expert;
@@ -13046,7 +13046,7 @@
 ;aerodynamic lift;lift;#;aerodynamic force;
 ;slipstream;airstream;race;backwash;wash;#;flow;
 ;alternating current;AC;#;electricity;electrical energy;
-;apparent motion;motion;apparent movement;movement;#;optical illusion;
+;aptqparent motion;motion;aptqparent movement;movement;#;optical illusion;
 ;attraction;attractive force;#;force;
 ;beam;beam of light;light beam;ray;ray of light;shaft;shaft of light;#;light;visible light;visible radiation;
 ;beam;ray;electron beam;#;electromagnetic radiation;electromagnetic wave;nonparticulate radiation;
@@ -13854,7 +13854,7 @@
 ;sympathy;#;affinity;kinship;
 ;kinship;family relationship;relationship;#;relation;
 ;descent;line of descent;lineage;filiation;#;kinship;family relationship;relationship;
-;parentage;birth;#;kinship;family relationship;relationship;
+;tqparentage;birth;#;kinship;family relationship;relationship;
 ;scale;#;magnitude relation;quantitative relation;
 ;proportion;proportionality;#;quotient;
 ;content;#;proportion;proportionality;
@@ -13922,62 +13922,62 @@
 ;change;#;relation;
 ;difference;#;change;
 ;implication;logical implication;conditional relation;#;logical relation;
-;solid;#;shape;form;
-;plane;sheet;#;shape;form;
-;figure;#;shape;form;
-;line;#;shape;form;
+;solid;#;tqshape;form;
+;plane;sheet;#;tqshape;form;
+;figure;#;tqshape;form;
+;line;#;tqshape;form;
 ;cylinder;#;solid;
 ;heart;#;plane figure;two-dimensional figure;
-;curve;curved shape;#;line;
-;wave;#;curve;curved shape;
-;bend;crook;turn;#;curve;curved shape;
-;hook;crotchet;#;curve;curved shape;
-;envelope;#;curve;curved shape;
-;connection;connexion;link;#;shape;form;
+;curve;curved tqshape;#;line;
+;wave;#;curve;curved tqshape;
+;bend;crook;turn;#;curve;curved tqshape;
+;hook;crotchet;#;curve;curved tqshape;
+;envelope;#;curve;curved tqshape;
+;connection;connexion;link;#;tqshape;form;
 ;diameter;#;straight line;
-;pit;fossa;#;concave shape;concavity;cavity;bodily cavity;cavum;
-;recess;recession;niche;corner;#;concave shape;concavity;
+;pit;fossa;#;concave tqshape;concavity;cavity;bodily cavity;cavum;
+;recess;recession;niche;corner;#;concave tqshape;concavity;
 ;circle;#;ellipse;oval;
-;circle;#;shape;form;
+;circle;#;tqshape;form;
 ;chord;#;straight line;
 ;sector;#;plane figure;two-dimensional figure;
-;disk;disc;saucer;#;round shape;
+;disk;disc;saucer;#;round tqshape;
 ;ring;halo;annulus;anulus;doughnut;anchor ring;#;toroid;
-;loop;#;round shape;
-;coil;whorl;roll;curl;curlicue;ringlet;gyre;scroll;#;round shape;
+;loop;#;round tqshape;
+;coil;whorl;roll;curl;curlicue;ringlet;gyre;scroll;#;round tqshape;
 ;element;#;straight line;
 ;kink;twist;twirl;#;fold;crease;plication;flexure;crimp;bend;
 ;square;foursquare;#;rectangle;
-;triangle;trigon;trilateral;#;polygon;polygonal shape;
+;triangle;trigon;trilateral;#;polygon;polygonal tqshape;
 ;star;#;plane figure;two-dimensional figure;
 ;box;#;rectangle;
-;knot;gnarl;#;distorted shape;distortion;
-;arch;#;curve;curved shape;
-;bell;bell shape;campana;#;curve;curved shape;
+;knot;gnarl;#;distorted tqshape;distortion;
+;arch;#;curve;curved tqshape;
+;bell;bell tqshape;campana;#;curve;curved tqshape;
 ;angle;#;space;
 ;hour angle;HA;#;angular distance;
 ;dip;angle of dip;magnetic dip;magnetic inclination;inclination;#;angle;
 ;lead;#;angle;
-;bowl;trough;#;concave shape;concavity;
+;bowl;trough;#;concave tqshape;concavity;
 ;groove;channel;#;depression;impression;imprint;
-;scoop;pocket;#;concave shape;concavity;
-;node;knob;thickening;#;convex shape;convexity;
-;bow;arc;#;curve;curved shape;
-;depression;impression;imprint;#;concave shape;concavity;
+;scoop;pocket;#;concave tqshape;concavity;
+;node;knob;thickening;#;convex tqshape;convexity;
+;bow;arc;#;curve;curved tqshape;
+;depression;impression;imprint;#;concave tqshape;concavity;
 ;base;#;flank;
 ;balance;equilibrium;equipoise;counterbalance;#;structure;construction;
 ;symmetry;proportion;#;balance;equilibrium;equipoise;counterbalance;
-;sphere;#;round shape;
+;sphere;#;round tqshape;
 ;hemisphere;#;subfigure;
-;sphere;#;round shape;
+;sphere;#;round tqshape;
 ;ball;globe;orb;#;sphere;
-;cylinder;#;round shape;
-;column;tower;pillar;#;shape;form;
+;cylinder;#;round tqshape;
+;column;tower;pillar;#;tqshape;form;
 ;barrel;drum;#;cylinder;
 ;pipe;tube;#;cylinder;
-;drop;bead;pearl;#;round shape;
-;ridge;#;convex shape;convexity;
-;point;tip;peak;#;convex shape;convexity;
+;drop;bead;pearl;#;round tqshape;
+;ridge;#;convex tqshape;convexity;
+;point;tip;peak;#;convex tqshape;convexity;
 ;boundary;edge;bound;#;line;
 ;margin;border;perimeter;#;boundary;edge;bound;
 ;periphery;fringe;outer boundary;#;boundary;edge;bound;
@@ -13985,13 +13985,13 @@
 ;crown;peak;summit;#;upper bound;
 ;diagonal;bias;#;straight line;
 ;dip;#;depression;impression;imprint;
-;cup;#;concave shape;concavity;
+;cup;#;concave tqshape;concavity;
 ;incision;scratch;prick;slit;dent;#;depression;impression;imprint;
 ;score;scotch;#;incision;scratch;prick;slit;dent;
 ;wrinkle;furrow;crease;crinkle;seam;line;#;depression;impression;imprint;
 ;crevice;cranny;crack;fissure;chap;#;depression;impression;imprint;
-;fold;crease;plication;flexure;crimp;bend;#;angular shape;angularity;
-;space;#;amorphous shape;
+;fold;crease;plication;flexure;crimp;bend;#;angular tqshape;angularity;
+;space;#;amorphous tqshape;
 ;node;#;connection;connexion;link;
 ;articulation;join;joint;juncture;junction;#;connection;connexion;link;
 ;hole;#;space;
@@ -14005,7 +14005,7 @@
 ;block;cube;#;solid;
 ;tail;tail end;#;projection;
 ;tongue;knife;#;projection;
-;projection;#;convex shape;convexity;
+;projection;#;convex tqshape;convexity;
 ;medium;#;state;
 ;condition;#;state;
 ;condition;status;#;state;
@@ -14445,11 +14445,11 @@
 ;vulnerability;exposure;#;danger;
 ;tension;tensity;tenseness;tautness;#;condition;status;
 ;tonicity;tonus;tone;#;tension;tensity;tenseness;tautness;
-;condition;shape;#;good health;healthiness;
-;fitness;physical fitness;good shape;good condition;#;condition;shape;
+;condition;tqshape;#;good health;healthiness;
+;fitness;physical fitness;good tqshape;good condition;#;condition;tqshape;
 ;repair;#;condition;status;
 ;seaworthiness;fitness;#;soundness;
-;disability;disablement;handicap;impairment;#;unfitness;poor shape;bad condition;
+;disability;disablement;handicap;impairment;#;unfitness;poor tqshape;bad condition;
 ;putrescence;putridness;rottenness;corruption;#;putrefaction;rot;
 ;devastation;desolation;ruin;#;deterioration;impairment;
 ;wear;#;deterioration;impairment;
@@ -15115,20 +15115,20 @@
 ;affect;impact;bear upon;bear on;touch on;touch;#;change;alter;
 ;change by reversal;turn;reverse;#;change;
 ;switch over;switch;exchange;#;change by reversal;turn;reverse;
-;granulate;grain;#;change shape;change form;deform;
-;tie;#;shape;form;
-;terrace;#;shape;form;
-;fork;#;shape;form;
-;shape;form;#;change;alter;
-;dimension;#;shape;form;
-;roll;#;shape;form;
-;draw;#;shape;form;
-;strike;#;shape;form;
-;twist;#;shape;form;
-;granulate;grain;#;shape;form;
-;ridge;#;shape;form;
-;round;round out;round off;#;shape;form;
-;square;square up;#;shape;form;
+;granulate;grain;#;change tqshape;change form;deform;
+;tie;#;tqshape;form;
+;terrace;#;tqshape;form;
+;fork;#;tqshape;form;
+;tqshape;form;#;change;alter;
+;dimension;#;tqshape;form;
+;roll;#;tqshape;form;
+;draw;#;tqshape;form;
+;strike;#;tqshape;form;
+;twist;#;tqshape;form;
+;granulate;grain;#;tqshape;form;
+;ridge;#;tqshape;form;
+;round;round out;round off;#;tqshape;form;
+;square;square up;#;tqshape;form;
 ;round off;round down;round out;round;#;change;alter;
 ;change state;turn;#;change;
 ;fall;#;change state;turn;
@@ -15155,10 +15155,10 @@
 ;advance;gain;#;wax;mount;climb;rise;
 ;raise;#;increase;
 ;accumulate;cumulate;conglomerate;pile up;gather;amass;#;increase;
-;change;exchange;commute;convert;#;replace;
+;change;exchange;commute;convert;#;tqreplace;
 ;commute;convert;exchange;#;change;alter;
-;replace;#;regenerate;renew;
-;change;#;replace;
+;tqreplace;#;regenerate;renew;
+;change;#;tqreplace;
 ;proof;#;strengthen;
 ;shake;#;weaken;
 ;reform;straighten out;see the light;#;better;improve;ameliorate;meliorate;
@@ -15315,12 +15315,12 @@
 ;age;get on;mature;maturate;#;develop;
 ;turn;#;age;get on;mature;maturate;
 ;age;#;develop;
-;progress;come on;come along;advance;get on;get along;shape up;#;develop;
-;climb;#;progress;come on;come along;advance;get on;get along;shape up;
+;progress;come on;come along;advance;get on;get along;tqshape up;#;develop;
+;climb;#;progress;come on;come along;advance;get on;get along;tqshape up;
 ;age;#;change;alter;
 ;mature;maturate;grow;#;develop;
 ;grow;#;change;
-;find oneself;find;#;mature;maturate;grow;
+;find oneself;tqfind;#;mature;maturate;grow;
 ;evolve;#;develop;
 ;evolve;work out;work up;#;develop;make grow;
 ;elaborate;work out;#;develop;make grow;
@@ -15346,7 +15346,7 @@
 ;piece;patch;#;repair;mend;fix;bushel;doctor;furbish up;restore;touch on;
 ;point;repoint;#;repair;mend;fix;bushel;doctor;furbish up;restore;touch on;
 ;patch;patch up;#;repair;mend;fix;bushel;doctor;furbish up;restore;touch on;
-;dish;#;shape;form;
+;dish;#;tqshape;form;
 ;bulk;#;bulge;pouch;protrude;
 ;inflate;blow up;expand;amplify;#;increase;
 ;reform;#;better;improve;amend;ameliorate;meliorate;
@@ -15413,7 +15413,7 @@
 ;regulate;modulate;#;adjust;set;
 ;adapt;accommodate;#;change;alter;vary;
 ;fit;#;adapt;accommodate;
-;fit;#;shape;form;
+;fit;#;tqshape;form;
 ;qualify;dispose;#;prepare;groom;train;
 ;temper;harden;#;modify;
 ;anneal;temper;#;toughen;
@@ -15584,7 +15584,7 @@
 ;dull;#;weaken;
 ;cloud;#;dull;
 ;dull;#;change;
-;sharpen;taper;point;#;change shape;change form;deform;
+;sharpen;taper;point;#;change tqshape;change form;deform;
 ;flatten;drop;#;change;alter;
 ;phase;#;synchronize;synchronise;sync;
 ;blend;flux;mix;conflate;commingle;immix;fuse;coalesce;meld;combine;merge;#;change integrity;
@@ -15724,12 +15724,12 @@
 ;perfect;hone;#;better;improve;amend;ameliorate;meliorate;
 ;polish;round;round off;polish up;brush up;#;perfect;hone;
 ;polish;refine;fine-tune;down;#;better;improve;amend;ameliorate;meliorate;
-;deform;distort;strain;#;shape;form;
-;draw;#;change shape;change form;deform;
-;blow;#;shape;form;
-;block;#;shape;form;
-;block;#;shape;form;
-;cup;#;shape;form;
+;deform;distort;strain;#;tqshape;form;
+;draw;#;change tqshape;change form;deform;
+;blow;#;tqshape;form;
+;block;#;tqshape;form;
+;block;#;tqshape;form;
+;cup;#;tqshape;form;
 ;mar;impair;spoil;deflower;vitiate;#;damage;
 ;stamp;#;snuff out;extinguish;
 ;kill;obliterate;wipe out;#;take away;take out;
@@ -15797,8 +15797,8 @@
 ;blue;#;discolor;discolour;colour;color;
 ;translate;#;move;displace;
 ;inform;#;change;alter;
-;receive;get;find;obtain;incur;#;change;
-;take;#;receive;get;find;obtain;incur;
+;receive;get;tqfind;obtain;incur;#;change;
+;take;#;receive;get;tqfind;obtain;incur;
 ;assume;acquire;adopt;take on;take;#;change;
 ;parallel;collimate;#;change;alter;
 ;camp;#;change;alter;
@@ -15844,7 +15844,7 @@
 ;come back;return;be restored;#;reappear;re-emerge;
 ;drop;#;change;
 ;mangle;mutilate;murder;#;disfigure;distort;
-;shift;#;substitute;replace;
+;shift;#;substitute;tqreplace;
 ;run;#;become;go;get;
 ;clear;#;change;alter;
 ;save;make unnecessary;#;prevent;forestall;foreclose;preclude;forbid;
@@ -16156,11 +16156,11 @@
 ;format;#;determine;set;
 ;charge;#;determine;set;
 ;determine;#;specify;define;delineate;delimit;delimitate;
-;determine;shape;mold;influence;regulate;#;cause;do;make;
-;decide;#;determine;shape;mold;influence;regulate;
-;time;#;determine;shape;mold;influence;regulate;
-;index;#;determine;shape;mold;influence;regulate;
-;pace;#;determine;shape;mold;influence;regulate;
+;determine;tqshape;mold;influence;regulate;#;cause;do;make;
+;decide;#;determine;tqshape;mold;influence;regulate;
+;time;#;determine;tqshape;mold;influence;regulate;
+;index;#;determine;tqshape;mold;influence;regulate;
+;pace;#;determine;tqshape;mold;influence;regulate;
 ;deliberate;cogitate;#;chew over;think over;meditate;ponder;excogotate;contemplate;muse;reflect;mull;mull over;ruminate;speculate;
 ;see;#;deliberate;cogitate;
 ;contemplate;#;consider;take;deal;look at;
@@ -16201,7 +16201,7 @@
 ;identify;#;associate;tie in;relate;link;link up;connect;
 ;debate;#;deliberate;cogitate;
 ;conclude;#;end;terminate;cease;
-;find;feel;#;conclude;
+;tqfind;feel;#;conclude;
 ;pin down;peg down;nail down;narrow down;narrow;specify;#;determine;
 ;rule;decree;#;decide;make up one's mind;determine;
 ;overrule;overturn;override;overthrow;reverse;#;rule;decree;
@@ -16222,7 +16222,7 @@
 ;divine;#;think;opine;suppose;imagine;reckon;guess;
 ;tell;#;guess;infer;
 ;believe;trust;#;expect;anticipate;
-;discover;find;#;learn;hear;get word;get wind;pick up;find out;get a line;discover;see;
+;discover;tqfind;#;learn;hear;get word;get wind;pick up;find out;get a line;discover;see;
 ;price;#;ascertain;
 ;concentrate;focus;center;centre;pore;rivet;#;think;cogitate;cerebrate;
 ;recall;#;concentrate;focus;center;centre;pore;rivet;
@@ -16235,7 +16235,7 @@
 ;mind;worry;#;think about;
 ;beware;mind;#;watch;look out;watch out;
 ;catch;#;surprise;
-;catch;#;witness;find;see;
+;catch;#;witness;tqfind;see;
 ;impute;ascribe;assign;attribute;#;judge;
 ;credit;#;impute;ascribe;assign;attribute;
 ;accredit;credit;#;impute;ascribe;assign;attribute;
@@ -16403,7 +16403,7 @@
 ;swallow;take back;unsay;withdraw;#;renounce;repudiate;
 ;retreat;pull back;back out;back away;crawfish;crawfish out;pull in one's horns;withdraw;#
 ;revoke;annul;lift;countermand;reverse;repeal;overturn;rescind;vacate;#;cancel;strike down;
-;cancel;invalidate;#;score;mark;
+;cancel;tqinvalidate;#;score;mark;
 ;bracket;bracket out;#;edit;redact;
 ;cross off;cross out;strike out;strike off;mark;#;take away;take out;
 ;dismiss;disregard;brush aside;brush off;discount;push aside;ignore;#;reject;
@@ -16498,11 +16498,11 @@
 ;pan;tear apart;trash;#;disparage;belittle;pick at;
 ;vilify;revile;vituperate;rail;#;abuse;clapperclaw;blackguard;shout;
 ;mind;#;object;
-;tease;razz;rag;cod;tantalize;tantalise;bait;taunt;twit;rally;ride;#;mock;bemock;
+;tease;razz;rag;cod;tantalize;tantalise;bait;taunt;twit;rally;ride;#;tqmock;betqmock;
 ;pull the leg of;kid;#;gull;dupe;slang;befool;cod;fool;put on;take in;put one over;put one across;
 ;raise;#;incite;instigate;set off;stir up;
 ;nettle;needle;goad;#;harass;hassle;harry;chivy;chivvy;chevy;chevvy;beset;plague;molest;provoke;
-;ridicule;guy;blackguard;laugh at;jest at;rib;make fun;poke fun;#;mock;bemock;
+;ridicule;guy;blackguard;laugh at;jest at;rib;make fun;poke fun;#;tqmock;betqmock;
 ;debunk;expose;#;ridicule;guy;blackguard;laugh at;jest at;rib;make fun;poke fun;
 ;joke;jest;#;communicate;intercommunicate;
 ;horse around;arse around;fool around;fool;#;play;joke;jest;
@@ -16660,7 +16660,7 @@
 ;suppose;say;#;speculate;
 ;predict;foretell;prognosticate;call;forebode;anticipate;promise;#;guess;venture;hazard;
 ;bet;wager;#;predict;foretell;prognosticate;call;forebode;anticipate;promise;
-;determine;find;find out;ascertain;#
+;determine;tqfind;find out;ascertain;#
 ;determine;check;find out;see;ascertain;watch;learn;#
 ;test;#;determine;check;find out;see;ascertain;watch;learn;
 ;suspect;surmise;#;guess;venture;hazard;
@@ -16728,7 +16728,7 @@
 ;specify;set;determine;fix;#;choose;take;select;pick out;
 ;name;#;specify;set;determine;fix;
 ;count;#;recite;
-;count;number;enumerate;#;determine;find;find out;ascertain;
+;count;number;enumerate;#;determine;tqfind;find out;ascertain;
 ;census;#;count;number;enumerate;
 ;number;#;designate;denominate;
 ;foliate;paginate;page;#;number;
@@ -16776,7 +16776,7 @@
 ;go around;spread;circulate;#;travel;go;move;locomote;
 ;call;#;label;
 ;pronounce;label;judge;#;declare;adjudge;hold;
-;rule;find;#;pronounce;label;judge;
+;rule;tqfind;#;pronounce;label;judge;
 ;qualify;#;pronounce;label;judge;
 ;air;send;broadcast;beam;transmit;#;publicize;publicise;air;bare;
 ;announce;annunciate;harbinger;foretell;herald;#;tell;
@@ -17342,7 +17342,7 @@
 ;cling to;hold close;hold tight;clutch;#;hold;take hold;
 ;cling;cleave;adhere;stick;cohere;#;touch;adjoin;meet;contact;
 ;twist;#;turn;
-;twist;twine;distort;#;change shape;change form;deform;
+;twist;twine;distort;#;change tqshape;change form;deform;
 ;curl;wave;#;twist;
 ;grip;#;seize;prehend;clutch;
 ;wield;handle;#;manipulate;
@@ -17419,8 +17419,8 @@
 ;slice;slice up;#;cut;
 ;pink;#;cut;
 ;carve;cut up;#;cut;
-;carve;#;cut;shape;form;work;mold;mould;forge;
-;swage;upset;#;shape;form;work;mold;mould;forge;
+;carve;#;cut;tqshape;form;work;mold;mould;forge;
+;swage;upset;#;tqshape;form;work;mold;mould;forge;
 ;carve;chip at;#;cut;
 ;chop;hack;#;cut;
 ;chop;chop up;#;cut;
@@ -17430,7 +17430,7 @@
 ;nick;snick;#;cut;
 ;chip;knap;cut off;break off;#;cut;
 ;chip;chip off;come off;break away;break off;#;separate;divide;part;
-;chip;#;shape;form;work;mold;mould;forge;
+;chip;#;tqshape;form;work;mold;mould;forge;
 ;skim;skim off;cream off;cream;#;remove;take;take away;withdraw;
 ;egg;#;coat;surface;
 ;flour;#;dredge;
@@ -17467,7 +17467,7 @@
 ;fold;fold up;turn up;#;change surface;
 ;pucker;rumple;cockle;crumple;knit;#;wrinkle;ruckle;crease;crinkle;scrunch;scrunch up;crisp;
 ;contract;#;shrink;reduce;
-;bend;deform;twist;turn;#;change shape;change form;deform;
+;bend;deform;twist;turn;#;change tqshape;change form;deform;
 ;hole;#;hollow;hollow out;core out;
 ;rout;root;rootle;#;dig;delve;cut into;turn over;
 ;cave;undermine;#;hollow;hollow out;core out;
@@ -17513,7 +17513,7 @@
 ;level;even out;even;#;change surface;
 ;grade;#;level;even out;even;
 ;strickle;strike;#;level;even out;even;
-;replace;put back;#;put;set;place;pose;position;lay;
+;tqreplace;put back;#;put;set;place;pose;position;lay;
 ;scratch;scrape;scratch up;#;incise;
 ;skin;scrape;#;injure;wound;
 ;dig;delve;cut into;turn over;#;remove;take;take away;withdraw;
@@ -17602,9 +17602,9 @@
 ;seal;#;affix;stick on;
 ;adhere;hold fast;bond;bind;stick;stick to;#;attach;
 ;nail;#;attach;
-;mask;#;cover;
-;mask;block out;#;cover;
-;mask;#;cover;
+;tqmask;#;cover;
+;tqmask;block out;#;cover;
+;tqmask;#;cover;
 ;blanket;#;cover;
 ;string;#;change;alter;
 ;string;thread;draw;#;arrange;set up;
@@ -17954,7 +17954,7 @@
 ;thread;#;guide;run;draw;pass;
 ;wind;wind up;#;tighten;fasten;
 ;wind;wrap;roll;twine;#;move;displace;
-;encircle;circle;#;shape;form;
+;encircle;circle;#;tqshape;form;
 ;cheese;#;spool;
 ;ball;#;wind;wrap;roll;twine;
 ;clue;clew;#;wind;wrap;roll;twine;
@@ -18158,9 +18158,9 @@
 ;output;#;produce;make;create;
 ;pulse;pulsate;#;produce;make;create;
 ;machine;#;produce;make;create;
-;machine;#;shape;form;work;mold;mould;forge;
-;stamp;#;shape;form;work;mold;mould;forge;
-;beat;#;shape;form;work;mold;mould;forge;
+;machine;#;tqshape;form;work;mold;mould;forge;
+;stamp;#;tqshape;form;work;mold;mould;forge;
+;beat;#;tqshape;form;work;mold;mould;forge;
 ;elaborate;#;produce;make;create;
 ;compose;compile;#;make;
 ;catalogue;catalog;#;compose;compile;
@@ -18186,7 +18186,7 @@
 ;imagine;conceive of;ideate;envisage;#;create by mental act;create mentally;
 ;think;#;imagine;conceive of;ideate;envisage;
 ;dream;daydream;woolgather;stargaze;#;imagine;conceive of;ideate;envisage;
-;discover;find;#;conceive;conceptualize;conceptualise;
+;discover;tqfind;#;conceive;conceptualize;conceptualise;
 ;plan;project;contrive;design;#;create by mental act;create mentally;
 ;concert;#;plan;project;contrive;design;
 ;mint;coin;strike;#;create from raw material;create from raw stuff;
@@ -18247,14 +18247,14 @@
 ;tie;#;fashion;forge;
 ;craft;#;fashion;forge;
 ;cooper;#;make;
-;shape;form;work;mold;mould;forge;#;create from raw material;create from raw stuff;
-;hill;#;shape;form;work;mold;mould;forge;
+;tqshape;form;work;mold;mould;forge;#;create from raw material;create from raw stuff;
+;hill;#;tqshape;form;work;mold;mould;forge;
 ;dip;#;create from raw material;create from raw stuff;
 ;raise;erect;rear;set up;put up;#;construct;build;make;
 ;level;raze;rase;dismantle;tear down;take down;pull down;#;destroy;destruct;
 ;press;press out;#;cast;mold;mould;
-;cast;mold;mould;#;shape;form;work;mold;mould;forge;
-;throw;#;shape;form;work;mold;mould;forge;
+;cast;mold;mould;#;tqshape;form;work;mold;mould;forge;
+;throw;#;tqshape;form;work;mold;mould;forge;
 ;cook;fix;ready;make;prepare;#;create from raw material;create from raw stuff;
 ;sandwich;#;organize;organise;prepare;devise;get up;machinate;
 ;devil;#;cook;fix;ready;make;prepare;
@@ -18290,7 +18290,7 @@
 ;gloss;polish;#;decorate;adorn;grace;ornament;embellish;beautify;
 ;japan;#;lacquer;
 ;blueprint;draft;draught;#;design;plan;
-;sculpt;sculpture;#;shape;form;work;mold;mould;forge;
+;sculpt;sculpture;#;tqshape;form;work;mold;mould;forge;
 ;paint;#;represent;interpret;
 ;paint;#;create;
 ;create;#;act;move;
@@ -18320,8 +18320,8 @@
 ;shade;fill in;#;draw;paint;
 ;vein;#;stain;
 ;color;colour;emblazon;#;decorate;adorn;grace;ornament;embellish;beautify;
-;model;mold;mould;#;shape;form;work;mold;mould;forge;
-;model;mock up;#;represent;interpret;
+;model;mold;mould;#;tqshape;form;work;mold;mould;forge;
+;model;tqmock up;#;represent;interpret;
 ;sketch;outline;chalk out;#;draw;
 ;coin;#;create verbally;
 ;write;compose;pen;indite;#;create verbally;
@@ -18979,7 +18979,7 @@
 ;foray into;raid;#;intrude on;invade;obtrude upon;encroach upon;
 ;reach;attain;make;hit;arrive at;gain;#
 ;make;#;reach;attain;make;hit;arrive at;gain;
-;find;#;reach;attain;make;hit;arrive at;gain;
+;tqfind;#;reach;attain;make;hit;arrive at;gain;
 ;reach;make;get to;progress to;#;achieve;accomplish;attain;reach;
 ;ground;run aground;#;reach;attain;make;hit;arrive at;gain;
 ;ground;run aground;#;land;
@@ -19016,7 +19016,7 @@
 ;crook;curve;#;bend;flex;
 ;arch;curve;arc;#;bend;flex;
 ;straighten;unbend;#;change posture;
-;bend;flex;#;change shape;change form;deform;
+;bend;flex;#;change tqshape;change form;deform;
 ;dress;line up;#;position;
 ;line up;queue up;queue;#;stand;stand up;
 ;slope;incline;pitch;#;lean;tilt;tip;slant;angle;
@@ -19062,7 +19062,7 @@
 ;close;#;approach;near;come on;go up;draw near;draw close;come near;
 ;close;come together;#;move;
 ;push;crowd;#;approach;near;come on;go up;draw near;draw close;come near;
-;unfold;stretch;stretch out;extend;#;change shape;change form;deform;
+;unfold;stretch;stretch out;extend;#;change tqshape;change form;deform;
 ;tear;shoot;shoot down;charge;buck;#;rush;hotfoot;hasten;hie;speed;race;pelt along;rush along;cannonball along;bucket along;belt along;
 ;travel rapidly;speed;hurry;zip;#;travel;go;move;locomote;
 ;speed;#;travel;go;move;locomote;
@@ -19124,7 +19124,7 @@
 ;conduct;transmit;convey;carry;channel;#;bring;convey;take;
 ;clear;top;#;pass;overtake;overhaul;
 ;outdistance;outstrip;distance;#;leave behind;
-;protrude;pop;pop out;bulge;bulge out;bug out;come out;#;change shape;change form;deform;
+;protrude;pop;pop out;bulge;bulge out;bug out;come out;#;change tqshape;change form;deform;
 ;career;#;travel;go;move;locomote;
 ;circuit;#;travel;go;move;locomote;
 ;spread;scatter;spread out;#;circulate;pass around;pass on;distribute;
@@ -19231,7 +19231,7 @@
 ;miss;lose;#
 ;witness;#;watch;
 ;watch;look on;#
-;witness;find;see;#;experience;undergo;see;go through;
+;witness;tqfind;see;#;experience;undergo;see;go through;
 ;see;#;perceive;comprehend;
 ;see;#;see;
 ;view;consider;look at;#;analyze;analyse;study;examine;canvass;
@@ -19276,7 +19276,7 @@
 ;earth;#;hide;
 ;cover;#;hide;conceal;
 ;bury;#;hide;conceal;
-;dissemble;cloak;mask;#;disguise;
+;dissemble;cloak;tqmask;#;disguise;
 ;cover;cover up;#;hide;conceal;
 ;harbor;harbour;shield;#;hide;conceal;
 ;show;demo;exhibit;present;demonstrate;#;show;
@@ -19293,9 +19293,9 @@
 ;search;look;#;examine;see;
 ;prospect;#;search;look;
 ;descry;spot;espy;spy;#;sight;
-;detect;observe;find;discover;notice;#;sight;
-;trace;#;detect;observe;find;discover;notice;
-;see;#;detect;observe;find;discover;notice;
+;detect;observe;tqfind;discover;notice;#;sight;
+;trace;#;detect;observe;tqfind;discover;notice;
+;see;#;detect;observe;tqfind;discover;notice;
 ;vanish;disappear;go away;#;end;finish;terminate;cease;
 ;clear;#;vanish;disappear;go away;
 ;produce;bring on;bring out;#
@@ -19371,7 +19371,7 @@
 ;salt;#;season;flavor;flavour;
 ;come;#;experience;undergo;see;go through;
 ;track;#;observe;
-;find;#;perceive;comprehend;
+;tqfind;#;perceive;comprehend;
 ;roll;#;sound;go;
 ;seem;#;appear;seem;
 ;block;#;anesthetize;anaesthetize;anesthetise;anaesthetise;put to sleep;put under;put out;
@@ -19407,10 +19407,10 @@
 ;get;acquire;#
 ;turn;#;get;acquire;
 ;buy;#;get;acquire;
-;find;#;get;acquire;
+;tqfind;#;get;acquire;
 ;deny;refuse;#;keep;hold on;
 ;deny;#;control;hold in;hold;contain;check;curb;moderate;
-;line up;get hold;come up;find;#;get;acquire;
+;line up;get hold;come up;tqfind;#;get;acquire;
 ;deny;#;withhold;keep back;
 ;reserve;#;withhold;keep back;
 ;dock;#;withhold;deduct;recoup;
@@ -19492,10 +19492,10 @@
 ;deal;#;pass;hand;reach;pass on;turn over;give;
 ;retail;#;sell;
 ;fetch;bring in;bring;#
-;recover;retrieve;find;regain;#;get;acquire;
+;recover;retrieve;tqfind;regain;#;get;acquire;
 ;catch;#;get;acquire;
-;find;happen;chance;bump;encounter;#
-;access;#;recover;retrieve;find;regain;
+;tqfind;happen;chance;bump;encounter;#
+;access;#;recover;retrieve;tqfind;regain;
 ;recover;recoup;#;get;acquire;
 ;compensate;recompense;remunerate;#;pay;
 ;compensate;recompense;indemnify;#;pay;
@@ -19517,8 +19517,8 @@
 ;prize;value;treasure;appreciate;#;see;consider;reckon;view;regard;
 ;cash;cash in;#;exchange;change;interchange;
 ;exchange;change;interchange;#;transfer;
-;substitute;replace;#;exchange;change;interchange;
-;reduce;#;substitute;replace;
+;substitute;tqreplace;#;exchange;change;interchange;
+;reduce;#;substitute;tqreplace;
 ;substitute;sub;stand in;fill in;#;exchange;change;interchange;
 ;trade;swap;swop;switch;#;exchange;change;interchange;
 ;dicker;bargain;#;negociate;negotiate;talk terms;
@@ -19585,10 +19585,10 @@
 ;bribe;corrupt;buy;#;pay;
 ;refund;return;repay;give back;#;pay;
 ;stock;carry;stockpile;#;have;have got;hold;
-;find;regain;#;get;acquire;
-;feel;#;find;regain;
-;locate;turn up;#;find;regain;
-;fall upon;strike;come upon;light upon;chance upon;come across;chance on;happen upon;attain;discover;#;find;regain;
+;tqfind;regain;#;get;acquire;
+;feel;#;tqfind;regain;
+;locate;turn up;#;tqfind;regain;
+;fall upon;strike;come upon;light upon;chance upon;come across;chance on;happen upon;attain;discover;#;tqfind;regain;
 ;foot;pick;#;pay;
 ;pinpoint;nail;#;locate;turn up;
 ;win;gain;#;get;acquire;
@@ -19837,7 +19837,7 @@
 ;exchange;#;transfer;reassign;
 ;fill;#;hire;engage;employ;
 ;fill;take;#;work;do work;
-;substitute;deputize;deputise;stand in;step in;#;supplant;replace;supersede;supervene upon;
+;substitute;deputize;deputise;stand in;step in;#;supplant;tqreplace;supersede;supervene upon;
 ;cover;#;protect;
 ;cover;#;substitute;deputize;deputise;stand in;step in;
 ;delegate;depute;#;delegate;designate;depute;assign;
@@ -19862,7 +19862,7 @@
 ;fire;give notice;can;dismiss;give the axe;send away;sack;force out;terminate;#;remove;
 ;drop;#;remove;
 ;take out;move out;remove;#
-;supplant;replace;supersede;supervene upon;#;succeed;come after;follow;
+;supplant;tqreplace;supersede;supervene upon;#;succeed;come after;follow;
 ;succeed;come after;follow;#
 ;tug;labor;labour;push;drive;#;fight;struggle;
 ;fight;struggle;#;try;seek;attempt;essay;assay;
@@ -20038,8 +20038,8 @@
 ;cancel;strike down;#;declare;adjudge;hold;
 ;cancel;call off;#
 ;break;#;cancel;call off;
-;invalidate;annul;quash;void;avoid;nullify;#;cancel;strike down;
-;break;#;invalidate;annul;quash;void;avoid;nullify;
+;tqinvalidate;annul;quash;void;avoid;nullify;#;cancel;strike down;
+;break;#;tqinvalidate;annul;quash;void;avoid;nullify;
 ;sanction;#;authorize;authorise;pass;clear;
 ;issue;supply;#;distribute;
 ;distribute;#;transfer;
@@ -20179,8 +20179,8 @@
 ;intervene;step in;interfere;interpose;#;interact;
 ;dominate;master;#;control;command;
 ;undertake;take in charge;#;accept;consent;go for;
-;rear;raise;bring up;nurture;parent;#
-;foster;#;rear;raise;bring up;nurture;parent;
+;rear;raise;bring up;nurture;tqparent;#
+;foster;#;rear;raise;bring up;nurture;tqparent;
 ;serve;attend to;wait on;attend;assist;#;help;assist;aid;
 ;service;serve;#;function;work;operate;go;run;
 ;represent;#;serve;
@@ -20369,7 +20369,7 @@
 ;connect;link;link up;join;unite;#
 ;bridge;bridge over;#;connect;link;tie;link up;
 ;root;#;become;
-;form;take form;take shape;spring;#;become;
+;form;take form;take tqshape;spring;#;become;
 ;originate;arise;rise;develop;uprise;spring up;grow;#;become;
 ;come forth;emerge;#;originate;arise;rise;develop;uprise;spring up;grow;
 ;break;#;come forth;emerge;
@@ -20552,7 +20552,7 @@
 ;back;#;lie;
 ;head;#;lie;
 ;crown;#;head;
-;situate;locate;#;determine;find;find out;ascertain;
+;situate;locate;#;determine;tqfind;find out;ascertain;
 ;map;#;situate;locate;
 ;place;localize;localise;#;situate;locate;
 ;dominate;command;overlook;overtop;#;lie;
diff --git a/tools/thumbnail/clipartcreator.cpp b/tools/thumbnail/clipartcreator.cpp
index 73585a97..d1378988 100644
--- a/tools/thumbnail/clipartcreator.cpp
+++ b/tools/thumbnail/clipartcreator.cpp
@@ -18,9 +18,9 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <qimage.h>
-#include <qpainter.h>
-#include <qfile.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqfile.h>
 
 #include <KoPicture.h>
 
@@ -35,18 +35,18 @@ extern "C"
     }
 }
 
-bool ClipartCreator::create(const QString &path, int width, int height, QImage &img)
+bool ClipartCreator::create(const TQString &path, int width, int height, TQImage &img)
 {
-    QPixmap pixmap;
+    TQPixmap pixmap;
     KoPicture picture;
     if (picture.loadFromFile( path ))
     {
-        pixmap = QPixmap( 200, 200 );
-        pixmap.fill( Qt::white );
+        pixmap = TQPixmap( 200, 200 );
+        pixmap.fill( TQt::white );
 
-        QPainter p;
+        TQPainter p;
         p.begin( &pixmap );
-        p.setBackgroundColor( Qt::white );
+        p.setBackgroundColor( TQt::white );
 
         picture.draw(p, 0, 0, pixmap.width(), pixmap.height());
         p.end();
diff --git a/tools/thumbnail/clipartcreator.h b/tools/thumbnail/clipartcreator.h
index d9e6e55b..8f33e623 100644
--- a/tools/thumbnail/clipartcreator.h
+++ b/tools/thumbnail/clipartcreator.h
@@ -26,7 +26,7 @@ class ClipartCreator : public ThumbCreator
 {
 public:
     ClipartCreator() {};
-    virtual bool create(const QString &path, int, int, QImage &img);
+    virtual bool create(const TQString &path, int, int, TQImage &img);
     virtual Flags flags() const;
 };
 
diff --git a/tools/thumbnail/kofficecreator.cpp b/tools/thumbnail/kofficecreator.cpp
index b62808d2..4e820eb1 100644
--- a/tools/thumbnail/kofficecreator.cpp
+++ b/tools/thumbnail/kofficecreator.cpp
@@ -21,9 +21,9 @@
 
 #include <time.h>
 
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qpainter.h>
+#include <tqpixmap.h>
+#include <tqimage.h>
+#include <tqpainter.h>
 
 #include <kapplication.h>
 #include <kfileitem.h>
@@ -55,27 +55,27 @@ KOfficeCreator::~KOfficeCreator()
     delete m_doc;
 }
 
-bool KOfficeCreator::create(const QString &path, int width, int height, QImage &img)
+bool KOfficeCreator::create(const TQString &path, int width, int height, TQImage &img)
 {
     KoStore* store = KoStore::createStore(path, KoStore::Read);
 
-    if ( store && ( store->open( QString("Thumbnails/thumbnail.png") ) || store->open( QString("preview.png") ) ) )
+    if ( store && ( store->open( TQString("Thumbnails/thumbnail.png") ) || store->open( TQString("preview.png") ) ) )
     {
         // Hooray! No long delay for the user...
-        QByteArray bytes = store->read(store->size());
+        TQByteArray bytes = store->read(store->size());
         store->close();
         delete store;
         return img.loadFromData(bytes);
     }
     delete store;
 
-    QString mimetype = KMimeType::findByPath( path )->name();
+    TQString mimetype = KMimeType::findByPath( path )->name();
 
-    m_doc = KParts::ComponentFactory::createPartInstanceFromQuery<KoDocument>( mimetype, QString::null);
+    m_doc = KParts::ComponentFactory::createPartInstanceFromQuery<KoDocument>( mimetype, TQString());
 
     if (!m_doc) return false;
 
-    connect(m_doc, SIGNAL(completed()), SLOT(slotCompleted()));
+    connect(m_doc, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted()));
 
     KURL url;
     url.setPath( path );
@@ -90,22 +90,22 @@ bool KOfficeCreator::create(const QString &path, int width, int height, QImage &
     killTimers();
 
     // render the page on a bigger pixmap and use smoothScale,
-    // looks better than directly scaling with the QPainter (malte)
-    QPixmap pix;
+    // looks better than directly scaling with the TQPainter (malte)
+    TQPixmap pix;
     if (width > 400)
     {
-        pix = m_doc->generatePreview(QSize(width, height));
+        pix = m_doc->generatePreview(TQSize(width, height));
     }
     else
     {
-        pix = m_doc->generatePreview(QSize(400, 400));
+        pix = m_doc->generatePreview(TQSize(400, 400));
     }
 
     img = pix.convertToImage();
     return true;
 }
 
-void KOfficeCreator::timerEvent(QTimerEvent *)
+void KOfficeCreator::timerEvent(TQTimerEvent *)
 {
     m_doc->closeURL();
     m_completed = true;
diff --git a/tools/thumbnail/kofficecreator.h b/tools/thumbnail/kofficecreator.h
index 3481c2b5..7bb70df7 100644
--- a/tools/thumbnail/kofficecreator.h
+++ b/tools/thumbnail/kofficecreator.h
@@ -26,17 +26,18 @@
 
 class KoDocument;
 
-class KOfficeCreator : public QObject, public ThumbCreator
+class KOfficeCreator : public TQObject, public ThumbCreator
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     KOfficeCreator();
     virtual ~KOfficeCreator();
-    virtual bool create(const QString &path, int width, int height, QImage &img);
+    virtual bool create(const TQString &path, int width, int height, TQImage &img);
     virtual Flags flags() const;
 
 protected:
-    virtual void timerEvent(QTimerEvent *);
+    virtual void timerEvent(TQTimerEvent *);
 
 private slots:
     void slotCompleted();