Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1157642 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
author: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2010-07-31 19:39:55 +0000
committer: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2010-07-31 19:39:55 +0000
commit: 0a6e0958c03e41c87b15557b6f407874f20c2f8d (patch)
tree: 2cdd58c4013b1be09cfcbb4ddae2b05712b9aeee /kvoctrain
parent: 83f9dfafc157ff7823804b3ff457b43d021a5b4b (diff)
download: tdeedu-0a6e0958c03e41c87b15557b6f407874f20c2f8d.tar.gz
tdeedu-0a6e0958c03e41c87b15557b6f407874f20c2f8d.zip
125 files changed, 2536 insertions, 2536 deletions
diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp
index 96d9c23e..7bdfe888 100644
--- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp
@@ -28,13 +28,13 @@
 #include <kvoctraindoc.h>
 #include "ProgressDlg.h"
 
-#include <qprogressbar.h>
-#include <qlabel.h>
+#include <tqprogressbar.h>
+#include <tqlabel.h>
 
 #include <kstandarddirs.h>
 
 
-ProgressDlg::ProgressDlg(const QString &doctitle, const QString &filename, const QString &title, QWidget* parent, const char* name)
+ProgressDlg::ProgressDlg(const TQString &doctitle, const TQString &filename, const TQString &title, TQWidget* parent, const char* name)
   : ProgressDlgForm( parent, name )
 {
   doc = 0;
diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h
index 6be7a8a6..43242aa2 100644
--- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h
+++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h
@@ -40,10 +40,10 @@ public:
 
     ProgressDlg
     (
-        const QString &doctitle,
-        const QString &filename,
-        const QString &title,
-        QWidget* parent = NULL,
+        const TQString &doctitle,
+        const TQString &filename,
+        const TQString &title,
+        TQWidget* parent = NULL,
         const char* name = NULL
     );
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
index 3a52d912..26834bea 100644
--- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
@@ -23,8 +23,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qcombobox.h>
-#include <qcheckbox.h>
+#include <tqcombobox.h>
+#include <tqcheckbox.h>
 
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -74,26 +74,26 @@ static ListRef date_itemlist [] =
 };
 
 
-BlockOptions::BlockOptions(QWidget* parent, const char* name, WFlags fl)
+BlockOptions::BlockOptions(TQWidget* parent, const char* name, WFlags fl)
 : BlockOptionsBase(parent, name, fl)
 {
-   connect(expire1, SIGNAL(activated(int)), this, SLOT(slotComboBoxActivated(int)));
-   connect(block1, SIGNAL(activated(int)), this, SLOT(slotComboBoxActivated(int)));
-   connect(expire2, SIGNAL(activated(int)), this, SLOT(slotComboBoxActivated(int)));
-   connect(block2, SIGNAL(activated(int)), this, SLOT(slotComboBoxActivated(int)));
-   connect(expire3, SIGNAL(activated(int)), this, SLOT(slotComboBoxActivated(int)));
-   connect(block3, SIGNAL(activated(int)), this, SLOT(slotComboBoxActivated(int)));
-   connect(expire4, SIGNAL(activated(int)), this, SLOT(slotComboBoxActivated(int)));
-   connect(block4, SIGNAL(activated(int)), this, SLOT(slotComboBoxActivated(int)));
-   connect(expire5, SIGNAL(activated(int)), this, SLOT(slotComboBoxActivated(int)));
-   connect(block5, SIGNAL(activated(int)), this, SLOT(slotComboBoxActivated(int)));
-   connect(expire6, SIGNAL(activated(int)), this, SLOT(slotComboBoxActivated(int)));
-   connect(block6, SIGNAL(activated(int)), this, SLOT(slotComboBoxActivated(int)));
-   connect(expire7, SIGNAL(activated(int)), this, SLOT(slotComboBoxActivated(int)));
-   connect(block7, SIGNAL(activated(int)), this, SLOT(slotComboBoxActivated(int)));
-
-   connect(kcfg_Block, SIGNAL(toggled(bool)), this, SLOT(slotBlockToggled(bool)));
-   connect(kcfg_Expire, SIGNAL(toggled(bool)), this, SLOT(slotExpireToggled(bool)));
+   connect(expire1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
+   connect(block1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
+   connect(expire2, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
+   connect(block2, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
+   connect(expire3, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
+   connect(block3, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
+   connect(expire4, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
+   connect(block4, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
+   connect(expire5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
+   connect(block5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
+   connect(expire6, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
+   connect(block6, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
+   connect(expire7, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
+   connect(block7, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
+
+   connect(kcfg_Block, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotBlockToggled(bool)));
+   connect(kcfg_Expire, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExpireToggled(bool)));
 
    fillWidgets();
    updateWidgets();
@@ -175,7 +175,7 @@ void BlockOptions::updateWidgets()
   emit blockExpireChanged(block, expire);
 }
 
-void BlockOptions::fillComboBox(QComboBox * cb)
+void BlockOptions::fillComboBox(TQComboBox * cb)
 {
   ListRef *ref = date_itemlist;
 
@@ -187,7 +187,7 @@ void BlockOptions::fillComboBox(QComboBox * cb)
   }
 }
 
-void BlockOptions::updateComboBox(int value, QComboBox * cb)
+void BlockOptions::updateComboBox(int value, TQComboBox * cb)
 {
   ListRef *ref = date_itemlist;
   int index = 0;
@@ -234,7 +234,7 @@ void BlockOptions::slotComboBoxActivated(int)
 
 void BlockOptions::checkValidity()
 {
-  QString message;
+  TQString message;
   bool found = false;
   for (int i = 1; i <= 6; i++)
   {
@@ -247,7 +247,7 @@ void BlockOptions::checkValidity()
           date_itemlist[m_blockComboList[i]->currentItem()].num != 0 &&
           date_itemlist[m_blockComboList[i - 1]->currentItem()].num >= date_itemlist[m_blockComboList[i]->currentItem()].num)
       {
-        QString format;
+        TQString format;
         if (!found)
           message.append(i18n("Illogical blocking times.\n"));
         found = true;
@@ -266,7 +266,7 @@ void BlockOptions::checkValidity()
           date_itemlist[m_expireComboList[i - 1]->currentItem()].num >=
             date_itemlist[m_expireComboList[i]->currentItem()].num)
       {
-        QString format;
+        TQString format;
         if (!found)
           message.append(i18n("\nIllogical expiration times.\n"));
         found = true;
@@ -286,7 +286,7 @@ void BlockOptions::checkValidity()
           date_itemlist[m_blockComboList[i]->currentItem()].num != 0 &&
           date_itemlist[m_blockComboList[i]->currentItem()].num >= date_itemlist[m_expireComboList[i]->currentItem()].num)
       {
-        QString format;
+        TQString format;
         if (!found)
           message.append(i18n("\nIllogical blocking vs. expiration times.\n"));
         found = true;
diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.h b/kvoctrain/kvoctrain/common-dialogs/blockoptions.h
index 366d2eb2..1d05f5ef 100644
--- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.h
@@ -26,7 +26,7 @@
 #ifndef BLOCKOPTIONS_H
 #define BLOCKOPTIONS_H
 
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
 
 #include "blockoptionsbase.h"
 #include "QueryManager.h"
@@ -38,7 +38,7 @@ class BlockOptions : public BlockOptionsBase
   Q_OBJECT
 
 public:
-  BlockOptions(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  BlockOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   void updateWidgets();
   bool hasChanged();
   bool isDefault();
@@ -55,12 +55,12 @@ protected slots:
 
 private:
   void fillWidgets();
-  void fillComboBox(QComboBox *);
-  void updateComboBox(int, QComboBox *);
+  void fillComboBox(TQComboBox *);
+  void updateComboBox(int, TQComboBox *);
   void checkValidity();
 
-  QValueList<QComboBox *> m_blockComboList;
-  QValueList<QComboBox *> m_expireComboList;
+  TQValueList<TQComboBox *> m_blockComboList;
+  TQValueList<TQComboBox *> m_expireComboList;
 };
 
 #endif
diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp b/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp
index ba3f0b14..e69d5c99 100644
--- a/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp
@@ -23,13 +23,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
 
 #include <knuminput.h>
 
 #include "generaloptions.h"
 
-GeneralOptions::GeneralOptions(QWidget* parent, const char* name, WFlags fl)
+GeneralOptions::GeneralOptions(TQWidget* parent, const char* name, WFlags fl)
 : GeneralOptionsBase(parent,name,fl)
 {
  kcfg_BackupTime->setEnabled(kcfg_AutoBackup->isChecked());
diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptions.h b/kvoctrain/kvoctrain/common-dialogs/generaloptions.h
index c4c7cc0b..434dd669 100644
--- a/kvoctrain/kvoctrain/common-dialogs/generaloptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/generaloptions.h
@@ -33,7 +33,7 @@ class GeneralOptions : public GeneralOptionsBase
   Q_OBJECT
 
 public:
-  GeneralOptions(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  GeneralOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 };
 
 #endif
diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp
index fae9cfa4..ea11654b 100644
--- a/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp
@@ -23,12 +23,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qpushbutton.h>
-#include <qcombobox.h>
+#include <tqpushbutton.h>
+#include <tqcombobox.h>
 
 #include "groupoptions.h"
 
-GroupOptions::GroupOptions(QWidget* parent, const char* name, WFlags fl)
+GroupOptions::GroupOptions(TQWidget* parent, const char* name, WFlags fl)
 : GroupOptionsBase(parent,name,fl)
 {
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptions.h b/kvoctrain/kvoctrain/common-dialogs/groupoptions.h
index bc8993af..6db54524 100644
--- a/kvoctrain/kvoctrain/common-dialogs/groupoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/groupoptions.h
@@ -33,7 +33,7 @@ class GroupOptions : public GroupOptionsBase
   Q_OBJECT
 
 public:
-  GroupOptions(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  GroupOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateButtons();
 };
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
index 2af07f63..73db49ce 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
@@ -16,12 +16,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qwidgetstack.h>
-#include <qlayout.h>
-#include <qradiobutton.h>
-#include <qcheckbox.h>
-#include <qlistview.h>
-#include <qlabel.h>
+#include <tqwidgetstack.h>
+#include <tqlayout.h>
+#include <tqradiobutton.h>
+#include <tqcheckbox.h>
+#include <tqlistview.h>
+#include <tqlabel.h>
 
 #include <klocale.h>
 #include <kstandarddirs.h>
@@ -54,7 +54,7 @@ static const char unapplied[] = I18N_NOOP(
     "If you save a profile, those changes will not be included.\n"
     "Do you wish to continue?");
 
-KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, QWidget *parent,
+KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *parent,
   const char *name,  KConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/,
   bool /*modal*/)
   : KConfigDialog(parent, name, config, dialogType, Default|Ok|Apply|Cancel|Help|User1, Ok, true), m_langSet(ls)
@@ -67,26 +67,26 @@ KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * les
 
   m_languageOptions = new LanguageOptions(m_langSet, 0, "Language Settings");
   addPage(m_languageOptions, i18n("Languages"), "set_language", i18n("Language Settings"), true);
-  connect(m_languageOptions, SIGNAL(widgetModified()), this, SLOT(updateButtons()));
+  connect(m_languageOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons()));
 
   m_viewOptions = new ViewOptions(0, "View Settings");
   addPage(m_viewOptions, i18n("View"), "view_choose", i18n("View Settings"), true);
 
   m_pasteOptions = new PasteOptions(m_langSet, doc, 0, "Copy & Paste Settings");
   addPage(m_pasteOptions, i18n("Copy & Paste"), "editpaste", i18n("Copy & Paste Settings"), true);
-  connect(m_pasteOptions, SIGNAL(widgetModified()), this, SLOT(updateButtons()));
+  connect(m_pasteOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons()));
 
   m_queryOptions = new QueryOptions(0, "Query Settings");
   addPage(m_queryOptions, i18n("Query"), "run_query", i18n("Query Settings"), true);
 
   m_thresholdOptions = new ThresholdOptions(lessons, m_queryManager, 0, "Threshold Settings");
   addPage(m_thresholdOptions, i18n("Thresholds"), "configure", i18n("Threshold Settings"), true);
-  connect(m_thresholdOptions, SIGNAL(widgetModified()), this, SLOT(updateButtons()));
+  connect(m_thresholdOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons()));
 
   m_blockOptions = new BlockOptions(0, "Blocking Settings");
   addPage(m_blockOptions, i18n("Blocking"), "configure", i18n("Blocking Settings"), true);
-  connect(m_blockOptions, SIGNAL(widgetModified()), this, SLOT(updateButtons()));
-  connect(m_blockOptions, SIGNAL(blockExpireChanged(bool, bool)), m_thresholdOptions, SLOT(slotBlockExpire(bool, bool)));
+  connect(m_blockOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons()));
+  connect(m_blockOptions, TQT_SIGNAL(blockExpireChanged(bool, bool)), m_thresholdOptions, TQT_SLOT(slotBlockExpire(bool, bool)));
 
   setButtonGuiItem(KDialogBase::User1, KGuiItem(i18n("&Profiles...")));
   setButtonTip(KDialogBase::User1, i18n("Save or load specific Query settings which consist in a profile"));
@@ -143,7 +143,7 @@ void KVocTrainPrefs::slotUser1()
   if (showDlg)
   {
     ProfilesDialog * dlg = new ProfilesDialog(m_queryManager, this, 0, true);
-    connect(dlg, SIGNAL(profileActivated()), this, SLOT(updateWidgets()));
+    connect(dlg, TQT_SIGNAL(profileActivated()), this, TQT_SLOT(updateWidgets()));
     dlg->show();
   }
 }
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
index ca723129..3aaf994d 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
@@ -46,7 +46,7 @@ public:
   /**
    * Creates a configuration dialog.
    */
-  KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, QWidget *parent=0,
+  KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *parent=0,
     const char *name=0, KConfigSkeleton *config=0, DialogType dialogType=IconList,
     int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index cbe8f08f..5da383b0 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -25,10 +25,10 @@
 
 //based on code copyright (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
 
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qfileinfo.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqfileinfo.h>
 
 #include <kapplication.h>
 #include <klocale.h>
@@ -677,19 +677,19 @@ KV_ISO639_Code kv_iso639_2[] = {
 };
 */
 
-LanguageOptions::LanguageOptions(LangSet & langset, QWidget* parent, const char* name, WFlags fl)
+LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char* name, WFlags fl)
   : LanguageOptionsBase(parent, name, fl), m_langSet(langset)
 {
   langset_popup = 0;
 
-  connect(b_langDel, SIGNAL(clicked()), this, SLOT(slotDeleteClicked()));
-  connect(b_langNew, SIGNAL(clicked()), this, SLOT(slotNewClicked()));
-  connect(b_langPixmap, SIGNAL(clicked()), SLOT(slotPixmapClicked()));
-  connect(e_newName, SIGNAL(textChanged(const QString&)), this, SLOT(slotNewNameChanged(const QString&)));
-  connect(d_shortName, SIGNAL(activated(const QString&)), this, SLOT(slotShortActivated(const QString&)));
-  connect(e_langLong, SIGNAL(textChanged(const QString&)), this, SLOT(slotLangChanged(const QString&)));
-  connect(e_shortName2, SIGNAL(textChanged(const QString&)), this, SLOT(slotShort2Changed(const QString&)));
-  connect(d_kblayout, SIGNAL(activated(const QString&)), this, SLOT(slotKeyboardLayoutChanged(const QString&)));
+  connect(b_langDel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteClicked()));
+  connect(b_langNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewClicked()));
+  connect(b_langPixmap, TQT_SIGNAL(clicked()), TQT_SLOT(slotPixmapClicked()));
+  connect(e_newName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotNewNameChanged(const TQString&)));
+  connect(d_shortName, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotShortActivated(const TQString&)));
+  connect(e_langLong, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLangChanged(const TQString&)));
+  connect(e_shortName2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotShort2Changed(const TQString&)));
+  connect(d_kblayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&)));
 
   // Load the languages first, then the countries and create the
   // menus for the languages last, so they will have flags
@@ -715,7 +715,7 @@ LanguageOptions::LanguageOptions(LangSet & langset, QWidget* parent, const char*
     e_shortName2->setText(m_langSet.shortId2(0));
     if (!m_langSet.PixMapFile(0).isEmpty() )
     {
-      QPixmap pix(m_langSet.PixMapFile(0));
+      TQPixmap pix(m_langSet.PixMapFile(0));
       if (!pix.isNull() )
       {
         m_lastPix = m_langSet.PixMapFile(0);
@@ -782,7 +782,7 @@ void LanguageOptions::slotDeleteClicked()
 }
 
 
-void LanguageOptions::slotKeyboardLayoutChanged(const QString& layout)
+void LanguageOptions::slotKeyboardLayoutChanged(const TQString& layout)
 {
   m_langSet.setKeyboardLayout(layout, d_shortName->currentItem());
   emit widgetModified();
@@ -802,9 +802,9 @@ void LanguageOptions::enableLangWidgets()
 
   if (enabled && KApplication::dcopClient()->isApplicationRegistered("kxkb"))
   {
-    QByteArray data;
-    QCString replyType;
-    QByteArray replyData;
+    TQByteArray data;
+    TQCString replyType;
+    TQByteArray replyData;
 
     if (!KApplication::dcopClient()->call("kxkb", "kxkb", "getLayoutsList()", data, replyType, replyData))
     {
@@ -812,12 +812,12 @@ void LanguageOptions::enableLangWidgets()
     }
     else
     {
-      if (replyType == "QStringList")
+      if (replyType == "TQStringList")
       {
-        QStringList layouts;
-        QDataStream stream(replyData, IO_ReadOnly);
+        TQStringList layouts;
+        TQDataStream stream(replyData, IO_ReadOnly);
         stream >> layouts;
-        layouts.prepend(QString::null);
+        layouts.prepend(TQString::null);
         d_kblayout->clear();
         d_kblayout->insertStringList(layouts);
       }
@@ -832,16 +832,16 @@ void LanguageOptions::enableLangWidgets()
 }
 
 
-void LanguageOptions::slotNewNameChanged(const QString& _s)
+void LanguageOptions::slotNewNameChanged(const TQString& _s)
 {
-   QString s = _s;
+   TQString s = _s;
    b_langNew->setEnabled(s.stripWhiteSpace().length() >= 2);
 }
 
 
 void LanguageOptions::slotNewClicked()
 {
-   QString s = e_newName->text();
+   TQString s = e_newName->text();
    d_shortName->insertItem(s.stripWhiteSpace());
    d_shortName->setCurrentItem(d_shortName->count()-1);
    enableLangWidgets();
@@ -851,10 +851,10 @@ void LanguageOptions::slotNewClicked()
 }
 
 
-void LanguageOptions::slotShortActivated(const QString& _id)
+void LanguageOptions::slotShortActivated(const TQString& _id)
 {
    int i = 0;
-   QString id = _id.stripWhiteSpace();
+   TQString id = _id.stripWhiteSpace();
    if (d_shortName->count() > (int) m_langSet.size() )
    {
      // avoid duplicates in language code
@@ -889,7 +889,7 @@ void LanguageOptions::slotShortActivated(const QString& _id)
 
      if (!m_langSet.PixMapFile(d_shortName->currentItem()).isEmpty())
      {
-       QPixmap pix(m_langSet.PixMapFile(d_shortName->currentItem()));
+       TQPixmap pix(m_langSet.PixMapFile(d_shortName->currentItem()));
        if (!pix.isNull())
          b_langPixmap->setPixmap(pix);
        else
@@ -898,7 +898,7 @@ void LanguageOptions::slotShortActivated(const QString& _id)
      else
        b_langPixmap->setText (i18n("No Picture Selected"));
 
-     QString layout = m_langSet.keyboardLayout(d_shortName->currentItem());
+     TQString layout = m_langSet.keyboardLayout(d_shortName->currentItem());
 
      //kdDebug() << "layout to select " << layout << endl;
 
@@ -919,7 +919,7 @@ void LanguageOptions::slotShortActivated(const QString& _id)
 }
 
 
-void LanguageOptions::slotLangChanged(const QString& s)
+void LanguageOptions::slotLangChanged(const TQString& s)
 {
   if (d_shortName->count() != 0 && d_shortName->currentItem() < (int) m_langSet.size())
   {
@@ -930,7 +930,7 @@ void LanguageOptions::slotLangChanged(const QString& s)
 }
 
 
-void LanguageOptions::slotShort2Changed(const QString& s)
+void LanguageOptions::slotShort2Changed(const TQString& s)
 {
   if (d_shortName->count() != 0 && d_shortName->currentItem() < (int) m_langSet.size())
   {
@@ -941,11 +941,11 @@ void LanguageOptions::slotShort2Changed(const QString& s)
 }
 
 
-bool LanguageOptions::setPixmap(QString pm)
+bool LanguageOptions::setPixmap(TQString pm)
 {
   if (d_shortName->count() )
   {
-    QPixmap pix (pm);
+    TQPixmap pix (pm);
     if (!pix.isNull() ) {
       m_langSet.setPixMapFile(pm, d_shortName->currentItem());
       b_langPixmap->setPixmap (pix);
@@ -963,9 +963,9 @@ void LanguageOptions::slotPixmapClicked()
 {
   if (m_langSet.size() > 0 )
   {
-    if (m_lastPix.isNull() || QPixmap(m_lastPix).isNull())
+    if (m_lastPix.isNull() || TQPixmap(m_lastPix).isNull())
     {
-      QString s;
+      TQString s;
       if (!m_langSet.shortId(d_shortName->currentItem()).isNull())
       {
         s = m_langSet.shortId(d_shortName->currentItem());
@@ -981,11 +981,11 @@ void LanguageOptions::slotPixmapClicked()
     }
     else
     {
-      QFileInfo fi (m_lastPix);
+      TQFileInfo fi (m_lastPix);
       m_lastPix = fi.dirPath()+"/flag.png";
     }
 
-    QString s = KFileDialog::getOpenFileName (m_lastPix, "*.png *.xpm *.gif *.xbm");
+    TQString s = KFileDialog::getOpenFileName (m_lastPix, "*.png *.xpm *.gif *.xbm");
     if (!s.isEmpty() )
     {
       if (setPixmap (s))
@@ -1008,22 +1008,22 @@ void LanguageOptions::loadCountryData()
 {
   // temperary use of our locale as the global locale
   KLocale *lsave = KGlobal::_locale;
-  QString curr_lang = lsave->language();
+  TQString curr_lang = lsave->language();
 
 //  KLocale locale("kvoctrain");
-  KLocale locale(QString::null);
+  KLocale locale(TQString::null);
   locale.setLanguage(curr_lang);
   KGlobal::_locale = &locale;
 
-  QString sub = QString::fromLatin1("l10n/");
-  QStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + QString::fromLatin1("*.desktop"));
+  TQString sub = TQString::fromLatin1("l10n/");
+  TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop"));
   regionlist.sort();
 
-  QMap<QString, Region>  regions;
+  TQMap<TQString, Region>  regions;
 
-  for (QStringList::ConstIterator it = regionlist.begin(); it != regionlist.end(); ++it)
+  for (TQStringList::ConstIterator it = regionlist.begin(); it != regionlist.end(); ++it)
   {
-    QString tag = *it;
+    TQString tag = *it;
     int index;
 
     index = tag.findRev('/');
@@ -1033,24 +1033,24 @@ void LanguageOptions::loadCountryData()
     if (index != -1) tag.truncate(index);
 
     KSimpleConfig entry(*it);
-    entry.setGroup(QString::fromLatin1("KCM Locale"));
-    QString name = entry.readEntry(QString::fromLatin1("Name"), i18n("without name"));
+    entry.setGroup(TQString::fromLatin1("KCM Locale"));
+    TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
 
     regions.insert(tag, Region(name));
   }
 
   // add all languages to the list
-  QStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + QString::fromLatin1("*/entry.desktop"));
+  TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop"));
 
   int idx = 0;
-  for (QStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit)
+  for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit)
   {
     KSimpleConfig entry(*sit);
-    entry.setGroup(QString::fromLatin1("KCM Locale"));
-    QString name = entry.readEntry(QString::fromLatin1("Name"), i18n("without name"));
-    QString submenu = entry.readEntry(QString::fromLatin1("Region"));
+    entry.setGroup(TQString::fromLatin1("KCM Locale"));
+    TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+    TQString submenu = entry.readEntry(TQString::fromLatin1("Region"));
 
-    QString tag = *sit;
+    TQString tag = *sit;
     int index = tag.findRev('/');
     tag.truncate(index);
     index = tag.findRev('/');
@@ -1059,15 +1059,15 @@ void LanguageOptions::loadCountryData()
     if (tag == "C")
       continue;
 
-    QStringList all_langs = QStringList::split(",", entry.readEntry(QString::fromLatin1("Languages")));
-    QValueList<int> langs;
+    TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::fromLatin1("Languages")));
+    TQValueList<int> langs;
 
-    QString pixmap = *sit;
+    TQString pixmap = *sit;
     index = pixmap.findRev('/');
     pixmap.truncate(index);
     pixmap += "/flag.png";
 
-    for (QStringList::Iterator it = all_langs.begin(); it != all_langs.end(); ++it)
+    for (TQStringList::Iterator it = all_langs.begin(); it != all_langs.end(); ++it)
     {
       // Treat ie "en_GB" and "en_USE" as "en" because the language list
       // only contains the first letters
@@ -1092,30 +1092,30 @@ void LanguageOptions::loadCountryData()
     regions[submenu].countries.append(countryIdMap[id]);
   }
 
-  langset_popup = new QPopupMenu();
+  langset_popup = new TQPopupMenu();
 
   // To have it sorted by name
-  QMap<QString, Region> regmap;
-  for (QMap<QString, Region>::Iterator it = regions.begin(); it != regions.end(); ++it)
+  TQMap<TQString, Region> regmap;
+  for (TQMap<TQString, Region>::Iterator it = regions.begin(); it != regions.end(); ++it)
     regmap.insert(it.data().region, it.data());
 
-  connect(langset_popup, SIGNAL(activated(int)), this, SLOT(slotLangFromGlobalActivated(int)));
-  for (QMap<QString, Region>::Iterator it = regmap.begin(); it != regmap.end(); ++it)
+  connect(langset_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromGlobalActivated(int)));
+  for (TQMap<TQString, Region>::Iterator it = regmap.begin(); it != regmap.end(); ++it)
   {
-    QPopupMenu *regpop = new QPopupMenu();
-    connect(regpop, SIGNAL(activated(int)), this, SLOT(slotLangFromGlobalActivated(int)));
+    TQPopupMenu *regpop = new TQPopupMenu();
+    connect(regpop, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromGlobalActivated(int)));
     langset_popup->insertItem(it.key(), regpop);
     Region r = it.data();
 
     // To have it sorted by name
-    QMap<QString, Country> countrymap;
-    for (QValueList<Country>::Iterator it = r.countries.begin(); it != r.countries.end(); ++it)
+    TQMap<TQString, Country> countrymap;
+    for (TQValueList<Country>::Iterator it = r.countries.begin(); it != r.countries.end(); ++it)
     {
       countrymap.insert((*it).country, *it);
     }
-    for (QMap<QString, Country>::Iterator it = countrymap.begin(); it != countrymap.end(); ++it)
+    for (TQMap<TQString, Country>::Iterator it = countrymap.begin(); it != countrymap.end(); ++it)
     {
-      regpop->insertItem(QPixmap(it.data().pixmap), it.key(), it.data().id);
+      regpop->insertItem(TQPixmap(it.data().pixmap), it.key(), it.data().id);
     }
   }
 
@@ -1130,9 +1130,9 @@ void LanguageOptions::slotLangFromGlobalActivated(int i)
   {
     Country c = countryIdMap[i];
     bool first = true;
-    for (QValueList<int>::Iterator it = c.langs.begin(); it != c.langs.end(); ++it)
+    for (TQValueList<int>::Iterator it = c.langs.begin(); it != c.langs.end(); ++it)
     {
-      QString s = global_langset.shortId(*it);
+      TQString s = global_langset.shortId(*it);
 
       if (d_shortName->contains(s.stripWhiteSpace()))
       {
@@ -1177,43 +1177,43 @@ void LanguageOptions::loadISO6391Data()
 {
   for (unsigned id = 0; id < (int)(sizeof(kv_iso639_1) / sizeof(kv_iso639_1[0])) && kv_iso639_1[id].iso1code != 0; ++id)
   {
-    QString s = i18n(kv_iso639_1[id].langname);
-    global_langset.addSet(kv_iso639_1[id].iso1code, s, QString::null, kv_iso639_1[id].iso2code);
+    TQString s = i18n(kv_iso639_1[id].langname);
+    global_langset.addSet(kv_iso639_1[id].iso1code, s, TQString::null, kv_iso639_1[id].iso2code);
   }
 }
 
 void LanguageOptions::createISO6391Menus()
 {
   // To have it sorted by name
-  QMap<QString, int> languages;
+  TQMap<TQString, int> languages;
   for (unsigned id = 0; id < global_langset.size(); ++id)
   {
-    QString s = global_langset.longId(id);
+    TQString s = global_langset.longId(id);
     languages.insert(s, id);
   }
 
-  iso6391_popup = new QPopupMenu();
+  iso6391_popup = new TQPopupMenu();
 
-  QPopupMenu *pop = 0;
-  QString lang = "";
-  for (QMap<QString, int>::Iterator it = languages.begin(); it != languages.end(); ++it)
+  TQPopupMenu *pop = 0;
+  TQString lang = "";
+  for (TQMap<TQString, int>::Iterator it = languages.begin(); it != languages.end(); ++it)
   {
     if (it.key()[0].upper() != lang[0].upper())
     {
-      pop = new QPopupMenu();
-      connect(pop, SIGNAL(activated(int)), this, SLOT(slotLangFromISO6391Activated(int)));
+      pop = new TQPopupMenu();
+      connect(pop, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromISO6391Activated(int)));
       iso6391_popup->insertItem(it.key()[0].upper(), pop, 1);
     }
 
     lang = it.key();
-    QString shortid = global_langset.shortId(it.data());
-    QString short2id = global_langset.shortId2(it.data());
+    TQString shortid = global_langset.shortId(it.data());
+    TQString short2id = global_langset.shortId2(it.data());
     lang += "\t("+shortid+")";
-    QString pixmap = global_langset.PixMapFile(it.data());
+    TQString pixmap = global_langset.PixMapFile(it.data());
     if (pixmap.isEmpty())
       pop->insertItem(lang, it.data());
     else
-      pop->insertItem(QPixmap(pixmap), lang, it.data());
+      pop->insertItem(TQPixmap(pixmap), lang, it.data());
   }
 }
 
@@ -1221,7 +1221,7 @@ void LanguageOptions::slotLangFromISO6391Activated(int id)
 {
    if (id < (int)global_langset.size())
    {
-     QString shortid = global_langset.shortId(id);
+     TQString shortid = global_langset.shortId(id);
 
      if (d_shortName->contains(shortid.stripWhiteSpace()))
      {
@@ -1269,7 +1269,7 @@ void LanguageOptions::updateSettings()
 
   for (int i = 0 ; i < (int) m_langSet.size(); i++)
   {
-    LanguageSettings languageSettings(QString::number(i));
+    LanguageSettings languageSettings(TQString::number(i));
     languageSettings.setShortId(m_langSet.shortId(i));
     languageSettings.setShort2Id(m_langSet.shortId2(i));
     languageSettings.setLongId(m_langSet.longId(i));
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.h b/kvoctrain/kvoctrain/common-dialogs/languageoptions.h
index b36d49a3..5da2bd88 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.h
@@ -26,7 +26,7 @@
 #ifndef LANGUAGEOPTIONS_H
 #define LANGUAGEOPTIONS_H
 
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
 
 #include "languageoptionsbase.h"
 #include "langset.h"
@@ -36,29 +36,29 @@ class LanguageOptions : public LanguageOptionsBase
   Q_OBJECT
 
 public:
-  LanguageOptions(LangSet & langset, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  LanguageOptions(LangSet & langset, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   virtual ~LanguageOptions ();
 
   LangSet getLangSet () const;
 
   struct Country
   {
-    Country(const QString& c, const QValueList<int> l, const QString& p, int i)
+    Country(const TQString& c, const TQValueList<int> l, const TQString& p, int i)
       : country(c), langs(l), pixmap(p), id(i) { }
     Country() { }
-    QString country;
-    QValueList<int> langs;
-    QString pixmap;
+    TQString country;
+    TQValueList<int> langs;
+    TQString pixmap;
     int id;
   };
 
   struct Region
   {
-    Region (const QString& reg)
+    Region (const TQString& reg)
       : region(reg) {}
     Region() {}
-    QString region;
-    QValueList<Country> countries;
+    TQString region;
+    TQValueList<Country> countries;
   };
 
   void updateWidgets();
@@ -73,27 +73,27 @@ protected slots:
   void slotDeleteClicked();
   void slotNewClicked();
   void slotPixmapClicked();
-  void slotLangChanged(const QString&);
-  void slotShort2Changed(const QString&);
-  void slotShortActivated(const QString&);
-  void slotNewNameChanged(const QString&);
+  void slotLangChanged(const TQString&);
+  void slotShort2Changed(const TQString&);
+  void slotShortActivated(const TQString&);
+  void slotNewNameChanged(const TQString&);
   void slotLangFromGlobalActivated(int);
   void slotLangFromISO6391Activated(int);
-  void slotKeyboardLayoutChanged(const QString&);
+  void slotKeyboardLayoutChanged(const TQString&);
 
 private:
-  bool setPixmap(QString pm);
+  bool setPixmap(TQString pm);
   void enableLangWidgets();
   void loadCountryData();
   void loadISO6391Data();
   void createISO6391Menus();
 
   LangSet global_langset;
-  QMap<int, Country> countryIdMap;
-  QPopupMenu * langset_popup;
-  QPopupMenu * iso6391_popup;
+  TQMap<int, Country> countryIdMap;
+  TQPopupMenu * langset_popup;
+  TQPopupMenu * iso6391_popup;
   LangSet m_langSet;
-  QString m_lastPix;
+  TQString m_lastPix;
   bool m_hasChanged;
 };
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
index cbfcadf4..ca79f2d5 100644
--- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
@@ -23,10 +23,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qpushbutton.h>
-#include <qlistbox.h>
-#include <qcheckbox.h>
-#include <qstringlist.h>
+#include <tqpushbutton.h>
+#include <tqlistbox.h>
+#include <tqcheckbox.h>
+#include <tqstringlist.h>
 
 #include <kcombobox.h>
 #include <klocale.h>
@@ -50,7 +50,7 @@ static const char *separator_id[] =
   0
 };
 
-PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, QWidget* parent, const char* name, WFlags fl)
+PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* parent, const char* name, WFlags fl)
 : PasteOptionsBase(parent,name,fl), m_langSet(langset)
 {
   OrderList->setEnabled(!kcfg_UseCurrent->isChecked());
@@ -58,13 +58,13 @@ PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, QWidget* paren
   SkipButton->setEnabled(!kcfg_UseCurrent->isChecked());
   DownButton->setEnabled(!kcfg_UseCurrent->isChecked());
 
-  connect(OrderList, SIGNAL(selectionChanged()), this, SLOT(syncButtons()));
-  connect(DownButton, SIGNAL(clicked()), this, SLOT(slotDownButtonClicked()));
-  connect(SkipButton, SIGNAL(clicked()), this, SLOT(slotSkipButtonClicked()));
-  connect(UpButton, SIGNAL(clicked()), this, SLOT(slotUpButtonClicked()));
+  connect(OrderList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(syncButtons()));
+  connect(DownButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownButtonClicked()));
+  connect(SkipButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSkipButtonClicked()));
+  connect(UpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpButtonClicked()));
 
-  connect(SeparatorCombo, SIGNAL(activated(int)), this, SLOT(slotSeparatorComboActivated(int)));
-  connect(kcfg_UseCurrent, SIGNAL(toggled(bool)), this, SLOT(slotUseCurrentDocToggled(bool)));
+  connect(SeparatorCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSeparatorComboActivated(int)));
+  connect(kcfg_UseCurrent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUseCurrentDocToggled(bool)));
 
   m_doc = doc;
   fillWidgets();
@@ -83,11 +83,11 @@ void PasteOptions::fillWidgets()
   SeparatorCombo->insertItem(i18n(" : "));
   SeparatorCombo->insertItem(i18n(" :: "));
 
-  QStringList sl = Prefs::pasteOrder();
+  TQStringList sl = Prefs::pasteOrder();
   OrderList->clear();
   for (int i = 0; i < (int) sl.count(); i++)
   {
-    QString codename = m_langSet.findLongId(sl[i]);
+    TQString codename = m_langSet.findLongId(sl[i]);
     if (codename.isEmpty())
       codename = sl[i];
     OrderList->insertItem(codename);
@@ -141,7 +141,7 @@ void PasteOptions::slotUpButtonClicked()
   if (OrderList->currentItem() > 0 && (int) OrderList->count() > 1)
   {
     int pos = OrderList->currentItem();
-    QString item = OrderList->text(pos);
+    TQString item = OrderList->text(pos);
     OrderList->removeItem(pos);
     OrderList->insertItem(item, pos-1);
     OrderList->setCurrentItem(pos-1);
@@ -164,7 +164,7 @@ void PasteOptions::slotDownButtonClicked()
   if ((int)OrderList->currentItem() < (int) OrderList->count()-1 && (int) OrderList->count() >  1)
   {
     int pos = OrderList->currentItem();
-    QString item = OrderList->text(pos);
+    TQString item = OrderList->text(pos);
     OrderList->removeItem(pos);
     OrderList->insertItem(item, pos+1);
     OrderList->setCurrentItem(pos+1);
@@ -206,7 +206,7 @@ bool PasteOptions::hasChanged()
   result = ((separator_id[SeparatorCombo->currentItem()] != Prefs::separator()));
   if (result)
     return true;
-  QStringList ol, pl;
+  TQStringList ol, pl;
   pl = Prefs::pasteOrder();
   ol = preparePasteOrderList();
   result = (pl.count() != ol.count());
@@ -237,7 +237,7 @@ void PasteOptions::slotSyncPasteOrderList()
 {
   for (int j = (int) OrderList->count()-1; j > 1; j--)
   {
-    QString comp = OrderList->text(j);
+    TQString comp = OrderList->text(j);
     for (int i = (int) j-1; i >=0; i--)
     {
       if (OrderList->text(i) == comp && !OrderList->text(i).isEmpty())
@@ -287,10 +287,10 @@ void PasteOptions::slotSyncPasteOrderList()
   }
 }
 
-QStringList PasteOptions::preparePasteOrderList()
+TQStringList PasteOptions::preparePasteOrderList()
 {
   slotSyncPasteOrderList();
-  QStringList sl;
+  TQStringList sl;
   // skip "skip" elements at tail
   int i;
   for (i = (int) OrderList->count()-1; i >= 0 && OrderList->text(i).isEmpty(); i--);
@@ -298,7 +298,7 @@ QStringList PasteOptions::preparePasteOrderList()
   // insert language codes and "skips" between them
   for ( /**/; i >= 0; i--)
   {
-    QString code = m_langSet.findShortId(OrderList->text(i));
+    TQString code = m_langSet.findShortId(OrderList->text(i));
     if (code.isEmpty())
       code = OrderList->text(i); // no longId previously available
     if (OrderList->text(i).isEmpty())
diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h
index 15b1015b..587f3c09 100644
--- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h
@@ -36,7 +36,7 @@ class PasteOptions : public PasteOptionsBase
   Q_OBJECT
 
 public:
-  PasteOptions(LangSet & langset, kvoctrainDoc * doc, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateWidgets();
   bool hasChanged();
@@ -58,7 +58,7 @@ private slots:
 
 private:
   void slotSyncPasteOrderList();
-  QStringList preparePasteOrderList();
+  TQStringList preparePasteOrderList();
   kvoctrainDoc * m_doc;
   LangSet m_langSet;
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
index d6669e7b..6660561f 100644
--- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
@@ -16,8 +16,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qcombobox.h>
-#include <qpushbutton.h>
+#include <tqcombobox.h>
+#include <tqpushbutton.h>
 
 #include <kdialogbase.h>
 #include <klocale.h>
@@ -34,27 +34,27 @@ SettingsProfile::SettingsProfile( )
 {
 }
 
-SettingsProfile::SettingsProfile(QString n, QString q, QString t, QString b)
+SettingsProfile::SettingsProfile(TQString n, TQString q, TQString t, TQString b)
 : name(n), query_set(q), thresh_set(t), block_set(b)
 {
 }
 
-ProfilesDialog::ProfilesDialog(QueryManager * m, QWidget *parent, const char *name, bool modal)
+ProfilesDialog::ProfilesDialog(QueryManager * m, TQWidget *parent, const char *name, bool modal)
  : KDialogBase(Swallow, i18n("Profiles"), Close, Close, parent, name, modal, false)
 {
   m_queryManager = m;
   mw = new GroupOptions(this);
   setMainWidget(mw);
 
-  connect(mw->ps_del, SIGNAL(clicked()), this, SLOT(slotDeleteGroup()));
-  connect(mw->ps_new, SIGNAL(clicked()), this, SLOT(slotNewGroup()));
-  connect(mw->ps_recall, SIGNAL(clicked()), this, SLOT(slotRecallGroup()));
-  connect(mw->ps_store, SIGNAL(clicked()), this, SLOT(slotStoreGroup()));
+  connect(mw->ps_del, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteGroup()));
+  connect(mw->ps_new, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewGroup()));
+  connect(mw->ps_recall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRecallGroup()));
+  connect(mw->ps_store, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStoreGroup()));
 
   int ls = Prefs::numPreSetting();
   for (int i = 0 ; i < ls; i++)
   {
-    PreSettings preSettings(QString::number(i));
+    PreSettings preSettings(TQString::number(i));
     preSettings.readConfig();
     profiles.append(SettingsProfile(preSettings.name(), preSettings.query(),
       preSettings.threshold(), preSettings.blocking()));
@@ -81,8 +81,8 @@ void ProfilesDialog::slotDeleteGroup()
 void ProfilesDialog::slotNewGroup()
 {
   bool ok;
-  QString newGroupName = KInputDialog::getText(i18n("Profile Description"),
-    i18n("Enter profile description:"), QString::null, &ok);
+  TQString newGroupName = KInputDialog::getText(i18n("Profile Description"),
+    i18n("Enter profile description:"), TQString::null, &ok);
 
   if (ok)
   {
@@ -111,7 +111,7 @@ void ProfilesDialog::slotStoreGroup()
 
 
 
-static bool extract (QString &line, QString &ret)
+static bool extract (TQString &line, TQString &ret)
 {
   int lim = line.find (",");
   if (lim < 0)
@@ -133,8 +133,8 @@ void ProfilesDialog::selectProfile(int profile)
 {
   if (profile < (int) profiles.count())
   {
-    QString line = profiles[profile].query_set;
-    QString s;
+    TQString line = profiles[profile].query_set;
+    TQString s;
     Prefs::setMaxTimePer(0);
     Prefs::setSwapDirection(false);
     Prefs::setAltLearn(false);
@@ -275,8 +275,8 @@ void ProfilesDialog::modifyProfile(int profile)
 
   if (profile < (int) profiles.count())
   {
-    QString s;
-    QString line;
+    TQString s;
+    TQString line;
 
     s.setNum(Prefs::maxTimePer());
     line += s + ',';
@@ -358,7 +358,7 @@ void ProfilesDialog::saveProfiles( )
   Prefs::setNumPreSetting(profiles.count());
   for (int i = 0 ; i < (int) profiles.count(); i++)
   {
-    PreSettings preSettings(QString::number(i));
+    PreSettings preSettings(TQString::number(i));
     preSettings.setName(profiles[i].name);
     preSettings.setQuery(profiles[i].query_set);
     preSettings.setThreshold(profiles[i].thresh_set);
diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h
index 827ba191..165eb534 100644
--- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h
+++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h
@@ -20,7 +20,7 @@
 #ifndef PROFILESDIALOG_H
 #define PROFILESDIALOG_H
 
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
 
 #include <kdialogbase.h>
 
@@ -35,12 +35,12 @@ class SettingsProfile
 {
 public:
   SettingsProfile();
-  SettingsProfile (QString n, QString q, QString t, QString b);
+  SettingsProfile (TQString n, TQString q, TQString t, TQString b);
 
-  QString name;
-  QString query_set;
-  QString thresh_set;
-  QString block_set;
+  TQString name;
+  TQString query_set;
+  TQString thresh_set;
+  TQString block_set;
 };
 
 class ProfilesDialog : public KDialogBase
@@ -48,7 +48,7 @@ class ProfilesDialog : public KDialogBase
   Q_OBJECT
 
 public:
-  ProfilesDialog(QueryManager * m, QWidget *parent = 0, const char *name = 0, bool modal = true);
+  ProfilesDialog(QueryManager * m, TQWidget *parent = 0, const char *name = 0, bool modal = true);
 
 signals:
   void profileActivated();
@@ -64,7 +64,7 @@ private:
   void modifyProfile(int profile);
   void saveProfiles();
 
-  typedef QValueList<SettingsProfile> Profiles;
+  typedef TQValueList<SettingsProfile> Profiles;
   Profiles profiles;
   QueryManager * m_queryManager;
   GroupOptions * mw;
diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp
index b1677e3f..2b4e6c5a 100644
--- a/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp
@@ -23,18 +23,18 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qgroupbox.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qlabel.h>
-#include <qbuttongroup.h>
+#include <tqgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqlabel.h>
+#include <tqbuttongroup.h>
 
 #include <knuminput.h>
 
 #include "queryoptions.h"
 #include "prefs.h"
 
-QueryOptions::QueryOptions(QWidget* parent, const char* name, WFlags fl)
+QueryOptions::QueryOptions(TQWidget* parent, const char* name, WFlags fl)
 : QueryOptionsBase(parent,name,fl)
 {
   kcfg_MaxTimePer->setDisabled(r_no_limit->isChecked());
diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h
index b424cbb2..409a597e 100644
--- a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h
@@ -33,7 +33,7 @@ class QueryOptions : public QueryOptionsBase
   Q_OBJECT
 
 public:
-  QueryOptions(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  QueryOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateWidgets();
 };
diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
index e611eb36..b54d60f6 100644
--- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
@@ -23,10 +23,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qlistbox.h>
-#include <qpushbutton.h>
-#include <qlabel.h>
-#include <qcombobox.h>
+#include <tqlistbox.h>
+#include <tqpushbutton.h>
+#include <tqlabel.h>
+#include <tqcombobox.h>
 
 #include <kcombobox.h>
 #include <klocale.h>
@@ -101,23 +101,23 @@ static ThreshListRef Threshdate_itemlist [] =
       };
 
 
-ThresholdOptions::ThresholdOptions(KComboBox * lessons, QueryManager * m, QWidget* parent, const char* name, WFlags fl)
+ThresholdOptions::ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* parent, const char* name, WFlags fl)
 : ThresholdOptionsBase(parent, name, fl), m_lessons(lessons)
 {
-  connect(lessoncomp,  SIGNAL(activated(int)), SLOT(slotSetLessonComp(int)));
-  connect(lessonlist,  SIGNAL(selectionChanged()), SIGNAL(widgetModified()));
-  connect(b_all_less,  SIGNAL(clicked()), SLOT(slotSelectAll()));
-  connect(b_none_less, SIGNAL(clicked()), SLOT(slotSelectNone()));
-  connect(typecomp,    SIGNAL(activated(int)), SLOT(slotSetTypeComp(int)));
-  connect(typelist,    SIGNAL(activated(int)), SLOT(slotComboActivated(int)));
-  connect(gradecomp,   SIGNAL(activated(int)), SLOT(slotSetGradeComp(int)));
-  connect(gradelist,   SIGNAL(activated(int)), SLOT(slotComboActivated(int)));
-  connect(querycomp,   SIGNAL(activated(int)), SLOT(slotSetQueryComp(int)));
-  connect(querylist,   SIGNAL(activated(int)), SLOT(slotComboActivated(int)));
-  connect(badcomp,     SIGNAL(activated(int)), SLOT(slotSetBadComp(int)));
-  connect(badlist,     SIGNAL(activated(int)), SLOT(slotComboActivated(int)));
-  connect(datecomp,    SIGNAL(activated(int)), SLOT(slotSetDateComp(int)));
-  connect(datelist,    SIGNAL(activated(int)), SLOT(slotComboActivated(int)));
+  connect(lessoncomp,  TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetLessonComp(int)));
+  connect(lessonlist,  TQT_SIGNAL(selectionChanged()), TQT_SIGNAL(widgetModified()));
+  connect(b_all_less,  TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectAll()));
+  connect(b_none_less, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectNone()));
+  connect(typecomp,    TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetTypeComp(int)));
+  connect(typelist,    TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int)));
+  connect(gradecomp,   TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetGradeComp(int)));
+  connect(gradelist,   TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int)));
+  connect(querycomp,   TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetQueryComp(int)));
+  connect(querylist,   TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int)));
+  connect(badcomp,     TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetBadComp(int)));
+  connect(badlist,     TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int)));
+  connect(datecomp,    TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetDateComp(int)));
+  connect(datelist,    TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int)));
 
   m_queryManager = m;
   fillWidgets();
@@ -147,8 +147,8 @@ void ThresholdOptions::fillWidgets()
   querylist->clear();
   for (int i = 0; i <= 15; i++)
   {
-    badlist->insertItem(QString::number(i));
-    querylist->insertItem(QString::number(i));
+    badlist->insertItem(TQString::number(i));
+    querylist->insertItem(TQString::number(i));
   }
 
   ref = Threshdate_itemlist;
@@ -344,7 +344,7 @@ void ThresholdOptions::slotSetLessonItems()
     }
   }
 
-  QString s;
+  TQString s;
   s.setNum(cnt);
   l_count->setText (s);
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h
index f64a99bb..e3d5b9da 100644
--- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h
@@ -36,7 +36,7 @@ class ThresholdOptions : public ThresholdOptionsBase
   Q_OBJECT
 
 public:
-  ThresholdOptions(KComboBox * lessons, QueryManager * m, QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateWidgets();
   bool hasChanged();
diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp
index 8c0cd2c6..773f263f 100644
--- a/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp
@@ -23,11 +23,11 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
 
 #include "viewoptions.h"
 
-ViewOptions::ViewOptions(QWidget* parent, const char* name, WFlags fl)
+ViewOptions::ViewOptions(TQWidget* parent, const char* name, WFlags fl)
 : ViewOptionsBase(parent,name,fl)
 {
   kcfg_GradeCol0->setEnabled(kcfg_UseGradeCol->isChecked());
diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptions.h b/kvoctrain/kvoctrain/common-dialogs/viewoptions.h
index fd3b3b1d..db3eb409 100644
--- a/kvoctrain/kvoctrain/common-dialogs/viewoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/viewoptions.h
@@ -33,7 +33,7 @@ class ViewOptions : public ViewOptionsBase
   Q_OBJECT
 
 public:
-  ViewOptions(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  ViewOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
 };
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp
index 3a6e3a5a..f1c8d62d 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp
@@ -26,14 +26,14 @@
 
 #include "DocOptionsPage.h"
 
-#include <qcheckbox.h>
+#include <tqcheckbox.h>
 
-DocOptionsPage::DocOptionsPage(bool sort, QWidget *parent, const char *name):DocOptionsPageForm(parent, name)
+DocOptionsPage::DocOptionsPage(bool sort, TQWidget *parent, const char *name):DocOptionsPageForm(parent, name)
 {
   sorter = sort;
   docsort->setChecked(sort);
 
-  connect( docsort, SIGNAL(toggled(bool)), SLOT(docSortToggled(bool)) );
+  connect( docsort, TQT_SIGNAL(toggled(bool)), TQT_SLOT(docSortToggled(bool)) );
 }
 
 void DocOptionsPage::docSortToggled(bool state)
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h
index 97655e4c..948a37af 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h
@@ -35,7 +35,7 @@ class DocOptionsPage : public DocOptionsPageForm
 
 public:
 
-  DocOptionsPage(bool sort, QWidget *parent, const char *name);
+  DocOptionsPage(bool sort, TQWidget *parent, const char *name);
 
   bool getSorting () const { return sorter; }
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
index 5f430175..a49fd65e 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
@@ -23,7 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <kstandarddirs.h>
@@ -39,48 +39,48 @@ DocPropsDlg::DocPropsDlg
 (
   kvoctrainDoc    *doc,
   const char      * /*start_page*/,
-  QComboBox       *lessons,
-  QString          title,
-  QString          author,
-  QString          license,
-  QString          doc_remark,
-  vector<QString>  types,
-  vector<QString>  tenses,
-  vector<QString>  usages,
-  QWidget         *parent,
+  TQComboBox       *lessons,
+  TQString          title,
+  TQString          author,
+  TQString          license,
+  TQString          doc_remark,
+  vector<TQString>  types,
+  vector<TQString>  tenses,
+  vector<TQString>  usages,
+  TQWidget         *parent,
   const char      *name,
   bool             modal
 )
   :
   KDialogBase(Tabbed, i18n("Document Properties"), Ok|Cancel, Ok, parent, name, modal)
 {
-  QFrame *page = addPage( i18n("&General") );
-  QVBoxLayout *topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+  TQFrame *page = addPage( i18n("&General") );
+  TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
   titleOptPage = new TitlePage (title, author, license, doc_remark, page, name);
   topLayout->addWidget( titleOptPage );
 
   page = addPage( i18n("L&essons"));
-  topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+  topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
   lessOptPage = new LessOptPage (lessons, doc, page, name);
   topLayout->addWidget( lessOptPage );
 
   page = addPage( i18n("word types","T&ypes"));
-  topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+  topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
   typeOptPage = new TypeOptPage (types, doc, page, name);
   topLayout->addWidget( typeOptPage );
 
   page = addPage( i18n("Te&nses"));
-  topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+  topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
   tenseOptPage = new TenseOptPage (tenses, doc, page, name);
   topLayout->addWidget( tenseOptPage );
 
   page = addPage( i18n("usage (area) of an expression", "&Usage"));
-  topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+  topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
   useOptPage = new UsageOptPage (usages, doc, page, name);
   topLayout->addWidget( useOptPage );
 
   page = addPage( i18n("&Options"));
-  topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+  topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
   docOptPage = new DocOptionsPage (doc->isAllowedSorting(), page, name);
   topLayout->addWidget( docOptPage );
 }
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h
index 31651c8e..9e6080d7 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h
@@ -51,36 +51,36 @@ public:
   (
     kvoctrainDoc    *doc,
     const char      *start_page,
-    QComboBox       *lessons,
-    QString          title,
-    QString          author,
-    QString          license,
-    QString          doc_remark,
-    vector<QString>  types,
-    vector<QString>  tenses,
-    vector<QString>  usages,
-    QWidget         *parent = NULL,
+    TQComboBox       *lessons,
+    TQString          title,
+    TQString          author,
+    TQString          license,
+    TQString          doc_remark,
+    vector<TQString>  types,
+    vector<TQString>  tenses,
+    vector<TQString>  usages,
+    TQWidget         *parent = NULL,
     const char      *name = NULL,
     bool             modal = true
   );
 
   inline bool getSorting()  const { return docOptPage->getSorting(); }
 
-  inline QString getTitle()      { return titleOptPage->getTitle(); }
-  inline QString getAuthor()     { return titleOptPage->getAuthor(); }
-  inline QString getLicense()    { return titleOptPage->getLicense(); }
-  inline QString getDocRemark()  { return titleOptPage->getDocRemark(); }
+  inline TQString getTitle()      { return titleOptPage->getTitle(); }
+  inline TQString getAuthor()     { return titleOptPage->getAuthor(); }
+  inline TQString getLicense()    { return titleOptPage->getLicense(); }
+  inline TQString getDocRemark()  { return titleOptPage->getDocRemark(); }
 
-  inline void getLesson (QComboBox *lessons, vector<int>& ret_index) const
+  inline void getLesson (TQComboBox *lessons, vector<int>& ret_index) const
     { lessOptPage->getLesson (lessons, ret_index); }
 
-  inline void getTypeNames (vector<QString> &types, vector<int>& ret_index) const
+  inline void getTypeNames (vector<TQString> &types, vector<int>& ret_index) const
     { typeOptPage->getTypeNames (types, ret_index); }
 
-  inline void getTenseNames (vector<QString> &tenses, vector<int>& ret_index) const
+  inline void getTenseNames (vector<TQString> &tenses, vector<int>& ret_index) const
     { tenseOptPage->getTenseNames (tenses, ret_index); }
 
-  inline void getUsageLabels (vector<QString> &usages, vector<int>& ret_index) const
+  inline void getUsageLabels (vector<TQString> &usages, vector<int>& ret_index) const
     { useOptPage->getUsageLabels (usages, ret_index); }
 
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
index 597978c0..76013ebf 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
@@ -27,10 +27,10 @@
 #include "DocPropLangDlg.h"
 #include "LangPropPage.h"
 
-#include <qstringlist.h>
-#include <qlayout.h>
-#include <qvaluelist.h>
-#include <qtabwidget.h>
+#include <tqstringlist.h>
+#include <tqlayout.h>
+#include <tqvaluelist.h>
+#include <tqtabwidget.h>
 
 #include <kapplication.h>
 #include <klocale.h>
@@ -42,17 +42,17 @@
 
 class kvoctraindoc;
 
-DocPropsLangDlg::DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, QWidget *parent, const char *name, bool modal)
+DocPropsLangDlg::DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *parent, const char *name, bool modal)
   :
   KDialogBase(Tabbed, i18n("Language Properties"), Ok|Cancel, Ok, parent, name, modal)
 {
-  QFrame * page;
-  QVBoxLayout * topLayout;
+  TQFrame * page;
+  TQVBoxLayout * topLayout;
   LangPropPage* lpp;
 
   for (int i = 0; i < (int) doc->numLangs(); i++)
   {
-    QString s;
+    TQString s;
     if (i == 0)
       s = doc->getOriginalIdent();
     else
@@ -60,15 +60,15 @@ DocPropsLangDlg::DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, QWidget *p
 
     int idx = langset->indexShortId(s);
 
-    QString tabCaption;
+    TQString tabCaption;
 
     if (idx >= 0)
       tabCaption = (langset->longId(idx));
     else
       tabCaption = (s);
 
-    page = addPage(s, s, QPixmap(langset->PixMapFile(idx))); ///@todo The pixmaps don't show up in tabbed dialog
-    topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+    page = addPage(s, s, TQPixmap(langset->PixMapFile(idx))); ///@todo The pixmaps don't show up in tabbed dialog
+    topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
     lpp = new LangPropPage (doc, s, doc->getConjugation(i), doc->getArticle(i), page, name);
     topLayout->addWidget( lpp );
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h
index e2fd9bf6..a6b7c14f 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h
@@ -26,7 +26,7 @@
 #ifndef DocPropsLangDlg_included
 #define DocPropsLangDlg_included
 
-#include <qvaluelist.h>
+#include <tqvaluelist.h>
 
 #include <kdialogbase.h>
 
@@ -42,13 +42,13 @@ class DocPropsLangDlg : public KDialogBase
 
 public:
 
-  DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, QWidget *parent = NULL, const char *name = NULL, bool modal = true);
+  DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *parent = NULL, const char *name = NULL, bool modal = true);
 
   Conjugation getConjugation(int idx) const;
   Article     getArticle(int idx) const;
 
 protected:
-  typedef QValueList<LangPropPage*> LangPagesList;
+  typedef TQValueList<LangPropPage*> LangPagesList;
   LangPagesList langPages;
 };
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
index 879b45d5..a9d255e6 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
@@ -30,17 +30,17 @@
 
 #include <klocale.h>
 
-#include <qlineedit.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
+#include <tqlineedit.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
 
 LangPropPage::LangPropPage
 (
   kvoctrainDoc      *_doc,
-  QString            curr_lang,
+  TQString            curr_lang,
   const Conjugation &conjug,
   const Article     &art,
-  QWidget           *parent,
+  TQWidget           *parent,
   const char        *name
 )
   :
@@ -51,25 +51,25 @@ LangPropPage::LangPropPage
 {
   l_langcode->setText(curr_lang);
 
-  connect( indef_female, SIGNAL(textChanged(const QString&)), SLOT(indefFemaleChanged(const QString&)) );
-  connect( def_female, SIGNAL(textChanged(const QString&)), SLOT(defFemaleChanged(const QString&)) );
-  connect( def_male, SIGNAL(textChanged(const QString&)), SLOT(defMaleChanged(const QString&)) );
-  connect( indef_male, SIGNAL(textChanged(const QString&)), SLOT(indefMaleChanged(const QString&)) );
-  connect( def_natural, SIGNAL(textChanged(const QString&)), SLOT(defNaturalChanged(const QString&)) );
-  connect( indef_natural, SIGNAL(textChanged(const QString&)), SLOT(indefNaturalChanged(const QString&)) );
-  connect( first_singular, SIGNAL(textChanged(const QString&)), SLOT(firstSingularChanged(const QString&)) );
-  connect( first_plural, SIGNAL(textChanged(const QString&)), SLOT(firstPluralChanged(const QString&)) );
-  connect( second_singular, SIGNAL(textChanged(const QString&)), SLOT(secondSingularChanged(const QString&)) );
-  connect( second_plural, SIGNAL(textChanged(const QString&)), SLOT(secondPluralChanged(const QString&)) );
-  connect( thirdF_singular, SIGNAL(textChanged(const QString&)), SLOT(thirdFSingularChanged(const QString&)) );
-  connect( thirdF_plural, SIGNAL(textChanged(const QString&)), SLOT(thirdFPluralChanged(const QString&)) );
-  connect( thirdM_singular, SIGNAL(textChanged(const QString&)), SLOT(thirdMSingularChanged(const QString&)) );
-  connect( thirdM_plural, SIGNAL(textChanged(const QString&)), SLOT(thirdMPluralChanged(const QString&)) );
-  connect( thirdN_singular, SIGNAL(textChanged(const QString&)), SLOT(thirdNSingularChanged(const QString&)) );
-  connect( thirdN_plural, SIGNAL(textChanged(const QString&)), SLOT(thirdNPluralChanged(const QString&)) );
-
-  connect( thirdS_common, SIGNAL(toggled(bool)), SLOT(slotThirdSCommonToggled(bool)) );
-  connect( thirdP_common, SIGNAL(toggled(bool)), SLOT(slotThirdPCommonToggled(bool)) );
+  connect( indef_female, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefFemaleChanged(const TQString&)) );
+  connect( def_female, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defFemaleChanged(const TQString&)) );
+  connect( def_male, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defMaleChanged(const TQString&)) );
+  connect( indef_male, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefMaleChanged(const TQString&)) );
+  connect( def_natural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defNaturalChanged(const TQString&)) );
+  connect( indef_natural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefNaturalChanged(const TQString&)) );
+  connect( first_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstSingularChanged(const TQString&)) );
+  connect( first_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstPluralChanged(const TQString&)) );
+  connect( second_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondSingularChanged(const TQString&)) );
+  connect( second_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondPluralChanged(const TQString&)) );
+  connect( thirdF_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFSingularChanged(const TQString&)) );
+  connect( thirdF_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFPluralChanged(const TQString&)) );
+  connect( thirdM_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMSingularChanged(const TQString&)) );
+  connect( thirdM_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMPluralChanged(const TQString&)) );
+  connect( thirdN_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNSingularChanged(const TQString&)) );
+  connect( thirdN_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNPluralChanged(const TQString&)) );
+
+  connect( thirdS_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdSCommonToggled(bool)) );
+  connect( thirdP_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) );
 
   conjugations = conjug;
 
@@ -94,7 +94,7 @@ LangPropPage::LangPropPage
   thirdN_plural->setEnabled(!common);
   thirdM_plural->setEnabled(!common);
 
-  QString def, indef;
+  TQString def, indef;
   articles.female(def, indef);
   def_female->setText (def);
   indef_female->setText (indef);
@@ -117,61 +117,61 @@ Conjugation LangPropPage::getConjugation()
 }
 
 
-void LangPropPage::firstPluralChanged(const QString& s)
+void LangPropPage::firstPluralChanged(const TQString& s)
 {
   conjugations.setPers1Plural (CONJ_PREFIX, s);
 }
 
 
-void LangPropPage::firstSingularChanged(const QString& s)
+void LangPropPage::firstSingularChanged(const TQString& s)
 {
   conjugations.setPers1Singular (CONJ_PREFIX, s);
 }
 
 
-void LangPropPage::secondSingularChanged(const QString& s)
+void LangPropPage::secondSingularChanged(const TQString& s)
 {
   conjugations.setPers2Singular (CONJ_PREFIX, s);
 }
 
 
-void LangPropPage::secondPluralChanged(const QString& s)
+void LangPropPage::secondPluralChanged(const TQString& s)
 {
   conjugations.setPers2Plural (CONJ_PREFIX, s);
 }
 
 
-void LangPropPage::thirdFPluralChanged(const QString& s)
+void LangPropPage::thirdFPluralChanged(const TQString& s)
 {
   conjugations.setPers3FemalePlural (CONJ_PREFIX, s);
 }
 
 
-void LangPropPage::thirdFSingularChanged(const QString& s)
+void LangPropPage::thirdFSingularChanged(const TQString& s)
 {
   conjugations.setPers3FemaleSingular (CONJ_PREFIX, s);
 }
 
 
-void LangPropPage::thirdMSingularChanged(const QString& s)
+void LangPropPage::thirdMSingularChanged(const TQString& s)
 {
   conjugations.setPers3MaleSingular (CONJ_PREFIX, s);
 }
 
 
-void LangPropPage::thirdNSingularChanged(const QString& s)
+void LangPropPage::thirdNSingularChanged(const TQString& s)
 {
   conjugations.setPers3NaturalSingular(CONJ_PREFIX, s);
 }
 
 
-void LangPropPage::thirdNPluralChanged(const QString& s)
+void LangPropPage::thirdNPluralChanged(const TQString& s)
 {
   conjugations.setPers3NaturalPlural (CONJ_PREFIX, s);
 }
 
 
-void LangPropPage::thirdMPluralChanged(const QString& s)
+void LangPropPage::thirdMPluralChanged(const TQString& s)
 {
   conjugations.setPers3MalePlural (CONJ_PREFIX, s);
 }
@@ -193,49 +193,49 @@ void LangPropPage::slotThirdPCommonToggled(bool common)
 }
 
 
-void LangPropPage::defFemaleChanged(const QString& s)
+void LangPropPage::defFemaleChanged(const TQString& s)
 {
-  QString def, indef;
+  TQString def, indef;
   articles.female(def, indef);
   articles.setFemale(s, indef);
 }
 
 
-void LangPropPage::indefFemaleChanged(const QString& s)
+void LangPropPage::indefFemaleChanged(const TQString& s)
 {
-  QString def, indef;
+  TQString def, indef;
   articles.female(def, indef);
   articles.setFemale(def, s);
 }
 
 
-void LangPropPage::defMaleChanged(const QString& s)
+void LangPropPage::defMaleChanged(const TQString& s)
 {
-  QString def, indef;
+  TQString def, indef;
   articles.male(def, indef);
   articles.setMale(s, indef);
 }
 
 
-void LangPropPage::indefMaleChanged(const QString& s)
+void LangPropPage::indefMaleChanged(const TQString& s)
 {
-  QString def, indef;
+  TQString def, indef;
   articles.male(def, indef);
   articles.setMale(def, s);
 }
 
 
-void LangPropPage::defNaturalChanged(const QString& s)
+void LangPropPage::defNaturalChanged(const TQString& s)
 {
-  QString def, indef;
+  TQString def, indef;
   articles.natural(def, indef);
   articles.setNatural(s, indef);
 }
 
 
-void LangPropPage::indefNaturalChanged(const QString& s)
+void LangPropPage::indefNaturalChanged(const TQString& s)
 {
-  QString def, indef;
+  TQString def, indef;
   articles.natural(def, indef);
   articles.setNatural(def, s);
 }
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h
index e98c9604..d7ab00f5 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h
@@ -42,10 +42,10 @@ public:
   LangPropPage
   (
     kvoctrainDoc      *doc,
-    QString            curr_lang,
+    TQString            curr_lang,
     const Conjugation &conjugations,
     const Article     &article,
-    QWidget           *parent = NULL,
+    TQWidget           *parent = NULL,
     const char        *name = NULL
   );
 
@@ -54,25 +54,25 @@ public:
 
 protected slots:
 
-  void secondPluralChanged(const QString&);
-  void secondSingularChanged(const QString&);
-  void thirdNSingularChanged(const QString&);
-  void thirdFPluralChanged(const QString&);
-  void thirdMSingularChanged(const QString&);
-  void thirdFSingularChanged(const QString&);
-  void thirdMPluralChanged(const QString&);
-  void thirdNPluralChanged(const QString&);
-  void firstPluralChanged(const QString&);
-  void firstSingularChanged(const QString&);
+  void secondPluralChanged(const TQString&);
+  void secondSingularChanged(const TQString&);
+  void thirdNSingularChanged(const TQString&);
+  void thirdFPluralChanged(const TQString&);
+  void thirdMSingularChanged(const TQString&);
+  void thirdFSingularChanged(const TQString&);
+  void thirdMPluralChanged(const TQString&);
+  void thirdNPluralChanged(const TQString&);
+  void firstPluralChanged(const TQString&);
+  void firstSingularChanged(const TQString&);
   void slotThirdSCommonToggled(bool);
   void slotThirdPCommonToggled(bool);
 
-  void defNaturalChanged(const QString& );
-  void indefMaleChanged(const QString& );
-  void indefNaturalChanged(const QString& );
-  void defFemaleChanged(const QString& );
-  void indefFemaleChanged(const QString& );
-  void defMaleChanged(const QString& );
+  void defNaturalChanged(const TQString& );
+  void indefMaleChanged(const TQString& );
+  void indefNaturalChanged(const TQString& );
+  void defFemaleChanged(const TQString& );
+  void indefFemaleChanged(const TQString& );
+  void defMaleChanged(const TQString& );
 
 protected:
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
index b5503228..d7015435 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
@@ -30,9 +30,9 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-#include <qcombobox.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
+#include <tqcombobox.h>
+#include <tqpushbutton.h>
+#include <tqlayout.h>
 
 #include <kvoctraindoc.h>
 
@@ -40,23 +40,23 @@
 
 LessOptPage::LessOptPage
 (
-  QComboBox     *lessons,
+  TQComboBox     *lessons,
   kvoctrainDoc  *_doc,
-  QWidget       *parent,
+  TQWidget       *parent,
   const char    *name
 )
   :
   LessOptPageForm( parent, name )
 {
-  connect( lessonList, SIGNAL(highlighted(int)), SLOT(slotLessonChosen(int)) );
-  connect( b_new, SIGNAL(clicked()), SLOT(slotNewLesson()) );
-  connect( b_modify, SIGNAL(clicked()), SLOT(slotModifyLesson()) );
-  connect( b_delete, SIGNAL(clicked()), SLOT(slotDeleteLesson()) );
-  connect( b_cleanup, SIGNAL(clicked()), SLOT(slotCleanup()) );
+  connect( lessonList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotLessonChosen(int)) );
+  connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewLesson()) );
+  connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyLesson()) );
+  connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteLesson()) );
+  connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );
 
   doc = _doc;
 
-  QString str;
+  TQString str;
   for (int i = 1; i < lessons->count(); i++) {
     str.setNum (i);
     if (i <= 9)
@@ -84,11 +84,11 @@ void LessOptPage::slotLessonChosen(int index)
 void LessOptPage::slotNewLesson()
 {
   bool ok;
-  QString getLesson = KInputDialog::getText(
-              i18n( "Lesson Description" ), i18n( "Enter lesson description:" ), QString::null, &ok );
+  TQString getLesson = KInputDialog::getText(
+              i18n( "Lesson Description" ), i18n( "Enter lesson description:" ), TQString::null, &ok );
   if( !ok )
     return;
-  QString str;
+  TQString str;
   int i = lessonList->count()+1;
   str.setNum (i);
   if (i <= 9)
@@ -106,15 +106,15 @@ void LessOptPage::slotModifyLesson()
 {
   if (lessonList->count() != 0 && (int) lessonList->count() > act_lesson)
   {
-    QString str = lessonList->text (act_lesson);
+    TQString str = lessonList->text (act_lesson);
     int pos = str.find (LESS_TAG);
     str.remove (0, pos+strlen (LESS_TAG));
     bool ok;
-    QString getLesson = KInputDialog::getText(
+    TQString getLesson = KInputDialog::getText(
                 i18n( "Lesson Description" ), i18n( "Enter lesson description:" ), str, &ok );
     if( !ok )
       return;
-    QString str2;
+    TQString str2;
     str2.setNum (act_lesson+1);
     if (act_lesson <= 9)
       str2.insert (0, " ");
@@ -125,7 +125,7 @@ void LessOptPage::slotModifyLesson()
 
 void LessOptPage::updateListBox(int start)
 {
-  QString str, str2;
+  TQString str, str2;
   for (int i = start; i < (int) lessonList->count(); i++)
   {
     str = lessonList->text (i);
@@ -171,12 +171,12 @@ void LessOptPage::slotDeleteLesson()
 }
 
 
-void LessOptPage::getLesson (QComboBox *ret_lesson, vector<int> &ret_Index)
+void LessOptPage::getLesson (TQComboBox *ret_lesson, vector<int> &ret_Index)
 {
   while (ret_lesson->count() > 1) /* first entry is "no lesson" */
     ret_lesson->removeItem (1);
 
-  QString str;
+  TQString str;
   for (int i = 0; i < (int) lessonList->count(); i++) {
     str = lessonList->text(i);
     int pos = str.find (LESS_TAG);
@@ -218,7 +218,7 @@ void LessOptPage::slotCleanup()
 
 
 void LessOptPage::cleanUnused (kvoctrainDoc *doc,
-                               const QComboBox * /*lessons*/,
+                               const TQComboBox * /*lessons*/,
                                const vector<int> &lessonIndex,
                                int old_lessons,
                                vector<int> &lessons_in_query)
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h
index faeb981d..9116e179 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h
@@ -42,16 +42,16 @@ public:
 
   LessOptPage
   (
-    QComboBox     *lessons,
+    TQComboBox     *lessons,
     kvoctrainDoc  *doc,
-    QWidget       *parent = NULL,
+    TQWidget       *parent = NULL,
     const char    *name = NULL
   );
 
-  void getLesson (QComboBox *ret_lesson, vector<int>& ret_Index);
+  void getLesson (TQComboBox *ret_lesson, vector<int>& ret_Index);
 
   static void cleanUnused(kvoctrainDoc *doc,
-                          const QComboBox *lessons,
+                          const TQComboBox *lessons,
                           const vector<int> &lessonIndex,
                           int old_lessons,
                           vector<int> &lessons_in_use);
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
index 0e3ece95..00325b7b 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
@@ -25,7 +25,7 @@
 
 #include "TenseOptPage.h"
 
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
 
 #include <kapplication.h>
 #include <kinputdialog.h>
@@ -38,21 +38,21 @@
 
 TenseOptPage::TenseOptPage
 (
-  const vector<QString> &tenses,
+  const vector<TQString> &tenses,
   kvoctrainDoc    *_doc,
-  QWidget         *parent,
+  TQWidget         *parent,
   const char      *name
 )
   :
   TenseOptPageForm( parent, name )
 {
-  connect( tenseList, SIGNAL(highlighted(int)), SLOT(slotTenseChosen(int)) );
-  connect( b_cleanup, SIGNAL(clicked()), SLOT(slotCleanup()) );
-  connect( b_delete, SIGNAL(clicked()), SLOT(slotDeleteTense()) );
-  connect( b_modify, SIGNAL(clicked()), SLOT(slotModifyTense()) );
-  connect( b_new, SIGNAL(clicked()), SLOT(slotNewTense()) );
+  connect( tenseList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTenseChosen(int)) );
+  connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );
+  connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteTense()) );
+  connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyTense()) );
+  connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewTense()) );
 
-  QString str;
+  TQString str;
   for (int i = 0; i < (int) tenses.size(); i++) {
     str.setNum (i+1);
     if (i <= 9)
@@ -82,12 +82,12 @@ void TenseOptPage::slotTenseChosen(int index)
 void TenseOptPage::slotNewTense()
 {
   bool ok;
-  QString getTense = KInputDialog::getText(
-              i18n( "Tense Description" ), i18n( "Enter tense description:" ), QString::null, &ok );
+  TQString getTense = KInputDialog::getText(
+              i18n( "Tense Description" ), i18n( "Enter tense description:" ), TQString::null, &ok );
   if( !ok )
     return;
 
-  QString str;
+  TQString str;
   int i = tenseList->count()+1;
   str.setNum (i);
   if (i <= 9)
@@ -105,15 +105,15 @@ void TenseOptPage::slotModifyTense()
 {
   if (tenseList->count() != 0 && (int) tenseList->count() > act_tense) 
   {
-    QString str = tenseList->text (act_tense);
+    TQString str = tenseList->text (act_tense);
     int pos = str.find (TENSE_TAG);
     str.remove (0, pos+strlen (TENSE_TAG));
     bool ok;
-    QString getTense = KInputDialog::getText(
+    TQString getTense = KInputDialog::getText(
               i18n( "Tense Description" ), i18n( "Enter tense description:" ), str, &ok );
     if( !ok )
       return;
-    QString str2;
+    TQString str2;
     str2.setNum (act_tense+1);
     if (act_tense <= 9)
       str2.insert (0, " ");
@@ -124,7 +124,7 @@ void TenseOptPage::slotModifyTense()
 
 void TenseOptPage::updateListBox(int start)
 {
-  QString str, str2;
+  TQString str, str2;
   for (int i = start; i < (int) tenseList->count(); i++) 
   {
     str = tenseList->text (i);
@@ -144,7 +144,7 @@ void TenseOptPage::slotDeleteTense()
   if (tenseList->count() != 0
       && (int) tenseList->count() > act) {
 
-    QString t;
+    TQString t;
     t.setNum(tenseIndex[act_tense]+1);
     t.insert (0, QM_USER_TYPE);
     for (int ent = 0; ent < doc->numEntries(); ent++) {
@@ -179,9 +179,9 @@ void TenseOptPage::slotDeleteTense()
 }
 
 
-void TenseOptPage::getTenseNames (vector<QString> &ret_tense, vector<int> &ret_Index)
+void TenseOptPage::getTenseNames (vector<TQString> &ret_tense, vector<int> &ret_Index)
 {
-  QString str;    ret_tense.clear();
+  TQString str;    ret_tense.clear();
   for (int i = 0; i < (int) tenseList->count(); i++) 
   {
     str = tenseList->text(i);
@@ -203,7 +203,7 @@ void TenseOptPage::slotCleanup()
     for (int i = 0; i < (int) doc->numEntries(); i++) {
       Conjugation conj = doc->getEntry(i)->getConjugation(col);
       for (int ci = 0; ci < conj.numEntries(); ci++) {
-        QString t = conj.getType(ci);
+        TQString t = conj.getType(ci);
         if (t.left(strlen(UL_USER_TENSE)) == UL_USER_TENSE) {
           t.remove (0, strlen(UL_USER_TENSE));
           int idx = t.toInt();
@@ -234,7 +234,7 @@ void TenseOptPage::slotCleanup()
 void TenseOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &tenseIndex, int old_tenses)
 {
   vector<int> translate_index;
-  vector<QString> new_tenseStr;
+  vector<TQString> new_tenseStr;
 
   /////////////////////////////////////////////////////
   // translate_index contains new index number for each
@@ -259,13 +259,13 @@ void TenseOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &tenseIndex,
       Conjugation conj = doc->getEntry(i)->getConjugation (col);
       bool dirty = false;
       for (int ci = 0; ci < conj.numEntries(); ci++) {
-        QString old = conj.getType(ci);
+        TQString old = conj.getType(ci);
         if (!old.isEmpty() && old.left(strlen(QM_USER_TYPE)) == QM_USER_TYPE) {
           old.remove (0, 1);
           int o = old.toInt();
 
           dirty = true;
-          QString newtense;
+          TQString newtense;
           if (translate_index[o] != 0) {
             newtense.setNum (translate_index[o]);
             newtense.insert (0, QM_USER_TYPE);
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h
index 2ae20b7f..4a164a67 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h
@@ -43,13 +43,13 @@ public:
 
   TenseOptPage
   (
-    const vector<QString> &tenses,
+    const vector<TQString> &tenses,
     kvoctrainDoc    *doc,
-    QWidget         *parent = NULL,
+    TQWidget         *parent = NULL,
     const char      *name = NULL
   );
 
-  void getTenseNames (vector<QString> &ret_types, vector<int> &ret_Index);
+  void getTenseNames (vector<TQString> &ret_types, vector<int> &ret_Index);
 
   static void cleanUnused(kvoctrainDoc *doc, const vector<int> &tenseIndex, int old_tenses);
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
index 038bceac..96f71bd4 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
@@ -29,17 +29,17 @@
 #include <kapplication.h>
 #include <klocale.h>
 
-#include <qlineedit.h>
-#include <qmultilineedit.h>
-#include <qlabel.h>
+#include <tqlineedit.h>
+#include <tqmultilineedit.h>
+#include <tqlabel.h>
 
 TitlePage::TitlePage
 (
-  QString  _title,
-  QString  _author,
-  QString  _license,
-  QString  _doc_remark,
-  QWidget* parent,
+  TQString  _title,
+  TQString  _author,
+  TQString  _license,
+  TQString  _doc_remark,
+  TQWidget* parent,
   const char* name
 )
   :
@@ -64,14 +64,14 @@ TitlePage::TitlePage
   e_remark->setText (doc_remark);
   label_remark->setBuddy(e_remark);
 
-  connect( e_author, SIGNAL(textChanged()),  SLOT(slotAuthorChanged()) );
-  connect( e_title, SIGNAL(textChanged(const QString&)),   SLOT(slotTitleChanged(const QString&)) );
-  connect( e_license, SIGNAL(textChanged(const QString&)), SLOT(slotLicenseChanged(const QString&)) );
-  connect( e_remark, SIGNAL(textChanged()),  SLOT(slotDocRemarkChanged()) );
+  connect( e_author, TQT_SIGNAL(textChanged()),  TQT_SLOT(slotAuthorChanged()) );
+  connect( e_title, TQT_SIGNAL(textChanged(const TQString&)),   TQT_SLOT(slotTitleChanged(const TQString&)) );
+  connect( e_license, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotLicenseChanged(const TQString&)) );
+  connect( e_remark, TQT_SIGNAL(textChanged()),  TQT_SLOT(slotDocRemarkChanged()) );
 }
 
 
-void TitlePage::slotTitleChanged(const QString& s)
+void TitlePage::slotTitleChanged(const TQString& s)
 {
   title = s;
 }
@@ -83,7 +83,7 @@ void TitlePage::slotAuthorChanged()
 }
 
 
-void TitlePage::slotLicenseChanged(const QString& s)
+void TitlePage::slotLicenseChanged(const TQString& s)
 {
   license = s;
 }
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h
index 45b85ee6..d656342a 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h
@@ -37,32 +37,32 @@ public:
 
   TitlePage
   (
-    QString      title,
-    QString      author,
-    QString      license,
-    QString      doc_remark,
-    QWidget     *parent = NULL,
+    TQString      title,
+    TQString      author,
+    TQString      license,
+    TQString      doc_remark,
+    TQWidget     *parent = NULL,
     const char  *name = NULL
   );
 
-  QString getTitle() { return title; }
-  QString getAuthor() { return author; }
-  QString getLicense() { return license; }
-  QString getDocRemark() { return doc_remark; }
+  TQString getTitle() { return title; }
+  TQString getAuthor() { return author; }
+  TQString getLicense() { return license; }
+  TQString getDocRemark() { return doc_remark; }
 
 protected slots:
 
-  void slotTitleChanged(const QString&);
+  void slotTitleChanged(const TQString&);
   void slotAuthorChanged();
-  void slotLicenseChanged(const QString&);
+  void slotLicenseChanged(const TQString&);
   void slotDocRemarkChanged();
 
 private:
 
-  QString title;
-  QString author;
-  QString license;
-  QString doc_remark;
+  TQString title;
+  TQString author;
+  TQString license;
+  TQString doc_remark;
 };
 
 #endif // TitlePage_included
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
index 9ab25379..c89129b8 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
@@ -30,7 +30,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
 
 #include <QueryManager.h>
 
@@ -38,22 +38,22 @@
 
 TypeOptPage::TypeOptPage
 (
-  const vector<QString> &types,
+  const vector<TQString> &types,
   kvoctrainDoc    *_doc,
-  QWidget         *parent,
+  TQWidget         *parent,
   const char      *name
 )
   :
   TypeOptPageForm( parent, name ),
   doc(_doc)
 {
-  connect( typeList, SIGNAL(highlighted(int)), SLOT(slotTypeChosen(int)) );
-  connect( b_cleanup, SIGNAL(clicked()), SLOT(slotCleanup()) );
-  connect( b_delete, SIGNAL(clicked()), SLOT(slotDeleteType()) );
-  connect( b_modify, SIGNAL(clicked()), SLOT(slotModifyType()) );
-  connect( b_new, SIGNAL(clicked()), SLOT(slotNewType()) );
+  connect( typeList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTypeChosen(int)) );
+  connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );
+  connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteType()) );
+  connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyType()) );
+  connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewType()) );
 
-  QString str;
+  TQString str;
   for (int i = 0; i < (int) types.size(); i++) {
     str.setNum (i+1);
     if (i <= 9)
@@ -82,11 +82,11 @@ void TypeOptPage::slotTypeChosen(int index)
 void TypeOptPage::slotNewType()
 {
   bool ok;
-  QString getType = KInputDialog::getText(
-              i18n( "Type Description" ), i18n( "Enter type description:" ), QString::null, &ok );
+  TQString getType = KInputDialog::getText(
+              i18n( "Type Description" ), i18n( "Enter type description:" ), TQString::null, &ok );
   if( !ok )
     return;
-  QString str;
+  TQString str;
   int i = typeList->count()+1;
   str.setNum (i);
   if (i <= 9)
@@ -104,15 +104,15 @@ void TypeOptPage::slotModifyType()
 {
   if (typeList->count() != 0
       && (int) typeList->count() > act_type) {
-    QString str = typeList->text (act_type);
+    TQString str = typeList->text (act_type);
     int pos = str.find (TYPE_TAG);
     str.remove (0, pos+strlen (TYPE_TAG));
     bool ok;
-    QString getType = KInputDialog::getText(
+    TQString getType = KInputDialog::getText(
                 i18n( "Type Description" ), i18n( "Enter type description:" ), str, &ok );
     if( !ok )
       return;
-    QString str2;
+    TQString str2;
     str2.setNum (act_type+1);
     if (act_type <= 9)
       str2.insert (0, " ");
@@ -123,7 +123,7 @@ void TypeOptPage::slotModifyType()
 
 void TypeOptPage::updateListBox(int start)
 {
-  QString str, str2;
+  TQString str, str2;
   for (int i = start; i < (int) typeList->count(); i++) {
     str = typeList->text (i);
     int pos = str.find (TYPE_TAG);
@@ -142,7 +142,7 @@ void TypeOptPage::slotDeleteType()
   if (typeList->count() != 0
       && (int) typeList->count() > act) {
 
-    QString t;
+    TQString t;
     t.setNum(typeIndex[act_type]+1);
     t.insert (0, QM_USER_TYPE);
     for (int ent = 0; ent < doc->numEntries(); ent++) {
@@ -174,9 +174,9 @@ void TypeOptPage::slotDeleteType()
 }
 
 
-void TypeOptPage::getTypeNames (vector<QString> &ret_type, vector<int> &ret_Index)
+void TypeOptPage::getTypeNames (vector<TQString> &ret_type, vector<int> &ret_Index)
 {
-  QString str;    ret_type.clear();
+  TQString str;    ret_type.clear();
   for (int i = 0; i < (int) typeList->count(); i++) {
     str = typeList->text(i);
     int pos = str.find (TYPE_TAG);
@@ -195,7 +195,7 @@ void TypeOptPage::slotCleanup()
 
   for (int col = 0; col < doc->numLangs(); col++)
     for (int i = 0; i < (int) doc->numEntries(); i++) {
-      QString t = doc->getEntry(i)->getType(col);
+      TQString t = doc->getEntry(i)->getType(col);
       if (t.left(strlen(QM_USER_TYPE)) == QM_USER_TYPE) {
         t.remove (0, 1);
         int idx = t.toInt();
@@ -225,7 +225,7 @@ void TypeOptPage::slotCleanup()
 void TypeOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &typeIndex, int old_types)
 {
   vector<int> translate_index;
-  vector<QString> new_typeStr;
+  vector<TQString> new_typeStr;
 
   /////////////////////////////////////////////////////
   // translate_index contains new index number for each
@@ -247,12 +247,12 @@ void TypeOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &typeIndex, i
 
   for (int col = 0; col < doc->numLangs(); col++) {
     for (int i = 0; i < doc->numEntries(); i++) {
-      QString old = doc->getEntry(i)->getType (col);
+      TQString old = doc->getEntry(i)->getType (col);
       if (!old.isEmpty() && old.left(strlen(QM_USER_TYPE)) == QM_USER_TYPE) {
         old.remove (0, 1);
         int o = old.toInt();
 
-        QString newtype;
+        TQString newtype;
         if (translate_index[o] != 0) {
           newtype.setNum (translate_index[o]);
           newtype.insert (0, QM_USER_TYPE);
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h
index e497e361..4cba8d7a 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h
@@ -42,13 +42,13 @@ public:
 
   TypeOptPage
   (
-    const vector<QString> &types,
+    const vector<TQString> &types,
     kvoctrainDoc    *doc,
-    QWidget         *parent = NULL,
+    TQWidget         *parent = NULL,
     const char      *name = NULL
   );
 
-  void getTypeNames (vector<QString> &ret_types, vector<int> &ret_Index);
+  void getTypeNames (vector<TQString> &ret_types, vector<int> &ret_Index);
 
   static void cleanUnused(kvoctrainDoc *doc, const vector<int> &lessonIndex, int old_lessons);
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
index 007622a8..96c4a093 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
@@ -30,8 +30,8 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 
-#include <qgroupbox.h>
-#include <qpushbutton.h>
+#include <tqgroupbox.h>
+#include <tqpushbutton.h>
 
 #include <QueryManager.h>
 
@@ -39,22 +39,22 @@
 
 UsageOptPage::UsageOptPage
 (
-  const vector<QString> &usages,
+  const vector<TQString> &usages,
   kvoctrainDoc    *_doc,
-  QWidget         *parent,
+  TQWidget         *parent,
   const char      *name
 )
   :
   UsageOptPageForm( parent, name ),
   doc(_doc)
 {
-  connect( b_cleanup, SIGNAL(clicked()), SLOT(slotCleanup()) );
-  connect( b_delete, SIGNAL(clicked()), SLOT(slotDeleteUsage()) );
-  connect( b_modify, SIGNAL(clicked()), SLOT(slotModifyUsage()) );
-  connect( b_new, SIGNAL(clicked()), SLOT(slotNewUsage()) );
-  connect( usageList, SIGNAL(highlighted(int)), SLOT(slotUsageChosen(int)) );
+  connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );
+  connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteUsage()) );
+  connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyUsage()) );
+  connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewUsage()) );
+  connect( usageList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotUsageChosen(int)) );
 
-  QString str;
+  TQString str;
   for (int i = 0; i < (int) usages.size(); i++) {
     str.setNum (i+1);
     if (i <= 9)
@@ -83,11 +83,11 @@ void UsageOptPage::slotUsageChosen(int index)
 void UsageOptPage::slotNewUsage()
 {
   bool ok;
-  QString getUsage = KInputDialog::getText(
-              i18n( "usage (area) of an expression", "Usage Description" ), i18n( "Enter usage description:" ), QString::null, &ok );
+  TQString getUsage = KInputDialog::getText(
+              i18n( "usage (area) of an expression", "Usage Description" ), i18n( "Enter usage description:" ), TQString::null, &ok );
   if( !ok )
     return;
-  QString str;
+  TQString str;
   int i = usageList->count()+1;
   str.setNum (i);
   if (i <= 9)
@@ -105,16 +105,16 @@ void UsageOptPage::slotModifyUsage()
 {
   if (usageList->count() != 0
       && (int) usageList->count() > act_usage) {
-    QString str = usageList->text (act_usage);
+    TQString str = usageList->text (act_usage);
     int pos = str.find (USAGE_TAG);
     str.remove (0, pos+strlen (USAGE_TAG));
 
     bool ok;
-    QString getUsage = KInputDialog::getText(
+    TQString getUsage = KInputDialog::getText(
                 i18n( "usage (area) of an expression", "Usage Description" ), i18n( "Enter usage description:" ), str, &ok );
     if( !ok )
       return;
-    QString str2;
+    TQString str2;
     str2.setNum (act_usage+1);
     if (act_usage <= 9)
       str2.insert (0, " ");
@@ -125,7 +125,7 @@ void UsageOptPage::slotModifyUsage()
 
 void UsageOptPage::updateListBox(int start)
 {
-  QString str, str2;
+  TQString str, str2;
   for (int i = start; i < (int) usageList->count(); i++) 
   {
     str = usageList->text (i);
@@ -144,7 +144,7 @@ void UsageOptPage::slotDeleteUsage()
   int act = act_usage;
   if (usageList->count() != 0 && (int) usageList->count() > act) 
   {
-    QString t;
+    TQString t;
     t.setNum(usageIndex[act_usage]+1);
     t.insert (0,  UL_USER_USAGE);
     t += UL_USAGE_DIV;
@@ -152,7 +152,7 @@ void UsageOptPage::slotDeleteUsage()
       // FIXME: ProgressDlg here?
       kvoctrainExpr *exp = doc->getEntry(ent);
       for (int lang = 0; lang < doc->numLangs(); lang++) {
-        QString ul = exp->getUsageLabel(lang) + UL_USAGE_DIV;
+        TQString ul = exp->getUsageLabel(lang) + UL_USAGE_DIV;
         if (ul.find(t) >= 0 ) {
           KMessageBox::information(this,
                     i18n("usage (area) of an expression",
@@ -181,10 +181,10 @@ void UsageOptPage::slotDeleteUsage()
 }
 
 
-void UsageOptPage::getUsageLabels (vector<QString> &ret_usage,
+void UsageOptPage::getUsageLabels (vector<TQString> &ret_usage,
                                    vector<int> &ret_Index)
 {
-  QString str;    ret_usage.clear();
+  TQString str;    ret_usage.clear();
   for (int i = 0; i < (int) usageList->count(); i++) {
     str = usageList->text(i);
     int pos = str.find (USAGE_TAG);
@@ -203,8 +203,8 @@ void UsageOptPage::slotCleanup()
 
   for (int col = 0; col < doc->numLangs(); col++)
     for (int i = 0; i < (int) doc->numEntries(); i++) {
-      QString t = doc->getEntry(i)->getUsageLabel(col);
-      QString n;
+      TQString t = doc->getEntry(i)->getUsageLabel(col);
+      TQString n;
       while (t.left(strlen(UL_USER_USAGE)) == UL_USER_USAGE) {
         t.remove (0, 1);
 
@@ -248,7 +248,7 @@ void UsageOptPage::cleanUnused(kvoctrainDoc *doc,
                                int old_usages)
 {
   vector<int> translate_index;
-  vector<QString> new_usageStr;
+  vector<TQString> new_usageStr;
 
   /////////////////////////////////////////////////////
   // translate_index contains new index number for each
@@ -270,11 +270,11 @@ void UsageOptPage::cleanUnused(kvoctrainDoc *doc,
 
   for (int col = 0; col < doc->numLangs(); col++) {
     for (int i = 0; i < doc->numEntries(); i++) {
-      QString t = doc->getEntry(i)->getUsageLabel (col);
+      TQString t = doc->getEntry(i)->getUsageLabel (col);
       if (!t.isEmpty() && t.left(strlen(UL_USER_USAGE)) == UL_USER_USAGE) {
-        QString tg;
+        TQString tg;
         while (t.left(strlen(UL_USER_USAGE)) == UL_USER_USAGE) {
-          QString n;
+          TQString n;
           t.remove (0, 1);
           int next;
           if ((next = t.find(UL_USAGE_DIV)) >= 0) {
@@ -286,7 +286,7 @@ void UsageOptPage::cleanUnused(kvoctrainDoc *doc,
             t = "";
           }
 
-          QString newusage;
+          TQString newusage;
           int o = n.toInt();
           if (translate_index[o] != 0) {
             newusage.setNum (translate_index[o]);
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h
index f9e8d978..5e7194bf 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h
@@ -44,13 +44,13 @@ public:
 
   UsageOptPage
   (
-    const vector<QString> &usages,
+    const vector<TQString> &usages,
     kvoctrainDoc    *doc,
-    QWidget         *parent = NULL,
+    TQWidget         *parent = NULL,
     const char      *name = NULL
   );
 
-  void getUsageLabels (vector<QString> &ret_usages, vector<int> &ret_Index);
+  void getUsageLabels (vector<TQString> &ret_usages, vector<int> &ret_Index);
 
   static void cleanUnused(kvoctrainDoc *doc, const vector<int> &lessonIndex, int old_lessons);
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp
index ce97d871..0bdae252 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp
@@ -29,17 +29,17 @@
 
 #include <langset.h>
 
-#include <qlineedit.h>
+#include <tqlineedit.h>
 
 
-AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, QWidget *parent, const char *name)
+AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *parent, const char *name)
   : AdjEntryPageForm( parent, name ), dlgbook(_dlgbook)
 {
   comparisons = comp;
 
-  connect( lev1Field, SIGNAL(textChanged(const QString&)), SLOT(lev1Changed(const QString&)) );
-  connect( lev2Field, SIGNAL(textChanged(const QString&)), SLOT(lev2Changed(const QString&)) );
-  connect( lev3Field, SIGNAL(textChanged(const QString&)), SLOT(lev3Changed(const QString&)) );
+  connect( lev1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev1Changed(const TQString&)) );
+  connect( lev2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev2Changed(const TQString&)) );
+  connect( lev3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev3Changed(const TQString&)) );
 
   setData(multi_sel, comp);
 }
@@ -61,21 +61,21 @@ void AdjEntryPage::setData(bool multi_sel, const Comparison  &comp)
 }
 
 
-void AdjEntryPage::lev1Changed(const QString& s)
+void AdjEntryPage::lev1Changed(const TQString& s)
 {
   setModified(true);
   comparisons.setL1 (s);
 }
 
 
-void AdjEntryPage::lev2Changed(const QString& s)
+void AdjEntryPage::lev2Changed(const TQString& s)
 {
   setModified(true);
   comparisons.setL2 (s);
 }
 
 
-void AdjEntryPage::lev3Changed(const QString& s)
+void AdjEntryPage::lev3Changed(const TQString& s)
 {
   setModified(true);
   comparisons.setL3 (s);
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h
index 095e22d7..efbae74f 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h
@@ -37,7 +37,7 @@ class AdjEntryPage : public AdjEntryPageForm
   Q_OBJECT
 
 public:
-  AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, QWidget *parent = NULL, const char *name = NULL);
+  AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *parent = NULL, const char *name = NULL);
 
   void setData (bool multi_sel, const Comparison  &comp);
 
@@ -51,9 +51,9 @@ signals:
   void sigModified();
 
 protected slots:
-  void lev1Changed(const QString&);
-  void lev2Changed(const QString&);
-  void lev3Changed(const QString&);
+  void lev1Changed(const TQString&);
+  void lev2Changed(const TQString&);
+  void lev3Changed(const TQString&);
 
 protected:
   Comparison    comparisons;
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp
index b7c1837e..87e0fe59 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp
@@ -23,7 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qmultilineedit.h>
+#include <tqmultilineedit.h>
 
 #include "AuxInfoEntryPage.h"
 #include "EntryDlg.h"
@@ -36,18 +36,18 @@ AuxInfoEntryPage::AuxInfoEntryPage
 (
   EntryDlg   *_dlgbook,
   bool        multi_sel,
-  QString     syno,
-  QString     anto,
-  QString     exam,
-  QString     rem,
-  QString     para,
-  QWidget    *parent,
+  TQString     syno,
+  TQString     anto,
+  TQString     exam,
+  TQString     rem,
+  TQString     para,
+  TQWidget    *parent,
   const char *name
 )
  : AuxInfoEntryPageForm( parent, name ), dlgbook(_dlgbook)
 
 {
-  QFontMetrics fm (synonym_line->font());
+  TQFontMetrics fm (synonym_line->font());
   int sz = fm.lineSpacing();
 
   synonym_line->setMaximumHeight(sz*3);
@@ -56,17 +56,17 @@ AuxInfoEntryPage::AuxInfoEntryPage
   remark_line->setMaximumHeight(sz*3);
   examp_line->setMaximumHeight(sz*3);
 
-  connect( para_line, SIGNAL(textChanged()), SLOT(slotParaSelected()) );
-  connect( remark_line, SIGNAL(textChanged()), SLOT(slotRemarkSelected()) );
-  connect( examp_line, SIGNAL(textChanged()), SLOT(slotExampSelected()) );
-  connect( antonym_line, SIGNAL(textChanged()), SLOT(slotAntonymSelected()) );
-  connect( synonym_line, SIGNAL(textChanged()), SLOT(slotSynonymSelected()) );
+  connect( para_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotParaSelected()) );
+  connect( remark_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotRemarkSelected()) );
+  connect( examp_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotExampSelected()) );
+  connect( antonym_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotAntonymSelected()) );
+  connect( synonym_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotSynonymSelected()) );
 
   setData(multi_sel, syno, anto, exam, rem, para);
 }
 
 
-void AuxInfoEntryPage::setData(bool multi_sel, QString syno, QString anto, QString  example, QString remark, QString para)
+void AuxInfoEntryPage::setData(bool multi_sel, TQString syno, TQString anto, TQString  example, TQString remark, TQString para)
 {
   synonym_line->setText(syno);
   antonym_line->setText(anto);
@@ -121,42 +121,42 @@ void AuxInfoEntryPage::slotParaSelected ()
 }
 
 
-QString AuxInfoEntryPage::getSynonym ()
+TQString AuxInfoEntryPage::getSynonym ()
 {
   normalize(synonym);
   return synonym;
 }
 
 
-QString AuxInfoEntryPage::getAntonym ()
+TQString AuxInfoEntryPage::getAntonym ()
 {
   normalize(antonym);
   return antonym;
 }
 
 
-QString AuxInfoEntryPage::getExample ()
+TQString AuxInfoEntryPage::getExample ()
 {
   normalize(example);
   return example;
 }
 
 
-QString AuxInfoEntryPage::getRemark  ()
+TQString AuxInfoEntryPage::getRemark  ()
 {
   normalize(remark);
   return remark;
 }
 
 
-QString AuxInfoEntryPage::getParaphrase  ()
+TQString AuxInfoEntryPage::getParaphrase  ()
 {
   normalize(paraphrase);
   return paraphrase;
 }
 
 
-void AuxInfoEntryPage::normalize (QString &str)
+void AuxInfoEntryPage::normalize (TQString &str)
 {
   LineList ll (str);
   ll.normalizeWS();
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h
index c9e78bf3..e8e88535 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h
@@ -39,22 +39,22 @@ public:
   (
     EntryDlg   *dlgbook,
     bool        multi_sel,
-    QString     syno,
-    QString     anto,
-    QString     example,
-    QString     remark,
-    QString     para,
-    QWidget    *parent = 0,
+    TQString     syno,
+    TQString     anto,
+    TQString     example,
+    TQString     remark,
+    TQString     para,
+    TQWidget    *parent = 0,
     const char *name = 0
   );
 
-  void setData(bool multi_sel, QString syno, QString anto, QString example, QString remark, QString  para);
+  void setData(bool multi_sel, TQString syno, TQString anto, TQString example, TQString remark, TQString  para);
 
-  QString getSynonym ();
-  QString getAntonym ();
-  QString getExample ();
-  QString getRemark  ();
-  QString getParaphrase();
+  TQString getSynonym ();
+  TQString getAntonym ();
+  TQString getExample ();
+  TQString getRemark  ();
+  TQString getParaphrase();
 
   bool isModified();
   void setModified(bool mod = true);
@@ -64,7 +64,7 @@ signals:
   void sigModified();
 
 protected:
-  void normalize(QString &str);
+  void normalize(TQString &str);
 
 protected slots:
   void slotAntonymSelected();
@@ -74,11 +74,11 @@ protected slots:
   void slotParaSelected();
 
 protected:
-  QString       synonym;
-  QString       antonym;
-  QString       example;
-  QString       remark;
-  QString       paraphrase;
+  TQString       synonym;
+  TQString       antonym;
+  TQString       example;
+  TQString       remark;
+  TQString       paraphrase;
   bool          modified;
   EntryDlg     *dlgbook;
 };
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
index 9f5bc8b6..9a7d44fb 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
@@ -26,12 +26,12 @@
 #include "CommonEntryPage.h"
 #include "EntryDlg.h"
 
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlistbox.h>
-#include <qcombobox.h>
-#include <qcheckbox.h>
-#include <qgroupbox.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
+#include <tqlistbox.h>
+#include <tqcombobox.h>
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -52,18 +52,18 @@ CommonEntryPage::CommonEntryPage
   EntryDlg     *_dlgbook,
   kvoctrainDoc *_doc,
   bool          multi_sel,
-  QString       expr,
+  TQString       expr,
   int           less,
-  QComboBox    *lessbox,
-  QString       lang,
-  QString       act_type,
-  QString       pron,
-  QString       act_usage,
-  QString       label,
+  TQComboBox    *lessbox,
+  TQString       lang,
+  TQString       act_type,
+  TQString       pron,
+  TQString       act_usage,
+  TQString       label,
   QueryManager &_querymanager,
   bool          active,
-  const QFont&  _ipafont,
-  QWidget      *parent,
+  const TQFont&  _ipafont,
+  TQWidget      *parent,
   const char   *name
 )
   :
@@ -80,18 +80,18 @@ CommonEntryPage::CommonEntryPage
   ipafont(_ipafont)
 {
 
-  connect( b_usageDlg, SIGNAL(clicked()), SLOT(invokeUsageDlg()) );
-  connect( b_LessDlg, SIGNAL(clicked()), SLOT(invokeLessDlg()) );
-  connect( b_pronDlg, SIGNAL(clicked()), SLOT(invokePronDlg()) );
-  connect( b_TypeDlg, SIGNAL(clicked()), SLOT(invokeTypeDlg()) );
-  connect( usage_box, SIGNAL(selectionChanged()), SLOT(slotUsageChanged()) );
-  connect( lesson_box, SIGNAL(activated(int)), SLOT(slotLessonSelected(int)) );
-  connect( subtype_box, SIGNAL(activated(int)), SLOT(slotSubTypeSelected(int)) );
-  connect( type_box, SIGNAL(activated(int)), SLOT(slotTypeSelected(int)) );
-  connect( c_active, SIGNAL(toggled(bool)), SLOT(slotActiveChanged(bool)) );
+  connect( b_usageDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeUsageDlg()) );
+  connect( b_LessDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeLessDlg()) );
+  connect( b_pronDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokePronDlg()) );
+  connect( b_TypeDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeTypeDlg()) );
+  connect( usage_box, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotUsageChanged()) );
+  connect( lesson_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotLessonSelected(int)) );
+  connect( subtype_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSubTypeSelected(int)) );
+  connect( type_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeSelected(int)) );
+  connect( c_active, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotActiveChanged(bool)) );
 
-  connect( pronunce_line, SIGNAL(textChanged(const QString&)), SLOT(slotPronunceSelected(const QString&)) );
-  connect( expr_line, SIGNAL(textChanged(const QString&)), SLOT(slotExprSelected(const QString&)) );
+  connect( pronunce_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotPronunceSelected(const TQString&)) );
+  connect( expr_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotExprSelected(const TQString&)) );
 
   usage_label->setTitle(i18n("Usage (area) of an Expression", "&Usage Labels"));
   pronunce_line->setFont(ipafont);
@@ -100,12 +100,12 @@ CommonEntryPage::CommonEntryPage
   type_box->setValidator (new BlockAllValidator() );
   subtype_box->setValidator (new BlockAllValidator() );
 
-  QPixmap list_pm = SmallIcon("view_text");
+  TQPixmap list_pm = SmallIcon("view_text");
   b_LessDlg->setPixmap(list_pm);
   b_TypeDlg->setPixmap(list_pm);
   b_usageDlg->setPixmap(list_pm);
 
-  QPixmap pron_pm = SmallIcon("view_icon");
+  TQPixmap pron_pm = SmallIcon("view_icon");
   b_pronDlg->setPixmap(pron_pm);
 
   setData(multi_sel, expr, less, lessbox, lang, type, pronunce, act_usage, label, querymanager, active);
@@ -114,14 +114,14 @@ CommonEntryPage::CommonEntryPage
 
 void CommonEntryPage::setData(
   bool          multi_sel,
-  QString       expr,
+  TQString       expr,
   int           less,
-  QComboBox    *lessBox,
-  QString       /*lang*/,
-  QString       type,
-  QString       pronunce,
-  QString       usage,
-  QString       /*label*/,
+  TQComboBox    *lessBox,
+  TQString       /*lang*/,
+  TQString       type,
+  TQString       pronunce,
+  TQString       usage,
+  TQString       /*label*/,
   QueryManager &/*querymanager*/,
   bool          active)
 {
@@ -172,12 +172,12 @@ void CommonEntryPage::setData(
 }
 
 
-void CommonEntryPage::setTypeBox(const QString &act_type)
+void CommonEntryPage::setTypeBox(const TQString &act_type)
 {
   all_types = QueryManager::getRelation(false);
   all_maintypes = QueryManager::getRelation(true);
 
-  QString s = QueryManager::getMainType(act_type)+QM_TYPE_DIV;
+  TQString s = QueryManager::getMainType(act_type)+QM_TYPE_DIV;
   int curr_type = 0;
   type_box->clear();
   type_box->insertItem (i18n("<none>"));
@@ -191,7 +191,7 @@ void CommonEntryPage::setTypeBox(const QString &act_type)
 }
 
 
-void CommonEntryPage::setLessonBox(QComboBox *lessbox, int lesson)
+void CommonEntryPage::setLessonBox(TQComboBox *lessbox, int lesson)
 {
   lesson_box->clear();
   for (int i = 0; i < lessbox->count(); i++)
@@ -202,13 +202,13 @@ void CommonEntryPage::setLessonBox(QComboBox *lessbox, int lesson)
 }
 
 
-void CommonEntryPage::setUsageBox(const QString & act_usage)
+void CommonEntryPage::setUsageBox(const TQString & act_usage)
 {
   usages = UsageManager::getRelation();
   usage_box->clear();
   for (int i = 0; i < (int) usages.size(); i++) {
     usage_box->insertItem (usages[i].longStr());
-    if (UsageManager::contains(QString(usages[i].identStr()), act_usage)) {
+    if (UsageManager::contains(TQString(usages[i].identStr()), act_usage)) {
       usage_box->setSelected (i, true);
     }
   }
@@ -221,7 +221,7 @@ void CommonEntryPage::slotUsageChanged()
   setModified(true);
   usageCollection = "";
   usage_dirty = true;
-  QString s;
+  TQString s;
   for (int i = 0; i < (int) usage_box->count(); i++) {
     if (usage_box->isSelected(i)) {
 
@@ -254,14 +254,14 @@ void CommonEntryPage::slotActiveChanged(bool state)
 }
 
 
-void CommonEntryPage::slotExprSelected (const QString& s)
+void CommonEntryPage::slotExprSelected (const TQString& s)
 {
   setModified(true);
   expression = s;
 }
 
 
-void CommonEntryPage::slotPronunceSelected (const QString& s)
+void CommonEntryPage::slotPronunceSelected (const TQString& s)
 {
   setModified(true);
   pronunce = s;
@@ -293,7 +293,7 @@ void CommonEntryPage::slotTypeSelected(int idx)
   else {
     type = all_maintypes[idx-1].shortStr();
     emit typeSelected(type);
-    QString main_patt = all_maintypes[idx-1].shortStr()+QM_TYPE_DIV;
+    TQString main_patt = all_maintypes[idx-1].shortStr()+QM_TYPE_DIV;
     int sub_idx;
     if ( idx-1 < (int) all_types.size() ){
       for (sub_idx = 0; sub_idx < (int) all_types.size(); sub_idx++) {
@@ -303,7 +303,7 @@ void CommonEntryPage::slotTypeSelected(int idx)
             current_subtypes.push_back(all_maintypes[idx-1].shortStr());
             first = false;
           }
-          QString s = all_types[sub_idx].longStr();
+          TQString s = all_types[sub_idx].longStr();
           subtype_box->insertItem (s.stripWhiteSpace());
           current_subtypes.push_back(all_types[sub_idx].shortStr());
         }
@@ -320,7 +320,7 @@ void CommonEntryPage::slotTypeSelected(int idx)
 void CommonEntryPage::phoneticSelected(wchar_t wc)
 {
   setModified(true);
-  pronunce += QChar(wc);
+  pronunce += TQChar(wc);
   pronunce_line->setText(pronunce);
 }
 
@@ -329,7 +329,7 @@ void CommonEntryPage::invokePronDlg()
 {
   //if (phoneticDlg == 0) {
     PhoneticEntryPage * phoneticDlg = new PhoneticEntryPage (ipafont, this);
-    connect (phoneticDlg, SIGNAL(charSelected(wchar_t)), SLOT(phoneticSelected(wchar_t)) );
+    connect (phoneticDlg, TQT_SIGNAL(charSelected(wchar_t)), TQT_SLOT(phoneticSelected(wchar_t)) );
     phoneticDlg->show();
   //}
   //else
@@ -340,7 +340,7 @@ void CommonEntryPage::invokePronDlg()
 void CommonEntryPage::invokeUsageDlg()
 {
   vector<int> usageIndex;
-  vector<QString> new_usageStr;
+  vector<TQString> new_usageStr;
 
   int old_usages = (int) doc->getUsageDescr().size();
 
@@ -350,7 +350,7 @@ void CommonEntryPage::invokeUsageDlg()
   UsageOptPage *usageOptPage = new UsageOptPage (doc->getUsageDescr(), doc, this, "name");
   usageOpt.setMainWidget(usageOptPage);
 
-  if (usageOpt.exec() == QDialog::Accepted)
+  if (usageOpt.exec() == TQDialog::Accepted)
   {
     usageOptPage->getUsageLabels(new_usageStr, usageIndex);
     UsageOptPage::cleanUnused(doc, usageIndex, old_usages);
@@ -365,7 +365,7 @@ void CommonEntryPage::invokeUsageDlg()
 void CommonEntryPage::invokeLessDlg()
 {
   vector<int> lessonIndex;
-  vector<QString> new_lessonStr;
+  vector<TQString> new_lessonStr;
 
   int old_lessons = (int) lesson_box->count();
   KDialogBase lessOpt(KDialogBase::Swallow, i18n("Edit Lesson Names"),
@@ -375,7 +375,7 @@ void CommonEntryPage::invokeLessDlg()
   lessOpt.setMainWidget(lessOptPage);
 
   vector<int> lessoninquery = doc->getLessonsInQuery();
-  if (lessOpt.exec() == QDialog::Accepted)
+  if (lessOpt.exec() == TQDialog::Accepted)
   {
     lessOptPage->getLesson(lesson_box, lessonIndex);
     LessOptPage::cleanUnused(doc, lesson_box, lessonIndex, old_lessons, lessoninquery);
@@ -392,7 +392,7 @@ void CommonEntryPage::invokeLessDlg()
 void CommonEntryPage::invokeTypeDlg()
 {
   vector<int> typeIndex;
-  vector<QString> new_typeStr;
+  vector<TQString> new_typeStr;
 
   int old_types = (int) doc->getTypeDescr().size();
   KDialogBase typeOpt(KDialogBase::Swallow, i18n("Edit User Defined Types"),
@@ -401,7 +401,7 @@ void CommonEntryPage::invokeTypeDlg()
   TypeOptPage *typeOptPage = new TypeOptPage (doc->getTypeDescr(), doc, this, "name");
   typeOpt.setMainWidget(typeOptPage);
 
-  if (typeOpt.exec() == QDialog::Accepted)
+  if (typeOpt.exec() == TQDialog::Accepted)
   {
     typeOptPage->getTypeNames(new_typeStr, typeIndex);
     TypeOptPage::cleanUnused(doc, typeIndex, old_types);
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h
index 71bbd84a..9d3652d2 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h
@@ -44,31 +44,31 @@ public:
     EntryDlg     *dlgbook,
     kvoctrainDoc *doc,
     bool          multi_sel,
-    QString       expr,
+    TQString       expr,
     int           less,
-    QComboBox    *lessBox,
-    QString       lang,
-    QString       type,
-    QString       pronunce,
-    QString       usage,
-    QString       label,
+    TQComboBox    *lessBox,
+    TQString       lang,
+    TQString       type,
+    TQString       pronunce,
+    TQString       usage,
+    TQString       label,
     QueryManager &querymanager,
     bool          active,
-    const QFont&  ipafont,
-    QWidget* parent = NULL,
+    const TQFont&  ipafont,
+    TQWidget* parent = NULL,
     const char* name = NULL
   );
 
   void setData(
     bool          multi_sel,
-    QString       expr,
+    TQString       expr,
     int           less,
-    QComboBox    *lessBox,
-    QString       lang,
-    QString       type,
-    QString       pronunce,
-    QString       usage,
-    QString       label,
+    TQComboBox    *lessBox,
+    TQString       lang,
+    TQString       type,
+    TQString       pronunce,
+    TQString       usage,
+    TQString       label,
     QueryManager &querymanager,
     bool          active);
 
@@ -79,10 +79,10 @@ public:
   bool usageDirty      () const { return usage_dirty; }
 
   int getLesson        () const { return lesson; }
-  QString getType      () const { return type; }
-  QString getExpr      () const { return expression; }
-  QString getPronunce  () const { return pronunce; }
-  QString getUsageLabel() const { return usageCollection; }
+  TQString getType      () const { return type; }
+  TQString getExpr      () const { return expression; }
+  TQString getPronunce  () const { return pronunce; }
+  TQString getUsageLabel() const { return usageCollection; }
   bool    getActive    () const { return entry_active; }
 
   bool isModified();
@@ -90,19 +90,19 @@ public:
   void setEnabled(int enable_type);
 
 signals:
-  void typeSelected(const QString &);
+  void typeSelected(const TQString &);
 
 protected:
-  void setTypeBox(const QString &act_type);
-  void setLessonBox(QComboBox *lessbox, int lesson);
-  void setUsageBox(const QString & act_type);
+  void setTypeBox(const TQString &act_type);
+  void setLessonBox(TQComboBox *lessbox, int lesson);
+  void setUsageBox(const TQString & act_type);
 
 protected slots:
   void slotLessonSelected(int);
-  void slotExprSelected(const QString&);
+  void slotExprSelected(const TQString&);
   void slotTypeSelected(int);
   void slotSubTypeSelected(int);
-  void slotPronunceSelected (const QString&);
+  void slotPronunceSelected (const TQString&);
   void slotUsageChanged();
   void slotActiveChanged(bool state);
   void phoneticSelected(wchar_t);
@@ -115,11 +115,11 @@ signals:
   void sigModified();
 
 protected:
-  QString       pronunce;
-  QString       expression;
-  QString       usageCollection;
+  TQString       pronunce;
+  TQString       expression;
+  TQString       usageCollection;
   int           lesson;
-  QString       type;
+  TQString       type;
   EntryDlg     *dlgbook;
   bool          lesson_dirty;
   bool          type_dirty;
@@ -132,9 +132,9 @@ protected:
   vector<TypeRelation>  all_maintypes;
   vector<TypeRelation>  all_types;
   vector<UsageRelation> usages;
-  vector<QString>       current_subtypes;
+  vector<TQString>       current_subtypes;
 
-  QFont                 ipafont;
+  TQFont                 ipafont;
   bool                  modified;
 };
 #endif // CommonEntryPage_included
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index 2d60ddb1..c0b249aa 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -26,8 +26,8 @@
 
 #include "EntryDlg.h"
 
-#include <qlayout.h>
-#include <qlineedit.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
 
 #include <kmainwindow.h>
 #include <kapplication.h>
@@ -49,38 +49,38 @@ EntryDlg::EntryDlg(
   count_t        t_bcount,
   time_t         f_qdate,
   time_t         t_qdate,
-  QString        f_faux_ami,
-  QString        t_faux_ami,
-  QString        expr,
+  TQString        f_faux_ami,
+  TQString        t_faux_ami,
+  TQString        expr,
   int            lesson,
-  QComboBox     *lessonbox,
-  QString        lang,
+  TQComboBox     *lessonbox,
+  TQString        lang,
   LangSet       &langset,
-  QString        rem,
-  QString        type,
-  QString        pronunce,
-  QString        synonym,
-  QString        antonym,
-  QString        example,
-  QString        usagelabel,
-  QString        paraphrase,
+  TQString        rem,
+  TQString        type,
+  TQString        pronunce,
+  TQString        synonym,
+  TQString        antonym,
+  TQString        example,
+  TQString        usagelabel,
+  TQString        paraphrase,
   const          Conjugation &con_prefix,
   const          Conjugation &conjugations,
   const          Article &/*article*/,
   const          Comparison &comp,
   const          MultipleChoice &mc,
   QueryManager  &querymanager,
-  const QString &title,
+  const TQString &title,
   bool           active,
-  const QFont&   ipafont,
-  QWidget       *parent,
+  const TQFont&   ipafont,
+  TQWidget       *parent,
   const char    *name,
   bool           modal)
   :
   KDialogBase(Tabbed, title, User1|User2|User3|Apply|Close, Apply, parent, name, modal, false,
     KGuiItem(i18n("&Reset")),
-    KGuiItem(QString::null, "view_left_right"),
-    KGuiItem(QString::null, "view_top_bottom"))
+    KGuiItem(TQString::null, "view_left_right"),
+    KGuiItem(TQString::null, "view_top_bottom"))
 
 {
   mainwin = main;
@@ -90,19 +90,19 @@ EntryDlg::EntryDlg(
   from_page = 0;
   to_page = 0;
 
-  QString s;
+  TQString s;
   if (langset.findLongId(lang).isEmpty() )
     s = lang;
   else
     s = langset.findLongId(lang);
 
-  QFrame *page;
-  QVBoxLayout *topLayout;
+  TQFrame *page;
+  TQVBoxLayout *topLayout;
 
   if (origin)
   {
     page = addPage( i18n("Co&mmon") );
-    topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+    topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
     comm_page = new CommonEntryPage (this, doc, multi_sel, expr, lesson, lessonbox,
                                       lang, type, pronunce, usagelabel,
                                       i18n("Original &expression in %1:").arg(s), querymanager, active,
@@ -110,29 +110,29 @@ EntryDlg::EntryDlg(
     topLayout->addWidget(comm_page);
 
     page = addPage( i18n("A&dditional") );
-    topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+    topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
     aux_page = new AuxInfoEntryPage (this, multi_sel, synonym, antonym, example, rem, paraphrase, page, name);
     topLayout->addWidget(aux_page);
 
     page = addPage( i18n("&Multiple Choice") );
-    topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+    topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
     mc_page = new MCEntryPage (this, multi_sel, mc, page, "MultipleChoice");
     topLayout->addWidget(mc_page);
 
     page = addPage( i18n("Con&jugation") );
-    topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+    topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
     tense_page = new TenseEntryPage (this, multi_sel, con_prefix, conjugations, page, "Conjugation");
     topLayout->addWidget(tense_page);
 
     page = addPage( i18n("Compar&ison") );
-    topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+    topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
     adj_page = new AdjEntryPage (this, multi_sel, comp, page, "Comparison");
     topLayout->addWidget(adj_page);
   }
   else
   {
     page = addPage( i18n("Co&mmon") );
-    topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+    topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
     comm_page = new CommonEntryPage (this, doc, multi_sel, expr, lesson, lessonbox,
                                       lang, type, pronunce, usagelabel,
                                       i18n("Translated &expression in %1:").arg(s), querymanager, active,
@@ -140,35 +140,35 @@ EntryDlg::EntryDlg(
     topLayout->addWidget(comm_page);
 
     page = addPage( i18n("A&dditional") );
-    topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+    topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
     aux_page = new AuxInfoEntryPage (this, multi_sel, synonym, antonym, example, rem, paraphrase, page, name);
     topLayout->addWidget(aux_page);
 
     page = addPage( i18n("&Multiple Choice") );
-    topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+    topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
     mc_page = new MCEntryPage (this, multi_sel, mc, page, "MultipleChoice");
     topLayout->addWidget(mc_page);
 
     page = addPage( i18n("Con&jugation") );
-    topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+    topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
     tense_page = new TenseEntryPage (this, multi_sel, con_prefix, conjugations, page, "Conjugation");
     topLayout->addWidget(tense_page);
 
     page = addPage( i18n("Compar&ison") );
-    topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+    topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
     adj_page = new AdjEntryPage (this, multi_sel, comp, page, "Comparison");
     topLayout->addWidget(adj_page);
   }
 
   page = addPage( i18n("&From Original") );
-  topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+  topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
   from_page = new FromToEntryPage (this, multi_sel, f_grd, f_qdate, f_qcount, f_bcount,
                                     f_faux_ami,
                                     i18n("Properties From Original"), page, name);
   topLayout->addWidget(from_page);
 
   page = addPage( i18n("&To Original") );
-  topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+  topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
   to_page   = new FromToEntryPage (this, multi_sel, t_grd, t_qdate, t_qcount, t_bcount,
                                     t_faux_ami,
                                     i18n("Properties to Original"), page, name);
@@ -176,23 +176,23 @@ EntryDlg::EntryDlg(
 
   updatePages (type);
 
-  connect(comm_page, SIGNAL(typeSelected(const QString&)), SLOT(updatePages(const QString&)) );
+  connect(comm_page, TQT_SIGNAL(typeSelected(const TQString&)), TQT_SLOT(updatePages(const TQString&)) );
 
-  connect( this, SIGNAL(user1Clicked()), this, SLOT(slotUndo()) );
-  connect( this, SIGNAL(applyClicked()), this, SLOT(slotApply()) );
-  connect( this, SIGNAL(user2Clicked()), this, SLOT(slotDockVertical()) );
-  connect( this, SIGNAL(user3Clicked()), this, SLOT(slotDockHorizontal()) );
+  connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotUndo()) );
+  connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotApply()) );
+  connect( this, TQT_SIGNAL(user2Clicked()), this, TQT_SLOT(slotDockVertical()) );
+  connect( this, TQT_SIGNAL(user3Clicked()), this, TQT_SLOT(slotDockHorizontal()) );
 
-  connect (comm_page, SIGNAL(sigModified()), this, SLOT(slotDisplayModified() ));
-  connect (aux_page, SIGNAL(sigModified()), this, SLOT(slotDisplayModified() ));
-  connect (adj_page, SIGNAL(sigModified()), this, SLOT(slotDisplayModified() ));
-  connect (mc_page, SIGNAL(sigModified()), this, SLOT(slotDisplayModified() ));
-  connect (tense_page, SIGNAL(sigModified()), this, SLOT(slotDisplayModified() ));
+  connect (comm_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() ));
+  connect (aux_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() ));
+  connect (adj_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() ));
+  connect (mc_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() ));
+  connect (tense_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() ));
 
   if (from_page != 0)
-    connect (from_page, SIGNAL(sigModified()), this, SLOT(slotDisplayModified() ));
+    connect (from_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() ));
   if (to_page != 0)
-    connect (to_page, SIGNAL(sigModified()), this, SLOT(slotDisplayModified() ));
+    connect (to_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() ));
 
   enableButtonApply(false);
   enableButton(User1, false);
@@ -212,33 +212,33 @@ void EntryDlg::setData(
   count_t        t_bcount,
   time_t         f_qdate,
   time_t         t_qdate,
-  QString        f_faux_ami,
-  QString        t_faux_ami,
-  QString        expr,
+  TQString        f_faux_ami,
+  TQString        t_faux_ami,
+  TQString        expr,
   int            lesson,
-  QComboBox     *lessonbox,
-  QString        lang,
+  TQComboBox     *lessonbox,
+  TQString        lang,
   LangSet       &langset,
-  QString        rem,
-  QString        type,
-  QString        pronunce,
-  QString        synonym,
-  QString        antonym,
-  QString        example,
-  QString        usagelabel,
-  QString        paraphrase,
+  TQString        rem,
+  TQString        type,
+  TQString        pronunce,
+  TQString        synonym,
+  TQString        antonym,
+  TQString        example,
+  TQString        usagelabel,
+  TQString        paraphrase,
   const          Conjugation &/*con_prefix*/,
   const          Conjugation &conjugations,
   const          Article &/*article*/,
   const          Comparison &comp,
   const          MultipleChoice &mc,
   QueryManager  &querymanager,
-  const QString &title,
+  const TQString &title,
   bool           active)
 {
   setCaption (kapp->makeStdCaption(title));
 
-  QString s;
+  TQString s;
   if (langset.findLongId(lang).isEmpty() )
     s = lang;
   else
@@ -265,9 +265,9 @@ void EntryDlg::setData(
 }
 
 
-void EntryDlg::updatePages(const QString &type)
+void EntryDlg::updatePages(const TQString &type)
 {
-  QString main;
+  TQString main;
   int pos;
   if ((pos = type.find (QM_TYPE_DIV)) < 0)  // only use main type
     main = type;
@@ -308,8 +308,8 @@ void EntryDlg::setModified(bool mod)
 
 void EntryDlg::setEnabled(int enable)
 {
-  QString type = comm_page->getType();
-  QString main;
+  TQString type = comm_page->getType();
+  TQString main;
   int pos;
   if ((pos = type.find (QM_TYPE_DIV)) < 0)  // only use main type
     main = type;
@@ -382,7 +382,7 @@ void EntryDlg::slotDisplayModified()
 }
 
 
-void EntryDlg::setCell(int row, int col, const vector<QTableSelection>& sel)
+void EntryDlg::setCell(int row, int col, const vector<TQTableSelection>& sel)
 {
   edit_row = row;
   edit_col = col;
@@ -390,7 +390,7 @@ void EntryDlg::setCell(int row, int col, const vector<QTableSelection>& sel)
 }
 
 
-void EntryDlg::getCell(int &row, int &col, vector<QTableSelection>& sel) const
+void EntryDlg::getCell(int &row, int &col, vector<TQTableSelection>& sel) const
 {
   row = edit_row;
   col = edit_col;
@@ -407,7 +407,7 @@ void EntryDlg::slotDockVertical()
   }
 
   KWinModule info;
-  QRect rect = info.workArea();
+  TQRect rect = info.workArea();
 
   int diff_x = frameGeometry().width()-width();
   int diff_y = frameGeometry().height()-height();
@@ -428,7 +428,7 @@ void EntryDlg::slotDockHorizontal()
   }
 
   KWinModule info;
-  QRect rect = info.workArea();
+  TQRect rect = info.workArea();
 
   int diff_x = frameGeometry().width()-width();
   int diff_y = frameGeometry().height()-height();
@@ -457,7 +457,7 @@ void EntryDlg::reject ()
 }
 
 
-void EntryDlg::closeEvent (QCloseEvent * /*e*/)
+void EntryDlg::closeEvent (TQCloseEvent * /*e*/)
 {
   emit sigEditChoice(EditCancel);
 }
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
index f349ccfc..1c8551e3 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
@@ -26,7 +26,7 @@
 #ifndef EntryDlg_included
 #define EntryDlg_included
 
-#include <qtable.h>
+#include <tqtable.h>
 
 #include <kdialogbase.h>
 
@@ -65,31 +65,31 @@ public:
     count_t        t_bcount,
     time_t         f_qdate,
     time_t         t_qdate,
-    QString        f_faux_ami,
-    QString        t_faux_ami,
-    QString        _expr,
+    TQString        f_faux_ami,
+    TQString        t_faux_ami,
+    TQString        _expr,
     int            _lesson,
-    QComboBox     *_lessonBox,
-    QString        lang,
+    TQComboBox     *_lessonBox,
+    TQString        lang,
     LangSet       &langset,
-    QString        remark,
-    QString        _type,
-    QString        pronunce,
-    QString        synonym,
-    QString        antonym,
-    QString        example,
-    QString        usagelabel,
-    QString        paraphrase,
+    TQString        remark,
+    TQString        _type,
+    TQString        pronunce,
+    TQString        synonym,
+    TQString        antonym,
+    TQString        example,
+    TQString        usagelabel,
+    TQString        paraphrase,
     const          Conjugation &con_prefix,
     const          Conjugation &conjugations,
     const          Article &article,
     const          Comparison &comp,
     const          MultipleChoice &mc,
     QueryManager  &querymanager,
-    const QString &title,
+    const TQString &title,
     bool           active,
-    const QFont&   ipafont,
-    QWidget       *parent = 0,
+    const TQFont&   ipafont,
+    TQWidget       *parent = 0,
     const char    *name = 0,
     bool           modal = false
   );
@@ -108,35 +108,35 @@ public:
     count_t        t_bcount,
     time_t         f_qdate,
     time_t         t_qdate,
-    QString        f_faux_ami,
-    QString        t_faux_ami,
-    QString        _expr,
+    TQString        f_faux_ami,
+    TQString        t_faux_ami,
+    TQString        _expr,
     int            _lesson,
-    QComboBox     *_lessonBox,
-    QString        lang,
+    TQComboBox     *_lessonBox,
+    TQString        lang,
     LangSet       &langset,
-    QString        remark,
-    QString        _type,
-    QString        pronunce,
-    QString        synonym,
-    QString        antonym,
-    QString        example,
-    QString        usagelabel,
-    QString        paraphrase,
+    TQString        remark,
+    TQString        _type,
+    TQString        pronunce,
+    TQString        synonym,
+    TQString        antonym,
+    TQString        example,
+    TQString        usagelabel,
+    TQString        paraphrase,
     const          Conjugation &con_prefix,
     const          Conjugation &conjugations,
     const          Article &article,
     const          Comparison &comp,
     const          MultipleChoice &mc,
     QueryManager  &querymanager,
-    const QString &title,
+    const TQString &title,
     bool           active);
 
   bool  fromDateDirty   () const { return from_page ? from_page->dateDirty() : false; }
   bool  fromGradeDirty  () const { return from_page ? from_page->gradeDirty() : false; }
   bool  fromBCountDirty () const { return from_page ? from_page->bCountDirty() : false; }
   bool  fromQCountDirty () const { return from_page ? from_page->qCountDirty() : false; }
-  QString getFromFauxAmi  () const { return from_page ? from_page->getFauxAmi() : QString(""); }
+  TQString getFromFauxAmi  () const { return from_page ? from_page->getFauxAmi() : TQString(""); }
 
   time_t  getFromDate   () const { return from_page ? from_page->getDate() : 0; }
   grade_t getFromGrade  () const { return from_page ? from_page->getGrade() : KV_NORM_GRADE; }
@@ -147,7 +147,7 @@ public:
   bool  toGradeDirty    () const { return to_page ? to_page->gradeDirty() : false; }
   bool  toBCountDirty   () const { return to_page ? to_page->bCountDirty() : false; }
   bool  toQCountDirty   () const { return to_page ? to_page->qCountDirty() : false; }
-  QString getToFauxAmi  () const { return to_page ? to_page->getFauxAmi() : QString(""); }
+  TQString getToFauxAmi  () const { return to_page ? to_page->getFauxAmi() : TQString(""); }
 
   time_t  getToDate     () const { return to_page ? to_page->getDate() : 0; }
   grade_t getToGrade    () const { return to_page ? to_page->getGrade() : KV_NORM_GRADE; }
@@ -160,17 +160,17 @@ public:
   bool    activeDirty  () const { return comm_page->activeDirty  (); }
 
   int     getLesson   ()  const { return comm_page->getLesson(); }
-  QString getType     ()  const { return comm_page->getType(); }
-  QString getExpr     ()  const { return comm_page->getExpr(); }
-  QString getPronunce ()  const { return comm_page->getPronunce(); }
-  QString getUsageLabel() const { return comm_page->getUsageLabel(); }
+  TQString getType     ()  const { return comm_page->getType(); }
+  TQString getExpr     ()  const { return comm_page->getExpr(); }
+  TQString getPronunce ()  const { return comm_page->getPronunce(); }
+  TQString getUsageLabel() const { return comm_page->getUsageLabel(); }
   bool    getActive()     const { return comm_page->getActive(); }
 
-  QString getSynonym  () const { return aux_page->getSynonym(); }
-  QString getAntonym  () const { return aux_page->getAntonym(); }
-  QString getRemark   () const { return aux_page->getRemark(); }
-  QString getExample  () const { return aux_page->getExample(); }
-  QString getParaphrase () const { return aux_page->getParaphrase(); }
+  TQString getSynonym  () const { return aux_page->getSynonym(); }
+  TQString getAntonym  () const { return aux_page->getAntonym(); }
+  TQString getRemark   () const { return aux_page->getRemark(); }
+  TQString getExample  () const { return aux_page->getExample(); }
+  TQString getParaphrase () const { return aux_page->getParaphrase(); }
 
   Conjugation getConjugation() const { return tense_page->getConjugation(); }
 
@@ -182,8 +182,8 @@ public:
   void setModified(bool mod);
   void setEnabled(int);
 
-  void setCell(int row, int col, const vector<QTableSelection>& sel);
-  void getCell(int &row, int &col, vector<QTableSelection>& sel) const;
+  void setCell(int row, int col, const vector<TQTableSelection>& sel);
+  void getCell(int &row, int &col, vector<TQTableSelection>& sel) const;
 
 signals:
   void sigEditChoice(int);
@@ -196,11 +196,11 @@ public slots:
   void slotDockVertical();
 
 protected slots:
-  void updatePages(const QString &type);
+  void updatePages(const TQString &type);
   virtual void reject ();
 
 protected:
-  virtual void closeEvent (QCloseEvent*e);
+  virtual void closeEvent (TQCloseEvent*e);
 
   FromToEntryPage  *from_page,
                     *to_page;
@@ -210,12 +210,12 @@ protected:
   AdjEntryPage     *adj_page;
   MCEntryPage      *mc_page;
   int               edit_row, edit_col;
-  QTabWidget       *tabber;
+  TQTabWidget       *tabber;
 
-  vector<QTableSelection> selections;
+  vector<TQTableSelection> selections;
   KMainWindow     *mainwin;
-  QSize            oldMainSize;
-  QPoint           oldMainPos;
+  TQSize            oldMainSize;
+  TQPoint           oldMainPos;
   bool             docked;
 };
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
index 462cdbf0..0a8bd0cb 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
@@ -27,10 +27,10 @@
 #include "FromToEntryPage.h"
 #include "EntryDlg.h"
 
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
+#include <tqpushbutton.h>
+#include <tqgroupbox.h>
 
 #include <klocale.h>
 
@@ -42,7 +42,7 @@
 
 #include <stdlib.h>
 
-static QStringList  monthnames;
+static TQStringList  monthnames;
 
 FromToEntryPage::FromToEntryPage
 (
@@ -52,9 +52,9 @@ FromToEntryPage::FromToEntryPage
   time_t      _time,
   count_t     _qcount,
   count_t     _bcount,
-  QString     faux,
-  QString     label,
-  QWidget    *parent,
+  TQString     faux,
+  TQString     label,
+  TQWidget    *parent,
   const char *name
 )
   :
@@ -75,23 +75,23 @@ FromToEntryPage::FromToEntryPage
   monthnames.append (i18n("November"));
   monthnames.append (i18n("December"));
 
-  connect( bcount_line, SIGNAL(textChanged(const QString&)),  SLOT(slotBCount(const QString&)) );
-  connect( qcount_line, SIGNAL(textChanged(const QString&)),  SLOT(slotQCount(const QString&)) );
-  connect( fauxami_line, SIGNAL(textChanged(const QString&)), SLOT(slotFauxAmiSelected(const QString&)) );
+  connect( bcount_line, TQT_SIGNAL(textChanged(const TQString&)),  TQT_SLOT(slotBCount(const TQString&)) );
+  connect( qcount_line, TQT_SIGNAL(textChanged(const TQString&)),  TQT_SLOT(slotQCount(const TQString&)) );
+  connect( fauxami_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotFauxAmiSelected(const TQString&)) );
 
-  connect( never, SIGNAL(clicked()), SLOT(slotNever()) );
-  connect( today, SIGNAL(clicked()), SLOT(slotToday()) );
-  connect( gradebox, SIGNAL(activated(int)), SLOT(slotGradeSelected(int)) );
+  connect( never, TQT_SIGNAL(clicked()), TQT_SLOT(slotNever()) );
+  connect( today, TQT_SIGNAL(clicked()), TQT_SLOT(slotToday()) );
+  connect( gradebox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotGradeSelected(int)) );
 
-  connect( year_spin,  SIGNAL(valueChanged(int)), SLOT(slotYearChanged(int)) );
-  connect( month_spin, SIGNAL(valueChanged(int)), SLOT(slotMonthChanged(int)) );
-  connect( day_spin,   SIGNAL(valueChanged(int)), SLOT(slotDayChanged(int)) );
+  connect( year_spin,  TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotYearChanged(int)) );
+  connect( month_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotMonthChanged(int)) );
+  connect( day_spin,   TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDayChanged(int)) );
 
-  year_spin->setData ((QStringList *) 0, 1980, 2100);
+  year_spin->setData ((TQStringList *) 0, 1980, 2100);
   month_spin->setData (&monthnames, 1, 12);
-  day_spin->setData ((QStringList *) 0, 1, 31);
+  day_spin->setData ((TQStringList *) 0, 1, 31);
 
-  QString s;
+  TQString s;
   for (int i = 0; i <= KV_MAX_GRADE; i++) {
     s.setNum (i);
     gradebox->insertItem( QueryManager::gradeStr(i) );
@@ -113,8 +113,8 @@ void FromToEntryPage::setData(
   time_t      _time,
   count_t     _qcount,
   count_t     _bcount,
-  QString     faux,
-  QString     label)
+  TQString     faux,
+  TQString     label)
 {
   grade = _grade;
   qcount = _qcount;
@@ -123,8 +123,8 @@ void FromToEntryPage::setData(
   fauxami_line->setText(fauxami);
 
   valid_date = false;
-  QDateTime dt;
-  QDate date;
+  TQDateTime dt;
+  TQDate date;
   if (_time != 0 && !multi_sel) {
     dt.setTime_t (_time);
     valid_date = true;
@@ -137,9 +137,9 @@ void FromToEntryPage::setData(
     day_spin->setValue(day);
     month_spin->setValue(month);
     year_spin->setValue(year);
-    year_spin->setSpecial(QString::null);
-    month_spin->setSpecial(QString::null);
-    day_spin->setSpecial(QString::null);
+    year_spin->setSpecial(TQString::null);
+    month_spin->setSpecial(TQString::null);
+    day_spin->setSpecial(TQString::null);
   }
   else {
     dt.setTime_t (time(0L));
@@ -156,7 +156,7 @@ void FromToEntryPage::setData(
 
   gradebox->setCurrentItem (grade);
 
-  QString s;
+  TQString s;
   s.setNum (qcount);
   qcount_line->setText (s);
 
@@ -185,7 +185,7 @@ void FromToEntryPage::setData(
 }
 
 
-void FromToEntryPage::slotFauxAmiSelected(const QString& s)
+void FromToEntryPage::slotFauxAmiSelected(const TQString& s)
 {
   setModified(true);
   fauxami = s;
@@ -200,7 +200,7 @@ void FromToEntryPage::slotGradeSelected (int g)
 }
 
 
-void FromToEntryPage::slotQCount(const QString& s)
+void FromToEntryPage::slotQCount(const TQString& s)
 {
   setModified(true);
   qcount_dirty = true;
@@ -208,7 +208,7 @@ void FromToEntryPage::slotQCount(const QString& s)
 }
 
 
-void FromToEntryPage::slotBCount(const QString& s)
+void FromToEntryPage::slotBCount(const TQString& s)
 {
   setModified(true);
   bcount_dirty = true;
@@ -220,9 +220,9 @@ time_t FromToEntryPage::getDate   () const
 {
   // FIXME: warning dialog/don`t quit dialog when date invalid
   if (valid_date) {
-    QDate act_date (year, month, day);
-    QDateTime time_null (QDate (1970, 1, 1), QTime (0,0,0));
-    return -QDateTime(act_date).secsTo (time_null);
+    TQDate act_date (year, month, day);
+    TQDateTime time_null (TQDate (1970, 1, 1), TQTime (0,0,0));
+    return -TQDateTime(act_date).secsTo (time_null);
   }
   else
     return 0;
@@ -249,7 +249,7 @@ void FromToEntryPage::slotYearChanged(int new_year)
     new_year = year;
   }
 
-  year_spin->setSpecial(QString::null);
+  year_spin->setSpecial(TQString::null);
 
   year = new_year;
   validate();
@@ -278,7 +278,7 @@ void FromToEntryPage::slotMonthChanged(int new_month)
     new_month = month;
   }
 
-  month_spin->setSpecial(QString::null);
+  month_spin->setSpecial(TQString::null);
 
   month = new_month;
   validate();
@@ -306,7 +306,7 @@ void FromToEntryPage::slotDayChanged(int new_day)
     new_day = day;
   }
 
-  day_spin->setSpecial(QString::null);
+  day_spin->setSpecial(TQString::null);
 
   day = new_day;
   validate();
@@ -329,7 +329,7 @@ void FromToEntryPage::slotToday()
 {
   setModified(true);
   date_dirty = true;
-  QDateTime dt;
+  TQDateTime dt;
   dt.setTime_t (time(0L));
 
   year = dt.date().year();
@@ -339,9 +339,9 @@ void FromToEntryPage::slotToday()
   day_spin->setValue(day);
   month_spin->setValue(month);
   year_spin->setValue(year);
-  year_spin->setSpecial(QString::null);
-  month_spin->setSpecial(QString::null);
-  day_spin->setSpecial(QString::null);
+  year_spin->setSpecial(TQString::null);
+  month_spin->setSpecial(TQString::null);
+  day_spin->setSpecial(TQString::null);
   validate();
 }
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h
index ad322eff..238f4462 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h
@@ -29,7 +29,7 @@
 
 #include "FromToEntryPageForm.h"
 #include <time.h>
-#include <qdatetime.h>
+#include <tqdatetime.h>
 
 #include <kvoctraindoc.h>
 
@@ -49,9 +49,9 @@ public:
       time_t      _date,
       count_t     _qcount,
       count_t     _bcount,
-      QString     faux,
-      QString     label,
-      QWidget    *parent = NULL,
+      TQString     faux,
+      TQString     label,
+      TQWidget    *parent = NULL,
       const char *name = NULL
   );
 
@@ -61,8 +61,8 @@ public:
       time_t      _date,
       count_t     _qcount,
       count_t     _bcount,
-      QString     faux,
-      QString     label);
+      TQString     faux,
+      TQString     label);
 
   time_t  dateDirty   () const { return date_dirty; }
   grade_t gradeDirty  () const { return grade_dirty; }
@@ -74,7 +74,7 @@ public:
   count_t getQCount () const { return qcount; }
   count_t getBCount () const { return bcount; }
 
-  QString getFauxAmi () const { return fauxami; }
+  TQString getFauxAmi () const { return fauxami; }
 
   bool isModified();
   void setModified(bool mod = true);
@@ -85,8 +85,8 @@ signals:
 
 protected slots:
     void slotGradeSelected(int);
-    void slotQCount(const QString&);
-    void slotBCount(const QString&);
+    void slotQCount(const TQString&);
+    void slotBCount(const TQString&);
 
     void slotIncYear();
     void slotIncMonth();
@@ -96,7 +96,7 @@ protected slots:
     void slotDecDay();
     void slotToday();
     void slotNever();
-    void slotFauxAmiSelected(const QString&);
+    void slotFauxAmiSelected(const TQString&);
 
     void slotDayChanged(int);
     void slotMonthChanged(int);
@@ -105,7 +105,7 @@ protected slots:
 protected:
     void validate();
 
-    QString    fauxami;
+    TQString    fauxami;
     bool       valid_date;
     bool       date_dirty,
                qcount_dirty,
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp
index a26e43ed..a6967704 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp
@@ -29,19 +29,19 @@
 
 #include <langset.h>
 
-#include <qlineedit.h>
+#include <tqlineedit.h>
 
 
-MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoice &mc, QWidget *parent, const char *name)
+MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *parent, const char *name)
   : MCEntryPageForm( parent, name ), dlgbook(_dlgbook)
 {
   multiplechoice = mc;
 
-  connect( mc1Field, SIGNAL(textChanged(const QString&)), SLOT(mc1Changed(const QString&)) );
-  connect( mc2Field, SIGNAL(textChanged(const QString&)), SLOT(mc2Changed(const QString&)) );
-  connect( mc3Field, SIGNAL(textChanged(const QString&)), SLOT(mc3Changed(const QString&)) );
-  connect( mc4Field, SIGNAL(textChanged(const QString&)), SLOT(mc4Changed(const QString&)) );
-  connect( mc5Field, SIGNAL(textChanged(const QString&)), SLOT(mc5Changed(const QString&)) );
+  connect( mc1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc1Changed(const TQString&)) );
+  connect( mc2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc2Changed(const TQString&)) );
+  connect( mc3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc3Changed(const TQString&)) );
+  connect( mc4Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc4Changed(const TQString&)) );
+  connect( mc5Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc5Changed(const TQString&)) );
 
   setData(multi_sel, mc);
 }
@@ -68,35 +68,35 @@ void MCEntryPage::setData(bool multi_sel, const MultipleChoice &mc)
 }
 
 
-void MCEntryPage::mc1Changed(const QString& s)
+void MCEntryPage::mc1Changed(const TQString& s)
 {
   setModified(true);
   multiplechoice.setMC1 (s);
 }
 
 
-void MCEntryPage::mc2Changed(const QString& s)
+void MCEntryPage::mc2Changed(const TQString& s)
 {
   setModified(true);
   multiplechoice.setMC2 (s);
 }
 
 
-void MCEntryPage::mc3Changed(const QString& s)
+void MCEntryPage::mc3Changed(const TQString& s)
 {
   setModified(true);
   multiplechoice.setMC3 (s);
 }
 
 
-void MCEntryPage::mc4Changed(const QString& s)
+void MCEntryPage::mc4Changed(const TQString& s)
 {
   setModified(true);
   multiplechoice.setMC4 (s);
 }
 
 
-void MCEntryPage::mc5Changed(const QString& s)
+void MCEntryPage::mc5Changed(const TQString& s)
 {
   setModified(true);
   multiplechoice.setMC5 (s);
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h
index 23fb441a..c2938814 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h
@@ -37,7 +37,7 @@ class MCEntryPage : public MCEntryPageForm
   Q_OBJECT
 
 public:
-  MCEntryPage(EntryDlg *dlgbook, bool multi_sel, const MultipleChoice &mc, QWidget *parent = NULL, const char *name = NULL);
+  MCEntryPage(EntryDlg *dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *parent = NULL, const char *name = NULL);
 
   void setData(bool multi_sel, const MultipleChoice &mc);
 
@@ -51,11 +51,11 @@ signals:
   void sigModified();
 
 protected slots:
-  void mc1Changed(const QString&);
-  void mc2Changed(const QString&);
-  void mc3Changed(const QString&);
-  void mc4Changed(const QString&);
-  void mc5Changed(const QString&);
+  void mc1Changed(const TQString&);
+  void mc2Changed(const TQString&);
+  void mc3Changed(const TQString&);
+  void mc4Changed(const TQString&);
+  void mc5Changed(const TQString&);
 
 protected:
   MultipleChoice  multiplechoice;
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp
index f8d1e6f9..9e7c7450 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp
@@ -27,20 +27,20 @@
 
 #include "MySpinBox.h"
 
-MySpinBox::MySpinBox (QWidget* parent, const char* name ): QSpinBox(parent, name ), spin_names (0)
+MySpinBox::MySpinBox (TQWidget* parent, const char* name ): TQSpinBox(parent, name ), spin_names (0)
 {
   setWrapping(true);
 }
 
 
-void MySpinBox::setData (QStringList *names, int minValue, int maxValue)
+void MySpinBox::setData (TQStringList *names, int minValue, int maxValue)
 {
   spin_names = names;
   setRange (minValue, maxValue);
 }
 
 
-QString MySpinBox::mapValueToText( int value )
+TQString MySpinBox::mapValueToText( int value )
 {
   if (special_str.length() != 0 )
     return special_str;
@@ -48,7 +48,7 @@ QString MySpinBox::mapValueToText( int value )
   if (spin_names != 0)
     return (*spin_names)[value];
   else
-    return QString("%1").arg(value);
+    return TQString("%1").arg(value);
 }
 
 
@@ -58,7 +58,7 @@ int MySpinBox::MySpinBox::mapTextToValue(bool *)
 }
 
 
-void MySpinBox::setSpecial(const QString &str)
+void MySpinBox::setSpecial(const TQString &str)
 {
   special_str = str;
   setSuffix("");  // update display
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h
index 284bb8ea..f17ba8ba 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h
@@ -26,23 +26,23 @@
 #ifndef MySpinbox_included
 #define MySpinbox_included
 
-#include <qspinbox.h>
+#include <tqspinbox.h>
 
 class QStringlist;
 
 class MySpinBox : public QSpinBox
 {
 public:
-  MySpinBox (QWidget* parent = 0, const char* name = 0);
+  MySpinBox (TQWidget* parent = 0, const char* name = 0);
 
-  void setSpecial(const QString &str);
-  void setData (QStringList *names, int minValue, int maxValue);
-  virtual QString mapValueToText( int value );
+  void setSpecial(const TQString &str);
+  void setData (TQStringList *names, int minValue, int maxValue);
+  virtual TQString mapValueToText( int value );
   virtual int mapTextToValue( bool* ok );
 
 protected:
-  QStringList *spin_names;
-  QString special_str;
+  TQStringList *spin_names;
+  TQString special_str;
 };
 
 #endif // MySpinbox_included
diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
index 6d26be5a..47487624 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
@@ -26,10 +26,10 @@
 
 #include "PhoneticEntryPage.h"
 
-#include <qlayout.h>
-#include <qframe.h>
-#include <qgroupbox.h>
-#include <qtooltip.h>
+#include <tqlayout.h>
+#include <tqframe.h>
+#include <tqgroupbox.h>
+#include <tqtooltip.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -175,32 +175,32 @@ void PhoneticButton::slotClicked()
 }
 
 
-PhoneticEntryPage::PhoneticEntryPage(const QFont &ipafont, QWidget *parent, const char *name, bool modal)
+PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, const char *name, bool modal)
   : KDialogBase(Plain, i18n("Select Characters From Phonetic Alphabet"), Close, Close, parent, name, modal)
 {
   int num = sizeof(kv_unicode_ref) / sizeof(kv_unicode_ref[0]);
-  QFrame * phoneticbox = plainPage();
-  QGridLayout *gbox = new QGridLayout(phoneticbox, KV_MAX_HORIZ, (num+KV_MAX_HORIZ-1)/KV_MAX_HORIZ, 1);
+  TQFrame * phoneticbox = plainPage();
+  TQGridLayout *gbox = new TQGridLayout(phoneticbox, KV_MAX_HORIZ, (num+KV_MAX_HORIZ-1)/KV_MAX_HORIZ, 1);
 
   KV_Unicode_Ref *uni_ref = kv_unicode_ref;
   int vert = 0;
   int horiz = 0;
   while (uni_ref->code != 0) {
-    QChar qc = uni_ref->code;
-    QString text = qc;
+    TQChar qc = uni_ref->code;
+    TQString text = qc;
     PhoneticButton *butt = new PhoneticButton(text, phoneticbox, this);
-    connect (butt, SIGNAL(clicked()), butt, SLOT(slotClicked()) );
-    QString tip = i18n("Unicode name: ");
-    tip += QString::fromLatin1(uni_ref->unicodename);
+    connect (butt, TQT_SIGNAL(clicked()), butt, TQT_SLOT(slotClicked()) );
+    TQString tip = i18n("Unicode name: ");
+    tip += TQString::fromLatin1(uni_ref->unicodename);
     tip += "\n";
     tip += i18n("Describing the sound of the character", "Sound: ");
     tip += i18n(uni_ref->audible);
     butt->setFont(ipafont);
-    butt->setSizePolicy(QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
+    butt->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
     int sz = QMAX(14, int(1.7*ipafont.pointSize()));
-    butt->setMaximumSize(QSize (sz, sz));
+    butt->setMaximumSize(TQSize (sz, sz));
     gbox->addWidget( butt, vert, horiz, AlignCenter );
-    QToolTip::add (butt, tip);
+    TQToolTip::add (butt, tip);
 
     if (++horiz >= KV_MAX_HORIZ) {
       ++vert;
@@ -212,10 +212,10 @@ PhoneticEntryPage::PhoneticEntryPage(const QFont &ipafont, QWidget *parent, cons
 }
 
 
-void PhoneticEntryPage::keyPressEvent( QKeyEvent *e )
+void PhoneticEntryPage::keyPressEvent( TQKeyEvent *e )
 {
   if ((e->state() & (ControlButton | AltButton)) == 0) {
-    QString s = e->text();
+    TQString s = e->text();
     for (unsigned i = 0; i < s.length(); ++i) {
       emit charSelected(s[i].unicode());
     }
diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h
index cf12ef48..d2747015 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h
@@ -27,7 +27,7 @@
 #ifndef PHONETICENTRYPAGE_H
 #define PHONETICENTRYPAGE_H
 
-#include <qpushbutton.h>
+#include <tqpushbutton.h>
 
 #include <kdialogbase.h>
 
@@ -36,13 +36,13 @@ class PhoneticEntryPage : public KDialogBase
   Q_OBJECT
 
 public:
-  PhoneticEntryPage(const QFont &ipafont, QWidget *parent = 0, const char *name = 0, bool modal = false);
+  PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent = 0, const char *name = 0, bool modal = false);
 
 signals:
   void charSelected(wchar_t);
 
 protected:
-  void keyPressEvent( QKeyEvent *e );
+  void keyPressEvent( TQKeyEvent *e );
 
   friend class PhoneticButton;
 };
@@ -53,8 +53,8 @@ class PhoneticButton : public QPushButton
   Q_OBJECT
 
 public:
-  PhoneticButton (const QString & text, QWidget * parent, PhoneticEntryPage *_page, const char * name = 0)
-  : QPushButton (text, parent, name), page(_page) {}
+  PhoneticButton (const TQString & text, TQWidget * parent, PhoneticEntryPage *_page, const char * name = 0)
+  : TQPushButton (text, parent, name), page(_page) {}
 
 protected slots:
   void slotClicked();
diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp
index 30fa4fdd..c8c7d41e 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp
@@ -23,10 +23,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qcombobox.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
+#include <tqcombobox.h>
+#include <tqcheckbox.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
 
 #include <langset.h>
 
@@ -39,27 +39,27 @@ TenseEntryPage::TenseEntryPage
   bool               multi_sel,
   const Conjugation &con_prefix,
   const Conjugation &conjug,
-  QWidget           *parent,
+  TQWidget           *parent,
   const char        *name
 )
   : TenseEntryPageForm( parent, name ), multi_mode(multi_sel), dlgbook(_dlgbook)
 {
 
-  connect( third_p_common, SIGNAL(toggled(bool)), SLOT(slotThirdPCommonToggled(bool)) );
-  connect( third_s_common, SIGNAL(toggled(bool)), SLOT(slotThirdSCommonToggled(bool)) );
-  connect( b_next, SIGNAL(clicked()), SLOT(slotNextConj()) );
-  connect( tensebox, SIGNAL(activated(int)), SLOT(slotTenseSelected(int)) );
-
-  connect( thirdN_plural, SIGNAL(textChanged(const QString&)), SLOT(thirdNPluralChanged(const QString&)) );
-  connect( thirdN_singular, SIGNAL(textChanged(const QString&)), SLOT(thirdNSingularChanged(const QString&)) );
-  connect( thirdM_plural, SIGNAL(textChanged(const QString&)), SLOT(thirdMPluralChanged(const QString&)) );
-  connect( thirdM_singular, SIGNAL(textChanged(const QString&)), SLOT(thirdMSingularChanged(const QString&)) );
-  connect( thirdF_plural, SIGNAL(textChanged(const QString&)), SLOT(thirdFPluralChanged(const QString&)) );
-  connect( thirdF_singular, SIGNAL(textChanged(const QString&)), SLOT(thirdFSingularChanged(const QString&)) );
-  connect( second_plural, SIGNAL(textChanged(const QString&)), SLOT(secondPluralChanged(const QString&)) );
-  connect( second_singular, SIGNAL(textChanged(const QString&)), SLOT(secondSingularChanged(const QString&)) );
-  connect( first_plural, SIGNAL(textChanged(const QString&)), SLOT(firstPluralChanged(const QString&)) );
-  connect( first_singular, SIGNAL(textChanged(const QString&)), SLOT(firstSingularChanged(const QString&)) );
+  connect( third_p_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) );
+  connect( third_s_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdSCommonToggled(bool)) );
+  connect( b_next, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextConj()) );
+  connect( tensebox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTenseSelected(int)) );
+
+  connect( thirdN_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNPluralChanged(const TQString&)) );
+  connect( thirdN_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNSingularChanged(const TQString&)) );
+  connect( thirdM_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMPluralChanged(const TQString&)) );
+  connect( thirdM_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMSingularChanged(const TQString&)) );
+  connect( thirdF_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFPluralChanged(const TQString&)) );
+  connect( thirdF_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFSingularChanged(const TQString&)) );
+  connect( second_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondPluralChanged(const TQString&)) );
+  connect( second_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondSingularChanged(const TQString&)) );
+  connect( first_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstPluralChanged(const TQString&)) );
+  connect( first_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstSingularChanged(const TQString&)) );
 
   prefix = con_prefix;
   selection = "";
@@ -98,7 +98,7 @@ void TenseEntryPage::setData(bool /*multi_sel*/, const Conjugation &conjug)
 }
 
 
-void TenseEntryPage::firstPluralChanged(const QString& s)
+void TenseEntryPage::firstPluralChanged(const TQString& s)
 {
   conjugations.setPers1Plural (selection, s);
   updateFields();
@@ -106,7 +106,7 @@ void TenseEntryPage::firstPluralChanged(const QString& s)
 }
 
 
-void TenseEntryPage::firstSingularChanged(const QString& s)
+void TenseEntryPage::firstSingularChanged(const TQString& s)
 {
   conjugations.setPers1Singular (selection, s);
   updateFields();
@@ -114,7 +114,7 @@ void TenseEntryPage::firstSingularChanged(const QString& s)
 }
 
 
-void TenseEntryPage::secondSingularChanged(const QString& s)
+void TenseEntryPage::secondSingularChanged(const TQString& s)
 {
   conjugations.setPers2Singular (selection, s);
   updateFields();
@@ -122,7 +122,7 @@ void TenseEntryPage::secondSingularChanged(const QString& s)
 }
 
 
-void TenseEntryPage::secondPluralChanged(const QString& s)
+void TenseEntryPage::secondPluralChanged(const TQString& s)
 {
   conjugations.setPers2Plural (selection, s);
   updateFields();
@@ -130,7 +130,7 @@ void TenseEntryPage::secondPluralChanged(const QString& s)
 }
 
 
-void TenseEntryPage::thirdFPluralChanged(const QString& s)
+void TenseEntryPage::thirdFPluralChanged(const TQString& s)
 {
   conjugations.setPers3FemalePlural (selection, s);
   updateFields();
@@ -138,7 +138,7 @@ void TenseEntryPage::thirdFPluralChanged(const QString& s)
 }
 
 
-void TenseEntryPage::thirdFSingularChanged(const QString& s)
+void TenseEntryPage::thirdFSingularChanged(const TQString& s)
 {
   conjugations.setPers3FemaleSingular (selection, s);
   updateFields();
@@ -146,7 +146,7 @@ void TenseEntryPage::thirdFSingularChanged(const QString& s)
 }
 
 
-void TenseEntryPage::thirdMSingularChanged(const QString& s)
+void TenseEntryPage::thirdMSingularChanged(const TQString& s)
 {
   conjugations.setPers3MaleSingular (selection, s);
   updateFields();
@@ -154,7 +154,7 @@ void TenseEntryPage::thirdMSingularChanged(const QString& s)
 }
 
 
-void TenseEntryPage::thirdNSingularChanged(const QString& s)
+void TenseEntryPage::thirdNSingularChanged(const TQString& s)
 {
   conjugations.setPers3NaturalSingular(selection, s);
   updateFields();
@@ -162,7 +162,7 @@ void TenseEntryPage::thirdNSingularChanged(const QString& s)
 }
 
 
-void TenseEntryPage::thirdNPluralChanged(const QString& s)
+void TenseEntryPage::thirdNPluralChanged(const TQString& s)
 {
   conjugations.setPers3NaturalPlural (selection, s);
   updateFields();
@@ -170,7 +170,7 @@ void TenseEntryPage::thirdNPluralChanged(const QString& s)
 }
 
 
-void TenseEntryPage::thirdMPluralChanged(const QString& s)
+void TenseEntryPage::thirdMPluralChanged(const TQString& s)
 {
   conjugations.setPers3MalePlural (selection, s);
   updateFields();
diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h
index 5c118e8d..94e7a74c 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h
@@ -43,7 +43,7 @@ public:
     bool               multi_sel,
     const Conjugation &con_prefix,
     const Conjugation &conjugations,
-    QWidget           *parent = NULL,
+    TQWidget           *parent = NULL,
     const char        *name = NULL
   );
 
@@ -62,17 +62,17 @@ protected:
   void updateFields();
 
 protected slots:
-  void secondPluralChanged(const QString&);
-  void secondSingularChanged(const QString&);
-  void thirdNSingularChanged(const QString&);
-  void thirdFPluralChanged(const QString&);
-  void thirdMSingularChanged(const QString&);
-  void thirdFSingularChanged(const QString&);
+  void secondPluralChanged(const TQString&);
+  void secondSingularChanged(const TQString&);
+  void thirdNSingularChanged(const TQString&);
+  void thirdFPluralChanged(const TQString&);
+  void thirdMSingularChanged(const TQString&);
+  void thirdFSingularChanged(const TQString&);
   void slotTenseSelected(int);
-  void thirdMPluralChanged(const QString&);
-  void thirdNPluralChanged(const QString&);
-  void firstSingularChanged(const QString&);
-  void firstPluralChanged(const QString&);
+  void thirdMPluralChanged(const TQString&);
+  void thirdNPluralChanged(const TQString&);
+  void firstSingularChanged(const TQString&);
+  void firstPluralChanged(const TQString&);
   void slotThirdSCommonToggled(bool);
   void slotThirdPCommonToggled(bool);
   void slotNextConj();
@@ -80,7 +80,7 @@ protected slots:
 protected:
   Conjugation   prefix,
                 conjugations;
-  QString       selection;
+  TQString       selection;
   bool          multi_mode;
   bool          modified;
   EntryDlg     *dlgbook;
diff --git a/kvoctrain/kvoctrain/entry-dialogs/blockall.cpp b/kvoctrain/kvoctrain/entry-dialogs/blockall.cpp
index 879acd8d..a21fd2b8 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/blockall.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/blockall.cpp
@@ -25,12 +25,12 @@
 
 #include "blockall.h"
 
-BlockAllValidator::BlockAllValidator() : QValidator (0, 0)
+BlockAllValidator::BlockAllValidator() : TQValidator (0, 0)
 {
 }
 
 
-BlockAllValidator::State BlockAllValidator::validate (QString&, int& ) const
+BlockAllValidator::State BlockAllValidator::validate (TQString&, int& ) const
 {
   return Invalid;
 }
diff --git a/kvoctrain/kvoctrain/entry-dialogs/blockall.h b/kvoctrain/kvoctrain/entry-dialogs/blockall.h
index 96b115be..f71230f6 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/blockall.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/blockall.h
@@ -26,13 +26,13 @@
 #ifndef BlockAll_included
 #define BlockAll_included
 
-#include <qvalidator.h>
+#include <tqvalidator.h>
 
 class BlockAllValidator : public QValidator
 {
 public:
   BlockAllValidator ();
-  State validate (QString&, int& ) const;
+  State validate (TQString&, int& ) const;
 };
 
 #endif // BlockAll_included
diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp
index fdbb2744..d441cc2e 100644
--- a/kvoctrain/kvoctrain/kva_clip.cpp
+++ b/kvoctrain/kvoctrain/kva_clip.cpp
@@ -26,7 +26,7 @@
 
 #include "kvoctrain.h"
 
-#include <qclipboard.h>
+#include <tqclipboard.h>
 
 #include <klineedit.h>
 #include <klocale.h>
@@ -37,8 +37,8 @@ using namespace std;
 
 void kvoctrainApp::slotSmartSearchClip()
 {
-  QString s;
-  QString entries = QApplication::clipboard()->text();
+  TQString s;
+  TQString entries = TQApplication::clipboard()->text();
 
   if (!entries.isEmpty()) {
     int pos = entries.find ('\n'); // search for a line end
@@ -63,7 +63,7 @@ void kvoctrainApp::slotSmartSearchClip()
 vector<int> kvoctrainApp::getCsvOrder(kvoctrainDoc *doc)
 {
   vector<int> csv_order;
-  QStringList lang_order = Prefs::pasteOrder();
+  TQStringList lang_order = Prefs::pasteOrder();
 
   if (!Prefs::useCurrent())
   {
@@ -114,9 +114,9 @@ void kvoctrainApp::slotEditCopy()
 {
   slotStatusMsg(i18n("Copying selection to clipboard..."));
 
-  QApplication::setOverrideCursor( waitCursor );
-  QString exp;
-  QString s;
+  TQApplication::setOverrideCursor( waitCursor );
+  TQString exp;
+  TQString s;
 
   vector <int> csv_order = getCsvOrder(doc);
 
@@ -148,15 +148,15 @@ void kvoctrainApp::slotEditCopy()
   }
   if (!exp.isEmpty()) {
 #if defined(_WS_X11_)
-//    disconnect(QApplication::clipboard(),SIGNAL(dataChanged()),this,0);
+//    disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),this,0);
 #endif
-    QApplication::clipboard()->setText(exp);
+    TQApplication::clipboard()->setText(exp);
 #if defined(_WS_X11_)
-//    connect(QApplication::clipboard(),SIGNAL(dataChanged()), this,SLOT(clipboardChanged()));
+//    connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged()));
 #endif
   }
 
-  QApplication::restoreOverrideCursor();
+  TQApplication::restoreOverrideCursor();
   slotStatusMsg(IDS_DEFAULT);
 }
 
@@ -165,14 +165,14 @@ void kvoctrainApp::slotEditPaste()
 {
   slotStatusMsg(i18n("Inserting clipboard contents..."));
 
-  QApplication::setOverrideCursor( waitCursor );
-  QString s;
-  QString entries = QApplication::clipboard()->text();
+  TQApplication::setOverrideCursor( waitCursor );
+  TQString s;
+  TQString entries = TQApplication::clipboard()->text();
 
   vector <int> csv_order = getCsvOrder(doc);
 
   bool changed = false;
-  QString num;
+  TQString num;
 // view->setView(0, langset, gradecols);
   while (!entries.isEmpty()) {
     int pos = entries.find ('\n'); // search for a line end
@@ -197,7 +197,7 @@ void kvoctrainApp::slotEditPaste()
         kvoctrainExpr expr;
         expr.setLesson(act_lesson);
         // now move columns according to paste-order
-        QString s;
+        TQString s;
         for (int i = 0; i < (int) csv_order.size(); i++) {
           if (csv_order[i] >= 0) {
             if (i == 0)
@@ -227,7 +227,7 @@ void kvoctrainApp::slotEditPaste()
     view->getTable()->updateContents(view->getTable()->numRows()-1, KV_COL_ORG);
   }
 
-  QApplication::restoreOverrideCursor();
+  TQApplication::restoreOverrideCursor();
   slotStatusMsg(IDS_DEFAULT);
 }
 
diff --git a/kvoctrain/kvoctrain/kva_config.cpp b/kvoctrain/kvoctrain/kva_config.cpp
index b5376c1e..875ecd04 100644
--- a/kvoctrain/kvoctrain/kva_config.cpp
+++ b/kvoctrain/kvoctrain/kva_config.cpp
@@ -23,7 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qfile.h>
+#include <tqfile.h>
 
 #include "kvoctrain.h"
 #include <kvoctraincore.h>
@@ -46,7 +46,7 @@ void kvoctrainApp::saveOptions()
   Prefs::setNumPreSetting(presettings.size());
   for (int i = 0 ; i < (int) presettings.size(); i++)
   {
-    PreSettings preSettings(QString::number(i));
+    PreSettings preSettings(TQString::number(i));
     preSettings.setName(presettings[i].name);
     preSettings.setQuery(presettings[i].query_set);
     preSettings.setThreshold(presettings[i].thresh_set);
@@ -63,7 +63,7 @@ void kvoctrainApp::saveLanguages()
   Prefs::setNumLangSet(langset.size());
   for (int i = 0 ; i < (int) langset.size(); i++)
   {
-    LanguageSettings languageSettings(QString::number(i));
+    LanguageSettings languageSettings(TQString::number(i));
     languageSettings.setShortId(langset.shortId(i));
     languageSettings.setShort2Id(langset.shortId2(i));
     languageSettings.setLongId(langset.longId(i));
@@ -81,7 +81,7 @@ void kvoctrainApp::readOptions()
   int ls = Prefs::numPreSetting();
   for (int i = 0 ; i < ls; i++)
   {
-    PreSettings preSettings(QString::number(i));
+    PreSettings preSettings(TQString::number(i));
     preSettings.readConfig();
     presettings.push_back(PreSetting(preSettings.name(), preSettings.query(),
       preSettings.threshold(), preSettings.blocking()));
@@ -96,16 +96,16 @@ void kvoctrainApp::readLanguages()
   int ls = Prefs::numLangSet();
   for (int i = 0 ; i < ls; i++)
   {
-    LanguageSettings languageSettings(QString::number(i));
+    LanguageSettings languageSettings(TQString::number(i));
     languageSettings.readConfig();
 
-    QString shortId = languageSettings.shortId();
+    TQString shortId = languageSettings.shortId();
     if (shortId.stripWhiteSpace().length() == 0) {
       shortId.setNum (i);
       shortId.insert (0, "id");
     }
 
-    QString longId = languageSettings.longId();
+    TQString longId = languageSettings.longId();
     if (longId.stripWhiteSpace().length() == 0) {
       longId.setNum (i);
       longId.insert (0, "ident");
@@ -125,8 +125,8 @@ void kvoctrainApp::saveProperties(KConfig *config )
 
     config->writeEntry(CFG_QUERYMODE, querymode);
 
-    QString filename=doc->URL().path();
-    QString tempname = kapp->tempSaveName(filename);
+    TQString filename=doc->URL().path();
+    TQString tempname = kapp->tempSaveName(filename);
     saveDocProps(doc);
     doc->saveAs(this, KURL(tempname), doc->getTitle(), kvoctrainDoc::automatic);
   }
@@ -137,15 +137,15 @@ void kvoctrainApp::readProperties(KConfig *config)
 {
   querymode = config->readBoolEntry(CFG_QUERYMODE, 0);
 
-  QString filename = config->readEntry(CFG_FILENAME);
-  QString title = config->readEntry(CFG_TITLE);
+  TQString filename = config->readEntry(CFG_FILENAME);
+  TQString title = config->readEntry(CFG_TITLE);
   bool modified = config->readBoolEntry(CFG_MODIFIED,false);
   if( modified ){
     bool b_canRecover;
-    QString tempname = kapp->checkRecoverFile(filename,b_canRecover);
+    TQString tempname = kapp->checkRecoverFile(filename,b_canRecover);
 
     if(b_canRecover){
-      pdlg = new ProgressDlg(QString(), QString(), kapp->makeStdCaption(""));
+      pdlg = new ProgressDlg(TQString(), TQString(), kapp->makeStdCaption(""));
       pdlg->show();
       doc = new kvoctrainDoc(this, KURL(tempname));
       removeProgressBar();
@@ -153,11 +153,11 @@ void kvoctrainApp::readProperties(KConfig *config)
       doc->setTitle(title);
       doc->setURL(KURL(filename));
       setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified()));
-      QFile::remove(tempname);
+      TQFile::remove(tempname);
     }
   }
   else if(!filename.isEmpty()){
-    pdlg = new ProgressDlg (QString(), QString(),
+    pdlg = new ProgressDlg (TQString(), TQString(),
                             kapp->makeStdCaption(""));
     pdlg->show();
     doc = new kvoctrainDoc(this, KURL(filename));
diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp
index 2aad63c3..d1572659 100644
--- a/kvoctrain/kvoctrain/kva_header.cpp
+++ b/kvoctrain/kvoctrain/kva_header.cpp
@@ -48,29 +48,29 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
   header_m = 0;
 
   if (header == KV_COL_LESS) {
-    header_m = new QPopupMenu();
+    header_m = new TQPopupMenu();
     header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header << 16) | IDH_SORT_COL_ALPHA);
     header_m->insertItem(SmallIconSet("sort_num"), i18n(SORT_NUM), (header << 16) | IDH_SORT_COL_NUM);
 
-    connect (header_m, SIGNAL(activated(int)), this, SLOT(slotHeaderCallBack(int)));
-    connect (header_m, SIGNAL(highlighted(int)), this, SLOT(slotHeaderStatus(int)));
+    connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
+    connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
 
-    header_m->exec(QPoint (x, y));
+    header_m->exec(TQPoint (x, y));
     return;
   }
 
   header -= KV_EXTRA_COLS; // adjust doc == header button
 
-  vector<QString> names;
-  QString curr_lang;
-  QString id = header == 0 ? doc->getOriginalIdent()
+  vector<TQString> names;
+  TQString curr_lang;
+  TQString id = header == 0 ? doc->getOriginalIdent()
                            : doc->getIdent(header);
 
   if (langset.indexShortId(id) >= 0)
     curr_lang = langset.longId(langset.indexShortId(id));
 
   // select one of the available languages for the column
-  QPopupMenu *langs_m = new QPopupMenu();
+  TQPopupMenu *langs_m = new TQPopupMenu();
   // hack: ID => header-id + language
 
   for (int i = 0; i < (int) langset.size(); i++) {
@@ -83,16 +83,16 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
   for (int i = 0; i < (int) langset.size(); i++) {
     if(   !langset.PixMapFile(i).isEmpty()
        && !langset.longId(i).isEmpty() )
-      langs_m->insertItem(QPixmap(langset.PixMapFile(i)), names[i],
+      langs_m->insertItem(TQPixmap(langset.PixMapFile(i)), names[i],
         (header << 16) | (i << (16+8)) | IDH_SET_LANG);
     else
       langs_m->insertItem(names[i],
         (header << 16) | (i << (16+8)) | IDH_SET_LANG);
   }
-  connect (langs_m, SIGNAL(activated(int)), this, SLOT(slotSetHeaderProp(int)));
-  connect (langs_m, SIGNAL(highlighted(int)), this, SLOT(slotHeaderStatus(int)));
+  connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int)));
+  connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
 
-  header_m = new QPopupMenu();
+  header_m = new TQPopupMenu();
 
   if (header != KV_COL_ORG - KV_EXTRA_COLS ) {
     header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_QUERY);
@@ -116,8 +116,8 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
     header_m->insertItem(SmallIconSet("delete_table_col"), i18n("&Remove Column"), (header << 16) | IDH_REMOVE );
   }
   else {
-    QPopupMenu *query_m =  new QPopupMenu();
-    QPopupMenu *multiple_m =  new QPopupMenu();
+    TQPopupMenu *query_m =  new TQPopupMenu();
+    TQPopupMenu *multiple_m =  new TQPopupMenu();
 
     names.clear();
     for (int j = 1; j < (int) doc->numLangs(); j++) {
@@ -134,7 +134,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
       if((j = langset.indexShortId(doc->getIdent(i))) >= 0
          && !langset.PixMapFile(j).isEmpty()
          && !langset.longId(j).isEmpty() ) {
-        query_m->insertItem(QPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]),
+        query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]),
             (i << (16+8)) |  IDH_START_QUERY);  // hack: IDs => header-ids + cmd
       }
       else {
@@ -142,15 +142,15 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
       }
     }
     header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL);
-    connect (query_m, SIGNAL(activated(int)), this, SLOT(slotHeaderCallBack(int)));
-    connect (query_m, SIGNAL(highlighted(int)), this, SLOT(slotHeaderStatus(int)));
+    connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
+    connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
     for (int i = 1; i < (int) doc->numLangs(); i++) {
       // show pixmap and long name if available
       int j;
       if((j = langset.indexShortId(doc->getIdent(i))) >= 0
          && !langset.PixMapFile(j).isEmpty()
          && !langset.longId(j).isEmpty() ) {
-        multiple_m->insertItem(QPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]),
+        multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]),
             (i << (16+8)) |  IDH_START_MULTIPLE);  // hack: IDs => header-ids + cmd
       }
       else {
@@ -167,17 +167,17 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
     header_m->insertItem(i18n("&Antonyms"), (header << 16) | IDH_START_ANTONYM);
     header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE);
     header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE);
-    connect (multiple_m, SIGNAL(activated(int)), this, SLOT(slotHeaderCallBack(int)));
-    connect (multiple_m, SIGNAL(highlighted(int)), this, SLOT(slotHeaderStatus(int)));
+    connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
+    connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
 
     header_m->insertSeparator();
     header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA);
     header_m->insertItem(SmallIconSet("set_language"), i18n("Set &Language"), langs_m, (2 << 16) | IDH_NULL);
   }
 
-  connect (header_m, SIGNAL(activated(int)), this, SLOT(slotHeaderCallBack(int)));
-  connect (header_m, SIGNAL(highlighted(int)), this, SLOT(slotHeaderStatus(int)));
-  header_m->exec(QPoint(x, y));
+  connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
+  connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+  header_m->exec(TQPoint(x, y));
 }
 
 
@@ -190,11 +190,11 @@ void kvoctrainApp::slotSetHeaderProp (int header_and_id) /*FOLD00*/
   if (id >= (int) langset.size())
     return; // ???
 
-  QString lid = langset.shortId(id);
+  TQString lid = langset.shortId(id);
   if  (!langset.longId(id).isEmpty() )
     lid = langset.longId(id);
 
-  QString pm = "";
+  TQString pm = "";
   if (!langset.PixMapFile(id).isEmpty() )
     pm = langset.PixMapFile(id);
 
@@ -255,17 +255,17 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
     break;
 
     case IDH_SET_LANG: {
-      QString from = langset.longId(header2);
+      TQString from = langset.longId(header2);
       if (from.isEmpty())
         from = langset.shortId(header2);
 
-      QString msg;
+      TQString msg;
       if (header1 == 0) {
-        QString format = i18n("Sets %1 as language for original");
+        TQString format = i18n("Sets %1 as language for original");
         msg = format.arg(from);
       }
       else {
-        QString format = i18n("Sets %1 as language for translation %2");
+        TQString format = i18n("Sets %1 as language for translation %2");
         msg = format.arg(from).arg(header1);
       }
       slotStatusHelpMsg(msg);
@@ -274,14 +274,14 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
 
     case IDH_APPEND: {
 
-      QString msg;
+      TQString msg;
       if (header1 == 0xFF) {
         msg = i18n("Appends a new language");
         slotStatusHelpMsg(msg);
       }
       else if (header1 < (int) langset.size() ) {
-        QString from = langset.longId(header1);
-        QString format = i18n("Appends %1 as new language");
+        TQString from = langset.longId(header1);
+        TQString format = i18n("Appends %1 as new language");
         msg = format.arg(from);
         slotStatusHelpMsg(msg);
       }
@@ -289,11 +289,11 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
     break;
 
     case IDH_REMOVE: {
-      QString from = header1 ? doc->getIdent(header1) : doc->getOriginalIdent();
+      TQString from = header1 ? doc->getIdent(header1) : doc->getOriginalIdent();
       if (!langset.findLongId(from).isEmpty())
         from = langset.findLongId(from);
-      QString msg;
-      QString format = i18n("Removes %1 irrevocably from dictionary");
+      TQString msg;
+      TQString format = i18n("Removes %1 irrevocably from dictionary");
       msg = format.arg(from);
       slotStatusHelpMsg(msg);
     }
@@ -301,16 +301,16 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
 
     case IDH_START_QUERY:
     case IDH_START_MULTIPLE: {
-      QString to = header1 ? doc->getIdent(header1) : doc->getOriginalIdent();
+      TQString to = header1 ? doc->getIdent(header1) : doc->getOriginalIdent();
       if (!langset.findLongId(to).isEmpty())
         to = langset.findLongId(to);
 
-      QString from = header2 ? doc->getIdent(header2) : doc->getOriginalIdent();
+      TQString from = header2 ? doc->getIdent(header2) : doc->getOriginalIdent();
       if (!langset.findLongId(from).isEmpty())
         from = langset.findLongId(from);
 
-      QString msg;
-      QString format;
+      TQString msg;
+      TQString format;
 
       if (doc->numLangs() == 1) {
         if (cmd == IDH_START_QUERY)
@@ -372,11 +372,11 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
     break;
 
     case IDH_RESET_GRADE: {
-      QString from = header1 ? doc->getIdent(header1) : doc->getOriginalIdent();
+      TQString from = header1 ? doc->getIdent(header1) : doc->getOriginalIdent();
       if (!langset.findLongId(from).isEmpty())
         from = langset.findLongId(from);
-      QString format = i18n("Resets all properties for %1");
-      QString msg = format.arg(from);
+      TQString format = i18n("Resets all properties for %1");
+      TQString msg = format.arg(from);
       slotStatusHelpMsg(msg);
     }
     break;
@@ -432,8 +432,8 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
     break;
 
     case IDH_REMOVE: {
-      QString msg;
-      QString name;
+      TQString msg;
+      TQString name;
 
       name = doc->getIdent(header1);
       int i= langset.indexShortId(name);
@@ -441,7 +441,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
           && !langset.longId(i).isEmpty() )
         name = langset.longId(i);
 
-      QString format = i18n("You are about to delete a language completely.\n"
+      TQString format = i18n("You are about to delete a language completely.\n"
                             "Do you really want to delete \"%1\"?");
       msg = format.arg(name);
 
@@ -528,9 +528,9 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
     break;
 
     case IDH_RESET_GRADE: {
-      QString msg;
-      QString name;
-      QString format;
+      TQString msg;
+      TQString name;
+      TQString format;
 
       if (act_lesson == 0) {
         name = doc->getIdent(header1);
diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp
index 8d8ef995..c1b3ebe8 100644
--- a/kvoctrain/kvoctrain/kva_init.cpp
+++ b/kvoctrain/kvoctrain/kva_init.cpp
@@ -27,8 +27,8 @@
 
 #include "common-dialogs/ProgressDlg.h"
 
-#include <qclipboard.h>
-#include <qtimer.h>
+#include <tqclipboard.h>
+#include <tqtimer.h>
 
 #include <klineedit.h>
 #include <kcombobox.h>
@@ -40,7 +40,7 @@
 
 #include "prefs.h"
 
-kvoctrainApp::kvoctrainApp(QWidget *parent, const char *name)
+kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name)
 : KMainWindow(parent, name)
 {
   doc = 0;
@@ -89,8 +89,8 @@ kvoctrainApp::kvoctrainApp(QWidget *parent, const char *name)
   editRemoveSelectedArea->setEnabled(view->getTable()->numRows() > 0);
 
   querying = false;
-  btimer = new QTimer( this );
-  connect( btimer, SIGNAL(timeout()), this, SLOT(slotTimeOutBackup()) );
+  btimer = new TQTimer( this );
+  connect( btimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeOutBackup()) );
   if (Prefs::autoBackup())
     btimer->start(Prefs::backupTime() * 60 * 1000, TRUE);
 }
@@ -98,154 +98,154 @@ kvoctrainApp::kvoctrainApp(QWidget *parent, const char *name)
 
 void kvoctrainApp::initActions()
 {
-  fileNew = KStdAction::openNew(this, SLOT(slotFileNew()), actionCollection());
+  fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection());
   fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document"));
   fileNew->setToolTip(fileNew->whatsThis());
 
-  fileOpen = KStdAction::open(this, SLOT(slotFileOpen()), actionCollection());
+  fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection());
   fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document"));
   fileOpen->setToolTip(fileOpen->whatsThis());
 
-  fileOpenExample = new KAction(i18n("Open &Example..."), "fileopen", 0, this, SLOT(slotFileOpenExample()), actionCollection(), "file_open_example");
+  fileOpenExample = new KAction(i18n("Open &Example..."), "fileopen", 0, this, TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example");
   fileOpen->setWhatsThis(i18n("Open a vocabulary document"));
   fileOpen->setToolTip(fileOpen->whatsThis());
 
-  fileGHNS = new KAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, this, SLOT(slotGHNS()), actionCollection(), "file_ghns");
+  fileGHNS = new KAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, this, TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns");
   fileGHNS->setWhatsThis(i18n("Downloads new vocabularies"));
   fileGHNS->setToolTip(fileGHNS->whatsThis());
 
-  fileOpenRecent = KStdAction::openRecent(this, SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
+  fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
 
-  fileMerge = new KAction(i18n("&Merge..."), 0, 0, this, SLOT(slotFileMerge()), actionCollection(), "file_merge");
+  fileMerge = new KAction(i18n("&Merge..."), 0, 0, this, TQT_SLOT(slotFileMerge()), actionCollection(), "file_merge");
   fileMerge->setWhatsThis(i18n("Merge an existing vocabulary document with the current one"));
   fileMerge->setToolTip(fileOpen->whatsThis());
 
-  fileSave = KStdAction::save(this, SLOT(slotFileSave()), actionCollection());
+  fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection());
   fileSave->setWhatsThis(i18n("Save the active vocabulary document"));
   fileSave->setToolTip(fileSave->whatsThis());
 
-  fileSaveAs = KStdAction::saveAs(this, SLOT(slotFileSaveAs()), actionCollection());
+  fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection());
   fileSaveAs->setWhatsThis(i18n("Save the active vocabulary document with a different name"));
   fileSaveAs->setToolTip(fileSaveAs->whatsThis());
 
-  filePrint = KStdAction::print(this, SLOT(slotFilePrint()), actionCollection());
+  filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection());
   filePrint->setWhatsThis(i18n("Print the active vocabulary document"));
   filePrint->setToolTip(filePrint->whatsThis());
 
-  fileQuit = KStdAction::quit(this, SLOT(slotFileQuit()), actionCollection());
+  fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection());
   fileQuit->setWhatsThis(i18n("Quit KVocTrain"));
   fileQuit->setToolTip(fileQuit->whatsThis());
 
-  editCopy = KStdAction::copy(this, SLOT(slotEditCopy()), actionCollection());
+  editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection());
   editCopy->setWhatsThis(i18n("Copy"));
   editCopy->setToolTip(editCopy->whatsThis());
 
-  editPaste = KStdAction::paste(this, SLOT(slotEditPaste()), actionCollection());
+  editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection());
   editPaste->setWhatsThis(i18n("Paste"));
   editPaste->setToolTip(editPaste->whatsThis());
 
-  editSelectAll = KStdAction::selectAll(this, SLOT(slotSelectAll()), actionCollection());
+  editSelectAll = KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection());
   editSelectAll->setWhatsThis(i18n("Select all rows"));
   editSelectAll->setToolTip(editSelectAll->whatsThis());
 
-  editClearSelection = KStdAction::deselect(this, SLOT(slotCancelSelection()), actionCollection());
+  editClearSelection = KStdAction::deselect(this, TQT_SLOT(slotCancelSelection()), actionCollection());
   editClearSelection->setWhatsThis(i18n("Deselect all rows"));
   editClearSelection->setToolTip(editClearSelection->whatsThis());
 
-  editSearchFromClipboard =  KStdAction::find(this, SLOT(slotSmartSearchClip()), actionCollection());
+  editSearchFromClipboard =  KStdAction::find(this, TQT_SLOT(slotSmartSearchClip()), actionCollection());
   editSearchFromClipboard->setWhatsThis(i18n("Search for the clipboard contents in the vocabulary"));
   editSearchFromClipboard->setToolTip(editSearchFromClipboard->whatsThis());
 
-  editAppend = new KAction(i18n("&Append New Entry"), "insert_table_row", "Insert", this, SLOT(slotAppendRow()), actionCollection(),"edit_append");
+  editAppend = new KAction(i18n("&Append New Entry"), "insert_table_row", "Insert", this, TQT_SLOT(slotAppendRow()), actionCollection(),"edit_append");
   editAppend->setWhatsThis(i18n("Append a new row to the vocabulary"));
   editAppend->setToolTip(editAppend->whatsThis());
 
-  editEditSelectedArea = new KAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", this, SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area");
+  editEditSelectedArea = new KAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", this, TQT_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area");
   editEditSelectedArea->setWhatsThis(i18n("Edit the entries in the selected rows"));
   editEditSelectedArea->setToolTip(editEditSelectedArea->whatsThis());
 
-  editRemoveSelectedArea = new KAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", this, SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area");
+  editRemoveSelectedArea = new KAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", this, TQT_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area");
   editRemoveSelectedArea->setWhatsThis(i18n("Delete the selected rows"));
   editRemoveSelectedArea->setToolTip(editRemoveSelectedArea->whatsThis());
 
-  editSaveSelectedArea = new KAction(i18n("Save E&ntries in Query As..."), KGlobal::iconLoader()->loadIcon("filesaveas", KIcon::Small), 0, this, SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area");
+  editSaveSelectedArea = new KAction(i18n("Save E&ntries in Query As..."), KGlobal::iconLoader()->loadIcon("filesaveas", KIcon::Small), 0, this, TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area");
   editSaveSelectedArea->setWhatsThis(i18n("Save the entries in the query as a new vocabulary"));
   editSaveSelectedArea->setToolTip(editSaveSelectedArea->whatsThis());
 
-  vocabShowStatistics = new KAction(i18n("Show &Statistics"), "statistics", 0, this, SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics");
+  vocabShowStatistics = new KAction(i18n("Show &Statistics"), "statistics", 0, this, TQT_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics");
   vocabShowStatistics->setWhatsThis(i18n("Show statistics for the current vocabulary"));
   vocabShowStatistics->setToolTip(vocabShowStatistics->whatsThis());
 
-  vocabAssignLessons = new KAction(i18n("Assign L&essons..."), "rand_less", 0, this, SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons");
+  vocabAssignLessons = new KAction(i18n("Assign L&essons..."), "rand_less", 0, this, TQT_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons");
   vocabAssignLessons->setWhatsThis(i18n("Create random lessons with unassigned entries"));
   vocabAssignLessons->setToolTip(vocabAssignLessons->whatsThis());
 
-  vocabCleanUp = new KAction(i18n("&Clean Up"), "cleanup", 0, this, SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up");
+  vocabCleanUp = new KAction(i18n("&Clean Up"), "cleanup", 0, this, TQT_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up");
   vocabCleanUp->setWhatsThis(i18n("Remove entries with same content from vocabulary"));
   vocabCleanUp->setToolTip(vocabCleanUp->whatsThis());
 
   vocabAppendLanguage = new KSelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language");
-  connect(vocabAppendLanguage->popupMenu(), SIGNAL(aboutToShow()), this, SLOT(aboutToShowVocabAppendLanguage()));
-  connect (vocabAppendLanguage->popupMenu(), SIGNAL(activated(int)), this, SLOT(slotAppendLang(int)));
-  connect (vocabAppendLanguage->popupMenu(), SIGNAL(highlighted(int)), this, SLOT(slotHeaderStatus(int)));
+  connect(vocabAppendLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabAppendLanguage()));
+  connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAppendLang(int)));
+  connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
 
   vocabSetLanguage = new KSelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language");
-  connect(vocabSetLanguage->popupMenu(), SIGNAL(aboutToShow()), this, SLOT(aboutToShowVocabSetLanguage()));
+  connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabSetLanguage()));
 
   vocabRemoveLanguage = new KSelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language");
-  connect(vocabRemoveLanguage->popupMenu(), SIGNAL(aboutToShow()), this, SLOT(aboutToShowVocabRemoveLanguage()));
-  connect(vocabRemoveLanguage->popupMenu(), SIGNAL(activated(int)), this, SLOT(slotHeaderCallBack(int)));
-  connect(vocabRemoveLanguage->popupMenu(), SIGNAL(highlighted(int)), this, SLOT(slotHeaderStatus(int)));
+  connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabRemoveLanguage()));
+  connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
+  connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
 
-  vocabDocumentProperties = new KAction(i18n("Document &Properties"), 0, 0, this, SLOT(slotDocProps()), actionCollection(), "vocab_document_properties");
+  vocabDocumentProperties = new KAction(i18n("Document &Properties"), 0, 0, this, TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties");
   vocabDocumentProperties->setWhatsThis(i18n("Edit document properties"));
   vocabDocumentProperties->setToolTip(vocabAppendLanguage->whatsThis());
 
-  vocabLanguageProperties = new KAction(i18n("Lan&guage Properties"), 0, 0, this, SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties");
+  vocabLanguageProperties = new KAction(i18n("Lan&guage Properties"), 0, 0, this, TQT_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties");
   vocabLanguageProperties->setWhatsThis(i18n("Edit language properties in current document"));
   vocabLanguageProperties->setToolTip(vocabSetLanguage->whatsThis());
 
   lessons = new KComboBox(this);
   lessons->setMinimumWidth(160);
-  connect(lessons, SIGNAL(highlighted(int)), this, SLOT(slotChooseLesson(int)));
-  lessons->setFocusPolicy(QWidget::NoFocus);
+  connect(lessons, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotChooseLesson(int)));
+  lessons->setFocusPolicy(TQWidget::NoFocus);
 
   vocabLessons = new KWidgetAction(lessons, i18n("Lessons"), 0, this, 0, actionCollection(), "vocab_lessons");
   vocabLessons->setWhatsThis(i18n("Choose current lesson"));
   vocabLessons->setToolTip(vocabLessons->whatsThis());
 
   searchLine = new KLineEdit(this);
-  searchLine->setFocusPolicy(QWidget::ClickFocus);
-  connect (searchLine, SIGNAL(returnPressed()), this, SLOT(slotSearchNext()));
-  connect (searchLine, SIGNAL(textChanged(const QString&)), this, SLOT(slotResumeSearch(const QString&)));
+  searchLine->setFocusPolicy(TQWidget::ClickFocus);
+  connect (searchLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchNext()));
+  connect (searchLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotResumeSearch(const TQString&)));
 
   vocabSearch = new KWidgetAction(searchLine, i18n("Smart Search"), 0, this, 0, actionCollection(), "vocab_search");
   vocabSearch->setAutoSized(true);
   vocabSearch->setWhatsThis(i18n("Search vocabulary for specified text "));
   vocabSearch->setToolTip(vocabSearch->whatsThis());
   /*
-  learningResumeQuery = new KAction(i18n("Resume &Query..."), "run_query", 0, this, SLOT(slotRestartQuery()), actionCollection(),"learning_resume_query");
+  learningResumeQuery = new KAction(i18n("Resume &Query..."), "run_query", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_query");
   //learningResumeQuery->setWhatsThis(i18n(""));
   learningResumeQuery->setToolTip(learningResumeQuery->whatsThis());
 
-  learningResumeMultipleChoice = new KAction(i18n("&Resume Multiple Choice..."), "run_multi", 0, this, SLOT(slotRestartQuery()), actionCollection(),"learning_resume_multiple_choice");
+  learningResumeMultipleChoice = new KAction(i18n("&Resume Multiple Choice..."), "run_multi", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_multiple_choice");
   //learningResumeMultipleChoice->setWhatsThis(i18n(""));
   learningResumeMultipleChoice->setToolTip(learningResumeMultipleChoice->whatsThis());
   */
-  configApp = KStdAction::preferences(this, SLOT( slotGeneralOptions()), actionCollection());
+  configApp = KStdAction::preferences(this, TQT_SLOT( slotGeneralOptions()), actionCollection());
   configApp->setWhatsThis(i18n("Show the configuration dialog"));
   configApp->setToolTip(configApp->whatsThis());
 
-  /*configQueryOptions = new KAction(i18n("Configure &Query..."), "configure_query", 0, this, SLOT(slotQueryOptions()), actionCollection(),"config_query_options");
+  /*configQueryOptions = new KAction(i18n("Configure &Query..."), "configure_query", 0, this, TQT_SLOT(slotQueryOptions()), actionCollection(),"config_query_options");
   configQueryOptions->setWhatsThis(i18n("Show the query configuration dialog"));
   configQueryOptions->setToolTip(configQueryOptions->whatsThis());*/
 
   actionCollection()->setHighlightingEnabled(true);
-  connect(actionCollection(), SIGNAL(actionStatusText(const QString &)), this, SLOT(slotStatusHelpMsg(const QString &)));
-  //connect(actionCollection(), SIGNAL(actionHighlighted(KAction *, bool)), this, SLOT(slotActionHighlighted(KAction *, bool)));
+  connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusHelpMsg(const TQString &)));
+  //connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), this, TQT_SLOT(slotActionHighlighted(KAction *, bool)));
 
   if (!initialGeometrySet())
-      resize( QSize(550, 400).expandedTo(minimumSizeHint()));
+      resize( TQSize(550, 400).expandedTo(minimumSizeHint()));
   setupGUI(ToolBar | Keys | StatusBar | Create);
   setAutoSaveSettings();
 
@@ -253,26 +253,26 @@ void kvoctrainApp::initActions()
   configToolbar->setWhatsThis(i18n("Toggle display of the toolbars"));
   configToolbar->setToolTip(configToolbar->whatsThis());
 
-  learn_menu = (QPopupMenu*) child( "learning", "KPopupMenu" );
-  connect(learn_menu, SIGNAL(activated(int)), this, SLOT(slotHeaderCallBack(int)));
-  connect(learn_menu, SIGNAL(highlighted(int)), this, SLOT(slotHeaderStatus(int)));
-  connect(learn_menu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowLearn()));
+  learn_menu = (TQPopupMenu*) child( "learning", "KPopupMenu" );
+  connect(learn_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
+  connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+  connect(learn_menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowLearn()));
 }
 
 
 void kvoctrainApp::initStatusBar()
 {
-  type_label = new QLabel(statusBar());
-  type_label->setFrameStyle(QFrame::NoFrame);
+  type_label = new TQLabel(statusBar());
+  type_label->setFrameStyle(TQFrame::NoFrame);
   statusBar()->addWidget(type_label, 150);
 
-  pron_label = new QLabel(statusBar());
-  pron_label->setFrameStyle(QFrame::NoFrame);
+  pron_label = new TQLabel(statusBar());
+  pron_label->setFrameStyle(TQFrame::NoFrame);
   pron_label->setFont(Prefs::iPAFont());
   statusBar()->addWidget(pron_label, 200);
 
-  rem_label = new QLabel(statusBar());
-  rem_label->setFrameStyle(QFrame::NoFrame);
+  rem_label = new TQLabel(statusBar());
+  rem_label->setFrameStyle(TQFrame::NoFrame);
   statusBar()->addWidget(rem_label, 150);
 }
 
@@ -287,7 +287,7 @@ void kvoctrainApp::initDoc( )
   loadDocProps(doc);
   if (doc->numLangs() == 0)
     doc->appendLang("en");
-  connect (doc, SIGNAL (docModified(bool)), this, SLOT(slotModifiedDoc(bool)));
+  connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool)));
   doc->setModified(false);
 }
 
diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp
index 22df3874..c809cc3a 100644
--- a/kvoctrain/kvoctrain/kva_io.cpp
+++ b/kvoctrain/kvoctrain/kva_io.cpp
@@ -25,7 +25,7 @@
 
 #include <unistd.h>
 
-#include <qtimer.h>
+#include <tqtimer.h>
 
 #include <kfiledialog.h>
 #include <kcombobox.h>
@@ -159,17 +159,17 @@ void kvoctrainApp::slotFileNew()
   if (queryExit() ) {
     view->setView (0, langset);
     delete doc;
-    QString name = "";
+    TQString name = "";
     doc = new kvoctrainDoc (this, 0 /*KURL(name)*/);
     loadDocProps(doc);
     if (doc->numLangs() == 0) {
-      QString l = "en";
+      TQString l = "en";
       doc->appendLang(l);
     }
     view->setView(doc, langset);
     view->getTable()->setFont(Prefs::tableFont());
     view->adjustContent();
-    connect (doc, SIGNAL (docModified(bool)), this, SLOT(slotModifiedDoc(bool)));
+    connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool)));
     doc->setModified(false);
   }
   slotStatusMsg(IDS_DEFAULT);
@@ -181,8 +181,8 @@ void kvoctrainApp::slotFileOpen()
   slotStatusMsg(i18n("Opening file..."));
 
   if (queryExit() ) {
-    QString s;
-    KURL url = KFileDialog::getOpenURL(QString::null, FILTER_RPATTERN, parentWidget(), i18n("Open Vocabulary File"));
+    TQString s;
+    KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, parentWidget(), i18n("Open Vocabulary File"));
     loadfileFromPath(url, true);
   }
   slotStatusMsg(IDS_DEFAULT);
@@ -197,8 +197,8 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent)
       delete doc;
       doc = 0;
 
-      QString format = i18n("Loading %1");
-      QString msg = format.arg(url.path());
+      TQString format = i18n("Loading %1");
+      TQString msg = format.arg(url.path());
 
       slotStatusMsg(msg);
       prepareProgressBar();
@@ -210,7 +210,7 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent)
       view->adjustContent();
       if (addRecent)
         fileOpenRecent->addURL(url) /*addRecentFile (url.path())*/;
-      connect (doc, SIGNAL (docModified(bool)), this, SLOT(slotModifiedDoc(bool)));
+      connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool)));
       doc->setModified(false);
     }
 }
@@ -220,12 +220,12 @@ void kvoctrainApp::slotFileOpenExample()
   slotStatusMsg(i18n("Opening example file..."));
 
   if (queryExit() ) {
-    QString s;
+    TQString s;
     s = locate("data",  "kvoctrain/examples/");
     KURL url = KFileDialog::getOpenURL(s, FILTER_RPATTERN, parentWidget(), i18n("Open Example Vocabulary File"));
     loadfileFromPath(url, false);
     if (doc)
-       doc->URL().setFileName(QString::null);
+       doc->URL().setFileName(TQString::null);
   }
   slotStatusMsg(IDS_DEFAULT);
 }
@@ -243,41 +243,41 @@ void kvoctrainApp::slotFileMerge()
 {
   slotStatusMsg(i18n("Merging file..."));
 
-  QString s;
-  KURL url = KFileDialog::getOpenURL(QString::null, FILTER_RPATTERN, parentWidget(), i18n("Merge Vocabulary File"));
+  TQString s;
+  KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, parentWidget(), i18n("Merge Vocabulary File"));
 
   if (!url.isEmpty() ) {
 
-    QString format = i18n("Loading %1");
-    QString msg = format.arg(url.path());
+    TQString format = i18n("Loading %1");
+    TQString msg = format.arg(url.path());
 
     slotStatusMsg(msg);
     prepareProgressBar();
     kvoctrainDoc *new_doc = new kvoctrainDoc (this, url);
-    connect (new_doc, SIGNAL (docModified(bool)), this, SLOT(slotModifiedDoc(bool)));
+    connect (new_doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool)));
     doc->setModified(false);
     removeProgressBar();
 
-    vector<QString> old_names = doc->getLessonDescr();
-    vector<QString> new_names = new_doc->getLessonDescr();
+    vector<TQString> old_names = doc->getLessonDescr();
+    vector<TQString> new_names = new_doc->getLessonDescr();
 
-    vector<QString> old_types = doc->getTypeDescr();
-    vector<QString> new_types = new_doc->getTypeDescr();
+    vector<TQString> old_types = doc->getTypeDescr();
+    vector<TQString> new_types = new_doc->getTypeDescr();
 
-    vector<QString> old_tenses = doc->getTenseDescr();
-    vector<QString> new_tenses = new_doc->getTenseDescr();
+    vector<TQString> old_tenses = doc->getTenseDescr();
+    vector<TQString> new_tenses = new_doc->getTenseDescr();
 
     vector<int> old_in_query = doc->getLessonsInQuery();
     vector<int> new_in_query = new_doc->getLessonsInQuery();
 
-    vector<QString> old_usages = doc->getUsageDescr();
-    vector<QString> new_usages = new_doc->getUsageDescr();
+    vector<TQString> old_usages = doc->getUsageDescr();
+    vector<TQString> new_usages = new_doc->getUsageDescr();
 
     format = i18n("Merging %1");
     msg = format.arg(url.path());
     slotStatusMsg(msg);
 
-    QApplication::setOverrideCursor( waitCursor );
+    TQApplication::setOverrideCursor( waitCursor );
 
     int lesson_offset = lessons->count()-1;
     for (int i = 0; i < (int) new_names.size(); i++) {
@@ -330,10 +330,10 @@ void kvoctrainApp::slotFileMerge()
         expr->setLesson(expr->getLesson()+lesson_offset);
 
         for (int lang = 0; lang <= (int) expr->numTranslations(); lang++) {
-          QString t = expr->getType (lang);
+          TQString t = expr->getType (lang);
           // adjust type offset
           if (!t.isEmpty() && t.left(1) == QM_USER_TYPE) {
-            QString t2;
+            TQString t2;
             t.remove (0, 1);
             t2.setNum (t.toInt()+types_offset);
             t2.insert (0, QM_USER_TYPE);
@@ -342,11 +342,11 @@ void kvoctrainApp::slotFileMerge()
 
           t = expr->getUsageLabel (lang);
           // adjust usage offset
-          QString tg;
+          TQString tg;
           if (!t.isEmpty() ) {
-            QString t2;
+            TQString t2;
             while (t.left(strlen(UL_USER_USAGE)) == UL_USER_USAGE) {
-              QString n;
+              TQString n;
               t.remove (0, 1);
               int next;
               if ((next = t.find(UL_USAGE_DIV)) >= 0) {
@@ -380,7 +380,7 @@ void kvoctrainApp::slotFileMerge()
             t = conj.getType(ci);
             if (!t.isEmpty() && t.left(1) == UL_USER_TENSE) {
               t.remove (0, strlen(UL_USER_TENSE));
-              QString t2;
+              TQString t2;
               t2.setNum (t.toInt()+tenses_offset);
               t2.insert (0, UL_USER_TENSE);
               conj.setType(ci, t2);
@@ -422,7 +422,7 @@ void kvoctrainApp::slotFileMerge()
 
             if (!cs_equal[lpos]) {
               cs_equal[lpos] = true;
-              QString id = lpos == 0 ? doc->getOriginalIdent()
+              TQString id = lpos == 0 ? doc->getOriginalIdent()
                                      : doc->getIdent(lpos);
             }
 
@@ -430,12 +430,12 @@ void kvoctrainApp::slotFileMerge()
               new_expr.setOriginal(s);
             else
               new_expr.setTranslation(i, s);
-            QString r = expr->getRemark(lpos);
+            TQString r = expr->getRemark(lpos);
             new_expr.setRemark (i, r);
 
-            QString t = expr->getType(lpos);
+            TQString t = expr->getType(lpos);
             if (!t.isEmpty() && t.left(1) == QM_USER_TYPE) {
-              QString t2;
+              TQString t2;
               t.remove (0, 1);
               t2.setNum (t.toInt()+types_offset);
               t2.insert (0, QM_USER_TYPE);
@@ -444,7 +444,7 @@ void kvoctrainApp::slotFileMerge()
 
             t = expr->getUsageLabel(lpos);
             if (!t.isEmpty() && t.left(1) == QM_USER_TYPE) {
-              QString t2;
+              TQString t2;
               t.remove (0, 1);
               t2.setNum (t.toInt()+usages_offset);
               t2.insert (0, QM_USER_TYPE);
@@ -456,7 +456,7 @@ void kvoctrainApp::slotFileMerge()
               t = conj.getType(ci);
               if (!t.isEmpty() && t.left(1) == QM_USER_TYPE) {
                 t.remove (0, strlen(QM_USER_TYPE));
-                QString t2;
+                TQString t2;
                 t2.setNum (t.toInt()+tenses_offset);
                 t2.insert (0, QM_USER_TYPE);
                 conj.setType(ci, t2);
@@ -484,7 +484,7 @@ void kvoctrainApp::slotFileMerge()
   view->setView(doc, langset);
   view->getTable()->setFont(Prefs::tableFont());
   view->adjustContent();
-  QApplication::restoreOverrideCursor();
+  TQApplication::restoreOverrideCursor();
   slotStatusMsg(IDS_DEFAULT);
 }
 
@@ -499,14 +499,14 @@ void kvoctrainApp::slotFileSave()
     return;
   }
 
-  QString format = i18n("Saving %1");
-  QString msg = format.arg(doc->URL().path());
+  TQString format = i18n("Saving %1");
+  TQString msg = format.arg(doc->URL().path());
   slotStatusMsg(msg);
 
   // remove previous backup
-  QFile::remove(QFile::encodeName(doc->URL().path()+"~"));
-  ::rename (QFile::encodeName(doc->URL().path()),
-            QFile::encodeName(doc->URL().path()+"~"));
+  TQFile::remove(TQFile::encodeName(doc->URL().path()+"~"));
+  ::rename (TQFile::encodeName(doc->URL().path()),
+            TQFile::encodeName(doc->URL().path()+"~"));
 
   prepareProgressBar();
   saveDocProps(doc);
@@ -522,7 +522,7 @@ void kvoctrainApp::fillLessonBox(kvoctrainDoc *the_doc)
 {
   lessons->clear();
   lessons->insertItem (the_doc->getLessonDescr(0));
-  vector<QString> names = the_doc->getLessonDescr();
+  vector<TQString> names = the_doc->getLessonDescr();
   for (int i = 0; i < (int) names.size(); i++)
     lessons->insertItem (names[i]);
   act_lesson = the_doc->getCurrentLesson();
@@ -592,25 +592,25 @@ void kvoctrainApp::slotFileSaveAs()
   if (entryDlg != 0)
     commitEntryDlg(false);
 
-  KURL url = KFileDialog::getSaveURL(QString::null, FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As"));
+  KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As"));
 
   if (!url.isEmpty() ) {
-    QFileInfo fileinfo(url.path());
+    TQFileInfo fileinfo(url.path());
     if (fileinfo.exists() && KMessageBox::warningContinueCancel(0,
        i18n("<qt>The file<br><b>%1</b><br>already exists. Do you want to overwrite it?</qt>")
-       .arg(url.path()),QString::null,i18n("Overwrite")) == KMessageBox::Cancel)
+       .arg(url.path()),TQString::null,i18n("Overwrite")) == KMessageBox::Cancel)
     {
     // do nothing
     }
     else
 
     if (doc) {
-      QString format = i18n("Saving %1");
-      QString msg = format.arg(url.path());
+      TQString format = i18n("Saving %1");
+      TQString msg = format.arg(url.path());
       slotStatusMsg(msg);
 
-      QFile::remove(QFile::encodeName(url.path()+"~"));         // remove previous backup
-      ::rename (QFile::encodeName(url.path()), QFile::encodeName(QString(url.path()+"~")));
+      TQFile::remove(TQFile::encodeName(url.path()+"~"));         // remove previous backup
+      ::rename (TQFile::encodeName(url.path()), TQFile::encodeName(TQString(url.path()+"~")));
       saveDocProps(doc);
 
       prepareProgressBar();
@@ -629,7 +629,7 @@ void kvoctrainApp::slotSaveSelection ()
     commitEntryDlg(false);
 
   slotStatusMsg(i18n("Saving selected area under new filename..."));
-  QString save_separator = Prefs::separator();
+  TQString save_separator = Prefs::separator();
   Prefs::setSeparator("\t");
   kvoctrainDoc seldoc(this, "");
   // transfer most important parts
@@ -644,26 +644,26 @@ void kvoctrainApp::slotSaveSelection ()
     if (doc->getEntry(i)->isInQuery() )
       seldoc.appendEntry(doc->getEntry(i));
 
-  KURL url = KFileDialog::getSaveURL(QString::null, FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As"));
+  KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As"));
 
   if (!url.isEmpty() )
   {
-    QFileInfo fileinfo(url.path());
+    TQFileInfo fileinfo(url.path());
     if (fileinfo.exists() && KMessageBox::warningContinueCancel(0,
        i18n("<qt>The file<br><b>%1</b><br>already exists. Do you want to overwrite it?</qt>")
-       .arg(url.path()),QString::null,i18n("Overwrite")) == KMessageBox::Cancel)
+       .arg(url.path()),TQString::null,i18n("Overwrite")) == KMessageBox::Cancel)
     {
     // do nothing
     }
     else
     {
-      QString format = i18n("Saving %1");
-      QString msg = format.arg(url.path());
+      TQString format = i18n("Saving %1");
+      TQString msg = format.arg(url.path());
       slotStatusMsg(msg);
 
-      QFile::remove(url.path()+"~");         // remove previous backup
+      TQFile::remove(url.path()+"~");         // remove previous backup
       // FIXME: check error
-      ::rename (QFile::encodeName(url.path()), QFile::encodeName(url.path()+"~"));
+      ::rename (TQFile::encodeName(url.path()), TQFile::encodeName(url.path()+"~"));
       saveDocProps(&seldoc);
 
       prepareProgressBar();
@@ -680,7 +680,7 @@ void kvoctrainApp::prepareProgressBar ()
 {
     statusBar()->clear ();
     pbar = new KProgress (statusBar());
-    pbar->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+    pbar->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
     statusBar()->addWidget(pbar, 150, true);
     pbar->show();
 }
diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp
index 98e1ed30..0f2ca08d 100644
--- a/kvoctrain/kvoctrain/kva_query.cpp
+++ b/kvoctrain/kvoctrain/kva_query.cpp
@@ -89,7 +89,7 @@ void kvoctrainApp::slotQueryOptions(int pageindex)
      qodlg.selectPage(pageindex);
 
    int res = qodlg.exec();
-   if (res == QDialog::Accepted) {
+   if (res == TQDialog::Accepted) {
 
       //type_querytimeout = qodlg.getTypeQueryTimeout();
       Prefs::setMaxTimePer(qodlg.getMQueryTime()*1000);
@@ -133,7 +133,7 @@ void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property)
     return;
 
   prepareProgressBar();
-  QApplication::setOverrideCursor( waitCursor );
+  TQApplication::setOverrideCursor( waitCursor );
   random_expr2.clear();
   queryList = querymanager.select (doc, act_lesson, act_query_col, property);
 
@@ -150,7 +150,7 @@ void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property)
   }
   query_num = query_startnum;
 
-  QApplication::restoreOverrideCursor();
+  TQApplication::restoreOverrideCursor();
   removeProgressBar();
   query_cycle = 1;
 
@@ -179,11 +179,11 @@ void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property)
                            exp,
                            doc);
 
-  connect( simpleQueryDlg, SIGNAL(sigEditEntry(int,int)),
-           this, SLOT(slotEditEntry(int,int)));
+  connect( simpleQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)),
+           this, TQT_SLOT(slotEditEntry(int,int)));
 
-  connect( simpleQueryDlg, SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
-           this, SLOT(slotTimeOutProperty(QueryDlgBase::Result)));
+  connect( simpleQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
+           this, TQT_SLOT(slotTimeOutProperty(QueryDlgBase::Result)));
 
   simpleQueryDlg->initFocus();
   simpleQueryDlg->show();
@@ -292,7 +292,7 @@ void kvoctrainApp::slotTimeOutProperty(QueryDlgBase::Result res)
 }
 
 
-void kvoctrainApp::slotStartTypeQuery(int col, const QString & type)
+void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type)
 {
   removeEntryDlg();
   slotStatusMsg(i18n("Starting special query..."));
@@ -304,7 +304,7 @@ void kvoctrainApp::slotStartTypeQuery(int col, const QString & type)
     return;
 
   prepareProgressBar();
-  QApplication::setOverrideCursor( waitCursor );
+  TQApplication::setOverrideCursor( waitCursor );
   random_expr2.clear();
 
   queryList = querymanager.select (doc, act_lesson, act_query_col, type);
@@ -321,7 +321,7 @@ void kvoctrainApp::slotStartTypeQuery(int col, const QString & type)
   }
   query_num = query_startnum;
 
-  QApplication::restoreOverrideCursor();
+  TQApplication::restoreOverrideCursor();
   removeProgressBar();
   query_cycle = 1;
 
@@ -352,11 +352,11 @@ void kvoctrainApp::slotStartTypeQuery(int col, const QString & type)
                             exp->getConjugation(act_query_col));
 
     verbQueryDlg->initFocus();
-    connect( verbQueryDlg, SIGNAL(sigEditEntry(int,int)),
-             this, SLOT(slotEditEntry(int,int)));
+    connect( verbQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)),
+             this, TQT_SLOT(slotEditEntry(int,int)));
 
-    connect(verbQueryDlg, SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
-                   this, SLOT(slotTimeOutType(QueryDlgBase::Result)));
+    connect(verbQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
+                   this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result)));
     verbQueryDlg->show();
   }
   else if (queryType == QT_Articles) {
@@ -370,10 +370,10 @@ void kvoctrainApp::slotStartTypeQuery(int col, const QString & type)
                           doc,
                           doc->getArticle(act_query_col));
     artQueryDlg->initFocus();
-    connect( artQueryDlg, SIGNAL(sigEditEntry(int,int)),
-             this, SLOT(slotEditEntry(int,int)));
-    connect(artQueryDlg, SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
-                      this, SLOT(slotTimeOutType(QueryDlgBase::Result)));
+    connect( artQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)),
+             this, TQT_SLOT(slotEditEntry(int,int)));
+    connect(artQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
+                      this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result)));
     artQueryDlg->show();
   }
   else if (queryType == QT_Comparison) {
@@ -387,11 +387,11 @@ void kvoctrainApp::slotStartTypeQuery(int col, const QString & type)
                           doc,
                           exp->getComparison(act_query_col));
     adjQueryDlg->initFocus();
-    connect( adjQueryDlg, SIGNAL(sigEditEntry(int,int)),
-              this, SLOT(slotEditEntry(int,int)));
+    connect( adjQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)),
+              this, TQT_SLOT(slotEditEntry(int,int)));
 
-    connect(adjQueryDlg, SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
-                    this, SLOT(slotTimeOutType(QueryDlgBase::Result)));
+    connect(adjQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
+                    this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result)));
     adjQueryDlg->show();
   }
   else {
@@ -558,7 +558,7 @@ void kvoctrainApp::slotRestartQuery()
 }
 
 
-void kvoctrainApp::slotStartQuery(const QString & translang, const QString & orglang, bool create_new)
+void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & orglang, bool create_new)
 {
   removeEntryDlg();
   slotStatusMsg(i18n("Starting random query..."));
@@ -580,7 +580,7 @@ void kvoctrainApp::slotStartQuery(const QString & translang, const QString & org
   act_query_org = orglang;
 
   prepareProgressBar();
-  QApplication::setOverrideCursor( waitCursor );
+  TQApplication::setOverrideCursor( waitCursor );
   random_expr2.clear();
 
   if (create_new || queryList.size() == 0)
@@ -598,7 +598,7 @@ void kvoctrainApp::slotStartQuery(const QString & translang, const QString & org
   }
   query_num = query_startnum;
 
-  QApplication::restoreOverrideCursor();
+  TQApplication::restoreOverrideCursor();
   removeProgressBar();
   query_cycle = 1;
 
@@ -617,7 +617,7 @@ void kvoctrainApp::slotStartQuery(const QString & translang, const QString & org
   random_query_nr = random.getLong(random_expr1.size());
   kvoctrainExpr *exp = random_expr1[random_query_nr].exp;
 
-  QString q_org,
+  TQString q_org,
           q_trans;
 
   if (oindex == 0) {  // usual: give original, ask for translation x
@@ -642,10 +642,10 @@ void kvoctrainApp::slotStartQuery(const QString & translang, const QString & org
                              exp,
                              doc);
       randomQueryDlg->initFocus();
-      connect( randomQueryDlg, SIGNAL(sigEditEntry(int,int)),
-               this, SLOT(slotEditEntry(int,int)));
-      connect(randomQueryDlg, SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
-               this, SLOT(slotTimeOutRandomQuery(QueryDlgBase::Result)));
+      connect( randomQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)),
+               this, TQT_SLOT(slotEditEntry(int,int)));
+      connect(randomQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
+               this, TQT_SLOT(slotTimeOutRandomQuery(QueryDlgBase::Result)));
       randomQueryDlg->show();
   }
   else if (queryType == QT_Multiple) {
@@ -661,10 +661,10 @@ void kvoctrainApp::slotStartQuery(const QString & translang, const QString & org
                              exp,
                              doc);
       mcQueryDlg->initFocus();
-      connect( mcQueryDlg, SIGNAL(sigEditEntry(int,int)),
-               this, SLOT(slotEditEntry(int,int)));
-      connect(mcQueryDlg, SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
-               this, SLOT(slotTimeOutMultipleChoice(QueryDlgBase::Result)));
+      connect( mcQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)),
+               this, TQT_SLOT(slotEditEntry(int,int)));
+      connect(mcQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
+               this, TQT_SLOT(slotTimeOutMultipleChoice(QueryDlgBase::Result)));
       mcQueryDlg->show();
   }
   else {
@@ -929,7 +929,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res)
 
   tindex = view->getTable()->findIdent(act_query_trans);
   oindex = view->getTable()->findIdent(act_query_org);
-  QString q_org,
+  TQString q_org,
           q_trans;
 
   if (Prefs::swapDirection()) {
diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp
index 86a306d9..62d2e901 100644
--- a/kvoctrain/kvoctrain/kvoctrain.cpp
+++ b/kvoctrain/kvoctrain/kvoctrain.cpp
@@ -35,7 +35,7 @@
 #include <kprinter.h>
 
 #include <kinputdialog.h>
-#include <qtimer.h>
+#include <tqtimer.h>
 
 #include <time.h>
 #include <ctype.h>
@@ -73,7 +73,7 @@ void kvoctrainApp::slotCancelSelection ()
 
 void kvoctrainApp::slotSelectAll ()
 {
-  QTableSelection ts;
+  TQTableSelection ts;
   KVocTrainTable *table = view->getTable();
   table->clearSelection();
   ts.init(0,0);
@@ -96,13 +96,13 @@ void kvoctrainApp::slotCurrentCellChanged(int row, int col)
 
   if (rem_label != 0)
     rem_label->setText(i18n("Abbreviation for R)emark","R: %1")
-                       .arg(noData ? QString::null : expr->getRemark(col)));
+                       .arg(noData ? TQString::null : expr->getRemark(col)));
   if (pron_label != 0)
     pron_label->setText(i18n("Abbreviation for P)ronouncation","P: %1")
-                        .arg(noData ? QString::null : expr->getPronunce(col)));
+                        .arg(noData ? TQString::null : expr->getPronunce(col)));
   if (type_label != 0)
     type_label->setText(i18n("Abbreviation for T)ype of word", "T: %1")
-                        .arg(noData ? QString::null : QueryManager::typeStr(expr->getType(col))));
+                        .arg(noData ? TQString::null : QueryManager::typeStr(expr->getType(col))));
 
   if (entryDlg != 0) {
     if (noData)
@@ -147,7 +147,7 @@ void kvoctrainApp::slotEditCallBack(int res)
               lesson = QMAX (0, lessons->count()-1);
             slotChooseLesson(lesson);
 
-            QString exp;
+            TQString exp;
             exp = doc->getEntry(row)->getTranslation(col+1-KV_COL_ORG);
             if (exp.isEmpty())
               view->getTable()->setCurrentRow(row, col+1);
@@ -160,7 +160,7 @@ void kvoctrainApp::slotEditCallBack(int res)
 
     case EntryDlg::EditUndo:
       int row, col;
-      vector<QTableSelection> tabsel;
+      vector<TQTableSelection> tabsel;
       entryDlg->getCell(row, col, tabsel);
       setDataEntryDlg(row, col);
     break;
@@ -187,7 +187,7 @@ void kvoctrainApp::commitEntryDlg(bool force)
    }
 
    int row, col;
-   vector<QTableSelection> tabsel;
+   vector<TQTableSelection> tabsel;
    entryDlg->getCell(row, col, tabsel);
    int hasSel = tabsel.size() > 1;
    if (tabsel.size() == 1)
@@ -311,7 +311,7 @@ void kvoctrainApp::createEntryDlg(int row, int col)
    if ((row < 0) || (col < 0) || (view->getTable()->numRows() <= 0))
      return;
 
-   QString title, text, lang;
+   TQString title, text, lang;
 
    int lesson = doc->getEntry(row)->getLesson();
    if (lesson >= lessons->count())
@@ -333,21 +333,21 @@ void kvoctrainApp::createEntryDlg(int row, int col)
                     0,
                     0,
                     0,
-                    QString::null,
-                    QString::null,
-                    QString::null,
+                    TQString::null,
+                    TQString::null,
+                    TQString::null,
                     lesson,
                     lessons,
                     doc->getOriginalIdent(),
                     langset,
-                    QString::null,
+                    TQString::null,
                     doc->getEntry(row)->getType(col),
-                    QString::null,
-                    QString::null,
-                    QString::null,
-                    QString::null,
-                    QString::null,
-                    QString::null,
+                    TQString::null,
+                    TQString::null,
+                    TQString::null,
+                    TQString::null,
+                    TQString::null,
+                    TQString::null,
                     doc->getConjugation(0),
                     Conjugation(),
                     doc->getArticle(0),
@@ -410,8 +410,8 @@ void kvoctrainApp::createEntryDlg(int row, int col)
                     doc->getEntry(row)->isActive(),
                     Prefs::iPAFont());
    }
-   connect( entryDlg, SIGNAL(sigEditChoice(int)),
-             this, SLOT(slotEditCallBack(int)));
+   connect( entryDlg, TQT_SIGNAL(sigEditChoice(int)),
+             this, TQT_SLOT(slotEditCallBack(int)));
 
    view->getTable()->setReadOnly(true);
 
@@ -420,7 +420,7 @@ void kvoctrainApp::createEntryDlg(int row, int col)
    else
      entryDlg->setEnabled(EntryDlg::EnableAll);
 
-   vector<QTableSelection> tabsel;
+   vector<TQTableSelection> tabsel;
    entryDlg->setCell(row, col+KV_EXTRA_COLS, tabsel);
    entryDlg->show();
 }
@@ -465,7 +465,7 @@ void kvoctrainApp::setDataEntryDlg (int row, int col)
    if ((row < 0) || (col < 0) || (view->getTable()->numRows() <= 0))
      return;
 
-   QString text, lang, title;
+   TQString text, lang, title;
 
    kvoctrainExpr *expr = doc->getEntry(row);
 
@@ -492,21 +492,21 @@ void kvoctrainApp::setDataEntryDlg (int row, int col)
                        0,
                        0,
                        0,
-                       QString::null,
-                       QString::null,
-                       QString::null,
+                       TQString::null,
+                       TQString::null,
+                       TQString::null,
                        lesson,
                        lessons,
                        doc->getOriginalIdent(),
                        langset,
-                       QString::null,
+                       TQString::null,
                        doc->getEntry(row)->getType(0),
-                       QString::null,
-                       QString::null,
-                       QString::null,
-                       QString::null,
-                       QString::null,
-                       QString::null,
+                       TQString::null,
+                       TQString::null,
+                       TQString::null,
+                       TQString::null,
+                       TQString::null,
+                       TQString::null,
                        doc->getConjugation(0),
                        Conjugation(),
                        doc->getArticle(0),
@@ -567,7 +567,7 @@ void kvoctrainApp::setDataEntryDlg (int row, int col)
    }
    view->getTable()->updateCell(row, col);
    view->getTable()->updateCell(row, KV_COL_LESS);
-   vector<QTableSelection> tabsel;
+   vector<TQTableSelection> tabsel;
    if (hasSel) {
      for (int i = 0; i < view->getTable()->numSelections(); ++i)
        tabsel.push_back(view->getTable()->selection(i));
@@ -597,15 +597,15 @@ void kvoctrainApp::slotDocProps ()
 
    int res = ddlg.exec();
 
-   if (res == QDialog::Accepted) {
+   if (res == TQDialog::Accepted) {
       vector<int> typeIndex;
       vector<int> tenseIndex;
       vector<int> usageIndex;
       vector<int> lessonIndex;
-      vector<QString> new_typeStr;
-      vector<QString> new_tenseStr;
-      vector<QString> new_usageStr;
-      vector<QString> new_lessonStr;
+      vector<TQString> new_typeStr;
+      vector<TQString> new_tenseStr;
+      vector<TQString> new_usageStr;
+      vector<TQString> new_lessonStr;
       vector<int> new_lessoninquery;
 
       doc->allowSorting(ddlg.getSorting() );
@@ -616,7 +616,7 @@ void kvoctrainApp::slotDocProps ()
       doc->setDocRemark(ddlg.getDocRemark() );
 
       slotStatusMsg(i18n("Updating lesson indices..."));
-      QApplication::setOverrideCursor( waitCursor );
+      TQApplication::setOverrideCursor( waitCursor );
 
       ddlg.getLesson(lessons, lessonIndex);
       ddlg.getTypeNames(new_typeStr, typeIndex);
@@ -653,7 +653,7 @@ void kvoctrainApp::slotDocProps ()
 
       setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified()));
 
-      QApplication::restoreOverrideCursor();
+      TQApplication::restoreOverrideCursor();
       slotStatusMsg(IDS_DEFAULT);
    }
 }
@@ -664,7 +664,7 @@ void kvoctrainApp::slotDocPropsLang ()
    DocPropsLangDlg ldlg (doc, &langset);
    int res = ldlg.exec();
 
-   if (res == QDialog::Accepted) {
+   if (res == TQDialog::Accepted) {
       for (int i = 0; i < doc->numLangs(); i++) {
         doc->setArticle(i, ldlg.getArticle(i) );
         doc->setConjugation(i, ldlg.getConjugation(i) );
@@ -691,7 +691,7 @@ bool kvoctrainApp::hasSelection()
   int num = view->getTable()->numSelections();
   if (num < 1) return false;
   if (num > 1) return true;
-  QTableSelection ts = view->getTable()->selection(0);
+  TQTableSelection ts = view->getTable()->selection(0);
   return (ts.bottomRow() - ts.topRow()) > 0;
 }
 
@@ -746,7 +746,7 @@ void kvoctrainApp::slotAppendRow ()
 }
 
 
-void kvoctrainApp::keyReleaseEvent( QKeyEvent *e )
+void kvoctrainApp::keyReleaseEvent( TQKeyEvent *e )
 {
   switch( e->key() ) {
     case Key_Shift:  shiftActive = false;
@@ -761,7 +761,7 @@ void kvoctrainApp::keyReleaseEvent( QKeyEvent *e )
 }
 
 
-void kvoctrainApp::keyPressEvent( QKeyEvent *e )
+void kvoctrainApp::keyPressEvent( TQKeyEvent *e )
 {
   controlActive = (e->state() & ControlButton) != 0;
   shiftActive = (e->state() & ShiftButton) != 0;
@@ -880,16 +880,16 @@ void kvoctrainApp::slotShowStatist()
 void kvoctrainApp::slotCleanVocabulary ()
 {
    prepareProgressBar();
-   QApplication::setOverrideCursor( waitCursor );
+   TQApplication::setOverrideCursor( waitCursor );
    int num = doc->cleanUp();
-   QApplication::restoreOverrideCursor();
+   TQApplication::restoreOverrideCursor();
    removeProgressBar();
 
    slotStatusMsg(IDS_DEFAULT);
 
    if (num != 0) {
      view->setView(doc, langset);
-     QString s =
+     TQString s =
         i18n("1 entry with the same content has been found and removed.",
              "%n entries with the same content have been found and removed.", num);
 
@@ -911,7 +911,7 @@ void kvoctrainApp::slotCreateRandom()
    Prefs::setEntriesPerLesson(res);
 
    slotStatusMsg(i18n("Creating random lessons..."));
-   QApplication::setOverrideCursor( waitCursor );
+   TQApplication::setOverrideCursor( waitCursor );
 
    vector<kvoctrainExpr*> randomList;
    for (int i = 0; i < doc->numEntries(); i++) {
@@ -922,7 +922,7 @@ void kvoctrainApp::slotCreateRandom()
 
    if (randomList.size () != 0) {
      int less_no = lessons->count() /* +1 anyway */ ;
-     QString s;
+     TQString s;
      s.setNum (less_no);
      s.insert (0, "- ");
      lessons->insertItem (s);
@@ -940,14 +940,14 @@ void kvoctrainApp::slotCreateRandom()
        randomList.erase(randomList.begin() + nr);
      }
 
-     vector<QString> new_lessonStr;
+     vector<TQString> new_lessonStr;
      for (int i = 1; i < lessons->count(); i++)
        new_lessonStr.push_back(lessons->text(i));
      doc->setLessonDescr (new_lessonStr);
      view->getTable()->updateContents();
      doc->setModified ();
    }
-   QApplication::restoreOverrideCursor();
+   TQApplication::restoreOverrideCursor();
    slotStatusMsg(IDS_DEFAULT);
 }
 
@@ -961,7 +961,7 @@ void kvoctrainApp::slotGeneralOptions()
 void kvoctrainApp::slotGeneralOptionsPage(int index)
 {
   KVocTrainPrefs* dialog = new KVocTrainPrefs(langset, doc, lessons, &querymanager, this, "settings",  Prefs::self() );
-  connect(dialog, SIGNAL(settingsChanged()), this, SLOT(slotApplyPreferences()));
+  connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplyPreferences()));
   if (index >= 0)
     dialog->selectPage(index);
   dialog->show();
@@ -980,10 +980,10 @@ void kvoctrainApp::slotApplyPreferences()
   // update header buttons
   for (int i = 0; i < (int) doc->numLangs(); i++)
   {
-    QString sid = i>0 ? doc->getIdent(i): doc->getOriginalIdent();
+    TQString sid = i>0 ? doc->getIdent(i): doc->getOriginalIdent();
     int idx = langset.indexShortId(sid);
-    QString pm = "";
-    QString lid = sid;
+    TQString pm = "";
+    TQString lid = sid;
     if (idx >= 0)
     {
       lid = langset.longId(idx);
@@ -999,7 +999,7 @@ void kvoctrainApp::slotAppendLang(int header_and_cmd)
    int lang_id = (header_and_cmd >> 16) & 0xFF;
 
    if (lang_id == 0xFF) {
-     QString msg = i18n("To append a new language which is not listed in "
+     TQString msg = i18n("To append a new language which is not listed in "
                         "the submenu, you must first add its data in the "
                         "general options dialog.\n"
                         "Should this dialog be invoked now?");
@@ -1040,7 +1040,7 @@ void kvoctrainApp::slotSearchNext()
 }
 
 
-void kvoctrainApp::slotResumeSearch(const QString& s)
+void kvoctrainApp::slotResumeSearch(const TQString& s)
 {
   if (s.length() == 0) {
     slotInitSearch();
@@ -1048,7 +1048,7 @@ void kvoctrainApp::slotResumeSearch(const QString& s)
   }
 
   slotStatusMsg(i18n("Searching expression..."));
-  QApplication::setOverrideCursor( waitCursor );
+  TQApplication::setOverrideCursor( waitCursor );
 
   // new word or shortend word
   if (s.length() < searchstr.length() )
@@ -1075,12 +1075,12 @@ void kvoctrainApp::slotResumeSearch(const QString& s)
   }
 
   searchstr = s;
-  QApplication::restoreOverrideCursor();
+  TQApplication::restoreOverrideCursor();
   slotStatusMsg(IDS_DEFAULT);
 }
 
 
-void kvoctrainApp::slotStatusMsg(const QString &/*text*/)
+void kvoctrainApp::slotStatusMsg(const TQString &/*text*/)
 {
 //
 }
@@ -1090,7 +1090,7 @@ void kvoctrainApp::aboutToShowLearn()
 {
   learn_menu->clear();
 
-  vector<QString> set_names;
+  vector<TQString> set_names;
   for (int i = 0; i < (int) langset.size(); i++) {
     if(langset.longId(i).isEmpty() )
       set_names.push_back(langset.shortId(i));
@@ -1098,10 +1098,10 @@ void kvoctrainApp::aboutToShowLearn()
       set_names.push_back(langset.longId(i));
   }
 
-  vector<QString> main_names;
+  vector<TQString> main_names;
   for (int j = 0; j < (int) doc->numLangs(); j++) {
    int i;
-   QString did = j == 0 ? doc->getOriginalIdent()
+   TQString did = j == 0 ? doc->getOriginalIdent()
                         : doc->getIdent(j);
    if ((i = langset.indexShortId(did)) >= 0)
      main_names.push_back(langset.longId(i));
@@ -1112,7 +1112,7 @@ void kvoctrainApp::aboutToShowLearn()
   for (int header = 0; header < (int) doc->numLangs(); header++) {
     // show pixmap and long name if available
     int j;
-    header_m = new QPopupMenu();
+    header_m = new TQPopupMenu();
     if (header != 0 ) {
       header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_QUERY);
       header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), (header << 16) | IDH_START_MULTIPLE);
@@ -1131,8 +1131,8 @@ void kvoctrainApp::aboutToShowLearn()
       header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE);
     }
     else {
-      QPopupMenu *query_m =  new QPopupMenu();
-      QPopupMenu *multiple_m =  new QPopupMenu();
+      TQPopupMenu *query_m =  new TQPopupMenu();
+      TQPopupMenu *multiple_m =  new TQPopupMenu();
 
       for (int i = 1; i < (int) doc->numLangs(); i++) {
         // show pixmap and long name if available
@@ -1140,7 +1140,7 @@ void kvoctrainApp::aboutToShowLearn()
         if((j = langset.indexShortId(doc->getIdent(i))) >= 0
            && !langset.PixMapFile(j).isEmpty()
            && !langset.longId(j).isEmpty() ) {
-          query_m->insertItem(QPixmap(langset.PixMapFile(j)), i18n("From %1").arg(main_names[i]),
+          query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(main_names[i]),
               (i << (16+8)) |  IDH_START_QUERY);  // hack: IDs => header-ids + cmd
         }
         else {
@@ -1149,8 +1149,8 @@ void kvoctrainApp::aboutToShowLearn()
       }
 
       header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL);
-      connect (query_m, SIGNAL(activated(int)), this, SLOT(slotHeaderCallBack(int)));
-      connect (query_m, SIGNAL(highlighted(int)), this, SLOT(slotHeaderStatus(int)));
+      connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
+      connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
 
       for (int i = 1; i < (int) doc->numLangs(); i++) {
         // show pixmap and long name if available
@@ -1158,7 +1158,7 @@ void kvoctrainApp::aboutToShowLearn()
         if((j = langset.indexShortId(doc->getIdent(i))) >= 0
            && !langset.PixMapFile(j).isEmpty()
            && !langset.longId(j).isEmpty() ) {
-          multiple_m->insertItem(QPixmap(langset.PixMapFile(j)), i18n("From %1").arg(main_names[i]),
+          multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(main_names[i]),
               (i << (16+8)) |  IDH_START_MULTIPLE);  // hack: IDs => header-ids + cmd
         }
         else {
@@ -1177,19 +1177,19 @@ void kvoctrainApp::aboutToShowLearn()
       header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE);
       header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE);
 
-      connect (multiple_m, SIGNAL(activated(int)), this, SLOT(slotHeaderCallBack(int)));
-      connect (multiple_m, SIGNAL(highlighted(int)), this, SLOT(slotHeaderStatus(int)));
+      connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
+      connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
     }
 
-    connect (header_m, SIGNAL(activated(int)), this, SLOT(slotHeaderCallBack(int)));
-    connect (header_m, SIGNAL(highlighted(int)), this, SLOT(slotHeaderStatus(int)));
+    connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
+    connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
 
-    QString id = header == 0 ? doc->getOriginalIdent()
+    TQString id = header == 0 ? doc->getOriginalIdent()
                              : doc->getIdent(header);
     if((j = langset.indexShortId(id)) >= 0
        && !langset.PixMapFile(j).isEmpty()
        && !langset.longId(j).isEmpty() ) {
-      learn_menu->insertItem(QPixmap(langset.PixMapFile(j)), main_names[header], header_m, IDH_NULL);
+      learn_menu->insertItem(TQPixmap(langset.PixMapFile(j)), main_names[header], header_m, IDH_NULL);
     }
     else {
       learn_menu->insertItem(id, header_m, IDH_NULL);
@@ -1210,9 +1210,9 @@ void kvoctrainApp::aboutToShowVocabAppendLanguage()
   if (doc != 0)
   {
     vocabAppendLanguage->clear();
-    QPopupMenu * add_m = vocabAppendLanguage->popupMenu();
+    TQPopupMenu * add_m = vocabAppendLanguage->popupMenu();
 
-    QStringList names;
+    TQStringList names;
     for (int i = 0; i < (int) langset.size(); i++)
     {
       if(langset.longId(i).isEmpty() )
@@ -1224,7 +1224,7 @@ void kvoctrainApp::aboutToShowVocabAppendLanguage()
     for (int i = 0; i < (int) langset.size(); i++)
     {
       if(!langset.PixMapFile(i).isEmpty() && !langset.longId(i).isEmpty())
-        add_m->insertItem(QPixmap(langset.PixMapFile(i)), names[i], (i << 16) | IDH_APPEND);
+        add_m->insertItem(TQPixmap(langset.PixMapFile(i)), names[i], (i << 16) | IDH_APPEND);
       else
         add_m->insertItem(names[i], (i << 16) | IDH_APPEND);
     }
@@ -1239,9 +1239,9 @@ void kvoctrainApp::aboutToShowVocabSetLanguage()
   if (doc != 0)
   {
     vocabSetLanguage->clear();
-    QPopupMenu * set_m = vocabSetLanguage->popupMenu();
+    TQPopupMenu * set_m = vocabSetLanguage->popupMenu();
 
-    QStringList names;
+    TQStringList names;
     for (int i = 0; i < (int) langset.size(); i++)
     {
       if(langset.longId(i).isEmpty() )
@@ -1253,18 +1253,18 @@ void kvoctrainApp::aboutToShowVocabSetLanguage()
     for (int header = 0; header < doc->numLangs(); ++header )
     {
       // select one of the available languages for the column
-      QPopupMenu *langs_m = new QPopupMenu();
+      TQPopupMenu *langs_m = new TQPopupMenu();
         // hack: ID => header-id + language
 
       for (int i = 0; i < (int) langset.size(); i++) {
         if(!langset.PixMapFile(i).isEmpty() && !langset.longId(i).isEmpty())
-          langs_m->insertItem(QPixmap(langset.PixMapFile(i)), names[i], (header << 16) | (i << (16+8)) | IDH_SET_LANG);
+          langs_m->insertItem(TQPixmap(langset.PixMapFile(i)), names[i], (header << 16) | (i << (16+8)) | IDH_SET_LANG);
         else
           langs_m->insertItem(names[i], (header << 16) | (i << (16+8)) | IDH_SET_LANG);
       }
 
-      connect (langs_m, SIGNAL(activated(int)), this, SLOT(slotSetHeaderProp(int)));
-      connect (langs_m, SIGNAL(highlighted(int)), this, SLOT(slotHeaderStatus(int)));
+      connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int)));
+      connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
 
       if (header == 0)
         set_m->insertItem(i18n("&Original"), langs_m, (2 << 16) | IDH_NULL);
@@ -1284,9 +1284,9 @@ void kvoctrainApp::aboutToShowVocabRemoveLanguage()
   if (doc != 0)
   {
     vocabRemoveLanguage->clear();
-    QPopupMenu * remove_m = vocabRemoveLanguage->popupMenu();
+    TQPopupMenu * remove_m = vocabRemoveLanguage->popupMenu();
 
-    QStringList names;
+    TQStringList names;
     for (int j = 1; j < (int) doc->numLangs(); j++)
     {
       int i;
@@ -1303,7 +1303,7 @@ void kvoctrainApp::aboutToShowVocabRemoveLanguage()
       if((j = langset.indexShortId(doc->getIdent(i))) >= 0
           && !langset.PixMapFile(j).isEmpty()
           && !langset.longId(j).isEmpty() )
-        remove_m->insertItem(QPixmap(langset.PixMapFile(j)), names[i-1], (i << 16) |  IDH_REMOVE);  // hack: IDs => header-ids + cmd
+        remove_m->insertItem(TQPixmap(langset.PixMapFile(j)), names[i-1], (i << 16) |  IDH_REMOVE);  // hack: IDs => header-ids + cmd
       else
         remove_m->insertItem(doc->getIdent(i), (i << 16) | IDH_REMOVE);
     }
@@ -1311,7 +1311,7 @@ void kvoctrainApp::aboutToShowVocabRemoveLanguage()
 }
 
 
-void kvoctrainApp::slotStatusHelpMsg(const QString &text)
+void kvoctrainApp::slotStatusHelpMsg(const TQString &text)
 {
   ///////////////////////////////////////////////////////////////////
   // change status message of whole statusbar temporary (text, msec)
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index ff81c414..73551066 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -32,7 +32,7 @@
 #endif
 
 // include files for QT
-#include <qpainter.h>
+#include <tqpainter.h>
 
 // include files for KDE
 #include <kapplication.h>
@@ -79,7 +79,7 @@ class kvoctrainApp : public KMainWindow
 
 public:
   /** construtor */
-  kvoctrainApp(QWidget *parent = NULL, const char *name = NULL);
+  kvoctrainApp(TQWidget *parent = NULL, const char *name = NULL);
   /** destructor */
   ~kvoctrainApp();
   void initActions();
@@ -116,8 +116,8 @@ public:
   void progressChanged (kvoctrainDoc *, int curr_percent);
 
  public slots:
-  void keyPressEvent( QKeyEvent *e );
-  void keyReleaseEvent( QKeyEvent *e );
+  void keyPressEvent( TQKeyEvent *e );
+  void keyReleaseEvent( TQKeyEvent *e );
   void slotModifiedDoc(bool mod);
   void slotCurrentCellChanged(int row, int col);
 //  void slotSelectEntry (int row, int col, int key_state);
@@ -136,7 +136,7 @@ public:
   void slotCancelSelection ();
   void slotSelectAll();
   void slotProgress(kvoctrainDoc*,int);
-  void slotResumeSearch(const QString&);
+  void slotResumeSearch(const TQString&);
   void slotSearchNext();
   void slotInitSearch();
   void slotCreateLesson(int header);
@@ -172,9 +172,9 @@ public:
 
   /** starts random query mode */
   void slotRestartQuery();
-  void slotStartTypeQuery(int col, const QString & type);
+  void slotStartTypeQuery(int col, const TQString & type);
   void slotStartPropertyQuery(int col, QueryType property);
-  void slotStartQuery(const QString & trans, const QString & org, bool create_new);
+  void slotStartQuery(const TQString & trans, const TQString & org, bool create_new);
 
   void slotTimeOutRandomQuery(QueryDlgBase::Result res);
   void slotTimeOutMultipleChoice(QueryDlgBase::Result res);
@@ -215,9 +215,9 @@ public:
   void slotEditPaste();
 
   /** change the status message to text */
-  void slotStatusMsg(const QString &text);
+  void slotStatusMsg(const TQString &text);
   /** change the status message of the whole statusbar temporary */
-  void slotStatusHelpMsg(const QString &text);
+  void slotStatusHelpMsg(const TQString &text);
 
 public:
   void removeProgressBar();
@@ -269,9 +269,9 @@ private:
   KAction* configApp;
   //KAction* configQueryOptions;
 
-  QString lastPixName;
+  TQString lastPixName;
 
-  QPopupMenu *learn_menu;
+  TQPopupMenu *learn_menu;
 
   /** view is the main widget which represents your working area. The View
     * class should handle all events of the view widget.  It is kept empty so
@@ -291,18 +291,18 @@ private:
   vector<QueryEntryRef> correct_1_times, correct_2_times, correct_3_times;
   QuerySelection queryList;
   //KNewStuff       *m_GHNS;
-  QTimer          *btimer;
+  TQTimer          *btimer;
   int              random_query_nr;
   bool             querymode;
   bool             querying;
-  QString          def_lang;
-  QPopupMenu      *header_m;
+  TQString          def_lang;
+  TQPopupMenu      *header_m;
   int              act_query_col;
-  QString          act_query_trans;
-  QString          act_query_org;
+  TQString          act_query_trans;
+  TQString          act_query_org;
   LangSet          langset;
   int              searchpos;
-  QString          searchstr;
+  TQString          searchstr;
   KLineEdit       *searchLine;
   KComboBox       *lessons;
   int              act_lesson;
@@ -312,10 +312,10 @@ private:
   bool             altActive;
   ProgressDlg     *pdlg;
   KProgress       *pbar;
-  QLabel          *vslide_label;
-  QLabel          *pron_label;
-  QLabel          *rem_label;
-  QLabel          *type_label;
+  TQLabel          *vslide_label;
+  TQLabel          *pron_label;
+  TQLabel          *rem_label;
+  TQLabel          *type_label;
   SimpleQueryDlg  *simpleQueryDlg;
   EntryDlg        *entryDlg;
   MCQueryDlg      *mcQueryDlg;
diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp
index 98e64c13..7dc54b45 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -23,8 +23,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qpainter.h>
-#include <qstyle.h>
+#include <tqpainter.h>
+#include <tqstyle.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
@@ -39,8 +39,8 @@
 #include "kv_resource.h"
 #include "prefs.h"
 
-KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, QWidget *parent, const char *name)
-  : QTable(parent, name), langs(ls)
+KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, TQWidget *parent, const char *name)
+  : TQTable(parent, name), langs(ls)
 {
   m_doc = doc;
   defaultItem = 0;
@@ -57,17 +57,17 @@ KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, QWidget *pa
 
   triggerSect = -1;
 
-  m_pixInQuery = QPixmap(KGlobal::iconLoader()->loadIcon("ok", KIcon::Small));
-  m_pixInactive = QPixmap(KGlobal::iconLoader()->loadIcon("no", KIcon::Small));
+  m_pixInQuery = TQPixmap(KGlobal::iconLoader()->loadIcon("ok", KIcon::Small));
+  m_pixInactive = TQPixmap(KGlobal::iconLoader()->loadIcon("no", KIcon::Small));
 
-  delayTimer = new QTimer(this);
-  connect(delayTimer, SIGNAL(timeout()), this, SLOT(menuTriggerTimeout()));
+  delayTimer = new TQTimer(this);
+  connect(delayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(menuTriggerTimeout()));
 
-  QHeader *header = horizontalHeader();
-  connect(header, SIGNAL(pressed(int)), this, SLOT(headerPressEvent(int)));
-  connect(header, SIGNAL(released(int)), this, SLOT(headerReleaseEvent(int)));
+  TQHeader *header = horizontalHeader();
+  connect(header, TQT_SIGNAL(pressed(int)), this, TQT_SLOT(headerPressEvent(int)));
+  connect(header, TQT_SIGNAL(released(int)), this, TQT_SLOT(headerReleaseEvent(int)));
 
-  connect(this, SIGNAL(currentChanged(int, int)), this, SLOT(slotCurrentChanged(int, int)));
+  connect(this, TQT_SIGNAL(currentChanged(int, int)), this, TQT_SLOT(slotCurrentChanged(int, int)));
 }
 
 
@@ -76,26 +76,26 @@ void KVocTrainTable::setCurrentItem(int row)
   setCurrentRow(row, currentColumn());
 }
 /*
-QWidget* KVocTrainTable::beginEdit(int row, int col, bool replace)
+TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace)
 {
   if (KApplication::dcopClient()->isApplicationRegistered("kxkb"))
   {
     if (m_doc)
     {
-      QString id = (col == KV_COL_ORG) ? m_doc->getOriginalIdent() : m_doc->getIdent(col - KV_EXTRA_COLS);
+      TQString id = (col == KV_COL_ORG) ? m_doc->getOriginalIdent() : m_doc->getIdent(col - KV_EXTRA_COLS);
 
       if (langs)
       {
-        QString kbLayout(langs->keyboardLayout(langs->indexShortId(id)));
+        TQString kbLayout(langs->keyboardLayout(langs->indexShortId(id)));
         kdDebug() << "Keyboard Layout: " << kbLayout << endl;
         if (!kbLayout.isEmpty())
         {
-          QByteArray data, replyData;
-          QCString replyType;
-          QDataStream arg(data, IO_WriteOnly);
+          TQByteArray data, replyData;
+          TQCString replyType;
+          TQDataStream arg(data, IO_WriteOnly);
           arg << kbLayout;
 
-          if (!KApplication::dcopClient()->call("kxkb", "kxkb", "setLayout(QString)", data, replyType, replyData))
+          if (!KApplication::dcopClient()->call("kxkb", "kxkb", "setLayout(TQString)", data, replyType, replyData))
           {
             kdDebug() << "kxkb dcop error: beginEdit()" << endl;
           }
@@ -103,12 +103,12 @@ QWidget* KVocTrainTable::beginEdit(int row, int col, bool replace)
       }
     }
   }
-  return QTable::beginEdit(row, col, replace);
+  return TQTable::beginEdit(row, col, replace);
 }
 
 void KVocTrainTable::endEdit(int row, int col, bool accept, bool replace)
 {
-  QTable::endEdit(row, col, accept, replace);
+  TQTable::endEdit(row, col, accept, replace);
 }
 */
 void KVocTrainTable::sortByColumn(int header, bool alpha) {
@@ -126,7 +126,7 @@ void KVocTrainTable::sortByColumn(int header, bool alpha) {
     return;
   }
 
-  QApplication::setOverrideCursor(waitCursor);
+  TQApplication::setOverrideCursor(waitCursor);
 
   clearSelection();
 
@@ -144,7 +144,7 @@ void KVocTrainTable::sortByColumn(int header, bool alpha) {
   repaintContents();
   m_doc->setModified();
   emit currentChanged(currentRow(), currentColumn());
-  QApplication::restoreOverrideCursor();
+  TQApplication::restoreOverrideCursor();
 }
 
 void KVocTrainTable::sortByColumn_alpha(int header)
@@ -166,7 +166,7 @@ void KVocTrainTable::sortByColumn_index(int header)
 
 void KVocTrainTable::setCurrentRow(int row, int col)
 {
-  QTable::setCurrentCell(row, col);
+  TQTable::setCurrentCell(row, col);
 }
 
 void KVocTrainTable::updateContents(int row, int col)
@@ -236,7 +236,7 @@ void KVocTrainTable::setDoc(kvoctrainDoc * rows)
   }
 
   if (d == 0) {
-    defaultItem = new KVocTrainTableItem(this, QTableItem::OnTyping, rows);
+    defaultItem = new KVocTrainTableItem(this, TQTableItem::OnTyping, rows);
   }
   else {
     defaultItem = d;
@@ -254,17 +254,17 @@ void KVocTrainTable::menuTriggerTimeout()
   int mt = triggerSect;
   triggerSect = -1;
 
-  QHeader *header = horizontalHeader();
+  TQHeader *header = horizontalHeader();
   int x = leftMargin();
   for (int i = 0; i < mt; ++i)
     x += header->sectionSize(i);
-  QPoint mpos = mapToGlobal(QPoint(x, topMargin()));
+  TQPoint mpos = mapToGlobal(TQPoint(x, topMargin()));
 
   if (mt != KV_COL_MARK)
     emit rightButtonClicked(mt, mpos.x(), mpos.y());
 
-  QMouseEvent me(QEvent::MouseButtonRelease, QPoint(0, 0), QMouseEvent::LeftButton, QMouseEvent::LeftButton);
-  QApplication::sendEvent(header, &me);
+  TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0, 0), TQMouseEvent::LeftButton, TQMouseEvent::LeftButton);
+  TQApplication::sendEvent(header, &me);
 }
 
 void KVocTrainTable::headerReleaseEvent(int /*sec*/)
@@ -285,15 +285,15 @@ void KVocTrainTable::headerPressEvent(int sec)
   delayTimer->start(500, true);
 }
 
-void KVocTrainTable::setFont(const QFont & font)
+void KVocTrainTable::setFont(const TQFont & font)
 {
-  QTable::setFont(font);
+  TQTable::setFont(font);
   horizontalHeader()->setFont(KGlobalSettings::generalFont());
   for (unsigned i = 0; i < (unsigned) numRows(); ++i)
     setRowHeight(i, fontMetrics().lineSpacing());
 }
 
-int cellAlignment(const QString & text)
+int cellAlignment(const TQString & text)
 {
   bool num;
   bool ok1 = false;
@@ -307,7 +307,7 @@ int cellAlignment(const QString & text)
 }
 
 
-void KVocTrainTable::paintCell(QPainter * p, int row, int col, const QRect & cr, bool selected, const QColorGroup &cg)
+void KVocTrainTable::paintCell(TQPainter * p, int row, int col, const TQRect & cr, bool selected, const TQColorGroup &cg)
 {
   if (cr.width() == 0 || cr.height() == 0)
     return;
@@ -320,7 +320,7 @@ void KVocTrainTable::paintCell(QPainter * p, int row, int col, const QRect & cr,
   int x2 = w - 1;
   int y2 = h - 1;
 
-  p->fillRect( 0, 0, w, h, selected ? cg.brush( QColorGroup::Highlight ) : cg.brush( QColorGroup::Base ) );
+  p->fillRect( 0, 0, w, h, selected ? cg.brush( TQColorGroup::Highlight ) : cg.brush( TQColorGroup::Base ) );
 
   kvoctrainExpr *expr = getRow(row);
   if (expr)
@@ -328,7 +328,7 @@ void KVocTrainTable::paintCell(QPainter * p, int row, int col, const QRect & cr,
     p->save();
     //cell->paint(p, col, w, selected, m_doc, numCols() == KV_EXTRA_COLS+2 ? KV_COL_TRANS : currentColumn(), gradecols);
 
-    QColor color = KV_NORM_COLOR;
+    TQColor color = KV_NORM_COLOR;
     int current_col = numCols() == KV_EXTRA_COLS+2 ? KV_COL_TRANS : currentColumn();
 
     if (Prefs::useGradeCol())
@@ -386,7 +386,7 @@ void KVocTrainTable::paintCell(QPainter * p, int row, int col, const QRect & cr,
     {
       case KV_COL_LESS: // lesson
       {
-        QString less_str;
+        TQString less_str;
         if (m_doc != 0 && expr->getLesson() != 0)
           less_str = m_doc->getLessonDescr(expr->getLesson());
         p->drawText( 3, fontpos, w, p->fontMetrics().lineSpacing(), Qt::AlignLeft, less_str);
@@ -410,23 +410,23 @@ void KVocTrainTable::paintCell(QPainter * p, int row, int col, const QRect & cr,
 
       case KV_COL_ORG: // original
       {
-        QString s = expr->getOriginal();
+        TQString s = expr->getOriginal();
         p->drawText(3, fontpos, w - 6, p->fontMetrics().lineSpacing(), cellAlignment(s), s);
       }
       break;
 
       default: // translation x
-        QString s = expr->getTranslation(col - KV_COL_ORG);
+        TQString s = expr->getTranslation(col - KV_COL_ORG);
         p->drawText(3, fontpos, w - 6, p->fontMetrics().lineSpacing(), cellAlignment(s), s);
         break;
     }
     p->restore();
   }
 
-  QPen pen( p->pen() );
-  int gridColor = style().styleHint( QStyle::SH_Table_GridLineColor, this );
+  TQPen pen( p->pen() );
+  int gridColor = style().styleHint( TQStyle::SH_Table_GridLineColor, this );
   if (gridColor != -1) {
-    const QPalette &pal = palette();
+    const TQPalette &pal = palette();
     if (cg != colorGroup()
         && cg != pal.disabled()
         && cg != pal.inactive())
@@ -441,20 +441,20 @@ void KVocTrainTable::paintCell(QPainter * p, int row, int col, const QRect & cr,
   p->setPen( pen );
 }
 
-void KVocTrainTable::setItem(int row, int col, QTableItem * /*item*/)
+void KVocTrainTable::setItem(int row, int col, TQTableItem * /*item*/)
 {
   // ignore item!
   updateContents(row, col);
 }
 
-QTableItem * KVocTrainTable::item(int row, int col) const
+TQTableItem * KVocTrainTable::item(int row, int col) const
 {
  if (defaultItem)
   defaultItem->setPosition(row, col);
   return defaultItem;
 }
 
-void KVocTrainTable::keyPressEvent(QKeyEvent * e)
+void KVocTrainTable::keyPressEvent(TQKeyEvent * e)
 {
   delayTimer->stop();
   switch(e->key())
@@ -470,11 +470,11 @@ void KVocTrainTable::keyPressEvent(QKeyEvent * e)
     case Key_Down:
     case Key_Next:
     case Key_Prior:
-      QTable::keyPressEvent(e);
+      TQTable::keyPressEvent(e);
       break;
 
       case Key_Left: {
-        QTable::keyPressEvent(e);
+        TQTable::keyPressEvent(e);
         int topCell = rowAt(0);
         int lastRowVisible = QMIN(numRows(), rowAt(contentsHeight()));
         if (numCols() > 2)
@@ -486,7 +486,7 @@ void KVocTrainTable::keyPressEvent(QKeyEvent * e)
     case Key_Shift:
     case Key_Alt:
       case Key_Control:  // fallthrough
-        QTable::keyPressEvent(e);
+        TQTable::keyPressEvent(e);
         emit forwardKeyPressEvent(e);
         break;
 
@@ -498,12 +498,12 @@ void KVocTrainTable::keyPressEvent(QKeyEvent * e)
         break;
 
     default:
-      QTable::keyPressEvent(e);
+      TQTable::keyPressEvent(e);
       break;
   }
 }
 
-void KVocTrainTable::keyReleaseEvent(QKeyEvent * e)
+void KVocTrainTable::keyReleaseEvent(TQKeyEvent * e)
 {
   delayTimer->stop();
   switch(e->key())
@@ -511,20 +511,20 @@ void KVocTrainTable::keyReleaseEvent(QKeyEvent * e)
     case Key_Shift:
     case Key_Alt:
     case Key_Control:  // fallthrough
-      QTable::keyPressEvent(e);
+      TQTable::keyPressEvent(e);
       emit forwardKeyReleaseEvent(e);
       break;
   }
 }
 
-void KVocTrainTable::contentsMousePressEvent(QMouseEvent * e)
+void KVocTrainTable::contentsMousePressEvent(TQMouseEvent * e)
 {
   delayTimer->stop();
   int cc = columnAt(e->x());
   int cr = rowAt(e->y());
   int co = currentColumn();
 
-  QTable::contentsMousePressEvent(e);
+  TQTable::contentsMousePressEvent(e);
 
   if(cc >= KV_EXTRA_COLS) {
     // update color of original when column changes and more than 1 translation
@@ -542,10 +542,10 @@ void KVocTrainTable::contentsMousePressEvent(QMouseEvent * e)
     setCurrentCell(cr, cc);
 }
 
-void KVocTrainTable::contentsMouseDoubleClickEvent(QMouseEvent * e)
+void KVocTrainTable::contentsMouseDoubleClickEvent(TQMouseEvent * e)
 {
   delayTimer->stop();
-  QTable::contentsMouseDoubleClickEvent(e);
+  TQTable::contentsMouseDoubleClickEvent(e);
 }
 
 void KVocTrainTable::activateNextCell()
@@ -553,7 +553,7 @@ void KVocTrainTable::activateNextCell()
   int currRow = currentRow();
   int currCol = currentColumn();
 
-  QTableSelection currentSel = selection(0);
+  TQTableSelection currentSel = selection(0);
 
   int tr = currentSel.topRow();
   int br = currentSel.bottomRow();
@@ -579,20 +579,20 @@ void KVocTrainTable::slotCurrentChanged(int row, int col)
   {
     if (m_doc)
     {
-      QString id = (col == KV_COL_ORG) ? m_doc->getOriginalIdent() : m_doc->getIdent(col - KV_EXTRA_COLS);
+      TQString id = (col == KV_COL_ORG) ? m_doc->getOriginalIdent() : m_doc->getIdent(col - KV_EXTRA_COLS);
 
       if (langs)
       {
-        QString kbLayout(langs->keyboardLayout(langs->indexShortId(id)));
+        TQString kbLayout(langs->keyboardLayout(langs->indexShortId(id)));
         //kdDebug() << "Keyboard Layout: " << kbLayout << endl;
         if (!kbLayout.isEmpty())
         {
-          QByteArray data, replyData;
-          QCString replyType;
-          QDataStream arg(data, IO_WriteOnly);
+          TQByteArray data, replyData;
+          TQCString replyType;
+          TQDataStream arg(data, IO_WriteOnly);
           arg << kbLayout;
 
-          if (!KApplication::dcopClient()->call("kxkb", "kxkb", "setLayout(QString)", data, replyType, replyData))
+          if (!KApplication::dcopClient()->call("kxkb", "kxkb", "setLayout(TQString)", data, replyType, replyData))
           {
             kdDebug() << "kxkb dcop error: beginEdit()" << endl;
           }
diff --git a/kvoctrain/kvoctrain/kvoctraintable.h b/kvoctrain/kvoctrain/kvoctraintable.h
index f42e0140..77fffa77 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.h
+++ b/kvoctrain/kvoctrain/kvoctraintable.h
@@ -26,8 +26,8 @@
 #ifndef KVOCTRAINTABLE_H
 #define KVOCTRAINTABLE_H
 
-#include <qtable.h>
-#include <qtimer.h>
+#include <tqtable.h>
+#include <tqtimer.h>
 
 #include "kvt-core/kvoctraindoc.h"
 #include "kvt-core/kvoctrainexpr.h"
@@ -42,7 +42,7 @@ class KVocTrainTable : public QTable
 Q_OBJECT
 public:
   public:
-    KVocTrainTable( kvoctrainDoc *_doc, const LangSet *ls, QWidget *parent = NULL, const char *name = NULL );
+    KVocTrainTable( kvoctrainDoc *_doc, const LangSet *ls, TQWidget *parent = NULL, const char *name = NULL );
 
     friend class kvoctrainView;
 
@@ -51,20 +51,20 @@ public:
     int count() { return numRows(); }
 
     void setModified(bool _dirty = true) { m_doc->setModified(_dirty); }
-    QString getIdent(int i) const { return m_doc->getIdent(i); }
-    QString getOriginalIdent() const { return m_doc->getOriginalIdent(); }
-    int findIdent(QString id) const { return m_doc->findIdent(id); }
+    TQString getIdent(int i) const { return m_doc->getIdent(i); }
+    TQString getOriginalIdent() const { return m_doc->getOriginalIdent(); }
+    int findIdent(TQString id) const { return m_doc->findIdent(id); }
     void setCurrentRow(int row, int col);
     void updateContents(int row = -1, int col = -1);
     kvoctrainExpr *getRow(int row);
     void setDoc(kvoctrainDoc *rows);
-    void setFont(const QFont &);
+    void setFont(const TQFont &);
 
   signals:
     void selected(int row);
     void rightButtonClicked(int header, int x, int y);
-    void forwardKeyPressEvent(QKeyEvent *);
-    void forwardKeyReleaseEvent(QKeyEvent *);
+    void forwardKeyPressEvent(TQKeyEvent *);
+    void forwardKeyReleaseEvent(TQKeyEvent *);
     void edited(int, int);
 
   public slots:
@@ -80,15 +80,15 @@ public:
 
   protected:
     int current;
-    //QWidget* beginEdit(int row, int col, bool replace);
+    //TQWidget* beginEdit(int row, int col, bool replace);
     //void endEdit(int row, int col, bool accept, bool replace);
-    void paintCell(QPainter *p, int row, int col, const QRect &cr, bool selected, const QColorGroup &cg);
-    void setItem(int row, int col, QTableItem * item);
-    QTableItem* item (int row, int col) const;
-    void keyPressEvent(QKeyEvent *e);
-    void keyReleaseEvent(QKeyEvent *e);
-    void contentsMousePressEvent(QMouseEvent *e);
-    void contentsMouseDoubleClickEvent(QMouseEvent *e);
+    void paintCell(TQPainter *p, int row, int col, const TQRect &cr, bool selected, const TQColorGroup &cg);
+    void setItem(int row, int col, TQTableItem * item);
+    TQTableItem* item (int row, int col) const;
+    void keyPressEvent(TQKeyEvent *e);
+    void keyReleaseEvent(TQKeyEvent *e);
+    void contentsMousePressEvent(TQMouseEvent *e);
+    void contentsMouseDoubleClickEvent(TQMouseEvent *e);
     void activateNextCell();
 
   private:
@@ -97,10 +97,10 @@ public:
     const LangSet* langs;
     //const GradeCols *gradecols;
     KVocTrainTableItem *defaultItem;
-    QTimer *delayTimer;
+    TQTimer *delayTimer;
     int triggerSect;
-    QPixmap m_pixInactive;
-    QPixmap m_pixInQuery;
+    TQPixmap m_pixInactive;
+    TQPixmap m_pixInQuery;
 };
 
 #endif
diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.cpp b/kvoctrain/kvoctrain/kvoctraintableitem.cpp
index 9972cd6d..f4aefca8 100644
--- a/kvoctrain/kvoctrain/kvoctraintableitem.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintableitem.cpp
@@ -23,8 +23,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qlineedit.h>
-#include <qcombobox.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
 
 #include <klocale.h>
 #include <kglobalsettings.h>
@@ -32,8 +32,8 @@
 #include "kvoctraintableitem.h"
 
 
-KVocTrainTableItem::KVocTrainTableItem( QTable *t, EditType et, kvoctrainDoc *doc)
-  : QTableItem( t, et, QString::null )
+KVocTrainTableItem::KVocTrainTableItem( TQTable *t, EditType et, kvoctrainDoc *doc)
+  : TQTableItem( t, et, TQString::null )
 {
   m_doc = doc;
   // we do not want that this item can be replaced
@@ -54,12 +54,12 @@ void KVocTrainTableItem::setDoc(kvoctrainDoc *doc)
 }
 
 
-QWidget *KVocTrainTableItem::createEditor() const
+TQWidget *KVocTrainTableItem::createEditor() const
 {
   if (m_doc != 0 && m_doc->numEntries() != 0 && row() >= 0 && col() >= 0) {
     switch (col()) {
       case KV_COL_LESS: {
-        QComboBox *lessonbox = new QComboBox(table()->viewport() );
+        TQComboBox *lessonbox = new TQComboBox(table()->viewport() );
         lessonbox->setFont(KGlobalSettings::generalFont());
         lessonbox->insertItem (m_doc->getLessonDescr(0));
         for (unsigned i = 1; i <= (unsigned) m_doc->numLessons(); ++i)
@@ -70,12 +70,12 @@ QWidget *KVocTrainTableItem::createEditor() const
       break;
 
       case KV_COL_MARK: {
-        QComboBox *statebox = new QComboBox(table()->viewport() );
+        TQComboBox *statebox = new TQComboBox(table()->viewport() );
         statebox->setFont(KGlobalSettings::generalFont());
         statebox->insertItem (i18n("state of a row", "Active, Not in Query"));
         statebox->insertItem (i18n("state of a row", "In Query"));
         statebox->insertItem (i18n("state of a row", "Inactive"));
-        QSize sz = statebox->sizeHint();
+        TQSize sz = statebox->sizeHint();
         sz.setHeight(table()->rowHeight(row()));
         statebox->setMinimumSize(sz);
         if (!m_doc->getEntry(row())->isActive() )
@@ -89,7 +89,7 @@ QWidget *KVocTrainTableItem::createEditor() const
       break;
 
       default: {
-        QLineEdit *edit = new QLineEdit(table()->viewport() );
+        TQLineEdit *edit = new TQLineEdit(table()->viewport() );
         edit->setFrame(false);
         if (col() == KV_COL_ORG)
           edit->setText(m_doc->getEntry(row())->getOriginal());
@@ -103,12 +103,12 @@ QWidget *KVocTrainTableItem::createEditor() const
 }
 
 
-void KVocTrainTableItem::setContentFromEditor( QWidget *w )
+void KVocTrainTableItem::setContentFromEditor( TQWidget *w )
 {
   if (m_doc != 0) {
-    if ( w->inherits( "QComboBox" ) ) {
+    if ( w->inherits( "TQComboBox" ) ) {
       if (col() == KV_COL_MARK) {
-        QComboBox *statebox = (QComboBox*) w;
+        TQComboBox *statebox = (TQComboBox*) w;
         kvoctrainExpr *expr = m_doc->getEntry(row());
         bool inq = false;
         bool act = true;
@@ -131,14 +131,14 @@ void KVocTrainTableItem::setContentFromEditor( QWidget *w )
         expr->setActive(act);
       }
       else if (col() == KV_COL_LESS) {
-        QComboBox *lessonbox = (QComboBox*) w;
+        TQComboBox *lessonbox = (TQComboBox*) w;
         if (m_doc->getEntry(row())->getLesson() != lessonbox->currentItem())
           m_doc->setModified();
         m_doc->getEntry(row())->setLesson(lessonbox->currentItem());
       }
     }
     else {
-      QLineEdit *edit = (QLineEdit*) w;
+      TQLineEdit *edit = (TQLineEdit*) w;
       if (col() == KV_COL_ORG) {
         if (m_doc->getEntry(row())->getOriginal() != edit->text())
           m_doc->setModified();
diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.h b/kvoctrain/kvoctrain/kvoctraintableitem.h
index fc347e43..aa3b7cdd 100644
--- a/kvoctrain/kvoctrain/kvoctraintableitem.h
+++ b/kvoctrain/kvoctrain/kvoctraintableitem.h
@@ -26,7 +26,7 @@
 #ifndef KVOCTRAINTABLEITEM_H
 #define KVOCTRAINTABLEITEM_H
 
-#include <qtable.h>
+#include <tqtable.h>
 
 #include "kvoctraindoc.h"
 #include "kv_resource.h"
@@ -37,9 +37,9 @@
 class KVocTrainTableItem : public QTableItem
 {
   public:
-    KVocTrainTableItem( QTable *t, EditType et, kvoctrainDoc *doc );
-    QWidget *createEditor() const;
-    void setContentFromEditor( QWidget *w );
+    KVocTrainTableItem( TQTable *t, EditType et, kvoctrainDoc *doc );
+    TQWidget *createEditor() const;
+    void setContentFromEditor( TQWidget *w );
     void setPosition(int row, int col);
     void setDoc(kvoctrainDoc *doc);
 
diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp
index e4ccc163..ebad99ee 100644
--- a/kvoctrain/kvoctrain/kvoctrainview.cpp
+++ b/kvoctrain/kvoctrain/kvoctrainview.cpp
@@ -38,16 +38,16 @@
 #include <kapplication.h>
 #include <kprinter.h>
 
-#include <qlayout.h>
-#include <qbitmap.h>
-#include <qfile.h>
+#include <tqlayout.h>
+#include <tqbitmap.h>
+#include <tqfile.h>
 
 #include <ctype.h>
 
 #define HEADER_MINSIZE   24
 #define KV_COLWIDTH_MARK 20
 
-kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp *_parent) : QWidget(_parent)
+kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp *_parent) : TQWidget(_parent)
 {
   m_doc = doc;
   parent = _parent;
@@ -59,15 +59,15 @@ kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp
   if (m_doc->numLangs() == 0)
     m_doc->appendLang(i18n("Original"));
 
-  connect(m_table, SIGNAL(selected(int)), m_table, SLOT(sortByColumn_alpha(int)));
-  connect(m_table, SIGNAL(rightButtonClicked(int, int, int)), parent, SLOT(slotHeaderMenu(int, int, int)));
-  connect(m_table, SIGNAL(edited(int, int)), parent, SLOT(slotEditEntry(int, int)));
-  connect(m_table, SIGNAL(currentChanged(int, int)), parent, SLOT(slotCurrentCellChanged(int, int)));
-  connect(m_table, SIGNAL(selectionChanged()), m_table, SLOT(slotSelectionChanged()));
-  connect(m_table, SIGNAL(forwardKeyPressEvent(QKeyEvent*)), parent, SLOT(keyPressEvent(QKeyEvent *)));
-  connect(m_table, SIGNAL(forwardKeyReleaseEvent(QKeyEvent*)), parent, SLOT(keyReleaseEvent(QKeyEvent *)));
+  connect(m_table, TQT_SIGNAL(selected(int)), m_table, TQT_SLOT(sortByColumn_alpha(int)));
+  connect(m_table, TQT_SIGNAL(rightButtonClicked(int, int, int)), parent, TQT_SLOT(slotHeaderMenu(int, int, int)));
+  connect(m_table, TQT_SIGNAL(edited(int, int)), parent, TQT_SLOT(slotEditEntry(int, int)));
+  connect(m_table, TQT_SIGNAL(currentChanged(int, int)), parent, TQT_SLOT(slotCurrentCellChanged(int, int)));
+  connect(m_table, TQT_SIGNAL(selectionChanged()), m_table, TQT_SLOT(slotSelectionChanged()));
+  connect(m_table, TQT_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), parent, TQT_SLOT(keyPressEvent(TQKeyEvent *)));
+  connect(m_table, TQT_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), parent, TQT_SLOT(keyReleaseEvent(TQKeyEvent *)));
 
-  list_layout = new QGridLayout( this, 2, 1/*, 4 */);
+  list_layout = new TQGridLayout( this, 2, 1/*, 4 */);
   list_layout->addWidget(m_table, 1, 0);
   list_layout->setRowStretch(1, 1);
   list_layout->activate();
@@ -76,29 +76,29 @@ kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp
 }
 
 
-void kvoctrainView::showEvent (QShowEvent * s_ev)
+void kvoctrainView::showEvent (TQShowEvent * s_ev)
 {
-  QWidget::showEvent(s_ev);
-  QResizeEvent r_ev(size(), size());
+  TQWidget::showEvent(s_ev);
+  TQResizeEvent r_ev(size(), size());
   resizeEvent(&r_ev);
 }
 
 
 void kvoctrainView::adjustContent()
 {
-  QResizeEvent r_ev(size(), size());
+  TQResizeEvent r_ev(size(), size());
   resizeEvent (&r_ev);
 }
 
 
-void kvoctrainView::resizeEvent (QResizeEvent *r_ev)
+void kvoctrainView::resizeEvent (TQResizeEvent *r_ev)
 {
-  QWidget::resizeEvent(r_ev);
+  TQWidget::resizeEvent(r_ev);
 
   if (r_ev == 0)
     return;
 
-  QHeader *header = m_table->horizontalHeader();
+  TQHeader *header = m_table->horizontalHeader();
   unsigned oldwidth = 0;
   for (int i = 0; i < m_table->numCols(); ++i)
     oldwidth += header->sectionSize(i);
@@ -176,8 +176,8 @@ void kvoctrainView::setView(kvoctrainDoc *doc, const LangSet& ls)
   if (m_doc) {
     int id = ls.indexShortId (m_doc->getOriginalIdent());
 
-    setHeaderProp(KV_COL_LESS, i18n("Lesson"),  QString::null);
-    setHeaderProp(KV_COL_MARK, "",  QString::null);
+    setHeaderProp(KV_COL_LESS, i18n("Lesson"),  TQString::null);
+    setHeaderProp(KV_COL_MARK, "",  TQString::null);
     m_table->setColumnWidth(KV_COL_MARK, KV_COLWIDTH_MARK);
 
     if (id < 0)
@@ -207,9 +207,9 @@ kvoctrainView::~kvoctrainView()
 }
 
 
-void kvoctrainView::setHeaderProp (int id, const QString &name, const QString &pixfile)
+void kvoctrainView::setHeaderProp (int id, const TQString &name, const TQString &pixfile)
 {
-  QHeader *header = m_table->horizontalHeader();
+  TQHeader *header = m_table->horizontalHeader();
 
   if (pixfile.isEmpty())
   {
@@ -217,8 +217,8 @@ void kvoctrainView::setHeaderProp (int id, const QString &name, const QString &p
   }
   else
   {
-    QPixmap pix;
-    if (QFile::exists(pixfile))
+    TQPixmap pix;
+    if (TQFile::exists(pixfile))
       pix.load(pixfile);
     else
     {
@@ -227,11 +227,11 @@ void kvoctrainView::setHeaderProp (int id, const QString &name, const QString &p
       pix.resize(21, 14);
       pix.fill(Qt::white);
 
-      QPainter p(&pix);
+      TQPainter p(&pix);
 
-      QFont font("sans");
+      TQFont font("sans");
       font.setPixelSize(10);
-      font.setWeight(QFont::Bold);
+      font.setWeight(TQFont::Bold);
       p.setFont(font);
       p.setPen(Qt::red);
       p.drawText(2, 1, pix.width(), pix.height()-2, Qt::AlignCenter, "err");
@@ -242,8 +242,8 @@ void kvoctrainView::setHeaderProp (int id, const QString &name, const QString &p
     int w = pix.width();
     int h = pix.height();
 
-    QPixmap arrow(w + 14, h);
-    QBitmap mask(arrow.width(), arrow.height());
+    TQPixmap arrow(w + 14, h);
+    TQBitmap mask(arrow.width(), arrow.height());
     arrow.fill(Qt::white);
     mask.fill(Qt::black);
 
@@ -251,22 +251,22 @@ void kvoctrainView::setHeaderProp (int id, const QString &name, const QString &p
     if (pix.mask() != 0)
       bitBlt(&mask, 0, 0, pix.mask(), 0, 0);
     else {
-      QBitmap bmp(pix.createHeuristicMask());
+      TQBitmap bmp(pix.createHeuristicMask());
       bitBlt(&mask, 0, 0, &bmp, 0, 0);
     }
 
-    QPainter p, pm;
+    TQPainter p, pm;
     p.begin(&arrow);
     pm.begin(&mask);
 
-    p.setPen(QColor(0, 0, 0));
+    p.setPen(TQColor(0, 0, 0));
     p.drawLine(w + 5, h - 2, w + 5 + 1, h - 2);
     p.drawLine(w + 4, h - 3, w + 6 + 1, h - 3);
     p.drawLine(w + 3, h - 4, w + 7 + 1, h - 4);
     p.drawLine(w + 2, h - 5, w + 8 + 1, h - 5);
     p.drawLine(w + 2, h - 6, w + 8 + 1, h - 6);
 
-    pm.setPen(QColor(255, 255, 255));
+    pm.setPen(TQColor(255, 255, 255));
     pm.drawLine(w + 5, h - 2, w + 5 + 1, h - 2);
     pm.drawLine(w + 4, h - 3, w + 6 + 1, h - 3);
     pm.drawLine(w + 3, h - 4, w + 7 + 1, h - 4);
@@ -277,14 +277,14 @@ void kvoctrainView::setHeaderProp (int id, const QString &name, const QString &p
     p.end();
     arrow.setMask(mask);
 
-    QIconSet set(arrow, QIconSet::Small);
+    TQIconSet set(arrow, TQIconSet::Small);
     header->setLabel(id, set, name);
   }
 }
 
 void kvoctrainView::print(KPrinter * pPrinter)
 {
-  QPainter painter;
+  TQPainter painter;
   int res = pPrinter->resolution();
   int marg = res;
 
@@ -298,11 +298,11 @@ void kvoctrainView::print(KPrinter * pPrinter)
   int hh = m_table->horizontalHeader()->height();
   int tPos = marg + hh;
 
-  QColorGroup cg;
+  TQColorGroup cg;
 
   painter.begin(pPrinter);
-  QRect w = painter.window();
-  QRect cr;
+  TQRect w = painter.window();
+  TQRect cr;
 
   pw = w.width() - (2 * marg);
 
@@ -360,13 +360,13 @@ void kvoctrainView::print(KPrinter * pPrinter)
   painter.end();
 }
 
-void kvoctrainView::newPage(QPainter & painter, int res, int startCol, int endCol)
+void kvoctrainView::newPage(TQPainter & painter, int res, int startCol, int endCol)
 {
   int marg = res;
   int hh = m_table->horizontalHeader()->height();
   int cw;
-  QRect cr;
-  QRect w = painter.window();
+  TQRect cr;
+  TQRect w = painter.window();
   painter.resetXForm();
   painter.setFont(KGlobalSettings::generalFont());
   painter.drawText(marg, marg - 20, i18n("KVocTrain - %1").arg(m_doc->getTitle()));
@@ -384,13 +384,13 @@ void kvoctrainView::newPage(QPainter & painter, int res, int startCol, int endCo
   }
 }
 
-void kvoctrainView::endOfPage(QPainter & painter, int pageNum, int res)
+void kvoctrainView::endOfPage(TQPainter & painter, int pageNum, int res)
 {
   painter.resetXForm();
   painter.setFont(KGlobalSettings::generalFont());
-  QRect w = painter.window();
-  QRect r = painter.boundingRect(0, 0, 0, 0, AlignAuto, QString::number(pageNum));
-  painter.drawText((w.width()/2) - (r.width()/2), w.height() - res + 20, QString::number(pageNum));
+  TQRect w = painter.window();
+  TQRect r = painter.boundingRect(0, 0, 0, 0, AlignAuto, TQString::number(pageNum));
+  painter.drawText((w.width()/2) - (r.width()/2), w.height() - res + 20, TQString::number(pageNum));
 }
 
 
diff --git a/kvoctrain/kvoctrain/kvoctrainview.h b/kvoctrain/kvoctrain/kvoctrainview.h
index f332e9a8..871e9730 100644
--- a/kvoctrain/kvoctrain/kvoctrainview.h
+++ b/kvoctrain/kvoctrain/kvoctrainview.h
@@ -63,25 +63,25 @@ class kvoctrainView : public QWidget
   void setView(kvoctrainDoc *doc, const LangSet &ls);
 
   KVocTrainTable* getTable() { return m_table; }
-  void setHeaderProp(int id, const QString &name, const QString &pixfile=QString::null);
+  void setHeaderProp(int id, const TQString &name, const TQString &pixfile=TQString::null);
 
   void adjustContent();
   void print(KPrinter *pPrinter);
 
 private:
-  void newPage(QPainter &, int, int, int);
-  void endOfPage(QPainter &, int, int);
+  void newPage(TQPainter &, int, int, int);
+  void endOfPage(TQPainter &, int, int);
 
 protected:
   KVocTrainTable  * m_table;
   bool              autoResize;
   kvoctrainDoc    * m_doc;
-  QGridLayout     * list_layout;
+  TQGridLayout     * list_layout;
   kvoctrainApp    * parent;
 
   /** resizes table when frame is resized */
-  virtual void resizeEvent(QResizeEvent *);
-  void showEvent(QShowEvent * s_ev);
+  virtual void resizeEvent(TQResizeEvent *);
+  void showEvent(TQShowEvent * s_ev);
 };
 
 #endif // KVOCTRAINVIEW_H
diff --git a/kvoctrain/kvoctrain/kvt-core/LineList.cpp b/kvoctrain/kvoctrain/kvt-core/LineList.cpp
index 5b79b3b9..4c38d530 100644
--- a/kvoctrain/kvoctrain/kvt-core/LineList.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/LineList.cpp
@@ -28,16 +28,16 @@
 
 #include <kdebug.h>
 
-LineList::LineList (const QString &multilines)
+LineList::LineList (const TQString &multilines)
 {
    setLines (multilines);
 }
 
 
-void LineList::setLines(const QString &the_lines )
+void LineList::setLines(const TQString &the_lines )
 {
   multilines.clear();
-  QString lines = the_lines;
+  TQString lines = the_lines;
   int pos;
   if ((pos = lines.find ('\n')) >= 0) {
     while (pos >= 0) {
@@ -69,7 +69,7 @@ int LineList::count() const
 }
 
 
-QString LineList::getLine (int index) const
+TQString LineList::getLine (int index) const
 {
    if (index < (int) multilines.size())
      return multilines[index];
@@ -80,9 +80,9 @@ QString LineList::getLine (int index) const
 }
 
 
-QString LineList::allLines() const
+TQString LineList::allLines() const
 {
-   QString ret;
+   TQString ret;
    if (multilines.size() > 0)
      ret = multilines[0];
 
diff --git a/kvoctrain/kvoctrain/kvt-core/LineList.h b/kvoctrain/kvoctrain/kvt-core/LineList.h
index b1d6f01f..15309c48 100644
--- a/kvoctrain/kvoctrain/kvt-core/LineList.h
+++ b/kvoctrain/kvoctrain/kvt-core/LineList.h
@@ -27,23 +27,23 @@
 #ifndef LineList_h
 #define LineList_h
 
-#include <qstring.h>
+#include <tqstring.h>
 
 #include <vector>
 using namespace std;
 
 class LineList {
  public:
-  LineList (const QString &multilines = "");
+  LineList (const TQString &multilines = "");
 
-  void setLines(const QString &lines);
+  void setLines(const TQString &lines);
   void normalizeWS();
   int count() const;
-  QString getLine (int index) const;
-  QString allLines() const;
+  TQString getLine (int index) const;
+  TQString allLines() const;
 
  protected:
-   vector<QString>  multilines;
+   vector<TQString>  multilines;
 };
 
 #endif // LineList_h
diff --git a/kvoctrain/kvoctrain/kvt-core/MultipleChoice.cpp b/kvoctrain/kvoctrain/kvt-core/MultipleChoice.cpp
index e73f358a..a326452a 100644
--- a/kvoctrain/kvoctrain/kvt-core/MultipleChoice.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/MultipleChoice.cpp
@@ -26,11 +26,11 @@
 #include "MultipleChoice.h"
 
 MultipleChoice::MultipleChoice (
-           const QString &mc1,
-           const QString &mc2,
-           const QString &mc3,
-           const QString &mc4,
-           const QString &mc5
+           const TQString &mc1,
+           const TQString &mc2,
+           const TQString &mc3,
+           const TQString &mc4,
+           const TQString &mc5
           )
 {
    setMC1 (mc1);
@@ -61,7 +61,7 @@ void MultipleChoice::clear()
 }
 
 
-QString MultipleChoice::mc (unsigned idx) const
+TQString MultipleChoice::mc (unsigned idx) const
 {
    switch (idx) {
      case 0: return muc1;
diff --git a/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h b/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h
index 99bc56ea..4d7fd029 100644
--- a/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h
+++ b/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h
@@ -27,7 +27,7 @@
 #ifndef MultipleChoice_included
 #define MultipleChoice_included
 
-#include <qstring.h>
+#include <tqstring.h>
 
 #define MAX_MULTIPLE_CHOICE  5  // select one out of x
 
@@ -39,26 +39,26 @@ public:
    MultipleChoice() {}
 
    MultipleChoice (
-           const QString &mc1,
-           const QString &mc2,
-           const QString &mc3,
-           const QString &mc4,
-           const QString &mc5
+           const TQString &mc1,
+           const TQString &mc2,
+           const TQString &mc3,
+           const TQString &mc4,
+           const TQString &mc5
           );
 
-   void setMC1 (const QString &s) { muc1 = s; }
-   void setMC2 (const QString &s) { muc2 = s; }
-   void setMC3 (const QString &s) { muc3 = s; }
-   void setMC4 (const QString &s) { muc4 = s; }
-   void setMC5 (const QString &s) { muc5 = s; }
+   void setMC1 (const TQString &s) { muc1 = s; }
+   void setMC2 (const TQString &s) { muc2 = s; }
+   void setMC3 (const TQString &s) { muc3 = s; }
+   void setMC4 (const TQString &s) { muc4 = s; }
+   void setMC5 (const TQString &s) { muc5 = s; }
 
-   QString mc1 () const { return muc1; }
-   QString mc2 () const { return muc2; }
-   QString mc3 () const { return muc3; }
-   QString mc4 () const { return muc4; }
-   QString mc5 () const { return muc5; }
+   TQString mc1 () const { return muc1; }
+   TQString mc2 () const { return muc2; }
+   TQString mc3 () const { return muc3; }
+   TQString mc4 () const { return muc4; }
+   TQString mc5 () const { return muc5; }
 
-   QString mc (unsigned idx) const;
+   TQString mc (unsigned idx) const;
 
    bool isEmpty() const;
    void normalize();
@@ -67,7 +67,7 @@ public:
 
 protected:
 
-   QString  muc1, muc2, muc3, muc4, muc5;
+   TQString  muc1, muc2, muc3, muc4, muc5;
 };
 
 
diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
index 2c7b76ca..7eb65e1a 100644
--- a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
@@ -34,7 +34,7 @@ using namespace std;
 #include "kvoctraincore.h"
 #include <prefs.h>
 
-vector<QString> QueryManager::userTypes;
+vector<TQString> QueryManager::userTypes;
 
 struct t_type_rel
 {
@@ -89,20 +89,20 @@ static t_type_rel InternalTypeRelations [] =
 };
 
 
-QString QueryManager::getSubType (const QString & type)
+TQString QueryManager::getSubType (const TQString & type)
 {
   int i;
-  QString t = type;
+  TQString t = type;
   if ((i = t.find(QM_TYPE_DIV)) >= 0) {
     t.remove(0, i+1);
     return t;
   }
   else
-    return QString::null;
+    return TQString::null;
 }
 
 
-QString QueryManager::getMainType (const QString & type)
+TQString QueryManager::getMainType (const TQString & type)
 {
   int i;
   if ((i = type.find(QM_TYPE_DIV)) >= 0)
@@ -201,7 +201,7 @@ bool QueryManager::validate(kvoctrainExpr *expr, int act_lesson, int oindex, int
 }
 
 
-QuerySelection QueryManager::select(kvoctrainDoc *doc, int act_lesson, int idx, QString type)
+QuerySelection QueryManager::select(kvoctrainDoc *doc, int act_lesson, int idx, TQString type)
 {
    QuerySelection random;
    random.resize(doc->numLessons()+1);
@@ -235,16 +235,16 @@ QuerySelection QueryManager::select(kvoctrainDoc *doc, int act_lesson, int idx,
 }
 
 
-bool QueryManager::validate(kvoctrainExpr *expr, int act_lesson, int idx, QString query_type)
+bool QueryManager::validate(kvoctrainExpr *expr, int act_lesson, int idx, TQString query_type)
 {
-   QString qtype;
+   TQString qtype;
    int pos = query_type.find (QM_TYPE_DIV);
    if (pos >= 0)
      qtype = query_type.left (pos);
    else
      qtype = query_type;
 
-   QString expr_type = expr->getType(idx);
+   TQString expr_type = expr->getType(idx);
    bool type_ok = false;
    if (qtype == QM_NOUN) {
      type_ok =    expr_type == QM_NOUN  QM_TYPE_DIV  QM_NOUN_S
@@ -337,9 +337,9 @@ bool QueryManager::validate(kvoctrainExpr *expr, int act_lesson, int idx, QueryT
 }
 
 
-QString QueryManager::compStr(Prefs::EnumCompType::type type)
+TQString QueryManager::compStr(Prefs::EnumCompType::type type)
 {
-   QString str = "???";
+   TQString str = "???";
    switch (type)
    {
     case DontCare: str = i18n("Do not Care"); break;
@@ -371,7 +371,7 @@ QString QueryManager::compStr(Prefs::EnumCompType::type type)
 }
 
 
-QString QueryManager::gradeStr (int i)
+TQString QueryManager::gradeStr (int i)
 {
   switch (i) {
     case KV_NORM_GRADE:    return i18n(KV_NORM_TEXT); break;
@@ -391,7 +391,7 @@ vector<TypeRelation> QueryManager::getRelation (bool only_maintypes)
 {
   vector<TypeRelation> vec;
   for (int i = 0; i < (int) userTypes.size(); i++) {
-    QString s;
+    TQString s;
     s.setNum(i+1);
     s.insert(0, QM_USER_TYPE);
     vec.push_back(TypeRelation(s, userTypes[i]));
@@ -409,16 +409,16 @@ vector<TypeRelation> QueryManager::getRelation (bool only_maintypes)
 }
 
 
-QString QueryManager::typeStr (const QString id)
+TQString QueryManager::typeStr (const TQString id)
 {
   if (id.left(1) == QM_USER_TYPE) {
-    QString num = id;
+    TQString num = id;
     num.remove (0, 1);
     int i = num.toInt()-1;
     if (i >= 0 && i < (int) userTypes.size() )
       return userTypes[i];
     else
-      return QString::null;
+      return TQString::null;
   }
   else {
     t_type_rel *type = InternalTypeRelations;
@@ -428,7 +428,7 @@ QString QueryManager::typeStr (const QString id)
       type++;
     }
   }
-  return QString::null;
+  return TQString::null;
 }
 
 
@@ -576,7 +576,7 @@ bool QueryManager::compareGrade (CompType type, grade_t qgrade, grade_t limit)
 }
 
 
-bool QueryManager::compareType (CompType type, const QString & exprtype, const QString & limit)
+bool QueryManager::compareType (CompType type, const TQString & exprtype, const TQString & limit)
 {
    bool erg = true;
    switch (type) {
@@ -637,19 +637,19 @@ bool QueryManager::compareLesson (CompType type, int less, const vector<int> &li
 }
 
 
-void QueryManager::setTypeNames (vector<QString> names)
+void QueryManager::setTypeNames (vector<TQString> names)
 {
   userTypes = names;
 }
 
 
-void QueryManager::setLessonItemStr (const QString & indices)
+void QueryManager::setLessonItemStr (const TQString & indices)
 {
   int pos;
-  QString indices_copy = indices;
+  TQString indices_copy = indices;
   lessonitems.clear();
   while ((pos = indices_copy.find(' ')) >= 0) {
-     QString s = indices_copy.left(pos);
+     TQString s = indices_copy.left(pos);
      indices_copy.remove(0, pos+1);
      lessonitems.push_back(s.toInt());
   }
@@ -659,9 +659,9 @@ void QueryManager::setLessonItemStr (const QString & indices)
 }
 
 
-QString QueryManager::lessonItemStr() const
+TQString QueryManager::lessonItemStr() const
 {
-   QString s, ret;
+   TQString s, ret;
    for (int i = 0; i < (int) lessonitems.size(); i++) {
      s.setNum (lessonitems[i]);
      if (i != 0)
diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.h b/kvoctrain/kvoctrain/kvt-core/QueryManager.h
index 07567d22..bdd7d815 100644
--- a/kvoctrain/kvoctrain/kvt-core/QueryManager.h
+++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.h
@@ -81,15 +81,15 @@ class TypeRelation
 {
  public:
 
-  TypeRelation (const QString & _short, const QString & _long)
+  TypeRelation (const TQString & _short, const TQString & _long)
     : shortId (_short), longId(_long) {}
 
-  QString shortStr() const { return shortId; }
-  QString longStr()  const { return longId;  }
+  TQString shortStr() const { return shortId; }
+  TQString longStr()  const { return longId;  }
 
  protected:
 
-  QString  shortId, longId;
+  TQString  shortId, longId;
 };
 
 
@@ -128,30 +128,30 @@ class QueryManager
   //void saveConfig (KConfig *);
 
   static vector<TypeRelation> getRelation (bool only_maintypes);
-  static void setTypeNames (vector<QString> names);
-  static QString getSubType (const QString & type);
-  static QString getMainType (const QString & type);
+  static void setTypeNames (vector<TQString> names);
+  static TQString getSubType (const TQString & type);
+  static TQString getMainType (const TQString & type);
 
-  static QString compStr(Prefs::EnumCompType::type type);
-  static QString gradeStr(int i);
-  static QString typeStr(const QString id);
+  static TQString compStr(Prefs::EnumCompType::type type);
+  static TQString gradeStr(int i);
+  static TQString typeStr(const TQString id);
 
   void setLessonItems(vector<int> indices) { lessonitems = indices; }
-  void setLessonItemStr(const QString & indices);
+  void setLessonItemStr(const TQString & indices);
   //void setDateItem (time_t time) { dateitem = time; }
   //void setQueryItem (int query) { queryitem = query; }
   //void setBadItem (int bad) { baditem = bad; }
-  //void setTypeItem (const QString & type) { typeitem = type; }
+  //void setTypeItem (const TQString & type) { typeitem = type; }
   //void setGradeItem (grade_t grade) { gradeitem = grade; }
   //void setBlockItem (int item, int grade);
   //void setExpireItem (int item, int grade);
 
   vector<int> lessonItems() const { return lessonitems; }
-  QString lessonItemStr() const;
+  TQString lessonItemStr() const;
   //time_t dateItem () const { return dateitem; }
   //int queryItem () const { return queryitem; }
   //int badItem () const { return baditem; }
-  //QString typeItem () const { return typeitem; }
+  //TQString typeItem () const { return typeitem; }
   //grade_t gradeItem () const { return gradeitem; }
   //int blockItem (int grade) const;
   //int expireItem (int grade) const;
@@ -177,10 +177,10 @@ class QueryManager
                         int oindex, int tindex);
 
   bool validate(kvoctrainExpr *expr, int act_lesson,
-                int index, QString type);
+                int index, TQString type);
 
   QuerySelection select(kvoctrainDoc*, int act_lesson,
-                        int index, QString type);
+                        int index, TQString type);
 
   bool validate(kvoctrainExpr *expr, int act_lesson,
                 int index, QueryType type);
@@ -196,7 +196,7 @@ class QueryManager
   bool compareQuery (CompType, int, int);
   bool compareBad (CompType, int, int);
   bool compareGrade (CompType, grade_t, grade_t);
-  bool compareType (CompType, const QString &, const QString &);
+  bool compareType (CompType, const TQString &, const TQString &);
   bool compareLesson (CompType type, int less, const vector<int> &limit, int current);
 
  /* CompType    typecomp,
@@ -209,7 +209,7 @@ class QueryManager
   //time_t      dateitem;
   //int         queryitem,
   //            baditem;
-  //QString     typeitem;
+  //TQString     typeitem;
   //grade_t     gradeitem;
   vector<int> lessonitems;
 
@@ -217,7 +217,7 @@ class QueryManager
   //            expireItems;
 
  private:
-  static vector<QString> userTypes;
+  static vector<TQString> userTypes;
 };
 
 #endif // QueryManager_included
diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
index 7f98665a..9180d6e4 100644
--- a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
@@ -33,7 +33,7 @@
 #include <vector>
 using namespace std;
 
-vector<QString> UsageManager::userUsages;
+vector<TQString> UsageManager::userUsages;
 
 // user usages are strings like this: #1
 
@@ -112,7 +112,7 @@ vector<UsageRelation> UsageManager::getRelation ()
 {
   vector<UsageRelation> vec;
   for (int i = 0; i < (int) userUsages.size(); i++) {
-    QString s;
+    TQString s;
     s.setNum(i+1);
     s.insert(0, UL_USER_USAGE);
     vec.push_back(UsageRelation(s, userUsages[i], userUsages[i]));
@@ -120,7 +120,7 @@ vector<UsageRelation> UsageManager::getRelation ()
 
   internalRelation_t *usage = InternalUsageRelations;
   while (usage->ident != 0) {
-    QString s;
+    TQString s;
     if (usage->context == 0)
       s = i18n(usage->shortid);
     else
@@ -135,9 +135,9 @@ vector<UsageRelation> UsageManager::getRelation ()
 }
 
 
-bool UsageManager::contains (const QString& label, const QString& collection)
+bool UsageManager::contains (const TQString& label, const TQString& collection)
 {
-   QString s = collection;
+   TQString s = collection;
    int pos;
    while ((pos = s.find(UL_USAGE_DIV)) >= 0) {
      if (s.left(pos) == label)
@@ -149,7 +149,7 @@ bool UsageManager::contains (const QString& label, const QString& collection)
 }
 
 
-void UsageManager::setUsageNames (vector<QString> names)
+void UsageManager::setUsageNames (vector<TQString> names)
 {
   userUsages = names;
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.h b/kvoctrain/kvoctrain/kvt-core/UsageManager.h
index e49a6c85..647de685 100644
--- a/kvoctrain/kvoctrain/kvt-core/UsageManager.h
+++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.h
@@ -94,15 +94,15 @@ struct UsageRelation
 {
  public:
 
-  UsageRelation (const QString & id, const QString & shorty, const QString & longy)
+  UsageRelation (const TQString & id, const TQString & shorty, const TQString & longy)
     :ident(id), shortId(shorty), longId(longy) {}
 
-  QString identStr() const { return ident; }
-  QString shortStr() const { return shortId; }
-  QString longStr()  const { return longId;  }
+  TQString identStr() const { return ident; }
+  TQString shortStr() const { return shortId; }
+  TQString longStr()  const { return longId;  }
 
  protected:
-  QString ident,
+  TQString ident,
           shortId,
           longId;
 };
@@ -114,14 +114,14 @@ class UsageManager
 
   UsageManager ();
 
-  static bool contains (const QString& label, const QString& collection);
+  static bool contains (const TQString& label, const TQString& collection);
   static vector<UsageRelation> getRelation ();
-  static void setUsageNames (vector<QString> names);
+  static void setUsageNames (vector<TQString> names);
 
  protected:
 
  private:
-  static vector<QString> userUsages;
+  static vector<TQString> userUsages;
 };
 
 #endif // UsageManager_included
diff --git a/kvoctrain/kvoctrain/kvt-core/grammarmanager.cpp b/kvoctrain/kvoctrain/kvt-core/grammarmanager.cpp
index 2c789890..1119d011 100644
--- a/kvoctrain/kvoctrain/kvt-core/grammarmanager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/grammarmanager.cpp
@@ -42,15 +42,15 @@ Conjugation::names [] =
 };
 
 
-vector<QString> Conjugation::userTenses;
+vector<TQString> Conjugation::userTenses;
 
 
 //================================================================
 
 Comparison::Comparison (
-           const QString &l1,
-           const QString &l2,
-           const QString &l3
+           const TQString &l1,
+           const TQString &l2,
+           const TQString &l3
           )
 {
    setL1 (l1);
@@ -79,9 +79,9 @@ void Comparison::clear()
 
 
 Article::Article
-          (const QString &fem_def, const QString &fem_indef,
-           const QString &mal_def, const QString &mal_indef,
-           const QString &nat_def, const QString &nat_indef
+          (const TQString &fem_def, const TQString &fem_indef,
+           const TQString &mal_def, const TQString &mal_indef,
+           const TQString &nat_def, const TQString &nat_indef
           )
 {
    setFemale  (fem_def, fem_indef);
@@ -91,7 +91,7 @@ Article::Article
 
 
 void Article::setFemale
-  (const QString &def, const QString &indef)
+  (const TQString &def, const TQString &indef)
 {
    fem_def = def;
    fem_indef = indef;
@@ -99,7 +99,7 @@ void Article::setFemale
 
 
 void Article::setMale
-  (const QString &def, const QString &indef)
+  (const TQString &def, const TQString &indef)
 {
    mal_def = def;
    mal_indef = indef;
@@ -107,7 +107,7 @@ void Article::setMale
 
 
 void Article::setNatural
-  (const QString &def, const QString &indef)
+  (const TQString &def, const TQString &indef)
 {
    nat_def = def;
    nat_indef = indef;
@@ -115,7 +115,7 @@ void Article::setNatural
 
 
 void Article::female
-  (QString &def, QString &indef) const
+  (TQString &def, TQString &indef) const
 {
    def = fem_def;
    indef = fem_indef;
@@ -123,7 +123,7 @@ void Article::female
 
 
 void Article::male
-  (QString &def, QString &indef) const
+  (TQString &def, TQString &indef) const
 {
    def = mal_def;
    indef = mal_indef;
@@ -131,7 +131,7 @@ void Article::male
 
 
 void Article::natural
-  (QString &def, QString &indef) const
+  (TQString &def, TQString &indef) const
 {
    def = nat_def;
    indef = nat_indef;
@@ -158,7 +158,7 @@ vector<TenseRelation> Conjugation::getRelation ()
   }
 
   for (int i = 0; i < (int) userTenses.size(); i++) {
-    QString s;
+    TQString s;
     s.setNum(i+1);
     s.insert(0, UL_USER_TENSE);
     vec.push_back(TenseRelation(s, userTenses[i]));
@@ -168,16 +168,16 @@ vector<TenseRelation> Conjugation::getRelation ()
 }
 
 
-void Conjugation::setTenseNames (vector<QString> names)
+void Conjugation::setTenseNames (vector<TQString> names)
 {
   userTenses = names;
 }
 
 
-QString Conjugation::getName (const QString &abbrev)
+TQString Conjugation::getName (const TQString &abbrev)
 {
-   if (abbrev.length() >= 2 && abbrev[0] == QString(UL_USER_TENSE)) {
-     QString s = abbrev;
+   if (abbrev.length() >= 2 && abbrev[0] == TQString(UL_USER_TENSE)) {
+     TQString s = abbrev;
      s.remove(0, 1);
      int i = s.toInt() - 1;
 
@@ -197,7 +197,7 @@ QString Conjugation::getName (const QString &abbrev)
 }
 
 
-QString Conjugation::getName (int idx)
+TQString Conjugation::getName (int idx)
 {
    if (idx < numInternalNames() )
      return i18n(names[idx].name);
@@ -210,11 +210,11 @@ QString Conjugation::getName (int idx)
 }
 
 
-QString Conjugation::getAbbrev (const QString &name)
+TQString Conjugation::getAbbrev (const TQString &name)
 {
    for (int i = 0; i < (int) userTenses.size(); i++)
      if (userTenses[i] == name) {
-       QString s;
+       TQString s;
        s.setNum(i+1);
        s.insert(0, UL_USER_TENSE);
        return s;
@@ -228,13 +228,13 @@ QString Conjugation::getAbbrev (const QString &name)
 }
 
 
-QString Conjugation::getAbbrev (int idx)
+TQString Conjugation::getAbbrev (int idx)
 {
    if (idx < numInternalNames() )
      return names[idx].abbrev;
 
    else if (idx < numTenses() ) {
-     QString s;
+     TQString s;
      s.setNum(idx-numInternalNames()+1);
      s.insert(0, UL_USER_TENSE);
      return s;
@@ -257,7 +257,7 @@ int Conjugation::numTenses()
 }
 
 
-QString Conjugation::getType (int idx)
+TQString Conjugation::getType (int idx)
 {
   if (idx >= (int) conjugations.size() )
     return "";
@@ -266,7 +266,7 @@ QString Conjugation::getType (int idx)
 }
 
 
-void Conjugation::setType (int idx, const QString & type)
+void Conjugation::setType (int idx, const TQString & type)
 {
   if (idx >= (int) conjugations.size() )
     return;
@@ -321,83 +321,83 @@ bool Conjugation::isEmpty (int idx)
    return default;
 
 
-bool Conjugation::pers3SingularCommon(const QString &type) const
+bool Conjugation::pers3SingularCommon(const TQString &type) const
 {
   _GET_CON_(s3common, type, false);
 }
 
 
-bool Conjugation::pers3PluralCommon(const QString &type) const
+bool Conjugation::pers3PluralCommon(const TQString &type) const
 {
   _GET_CON_(p3common, type, false);
 }
 
 
-QString Conjugation::pers1Singular
-  (const QString &type) const
+TQString Conjugation::pers1Singular
+  (const TQString &type) const
 {
   _GET_CON_(pers1_sing, type, "");
 }
 
 
-QString Conjugation::pers2Singular
-  (const QString &type) const
+TQString Conjugation::pers2Singular
+  (const TQString &type) const
 {
   _GET_CON_(pers2_sing, type, "");
 }
 
 
-QString Conjugation::pers3FemaleSingular
-  (const QString &type) const
+TQString Conjugation::pers3FemaleSingular
+  (const TQString &type) const
 {
   _GET_CON_(pers3_f_sing, type, "");
 }
 
 
-QString Conjugation::pers3MaleSingular
-  (const QString &type) const
+TQString Conjugation::pers3MaleSingular
+  (const TQString &type) const
 {
   _GET_CON_(pers3_m_sing, type, "");
 }
 
 
-QString Conjugation::pers3NaturalSingular
-  (const QString &type) const
+TQString Conjugation::pers3NaturalSingular
+  (const TQString &type) const
 {
   _GET_CON_(pers3_n_sing, type, "");
 }
 
 
-QString Conjugation::pers1Plural
-  (const QString &type) const
+TQString Conjugation::pers1Plural
+  (const TQString &type) const
 {
   _GET_CON_(pers1_plur, type, "");
 }
 
 
-QString Conjugation::pers2Plural
-  (const QString &type) const
+TQString Conjugation::pers2Plural
+  (const TQString &type) const
 {
   _GET_CON_(pers2_plur, type, "");
 }
 
 
-QString Conjugation::pers3FemalePlural
-  (const QString &type) const
+TQString Conjugation::pers3FemalePlural
+  (const TQString &type) const
 {
   _GET_CON_(pers3_f_plur, type, "");
 }
 
 
-QString Conjugation::pers3MalePlural
-  (const QString &type) const
+TQString Conjugation::pers3MalePlural
+  (const TQString &type) const
 {
   _GET_CON_(pers3_m_plur, type, "");
 }
 
 
-QString Conjugation::pers3NaturalPlural
-  (const QString &type) const
+TQString Conjugation::pers3NaturalPlural
+  (const TQString &type) const
 {
   _GET_CON_(pers3_n_plur, type, "");
 }
@@ -418,83 +418,83 @@ QString Conjugation::pers3NaturalPlural
    conjugations.push_back(ct);
 
 
-void Conjugation::setPers3PluralCommon(const QString &type, bool f)
+void Conjugation::setPers3PluralCommon(const TQString &type, bool f)
 {
   _SET_CON_(p3common, type, f);
 }
 
 
-void Conjugation::setPers3SingularCommon(const QString &type, bool f)
+void Conjugation::setPers3SingularCommon(const TQString &type, bool f)
 {
   _SET_CON_(s3common, type, f);
 }
 
 
 void Conjugation::setPers1Singular
-  (const QString &type, const QString &str)
+  (const TQString &type, const TQString &str)
 {
   _SET_CON_(pers1_sing, type, str);
 }
 
 
 void Conjugation::setPers2Singular
-  (const QString &type, const QString &str)
+  (const TQString &type, const TQString &str)
 {
   _SET_CON_(pers2_sing, type, str);
 }
 
 
 void Conjugation::setPers3FemaleSingular
-  (const QString &type, const QString &str)
+  (const TQString &type, const TQString &str)
 {
   _SET_CON_(pers3_f_sing, type, str);
 }
 
 
 void Conjugation::setPers3MaleSingular
-  (const QString &type, const QString &str)
+  (const TQString &type, const TQString &str)
 {
   _SET_CON_(pers3_m_sing, type, str);
 }
 
 
 void Conjugation::setPers3NaturalSingular
-  (const QString &type, const QString &str)
+  (const TQString &type, const TQString &str)
 {
   _SET_CON_(pers3_n_sing, type, str);
 }
 
 
 void Conjugation::setPers1Plural
-  (const QString &type, const QString &str)
+  (const TQString &type, const TQString &str)
 {
   _SET_CON_(pers1_plur, type, str);
 }
 
 
 void Conjugation::setPers2Plural
-  (const QString &type, const QString &str)
+  (const TQString &type, const TQString &str)
 {
   _SET_CON_(pers2_plur, type, str);
 }
 
 
 void Conjugation::setPers3FemalePlural
-  (const QString &type, const QString &str)
+  (const TQString &type, const TQString &str)
 {
   _SET_CON_(pers3_f_plur, type, str);
 }
 
 
 void Conjugation::setPers3MalePlural
-  (const QString &type, const QString &str)
+  (const TQString &type, const TQString &str)
 {
   _SET_CON_(pers3_m_plur, type, str);
 }
 
 
 void Conjugation::setPers3NaturalPlural
-  (const QString &type, const QString &str)
+  (const TQString &type, const TQString &str)
 {
   _SET_CON_(pers3_n_plur, type, str);
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/grammarmanager.h b/kvoctrain/kvoctrain/kvt-core/grammarmanager.h
index 1b9cfe76..01f020b9 100644
--- a/kvoctrain/kvoctrain/kvt-core/grammarmanager.h
+++ b/kvoctrain/kvoctrain/kvt-core/grammarmanager.h
@@ -27,7 +27,7 @@
 #ifndef grammarmanager_included
 #define grammarmanager_included
 
-#include <qstring.h>
+#include <tqstring.h>
 
 #include <vector>
 using namespace std;
@@ -54,22 +54,22 @@ public:
    Article() {}
 
    Article (
-           const QString &fem_def, const QString &fem_indef,
-           const QString &mal_def, const QString &mal_indef,
-           const QString &nat_def, const QString &nat_indef
+           const TQString &fem_def, const TQString &fem_indef,
+           const TQString &mal_def, const TQString &mal_indef,
+           const TQString &nat_def, const TQString &nat_indef
           );
 
-   void setFemale  (const QString &def, const QString &indef);
-   void setMale    (const QString &def, const QString &indef);
-   void setNatural (const QString &def, const QString &indef);
+   void setFemale  (const TQString &def, const TQString &indef);
+   void setMale    (const TQString &def, const TQString &indef);
+   void setNatural (const TQString &def, const TQString &indef);
 
-   void female  (QString &def, QString &indef) const;
-   void male    (QString &def, QString &indef) const;
-   void natural (QString &def, QString &indef) const;
+   void female  (TQString &def, TQString &indef) const;
+   void male    (TQString &def, TQString &indef) const;
+   void natural (TQString &def, TQString &indef) const;
 
 protected:
 
-   QString  fem_def, fem_indef,
+   TQString  fem_def, fem_indef,
             mal_def, mal_indef,
             nat_def, nat_indef;
 };
@@ -83,25 +83,25 @@ public:
    Comparison() {}
 
    Comparison (
-           const QString &l1,
-           const QString &l2,
-           const QString &l3
+           const TQString &l1,
+           const TQString &l2,
+           const TQString &l3
           );
 
-   void setL1 (const QString &s) { ls1 = s; }
-   void setL2 (const QString &s) { ls2 = s; }
-   void setL3 (const QString &s) { ls3 = s; }
+   void setL1 (const TQString &s) { ls1 = s; }
+   void setL2 (const TQString &s) { ls2 = s; }
+   void setL3 (const TQString &s) { ls3 = s; }
 
-   QString l1 () const { return ls1; }
-   QString l2 () const { return ls2; }
-   QString l3 () const { return ls3; }
+   TQString l1 () const { return ls1; }
+   TQString l2 () const { return ls2; }
+   TQString l3 () const { return ls3; }
 
    bool isEmpty() const;
    void clear();
 
 protected:
 
-   QString  ls1, ls2, ls3;
+   TQString  ls1, ls2, ls3;
 };
 
 
@@ -109,15 +109,15 @@ class TenseRelation
 {
  public:
 
-  TenseRelation (const QString & _short, const QString & _long)
+  TenseRelation (const TQString & _short, const TQString & _long)
     : shortId (_short), longId(_long) {}
 
-  inline QString shortStr() const { return shortId; }
-  inline QString longStr()  const { return longId;  }
+  inline TQString shortStr() const { return shortId; }
+  inline TQString longStr()  const { return longId;  }
 
  protected:
 
-  QString  shortId, longId;
+  TQString  shortId, longId;
 };
 
 
@@ -131,47 +131,47 @@ public:
    int numEntries() const;
 
    static vector<TenseRelation> getRelation ();
-   static void setTenseNames (vector<QString> names);
+   static void setTenseNames (vector<TQString> names);
 
-   static QString getName (const QString &abbrev);
-   static QString getName (int index);
-   static QString getAbbrev (const QString &name);
-   static QString getAbbrev (int index);
+   static TQString getName (const TQString &abbrev);
+   static TQString getName (int index);
+   static TQString getAbbrev (const TQString &name);
+   static TQString getAbbrev (int index);
    static int numInternalNames();
    static int numTenses();
 
-   QString getType (int index);
-   void setType (int index, const QString & type);
+   TQString getType (int index);
+   void setType (int index, const TQString & type);
    void cleanUp();
    bool isEmpty (int idx);
 
-   QString pers1Singular(const QString &type) const;
-   QString pers2Singular(const QString &type) const;
-   bool    pers3SingularCommon(const QString &type) const;
-   QString pers3FemaleSingular(const QString &type) const;
-   QString pers3MaleSingular(const QString &type) const;
-   QString pers3NaturalSingular(const QString &type) const;
-
-   QString pers1Plural(const QString &type) const;
-   QString pers2Plural(const QString &type) const;
-   bool    pers3PluralCommon(const QString &type) const;
-   QString pers3FemalePlural(const QString &type) const;
-   QString pers3MalePlural(const QString &type) const;
-   QString pers3NaturalPlural(const QString &type) const;
-
-   void setPers1Singular(const QString &type, const QString &str);
-   void setPers2Singular(const QString &type, const QString &str);
-   void setPers3SingularCommon(const QString &type, bool f);
-   void setPers3FemaleSingular(const QString &type, const QString &str);
-   void setPers3MaleSingular(const QString &type, const QString &str);
-   void setPers3NaturalSingular(const QString &type, const QString &str);
-
-   void setPers1Plural(const QString &type, const QString &str);
-   void setPers2Plural(const QString &type, const QString &str);
-   void setPers3PluralCommon(const QString &type, bool f);
-   void setPers3FemalePlural(const QString &type, const QString &str);
-   void setPers3MalePlural(const QString &type, const QString &str);
-   void setPers3NaturalPlural(const QString &type, const QString &str);
+   TQString pers1Singular(const TQString &type) const;
+   TQString pers2Singular(const TQString &type) const;
+   bool    pers3SingularCommon(const TQString &type) const;
+   TQString pers3FemaleSingular(const TQString &type) const;
+   TQString pers3MaleSingular(const TQString &type) const;
+   TQString pers3NaturalSingular(const TQString &type) const;
+
+   TQString pers1Plural(const TQString &type) const;
+   TQString pers2Plural(const TQString &type) const;
+   bool    pers3PluralCommon(const TQString &type) const;
+   TQString pers3FemalePlural(const TQString &type) const;
+   TQString pers3MalePlural(const TQString &type) const;
+   TQString pers3NaturalPlural(const TQString &type) const;
+
+   void setPers1Singular(const TQString &type, const TQString &str);
+   void setPers2Singular(const TQString &type, const TQString &str);
+   void setPers3SingularCommon(const TQString &type, bool f);
+   void setPers3FemaleSingular(const TQString &type, const TQString &str);
+   void setPers3MaleSingular(const TQString &type, const TQString &str);
+   void setPers3NaturalSingular(const TQString &type, const TQString &str);
+
+   void setPers1Plural(const TQString &type, const TQString &str);
+   void setPers2Plural(const TQString &type, const TQString &str);
+   void setPers3PluralCommon(const TQString &type, bool f);
+   void setPers3FemalePlural(const TQString &type, const TQString &str);
+   void setPers3MalePlural(const TQString &type, const TQString &str);
+   void setPers3NaturalPlural(const TQString &type, const TQString &str);
 
 private:
 
@@ -182,10 +182,10 @@ private:
         s3common = false;
       }
 
-      QString type;
+      TQString type;
       bool    p3common,
               s3common;
-      QString pers1_sing,
+      TQString pers1_sing,
               pers2_sing,
               pers3_m_sing,
               pers3_f_sing,
@@ -207,7 +207,7 @@ protected:
    vector<conjug_t>       conjugations;
 
    static conjug_name_t   names [];
-   static vector<QString> userTenses;
+   static vector<TQString> userTenses;
 };
 
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
index 851e0ea9..e4906935 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
@@ -27,37 +27,37 @@
 
 #include "kvoctrain.h"
 
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
 
 #include <vector>
 using namespace std;
 
-bool kvoctrainDoc::saveTypeNameCsv (QTextStream &)
+bool kvoctrainDoc::saveTypeNameCsv (TQTextStream &)
 {
  return true;
 }
 
 
-bool kvoctrainDoc::loadTypeNameCsv (QTextStream &)
+bool kvoctrainDoc::loadTypeNameCsv (TQTextStream &)
 {
  return true;
 }
 
 
-bool kvoctrainDoc::saveLessonCsv (QTextStream &)
+bool kvoctrainDoc::saveLessonCsv (TQTextStream &)
 {
  return true;
 }
 
 
-bool kvoctrainDoc::loadLessonCsv (QTextStream &)
+bool kvoctrainDoc::loadLessonCsv (TQTextStream &)
 {
  return true;
 }
 
-bool kvoctrainDoc::saveToCsv (QTextStream& os, QString &)
+bool kvoctrainDoc::saveToCsv (TQTextStream& os, TQString &)
 {
-  QString separator = Prefs::separator();
+  TQString separator = Prefs::separator();
 
   saveTypeNameCsv (os);
   saveLessonCsv (os);
@@ -73,9 +73,9 @@ bool kvoctrainDoc::saveToCsv (QTextStream& os, QString &)
   vector <int> csv_order = kvoctrainApp::getCsvOrder(this);
 
   vector<kvoctrainExpr>::const_iterator first =  vocabulary.begin ();
-  QString exp;
+  TQString exp;
 
-  os.setCodec(QTextCodec::codecForName("UTF-8"));
+  os.setCodec(TQTextCodec::codecForName("UTF-8"));
   while (first != vocabulary.end ()) {
 
     ent_no++;
@@ -110,10 +110,10 @@ bool kvoctrainDoc::saveToCsv (QTextStream& os, QString &)
 }
 
 
-bool kvoctrainDoc::loadFromCsv (QTextStream& is)
+bool kvoctrainDoc::loadFromCsv (TQTextStream& is)
 {
-  QString separator = Prefs::separator();
-  QStringList lang_order = Prefs::pasteOrder();
+  TQString separator = Prefs::separator();
+  TQStringList lang_order = Prefs::pasteOrder();
 
   langs.clear();
   vocabulary.clear();
@@ -122,8 +122,8 @@ bool kvoctrainDoc::loadFromCsv (QTextStream& is)
 
   // autodetect utf8
   // FIXME: provide choice for Latinx?
-  is.setCodec(QTextCodec::codecForName("ISO 8859-1"));
-  is.setEncoding(QTextStream::Latin1);
+  is.setCodec(TQTextCodec::codecForName("ISO 8859-1"));
+  is.setEncoding(TQTextStream::Latin1);
 
   int size = is.device()->size ();
   int ln = size / 20 / 100;  // assume each line about 20 chars
@@ -133,7 +133,7 @@ bool kvoctrainDoc::loadFromCsv (QTextStream& is)
   bool utf8_mode = false;
   int lang_num = 0;
   for (int l = 0; !is.eof(); l++) {
-    QString s = is.readLine();
+    TQString s = is.readLine();
 
     // autodetect utf8
     if (!utf8_mode) {
@@ -180,9 +180,9 @@ bool kvoctrainDoc::loadFromCsv (QTextStream& is)
       }
 
       if (utf8_mode) {
-        is.setCodec(QTextCodec::codecForName("UTF-8"));
-        is.setEncoding(QTextStream::UnicodeUTF8);
-        s = QString::fromUtf8(s.ascii());
+        is.setCodec(TQTextCodec::codecForName("UTF-8"));
+        is.setEncoding(TQTextStream::UnicodeUTF8);
+        s = TQString::fromUtf8(s.ascii());
       }
 
     }
@@ -204,7 +204,7 @@ bool kvoctrainDoc::loadFromCsv (QTextStream& is)
         if (i == 0)
           expr.setOriginal(bucket.getOriginal());
         else {
-          QString ts = bucket.getTranslation(i);
+          TQString ts = bucket.getTranslation(i);
           expr.setTranslation(i, ts);
         }
       }
@@ -220,7 +220,7 @@ bool kvoctrainDoc::loadFromCsv (QTextStream& is)
       if (j == 0)
         langs.push_back("org");
       else {
-        QString s;
+        TQString s;
         s.setNum(j);
         s.insert(0, "trans");
         langs.push_back(s);
@@ -232,12 +232,12 @@ bool kvoctrainDoc::loadFromCsv (QTextStream& is)
 }
 
 
-void kvoctrainDoc::errorCsv (int /*line*/, const QString &text )
+void kvoctrainDoc::errorCsv (int /*line*/, const TQString &text )
 {
    unknown_elem = true;
-   QApplication::setOverrideCursor( arrowCursor, true );
-   QString s = kapp->makeStdCaption(i18n("Error in csv file"));
-   QString msg = text;
+   TQApplication::setOverrideCursor( arrowCursor, true );
+   TQString s = kapp->makeStdCaption(i18n("Error in csv file"));
+   TQString msg = text;
    KMessageBox::error( 0, msg, s);
-   QApplication::restoreOverrideCursor();
+   TQApplication::restoreOverrideCursor();
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
index feb160cf..7212f456 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
@@ -90,9 +90,9 @@ Sachgebiete|
 */
 
 
-static QString extract (QString &line)
+static TQString extract (TQString &line)
 {
-   QString ret;
+   TQString ret;
    int lim = line.find ("|");
    if (lim < 0) {
      ret = line;
@@ -107,7 +107,7 @@ static QString extract (QString &line)
 }
 
 
-bool kvoctrainDoc::saveTypeNameLex (QTextStream &os)
+bool kvoctrainDoc::saveTypeNameLex (TQTextStream &os)
 {
   int i;
   for (i = 0; i < (int) type_descr.size() && i < LEX_MAX_ATTR; i++)
@@ -120,10 +120,10 @@ bool kvoctrainDoc::saveTypeNameLex (QTextStream &os)
 }
 
 
-bool kvoctrainDoc::loadTypeNameLex (QTextStream &is)
+bool kvoctrainDoc::loadTypeNameLex (TQTextStream &is)
 {
-  QString s;
-  QString attr;
+  TQString s;
+  TQString attr;
 
   type_descr.clear();
 
@@ -143,7 +143,7 @@ bool kvoctrainDoc::loadTypeNameLex (QTextStream &is)
 }
 
 
-bool kvoctrainDoc::saveLessonLex (QTextStream &os)
+bool kvoctrainDoc::saveLessonLex (TQTextStream &os)
 {
   int i;
   for (i = 0; i < (int) lesson_descr.size() && i < LEX_MAX_LESSON; i++)
@@ -156,10 +156,10 @@ bool kvoctrainDoc::saveLessonLex (QTextStream &os)
 }
 
 
-bool kvoctrainDoc::loadLessonLex (QTextStream &is)
+bool kvoctrainDoc::loadLessonLex (TQTextStream &is)
 {
-  QString s;
-  QString lesson;
+  TQString s;
+  TQString lesson;
 
   lesson_descr.clear();
 
@@ -167,7 +167,7 @@ bool kvoctrainDoc::loadLessonLex (QTextStream &is)
     s = is.readLine();
     lesson = extract (s);
     if (lesson.stripWhiteSpace().isEmpty()) {
-      lesson = "#" + QString::number(i+1);
+      lesson = "#" + TQString::number(i+1);
     }
     lesson_descr.push_back (lesson);
   }
@@ -176,7 +176,7 @@ bool kvoctrainDoc::loadLessonLex (QTextStream &is)
 }
 
 
-bool kvoctrainDoc::saveToLex (QTextStream& os, QString & /*title*/)
+bool kvoctrainDoc::saveToLex (TQTextStream& os, TQString & /*title*/)
 {
   os << LEX_IDENT_50 "\n";
   os << "LEX|" << getOriginalIdent() << "|" << getIdent(1) << "|"
@@ -238,12 +238,12 @@ bool kvoctrainDoc::saveToLex (QTextStream& os, QString & /*title*/)
 }
 
 
-bool kvoctrainDoc::loadFromLex (QTextStream& is)
+bool kvoctrainDoc::loadFromLex (TQTextStream& is)
 {
 
   langs.clear();
   vocabulary.clear();
-  QString version,
+  TQString version,
           info1,
           s_dummy,
           title,
@@ -285,7 +285,7 @@ bool kvoctrainDoc::loadFromLex (QTextStream& is)
   langs.push_back (orgID.left(2).lower());
   langs.push_back (transID.left(2).lower());
 
-  QTextStream params (info1, IO_ReadOnly);
+  TQTextStream params (info1, IO_ReadOnly);
   params >> i_dummy;
   params >> i_dummy;
   params >> i_dummy;
@@ -346,17 +346,17 @@ bool kvoctrainDoc::loadFromLex (QTextStream& is)
     is >> f_grade;
     is >> lesson;
 
-    QString line = is.readLine();
-    QString s;
+    TQString line = is.readLine();
+    TQString s;
 
-    QString original = extract (line);
+    TQString original = extract (line);
     for (int i = 0; i < 3; i++) {
       s = extract (line);
       if (!s.isEmpty())
         original += ", " +s;
     }
 
-    QString translation = extract (line);
+    TQString translation = extract (line);
     for (int i = 0; i < 3; i++) {
       s = extract (line);
       if (!s.isEmpty())
@@ -384,12 +384,12 @@ bool kvoctrainDoc::loadFromLex (QTextStream& is)
 }
 
 
-void kvoctrainDoc::errorLex (int /*line*/, const QString &text )
+void kvoctrainDoc::errorLex (int /*line*/, const TQString &text )
 {
    unknown_elem = true;
-   QApplication::setOverrideCursor( arrowCursor, true );
-   QString s = kapp->makeStdCaption(i18n("Error in lex file"));
-   QString msg = text;
+   TQApplication::setOverrideCursor( arrowCursor, true );
+   TQString s = kapp->makeStdCaption(i18n("Error in lex file"));
+   TQString msg = text;
    KMessageBox::error(0, msg, s);
-   QApplication::restoreOverrideCursor();
+   TQApplication::restoreOverrideCursor();
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
index 4aea5283..f07e906d 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
@@ -70,7 +70,7 @@ bool kvoctrainDoc::extract_T_GROUP_attr (XmlReader &xml,
 bool kvoctrainDoc::loadTypeNameKvtMl (XmlElement elem, XmlReader& xml)
 {
   bool endOfGroup = false;
-  QString s;
+  TQString s;
   type_descr.clear();
 
   if (!extract_T_GROUP_attr (xml, elem))
@@ -144,7 +144,7 @@ bool kvoctrainDoc::loadTypeNameKvtMl (XmlElement elem, XmlReader& xml)
 bool kvoctrainDoc::loadTenseNameKvtMl (XmlElement elem, XmlReader& xml)
 {
   bool endOfGroup = false;
-  QString s;
+  TQString s;
   tense_descr.clear();
 
   if (!extract_T_GROUP_attr (xml, elem))
@@ -218,7 +218,7 @@ bool kvoctrainDoc::loadTenseNameKvtMl (XmlElement elem, XmlReader& xml)
 bool kvoctrainDoc::loadUsageNameKvtMl (XmlElement elem, XmlReader& xml)
 {
   bool endOfGroup = false;
-  QString s;
+  TQString s;
   usage_descr.clear();
 
   if (!extract_T_GROUP_attr (xml, elem))
@@ -292,23 +292,23 @@ bool kvoctrainDoc::loadUsageNameKvtMl (XmlElement elem, XmlReader& xml)
 bool kvoctrainDoc::extract_O_T_attr (
                        XmlReader &xml,
                        XmlElement &elem,
-                       QString &lang,
+                       TQString &lang,
                        grade_t &grade, grade_t &rev_grade,
                        int &count, int &rev_count,
                        time_t &date, time_t &rev_date,
-                       QString &remark,
+                       TQString &remark,
                        int &bcount, int &rev_bcount,
-                       QString &query_id,
-                       QString &pronunce,
+                       TQString &query_id,
+                       TQString &pronunce,
                        int &width,
-                       QString &type,
-                       QString &faux_ami_f,
-                       QString &faux_ami_t,
-                       QString &synonym,
-                       QString &example,
-                       QString &antonym,
-                       QString &usage,
-                       QString &paraphrase)
+                       TQString &type,
+                       TQString &faux_ami_f,
+                       TQString &faux_ami_t,
+                       TQString &synonym,
+                       TQString &example,
+                       TQString &antonym,
+                       TQString &usage,
+                       TQString &paraphrase)
 {
   grade = KV_NORM_GRADE;
   rev_grade = KV_NORM_GRADE;
@@ -345,7 +345,7 @@ bool kvoctrainDoc::extract_O_T_attr (
     }
 
     else if ((*first).name () == KV_GRADE) {
-      QString s = (*first).stringValue();
+      TQString s = (*first).stringValue();
 
       if ((pos = s.find(';')) >= 1) {
         grade = s.left(pos).toInt();
@@ -356,7 +356,7 @@ bool kvoctrainDoc::extract_O_T_attr (
     }
 
     else if ((*first).name () == KV_COUNT) {
-      QString s = (*first).stringValue();
+      TQString s = (*first).stringValue();
       if ((pos = s.find(';')) >= 1) {
         count = s.left(pos).toInt();
         rev_count = s.mid(pos+1, s.length()).toInt();
@@ -366,7 +366,7 @@ bool kvoctrainDoc::extract_O_T_attr (
     }
 
     else if ((*first).name () == KV_BAD) {
-      QString s = (*first).stringValue();
+      TQString s = (*first).stringValue();
       if ((pos = s.find(';')) >= 1) {
         bcount = s.left(pos).toInt();
         rev_bcount = s.mid(pos+1, s.length()).toInt();
@@ -375,7 +375,7 @@ bool kvoctrainDoc::extract_O_T_attr (
     }
 
     else if ((*first).name () == KV_DATE) {
-      QString s = (*first).stringValue();
+      TQString s = (*first).stringValue();
       if ((pos = s.find(';')) >= 1) {
       date = s.left(pos).toInt();
       rev_date = s.mid(pos+1, s.length()).toInt();
@@ -386,7 +386,7 @@ bool kvoctrainDoc::extract_O_T_attr (
     }
 
     else if ((*first).name () == KV_DATE2) {
-      QString s = (*first).stringValue();
+      TQString s = (*first).stringValue();
       if ((pos = s.find(';')) >= 1) {
         date = decompressDate (s.left(pos));
         rev_date = decompressDate (s.mid(pos+1, s.length()));
@@ -422,7 +422,7 @@ bool kvoctrainDoc::extract_O_T_attr (
       if (usage.length() != 0 && usage.left(1) == UL_USER_USAGE) {
         int num = QMIN(usage.mid (1, 40).toInt(), 1000); // paranioa check
         if( num > (int) usage_descr.size() ) { // description missing ?
-          QString s;
+          TQString s;
           for (int i = usage_descr.size(); i < num; i++) {
             s.setNum (i+1);
             s.insert (0, "#");  // invent descr according to number
@@ -452,7 +452,7 @@ bool kvoctrainDoc::extract_O_T_attr (
       if (type.length() != 0 && type.left(1) == QM_USER_TYPE) {
         int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
         if( num > (int) type_descr.size() ) { // description missing ?
-          QString s;
+          TQString s;
           for (int i = type_descr.size(); i < num; i++) {
             s.setNum (i+1);
             s.insert (0, "#");  // invent descr according to number
@@ -487,7 +487,7 @@ bool kvoctrainDoc::extract_KVT_E_attr (
                          int          &lesson,
                          bool         &sel,
                          bool         &active,
-                         QString      &type)
+                         TQString      &type)
 {
   lesson = 0;
   sel = false;
@@ -513,7 +513,7 @@ bool kvoctrainDoc::extract_KVT_E_attr (
       if (type.length() != 0 && type.left(1) == QM_USER_TYPE) {
         int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
         if( num > (int) type_descr.size() ) { // description missing ?
-          QString s;
+          TQString s;
           for (int i = type_descr.size(); i < num; i++) {
             s.setNum (i+1);
             s.insert (0, "#");  // invent descr according to number
@@ -543,7 +543,7 @@ bool kvoctrainDoc::loadComparison (Comparison &comp, XmlElement elem,
 */
 {
   bool endOfGroup = false;
-  QString s;
+  TQString s;
   comp.clear();
 
   do {
@@ -610,7 +610,7 @@ bool kvoctrainDoc::loadMultipleChoice (MultipleChoice &mc, XmlElement elem,
 
 {
   bool endOfGroup = false;
-  QString s;
+  TQString s;
   mc.clear();
 
   do {
@@ -816,17 +816,17 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
 }
 
 
-bool kvoctrainDoc::unknownAttribute (int line, const QString &name,
-                                     const QString &attr )
+bool kvoctrainDoc::unknownAttribute (int line, const TQString &name,
+                                     const TQString &attr )
 {
    if (unknown_attr) // show dialog only once
      return true;    // proceed
 
    unknown_attr = true;
 
-   QString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
+   TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
 
-   QString format = i18n(
+   TQString format = i18n(
       "Your document contains an unknown attribute <%1> "   // keep trailing space
        "in tag <%2>.\n"
       "Maybe your version of KVocTrain is too old, "
@@ -834,55 +834,55 @@ bool kvoctrainDoc::unknownAttribute (int line, const QString &name,
       "If you proceed and save afterwards you are likely to lose data;\n"
       "do you want to proceed anyway?\n"
      );
-   QString msg = format.arg(attr).arg(name);
+   TQString msg = format.arg(attr).arg(name);
 
-   QApplication::setOverrideCursor( arrowCursor, true );
-   QString s = kapp->makeStdCaption(i18n("Unknown attribute"));
+   TQApplication::setOverrideCursor( arrowCursor, true );
+   TQString s = kapp->makeStdCaption(i18n("Unknown attribute"));
    bool result = (KMessageBox::warningContinueCancel(0, ln+msg, s) == KMessageBox::Continue);
-   QApplication::restoreOverrideCursor();
+   TQApplication::restoreOverrideCursor();
    return result;
 }
 
 
-void kvoctrainDoc::unknownElement (int line, const QString &elem )
+void kvoctrainDoc::unknownElement (int line, const TQString &elem )
 {
    unknown_elem = true;
 
-   QString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
+   TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
 
-   QString format = i18n(
+   TQString format = i18n(
       "Your document contains an unknown tag <%1>.  "  // keep trailing space
       "Maybe your version of KVocTrain is too old, "
       "or the document is damaged.\n"
       "Loading is aborted because KVocTrain cannot "
       "read documents with unknown elements.\n"
      );
-   QString msg = format.arg(elem);
-   QApplication::setOverrideCursor( arrowCursor, true );
-   QString s = kapp->makeStdCaption(i18n("Unknown element"));
+   TQString msg = format.arg(elem);
+   TQApplication::setOverrideCursor( arrowCursor, true );
+   TQString s = kapp->makeStdCaption(i18n("Unknown element"));
    KMessageBox::sorry(0, ln+msg, s);
-   QApplication::restoreOverrideCursor();
+   TQApplication::restoreOverrideCursor();
 }
 
 
-void kvoctrainDoc::errorKvtMl (int line, const QString &text )
+void kvoctrainDoc::errorKvtMl (int line, const TQString &text )
 {
-   QApplication::setOverrideCursor( arrowCursor, true );
-   QString s = kapp->makeStdCaption(i18n("Error"));
-   QString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
+   TQApplication::setOverrideCursor( arrowCursor, true );
+   TQString s = kapp->makeStdCaption(i18n("Error"));
+   TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
 
-   QString msg = text;
+   TQString msg = text;
    KMessageBox::error(0, ln+msg, s);
-   QApplication::restoreOverrideCursor();
+   TQApplication::restoreOverrideCursor();
 }
 
 
-void kvoctrainDoc::warningKvtMl (int line, const QString &text )
+void kvoctrainDoc::warningKvtMl (int line, const TQString &text )
 {
-   QApplication::setOverrideCursor( arrowCursor, true );
-   QString s = kapp->makeStdCaption(i18n("Warning"));
-   QString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
-   QString msg = text;
+   TQApplication::setOverrideCursor( arrowCursor, true );
+   TQString s = kapp->makeStdCaption(i18n("Warning"));
+   TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
+   TQString msg = text;
    KMessageBox::information(0, ln+msg, s);
-   QApplication::restoreOverrideCursor();
+   TQApplication::restoreOverrideCursor();
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp
index 8179bfa6..f4443ca5 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp
@@ -37,30 +37,30 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
                 r_qcount;
   int           bcount,
                 r_bcount;
-  QString       remark;
-  QString       pronunce;
+  TQString       remark;
+  TQString       pronunce;
   time_t        qdate,
                 r_qdate;
   bool          inquery;
   bool          active;
-  QString       lang;
-  QString       textstr;
-  QString       exprtype;
+  TQString       lang;
+  TQString       textstr;
+  TQString       exprtype;
   bool          org_found = false;
-  QString       q_org,
+  TQString       q_org,
                 q_trans;
-  QString       query_id;
+  TQString       query_id;
   kvoctrainExpr expr;
   int           lesson;
   int           width;
-  QString       type;
-  QString       faux_ami_f;
-  QString       faux_ami_t;
-  QString       synonym;
-  QString       example;
-  QString       antonym;
-  QString       usage;
-  QString       paraphrase;
+  TQString       type;
+  TQString       faux_ami_f;
+  TQString       faux_ami_t;
+  TQString       synonym;
+  TQString       example;
+  TQString       antonym;
+  TQString       usage;
+  TQString       paraphrase;
   vector<Conjugation> conjug;
   Comparison     comparison;
   MultipleChoice mc;
@@ -70,7 +70,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
 
   if (lesson
       && lesson > (int) lesson_descr.size() ) { // description missing ?
-    QString s;
+    TQString s;
     for (int i = lesson_descr.size(); i < lesson; i++) {
       s.setNum (i+1);
       s.insert (0, "#");  // invent descr according to number
@@ -164,7 +164,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
       }
 
       if (elem.tag () == KV_CONJUG_GRP && !elem.isEndTag() ) {
-        if (!loadConjugKvtMl (conjug, (QString) KV_CON_TYPE, elem, xml))
+        if (!loadConjugKvtMl (conjug, (TQString) KV_CON_TYPE, elem, xml))
           return false;
 
         if (! xml.readElement (elem) ) {
@@ -324,7 +324,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
       }
 
       if (elem.tag () == KV_CONJUG_GRP && !elem.isEndTag() ) {
-        if (!loadConjugKvtMl (conjug, (QString) KV_CON_TYPE, elem, xml))
+        if (!loadConjugKvtMl (conjug, (TQString) KV_CON_TYPE, elem, xml))
           return false;
 
         if (! xml.readElement (elem) ) {
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
index e6588675..f952b38a 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
@@ -27,14 +27,14 @@
 
 #include <klocale.h>
 
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
 
-bool kvoctrainDoc::loadFromKvtMl (QTextStream& is)
+bool kvoctrainDoc::loadFromKvtMl (TQTextStream& is)
 {
   // important, first action
   // switch to actual encoding afterwards, otherwise blocked
-  is.setCodec(QTextCodec::codecForName("UTF-8"));
-  is.setEncoding(QTextStream::UnicodeUTF8);
+  is.setCodec(TQTextCodec::codecForName("UTF-8"));
+  is.setEncoding(TQTextStream::UnicodeUTF8);
 
   langs.clear();
   vocabulary.clear();
@@ -71,20 +71,20 @@ bool kvoctrainDoc::loadFromKvtMl (QTextStream& is)
 
     if ((*first).name () == KV_ENCODING) {
   
-      if ((*first).stringValue().upper() == (QString)"UTF-8" ) {
-        is.setCodec(QTextCodec::codecForName("UTF-8"));
-        is.setEncoding(QTextStream::UnicodeUTF8);
+      if ((*first).stringValue().upper() == (TQString)"UTF-8" ) {
+        is.setCodec(TQTextCodec::codecForName("UTF-8"));
+        is.setEncoding(TQTextStream::UnicodeUTF8);
       }
-      else if ((*first).stringValue().upper() == (QString)"8BIT" ) {  // old compatibility mode
-        is.setCodec(QTextCodec::codecForName("ISO 8859-1"));
-        is.setEncoding(QTextStream::Latin1);
+      else if ((*first).stringValue().upper() == (TQString)"8BIT" ) {  // old compatibility mode
+        is.setCodec(TQTextCodec::codecForName("ISO 8859-1"));
+        is.setEncoding(TQTextStream::Latin1);
       }
       else {
-        is.setCodec(QTextCodec::codecForName("ISO 8859-1"));
-        is.setEncoding(QTextStream::Latin1);
-        QString format = i18n("Unknown document encoding \"%1\" was encountered.\n\n"
+        is.setCodec(TQTextCodec::codecForName("ISO 8859-1"));
+        is.setEncoding(TQTextStream::Latin1);
+        TQString format = i18n("Unknown document encoding \"%1\" was encountered.\n\n"
 				"It will be ignored. Encoding is now \"%2\".");
-        QString msg =format.arg((*first).stringValue ().upper()).arg("ISO 8859-1");
+        TQString msg =format.arg((*first).stringValue ().upper()).arg("ISO 8859-1");
         warningKvtMl (xml.lineNumber(), msg);
       }
   
@@ -155,7 +155,7 @@ bool kvoctrainDoc::extract_L_DESCR_attr (XmlReader &xml,
 }
 
 
-bool kvoctrainDoc::check_Empty_attr (QString tag_name,
+bool kvoctrainDoc::check_Empty_attr (TQString tag_name,
                                      XmlReader &xml,
                                      XmlElement &elem)
 {
@@ -168,10 +168,10 @@ bool kvoctrainDoc::check_Empty_attr (QString tag_name,
 }
 
 
-bool kvoctrainDoc::extract_simple_tag (QString tag_name,
+bool kvoctrainDoc::extract_simple_tag (TQString tag_name,
                                 XmlReader& xml,
                                 XmlElement &elem,
-                                QString &data,
+                                TQString &data,
                                 bool check_it)
 {
   if (check_it)
@@ -208,7 +208,7 @@ bool kvoctrainDoc::extract_simple_tag (QString tag_name,
 
 bool kvoctrainDoc::extract_CON_E_attr (XmlReader& xml,
                                        XmlElement &elem,
-                                       QString &lang)
+                                       TQString &lang)
 {
   lang = "";
 
@@ -246,19 +246,19 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
 {
   bool endOfGroup = false;
   bool inEntry = false;
-  QString s;
+  TQString s;
   articles.clear();
 
   if (!check_Empty_attr (KV_ARTICLE_GRP, xml, elem))
     return false;
 
-  QString fem_def,
+  TQString fem_def,
           mal_def,
           nat_def,
           fem_indef,
           mal_indef,
           nat_indef;
-  QString lang;
+  TQString lang;
   int count = 0;
 
   do {
@@ -391,7 +391,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
 
 bool kvoctrainDoc::extract_T_attr (XmlReader &xml,
                                    XmlElement &elem,
-                                   QString &name)
+                                   TQString &name)
 {
   name = "";
   list<XmlAttribute>::const_iterator first = elem.attributes ().begin ();
@@ -413,8 +413,8 @@ bool kvoctrainDoc::extract_T_attr (XmlReader &xml,
 bool kvoctrainDoc::extract_BOOL_attr (
                                XmlReader &xml,
                                XmlElement &elem,
-                               const QString &tag_name,
-                               const QString &attr_name,
+                               const TQString &tag_name,
+                               const TQString &attr_name,
                                bool &flag)
 {
   list<XmlAttribute>::const_iterator first =  elem.attributes ().begin ();
@@ -432,7 +432,7 @@ bool kvoctrainDoc::extract_BOOL_attr (
 
 
 bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
-                                    const QString &entry_tag,
+                                    const TQString &entry_tag,
                                     XmlElement elem, XmlReader& xml)
 
 /*
@@ -470,7 +470,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
 {
   bool endOfGroup = false;
   bool inEntry = false;
-  QString s;
+  TQString s;
 
   curr_conjug.clear();
 
@@ -479,7 +479,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
 
   bool    p3_common,
           s3_common;
-  QString pers1_sing,
+  TQString pers1_sing,
           pers2_sing,
           pers3_m_sing,
           pers3_f_sing,
@@ -490,8 +490,8 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
           pers3_f_plur,
           pers3_n_plur;
 
-  QString lang;
-  QString type;
+  TQString lang;
+  TQString type;
   int count = 0;
   curr_conjug.push_back (Conjugation());
 
@@ -546,7 +546,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
           if (type.length() != 0 && type.left(1) == UL_USER_TENSE) {
             int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
             if( num > (int) tense_descr.size() ) { // description missing ?
-              QString s;
+              TQString s;
               for (int i = tense_descr.size(); i < num; i++) {
                 s.setNum (i+1);
                 s.insert (0, "#");  // invent descr according to number
@@ -731,7 +731,7 @@ bool kvoctrainDoc::extract_L_GROUP_attr (XmlReader &xml,
 bool kvoctrainDoc::loadLessonKvtMl (XmlElement elem, XmlReader& xml)
 {
   bool endOfGroup = false;
-  QString s;
+  TQString s;
   bool isCurr;
   bool inQuery = false;
   lesson_descr.clear();
@@ -814,7 +814,7 @@ bool kvoctrainDoc::loadLessonKvtMl (XmlElement elem, XmlReader& xml)
 bool kvoctrainDoc::loadOptionsKvtMl (XmlElement elem, XmlReader& xml)
 {
   bool endOfGroup = false;
-  QString s;
+  TQString s;
 
   do {
     if (! xml.readElement (elem))
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
index 2dfde3fe..72020b94 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
@@ -32,31 +32,31 @@
 
 
 
-bool kvoctrainDoc::saveTypeNameVcb (QTextStream &/*os*/)
+bool kvoctrainDoc::saveTypeNameVcb (TQTextStream &/*os*/)
 {
  return true;
 }
 
 
-bool kvoctrainDoc::loadTypeNameVcb (QTextStream &/*is*/)
+bool kvoctrainDoc::loadTypeNameVcb (TQTextStream &/*is*/)
 {
  return true;
 }
 
 
-bool kvoctrainDoc::saveLessonVcb (QTextStream &/*os*/)
+bool kvoctrainDoc::saveLessonVcb (TQTextStream &/*os*/)
 {
  return true;
 }
 
 
-bool kvoctrainDoc::loadLessonVcb (QTextStream &/*is*/)
+bool kvoctrainDoc::loadLessonVcb (TQTextStream &/*is*/)
 {
  return true;
 }
 
 
-bool kvoctrainDoc::saveToVcb (QTextStream& os, QString &/*title*/)
+bool kvoctrainDoc::saveToVcb (TQTextStream& os, TQString &/*title*/)
 {
   saveTypeNameVcb (os);
   saveLessonVcb (os);
@@ -73,7 +73,7 @@ bool kvoctrainDoc::saveToVcb (QTextStream& os, QString &/*title*/)
     if (ent_percent != 0 && (ent_no % ent_percent) == 0 )
       emit progressChanged(this, int(ent_no / f_ent_percent));
 
-    QString s, exp;
+    TQString s, exp;
 
     exp = (*first).getOriginal()+VCB_SEPARATOR;
     exp += (*first).getTranslation(1)+VCB_SEPARATOR;
@@ -95,7 +95,7 @@ bool kvoctrainDoc::saveToVcb (QTextStream& os, QString &/*title*/)
 }
 
 
-bool kvoctrainDoc::loadFromVcb (QTextStream& is)
+bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
 {
 
   langs.clear();
@@ -109,7 +109,7 @@ bool kvoctrainDoc::loadFromVcb (QTextStream& is)
   emit progressChanged (this, 0);
 
   for (int l = 0; !is.eof(); l++) {
-    QString s = is.readLine();
+    TQString s = is.readLine();
 
     ln--;
     if (ln <= 0) {
@@ -118,7 +118,7 @@ bool kvoctrainDoc::loadFromVcb (QTextStream& is)
     }
 
     if (!s.stripWhiteSpace().isEmpty()) {
-      QString o, t;
+      TQString o, t;
       grade_t ograde = KV_LEV1_GRADE,
               tgrade = KV_LEV1_GRADE;
       size_t  odate = time(0),
@@ -127,13 +127,13 @@ bool kvoctrainDoc::loadFromVcb (QTextStream& is)
       int pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         o = s.left(pos);
-        s.remove (0, pos+QString(VCB_SEPARATOR).length());
+        s.remove (0, pos+TQString(VCB_SEPARATOR).length());
       }
 
       pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         t = s.left(pos);
-        s.remove (0, pos+QString(VCB_SEPARATOR).length());
+        s.remove (0, pos+TQString(VCB_SEPARATOR).length());
       }
       else {
         t = s;
@@ -142,19 +142,19 @@ bool kvoctrainDoc::loadFromVcb (QTextStream& is)
       pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         ograde = s.left(pos).toInt();
-        s.remove (0, pos+QString(VCB_SEPARATOR).length());
+        s.remove (0, pos+TQString(VCB_SEPARATOR).length());
       }
 
       pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         tgrade = s.left(pos).toInt();
-        s.remove (0, pos+QString(VCB_SEPARATOR).length());
+        s.remove (0, pos+TQString(VCB_SEPARATOR).length());
       }
 
       pos = s.find (VCB_SEPARATOR);
       if (pos >= 0) {
         odate = s.left(pos).toInt();
-        s.remove (0, pos+QString(VCB_SEPARATOR).length());
+        s.remove (0, pos+TQString(VCB_SEPARATOR).length());
       }
 
       if (s.stripWhiteSpace().length() > 0) {
@@ -188,12 +188,12 @@ bool kvoctrainDoc::loadFromVcb (QTextStream& is)
 }
 
 
-void kvoctrainDoc::errorVcb (int /*line*/, const QString &text )
+void kvoctrainDoc::errorVcb (int /*line*/, const TQString &text )
 {
    unknown_elem = true;
-   QApplication::setOverrideCursor( arrowCursor, true );
-   QString s = kapp->makeStdCaption(i18n("Error in vocabbox file"));
-   QString msg = text;
+   TQApplication::setOverrideCursor( arrowCursor, true );
+   TQString s = kapp->makeStdCaption(i18n("Error in vocabbox file"));
+   TQString msg = text;
    KMessageBox::error(0, msg, s);
-   QApplication::restoreOverrideCursor();
+   TQApplication::restoreOverrideCursor();
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
index e99c2e31..7cce072b 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
@@ -30,7 +30,7 @@
 #include "kvoctraincore.h"
 
 
-bool kvoctrainDoc::loadFromVoc(QTextStream& is)
+bool kvoctrainDoc::loadFromVoc(TQTextStream& is)
 {
   author = "http://www.vokabeln.de"; //DO NOT translate
 
@@ -38,7 +38,7 @@ bool kvoctrainDoc::loadFromVoc(QTextStream& is)
   vocabulary.clear();
   lesson_descr.clear();
 
-  QString title,
+  TQString title,
           lang1,
           lang2,
           expression,
@@ -53,7 +53,7 @@ bool kvoctrainDoc::loadFromVoc(QTextStream& is)
 
   int lines = 10000;
 
-  QStringList titles,
+  TQStringList titles,
               languages,
               words;
 
@@ -68,7 +68,7 @@ bool kvoctrainDoc::loadFromVoc(QTextStream& is)
       title.append(" ");
   }
 
-  titles = QStringList::split("\",", title);
+  titles = TQStringList::split("\",", title);
   doctitle = titles[0].mid(1);
   wordCount = titles[1].section(',', 0, 0).toInt();
 
@@ -76,7 +76,7 @@ bool kvoctrainDoc::loadFromVoc(QTextStream& is)
   is.readLine();
 
   lang1 = is.readLine();
-  languages = QStringList::split("\",", lang1);
+  languages = TQStringList::split("\",", lang1);
 
   langs.push_back(languages[0].mid(1));
   langs.push_back(languages[1].mid(1));
@@ -102,7 +102,7 @@ bool kvoctrainDoc::loadFromVoc(QTextStream& is)
         expression.append(" ");
     }
 
-    words = QStringList::split("\",", expression);
+    words = TQStringList::split("\",", expression);
     original = words[0].mid(1);
     translation = words[1].mid(1);
     lesson = words[2].toInt();
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
index af0ba06d..c3f546c7 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
@@ -28,7 +28,7 @@
 
 #include <kdebug.h>
 
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
 
 bool kvoctrainDoc::saveTypeNameKvtMl (XmlWriter &xml)
 {
@@ -124,9 +124,9 @@ bool kvoctrainDoc::saveLessonKvtMl (XmlWriter &xml)
       xml.startTag (KV_LESS_DESC, false);
       xml.addAttribute (KV_LESS_NO, lfn+1 );
       if (getCurrentLesson() == lfn+1)
-        xml.addAttribute (KV_LESS_CURR, (QString) "1" );
+        xml.addAttribute (KV_LESS_CURR, (TQString) "1" );
       if (lfn < (int) lessons_in_query.size() && lessons_in_query[lfn])
-        xml.addAttribute (KV_LESS_QUERY, (QString) "1" );
+        xml.addAttribute (KV_LESS_QUERY, (TQString) "1" );
       xml.closeTag();
       xml.writeText (lesson_descr[lfn]);
       xml.endTag (KV_LESS_DESC, true);
@@ -140,8 +140,8 @@ bool kvoctrainDoc::saveLessonKvtMl (XmlWriter &xml)
 }
 
 
-bool kvoctrainDoc::saveConjug (const Conjugation &curr_conjug, QString type,
-                               XmlWriter &xml, QString identstr)
+bool kvoctrainDoc::saveConjug (const Conjugation &curr_conjug, TQString type,
+                               XmlWriter &xml, TQString identstr)
 {
   bool linefeed = type == CONJ_PREFIX;
   if (linefeed)
@@ -260,7 +260,7 @@ bool kvoctrainDoc::saveConjugHeader(vector<Conjugation> &curr_conjug,
   xml.startTag (KV_CONJUG_GRP, false);
   xml.closeTag(false, true);
 
-  QString def, indef, s;
+  TQString def, indef, s;
   for (int ent = 0; ent < QMIN((int) curr_conjug.size(), numLangs()); ent++) {
     xml.writeText("  ");            // indent entry a bit
     xml.startTag (KV_CON_ENTRY, false);
@@ -310,7 +310,7 @@ bool kvoctrainDoc::saveComparison (const Comparison &comp,
     return true;
 
   xml.writeText("\n");
-  QString identstr;
+  TQString identstr;
   identstr.fill (' ', ident+1);
 
   xml.writeText(identstr);
@@ -361,7 +361,7 @@ bool kvoctrainDoc::saveMultipleChoice (const MultipleChoice &mc,
     return true;
 
   xml.writeText("\n");
-  QString identstr;
+  TQString identstr;
   identstr.fill (' ', ident+1);
 
   xml.writeText(identstr);
@@ -431,7 +431,7 @@ bool kvoctrainDoc::saveConjugEntry (Conjugation &curr_conjug,
   if (curr_conjug.numEntries() == 0 )
     return true;
 
-  QString identstr;
+  TQString identstr;
   identstr.fill (' ', ident+1);
   xml.writeText("\n");
 
@@ -439,8 +439,8 @@ bool kvoctrainDoc::saveConjugEntry (Conjugation &curr_conjug,
   xml.startTag (KV_CONJUG_GRP, false);
   xml.closeTag(false, true);
 
-  QString def, indef, s;
-  QString type;
+  TQString def, indef, s;
+  TQString type;
   for (int lfn = 0; lfn < (int) curr_conjug.numEntries(); lfn++) {
     xml.writeText(identstr+" ");            // indent entry a bit
     xml.startTag (KV_CON_TYPE, false);
@@ -484,7 +484,7 @@ bool kvoctrainDoc::saveArticleKvtMl (XmlWriter &xml)
   xml.startTag (KV_ARTICLE_GRP, false);
   xml.closeTag(false, true);
 
-  QString def, indef, s;
+  TQString def, indef, s;
   for (int lfn = 0; lfn < QMIN((int) articles.size(), numLangs()); lfn++) {
     xml.writeText("  ");            // indent entry a bit
     xml.startTag (KV_ART_ENTRY, false);
@@ -575,10 +575,10 @@ bool kvoctrainDoc::saveOptionsKvtMl (XmlWriter &xml)
 }
 
 
-bool kvoctrainDoc::saveToKvtMl (QTextStream& os, QString &title) {
+bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) {
   bool first_expr = true;
 
-  os.setCodec(QTextCodec::codecForName("UTF-8"));
+  os.setCodec(TQTextCodec::codecForName("UTF-8"));
 
   XmlWriter xml (os);
   xml.setAutoEndl (false);
@@ -650,10 +650,10 @@ bool kvoctrainDoc::saveToKvtMl (QTextStream& os, QString &title) {
   xml.writeText ("\n ");
   xml.startTag (KV_DOCTYPE, false);
   xml.writeText ("\n ");
-  xml.addAttribute (KV_ENCODING, (QString)"UTF-8");
+  xml.addAttribute (KV_ENCODING, (TQString)"UTF-8");
   xml.writeText ("\n ");
 
-  xml.addAttribute (KV_GENERATOR, (QString) "kvoctrain" KVD_VERS_PREFIX KVOCTRAIN_VERSION_STRING);
+  xml.addAttribute (KV_GENERATOR, (TQString) "kvoctrain" KVD_VERS_PREFIX KVOCTRAIN_VERSION_STRING);
   xml.writeText ("\n ");
   xml.addAttribute (KV_COLS,  numLangs() );
   xml.writeText ("\n ");
@@ -707,7 +707,7 @@ bool kvoctrainDoc::saveToKvtMl (QTextStream& os, QString &title) {
   if (!saveUsageNameKvtMl(xml))
     return false;
 
-  QString q_org, q_trans;
+  TQString q_org, q_trans;
   vector<kvoctrainExpr>::const_iterator first =  vocabulary.begin ();
   getQueryLang (q_org, q_trans);
 
@@ -725,7 +725,7 @@ bool kvoctrainDoc::saveToKvtMl (QTextStream& os, QString &title) {
       emit progressChanged(this, ent_no / (int) f_ent_percent);
 
     if ((*first).getLesson() != 0) {   // entry belongs to lesson x
-      QString ls;
+      TQString ls;
       int lm = (*first).getLesson();
       if (lm > (int) lesson_descr.size() ) { // should not be
         kdError() << "index of lesson member too high: " << lm << endl;
@@ -736,11 +736,11 @@ bool kvoctrainDoc::saveToKvtMl (QTextStream& os, QString &title) {
     }
 
     if ((*first).isInQuery()) {   // entry was selected for query
-      xml.addAttribute (KV_SELECTED, (QString) "1");
+      xml.addAttribute (KV_SELECTED, (TQString) "1");
     }
 
     if (!(*first).isActive()) {   // entry was inactive
-      xml.addAttribute (KV_INACTIVE, (QString) "1");
+      xml.addAttribute (KV_INACTIVE, (TQString) "1");
     }
 
     if ((*first).uniqueType() && !(*first).getType(0).isEmpty()) {
@@ -750,7 +750,7 @@ bool kvoctrainDoc::saveToKvtMl (QTextStream& os, QString &title) {
     xml.closeTag ();
     xml.startTag (KV_ORG, false);
     if (first_expr) { // save space, only tell language in first entry
-      QString s;
+      TQString s;
       s.setNum (getSizeHint (0));
       xml.addAttribute (KV_SIZEHINT, s);
 
@@ -759,9 +759,9 @@ bool kvoctrainDoc::saveToKvtMl (QTextStream& os, QString &title) {
          s = "original";
       xml.addAttribute (KV_LANG, s);
       if (s == q_org)
-        xml.addAttribute (KV_QUERY, (QString) KV_O);
+        xml.addAttribute (KV_QUERY, (TQString) KV_O);
       else if (s == q_trans)
-        xml.addAttribute (KV_QUERY, (QString) KV_T);
+        xml.addAttribute (KV_QUERY, (TQString) KV_T);
 
     }
 
@@ -802,8 +802,8 @@ bool kvoctrainDoc::saveToKvtMl (QTextStream& os, QString &title) {
     if (!saveMultipleChoice ((*first).getMultipleChoice(0), xml, 1))
         return false;
 
-    QString s;
-    QString entype = s = (*first).getType(0);
+    TQString s;
+    TQString entype = s = (*first).getType(0);
     int pos = s.find (QM_TYPE_DIV);
     if (pos >= 0)
       entype = s.left (pos);
@@ -830,7 +830,7 @@ bool kvoctrainDoc::saveToKvtMl (QTextStream& os, QString &title) {
     while (trans < (int)langs.size()) {
       xml.startTag (KV_TRANS, false);
       if (first_expr) {   // save space, only tell language in first entry
-        QString s;
+        TQString s;
         s.setNum (getSizeHint (trans));
         xml.addAttribute (KV_SIZEHINT, s);
 
@@ -841,12 +841,12 @@ bool kvoctrainDoc::saveToKvtMl (QTextStream& os, QString &title) {
         }
         xml.addAttribute (KV_LANG, s);
         if (s == q_org)
-          xml.addAttribute (KV_QUERY, (QString) KV_O);
+          xml.addAttribute (KV_QUERY, (TQString) KV_O);
         else if (s == q_trans)
-          xml.addAttribute (KV_QUERY, (QString) KV_T);
+          xml.addAttribute (KV_QUERY, (TQString) KV_T);
       }
 
-      QString s1, s2;
+      TQString s1, s2;
 
       if ((*first).getGrade(trans, false) != 0
           ||(*first).getGrade(trans, true) != 0) {
@@ -923,8 +923,8 @@ bool kvoctrainDoc::saveToKvtMl (QTextStream& os, QString &title) {
       if (!saveMultipleChoice ((*first).getMultipleChoice(trans), xml, 1))
           return false;
 
-      QString s;
-      QString entype = s = (*first).getType(0);
+      TQString s;
+      TQString entype = s = (*first).getType(0);
       int pos = s.find (QM_TYPE_DIV);
       if (pos >= 0)
         entype = s.left (pos);
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index f2701bed..a10aa28a 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -34,8 +34,8 @@
 #include <kmessagebox.h>
 #include <kio/netaccess.h>
 
-#include <qfileinfo.h>
-#include <qregexp.h>
+#include <tqfileinfo.h>
+#include <tqregexp.h>
 
 #include <algorithm>
 #include <functional>
@@ -53,7 +53,7 @@ using namespace std;
 //  kvoctrainDoc
 //********************************************************
 
-void kvoctrainDoc::setVersion (const QString & vers)
+void kvoctrainDoc::setVersion (const TQString & vers)
 {
    doc_version = vers;
 }
@@ -67,7 +67,7 @@ void kvoctrainDoc::getVersion(int &, int &, int &)
 void kvoctrainDoc::Init ()
 {
 
-  setVersion (QString::fromUtf8(KVOCTRAIN_VERSION_STRING));
+  setVersion (TQString::fromUtf8(KVOCTRAIN_VERSION_STRING));
   lesson_descr.clear();
   type_descr.clear();
   tense_descr.clear();
@@ -91,18 +91,18 @@ void kvoctrainDoc::Init ()
 }
 
 
-kvoctrainDoc::kvoctrainDoc(QObject *parent, const KURL& url)
+kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
 {
   Init();
   if (!url.isEmpty())
     doc_url = url;
 
-  connect( this, SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, SLOT(slotProgress(kvoctrainDoc*,int)) );
+  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
 
-  QString tmpfile;
+  TQString tmpfile;
   if (KIO::NetAccess::download( url, tmpfile, 0 ))
   {
-    QFile f(tmpfile);
+    TQFile f(tmpfile);
     if (!f.open(IO_ReadOnly))
     {
       KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").arg(url.path()));
@@ -114,59 +114,59 @@ kvoctrainDoc::kvoctrainDoc(QObject *parent, const KURL& url)
     bool read = false;
     while (!read) {
 
-      QApplication::setOverrideCursor( waitCursor );
+      TQApplication::setOverrideCursor( waitCursor );
       switch (ft) {
         case kvtml:
         {
-          QTextStream is (&f);
+          TQTextStream is (&f);
           read = loadFromKvtMl (is);
         }
         break;
 
         case vt_lex:
         {
-          QTextStream is (&f);
+          TQTextStream is (&f);
           read = loadFromLex (is);
         }
         break;
 
         case vt_vcb:
         {
-          QTextStream is (&f);
+          TQTextStream is (&f);
           read = loadFromVcb (is);
         }
         break;
 
         case vt_voc:
         {
-          QTextStream is (&f);
+          TQTextStream is (&f);
           read = loadFromVoc(is);
         }
         break;
 
         case csv:
         {
-          QTextStream is(&f);
+          TQTextStream is(&f);
           read = loadFromCsv(is);
         }
         break;
 
         default:
         {
-          QTextStream is (&f);
+          TQTextStream is (&f);
           read = loadFromKvtMl (is);
         }
       }
 
-      QApplication::restoreOverrideCursor();
+      TQApplication::restoreOverrideCursor();
 
       if (!read) {
         if (unknown_attr || unknown_elem ) {
           Init();
           return;
         }
-        QString format = i18n("Could not load \"%1\"\nDo you want to try again?");
-        QString msg = format.arg(url.path());
+        TQString format = i18n("Could not load \"%1\"\nDo you want to try again?");
+        TQString msg = format.arg(url.path());
         int result = KMessageBox::warningContinueCancel(0, msg,
                                                         kapp->makeStdCaption(i18n("I/O Failure")),
                                                         i18n("&Retry"));
@@ -187,15 +187,15 @@ kvoctrainDoc::~kvoctrainDoc()
 }
 
 
-bool kvoctrainDoc::saveAs (QObject *parent, const KURL & url, QString title, FileType ft)
+bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, FileType ft)
 {
-  connect( this, SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, SLOT(slotProgress(kvoctrainDoc*,int)) );
+  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
 
   KURL tmp (url);
   if (title == i18n("Untitled"))
-    title = QString::null;
+    title = TQString::null;
   if (title == doc_url.fileName())
-    title = QString::null;
+    title = TQString::null;
 
   if (ft == automatic)
   {
@@ -218,7 +218,7 @@ bool kvoctrainDoc::saveAs (QObject *parent, const KURL & url, QString title, Fil
   while (!saved)
   {
 
-    QFile f(tmp.path());
+    TQFile f(tmp.path());
 
     if (!f.open(IO_WriteOnly))
     {
@@ -226,28 +226,28 @@ bool kvoctrainDoc::saveAs (QObject *parent, const KURL & url, QString title, Fil
       return false;
     }
 
-    QApplication::setOverrideCursor( waitCursor );
+    TQApplication::setOverrideCursor( waitCursor );
     switch (ft) {
       case kvtml: {
-        QTextStream os( &f );                       // serialize using f
+        TQTextStream os( &f );                       // serialize using f
         saved = saveToKvtMl(os, title);
       }
       break;
 
       case vt_lex: {
-        QTextStream os( &f );                       // serialize using f
+        TQTextStream os( &f );                       // serialize using f
         saved = saveToLex(os, title);
       }
       break;
 
       case vt_vcb: {
-        QTextStream os( &f );                       // serialize using f
+        TQTextStream os( &f );                       // serialize using f
         saved = saveToVcb(os, title);
       }
       break;
 
       case csv: {
-        QTextStream os( &f );                       // serialize using f
+        TQTextStream os( &f );                       // serialize using f
         saved = saveToCsv(os, title);
       }
       break;
@@ -258,11 +258,11 @@ bool kvoctrainDoc::saveAs (QObject *parent, const KURL & url, QString title, Fil
       break;
     }
     f.close();
-    QApplication::restoreOverrideCursor();
+    TQApplication::restoreOverrideCursor();
 
     if (!saved) {
-      QString format = i18n("Could not save \"%1\"\nDo you want to try again?");
-      QString msg = format.arg(tmp.path());
+      TQString format = i18n("Could not save \"%1\"\nDo you want to try again?");
+      TQString msg = format.arg(tmp.path());
       int result = KMessageBox::warningContinueCancel(0, msg,
                                                       kapp->makeStdCaption(i18n("I/O Failure")),
                                                       i18n("&Retry"));
@@ -292,9 +292,9 @@ void kvoctrainDoc::removeEntry(int index)
 }
 
 
-int kvoctrainDoc::findIdent (const QString &lang) const
+int kvoctrainDoc::findIdent (const TQString &lang) const
 {
-  vector<QString>::const_iterator first = langs.begin();
+  vector<TQString>::const_iterator first = langs.begin();
   int count = 0;
   while (first != langs.end()) {
     if ( *first == lang)
@@ -306,7 +306,7 @@ int kvoctrainDoc::findIdent (const QString &lang) const
 }
 
 
-QString kvoctrainDoc::getIdent (int index) const
+TQString kvoctrainDoc::getIdent (int index) const
 {
   if (index >= (int)langs.size() || index < 1 )
     return "";
@@ -315,7 +315,7 @@ QString kvoctrainDoc::getIdent (int index) const
 }
 
 
-void kvoctrainDoc::setIdent (int idx, const QString &id)
+void kvoctrainDoc::setIdent (int idx, const TQString &id)
 {
   if (idx < (int)langs.size() && idx >= 1 ) {
     langs[idx] = id;
@@ -323,7 +323,7 @@ void kvoctrainDoc::setIdent (int idx, const QString &id)
 }
 
 
-QString kvoctrainDoc::getTypeName (int index) const
+TQString kvoctrainDoc::getTypeName (int index) const
 {
   if (index >= (int)type_descr.size())
     return "";
@@ -332,7 +332,7 @@ QString kvoctrainDoc::getTypeName (int index) const
 }
 
 
-void kvoctrainDoc::setTypeName (int idx, QString &id)
+void kvoctrainDoc::setTypeName (int idx, TQString &id)
 {
   if (idx >= (int)type_descr.size())
     for (int i = (int)type_descr.size(); i <= idx; i++)
@@ -342,7 +342,7 @@ void kvoctrainDoc::setTypeName (int idx, QString &id)
 }
 
 
-QString kvoctrainDoc::getTenseName (int index) const
+TQString kvoctrainDoc::getTenseName (int index) const
 {
   if (index >= (int)tense_descr.size())
     return "";
@@ -351,7 +351,7 @@ QString kvoctrainDoc::getTenseName (int index) const
 }
 
 
-void kvoctrainDoc::setTenseName (int idx, QString &id)
+void kvoctrainDoc::setTenseName (int idx, TQString &id)
 {
   if (idx >= (int)tense_descr.size())
     for (int i = (int)tense_descr.size(); i <= idx; i++)
@@ -361,7 +361,7 @@ void kvoctrainDoc::setTenseName (int idx, QString &id)
 }
 
 
-QString kvoctrainDoc::getUsageName (int index) const
+TQString kvoctrainDoc::getUsageName (int index) const
 {
   if (index >= (int)usage_descr.size())
     return "";
@@ -370,7 +370,7 @@ QString kvoctrainDoc::getUsageName (int index) const
 }
 
 
-void kvoctrainDoc::setUsageName (int idx, QString &id)
+void kvoctrainDoc::setUsageName (int idx, TQString &id)
 {
   if (idx >= (int)usage_descr.size())
     for (int i = (int)usage_descr.size(); i <= idx; i++)
@@ -499,7 +499,7 @@ void kvoctrainDoc::removeIdent (int index)
 }
 
 
-QString kvoctrainDoc::getOriginalIdent () const
+TQString kvoctrainDoc::getOriginalIdent () const
 {
   if (langs.size() > 0)
     return langs[0];
@@ -508,7 +508,7 @@ QString kvoctrainDoc::getOriginalIdent () const
 }
 
 
-void kvoctrainDoc::setOriginalIdent (const QString &id)
+void kvoctrainDoc::setOriginalIdent (const TQString &id)
 {
   if (langs.size() > 0) {
     langs[0] = id;
@@ -528,9 +528,9 @@ public:
     {
       return
         !dir
-        ? (QString::compare(x.getOriginal().upper(),
+        ? (TQString::compare(x.getOriginal().upper(),
                             y.getOriginal().upper() ) < 0)
-        : (QString::compare(x.getOriginal().upper(),
+        : (TQString::compare(x.getOriginal().upper(),
                             y.getOriginal().upper() ) > 0);
     }
 
@@ -553,16 +553,16 @@ public:
       if (x.getLesson() != y.getLesson() )
         return
           !dir
-          ? (QString::compare(doc.getLessonDescr(x.getLesson()).upper(),
+          ? (TQString::compare(doc.getLessonDescr(x.getLesson()).upper(),
                               doc.getLessonDescr(y.getLesson()).upper() ) < 0)
-          : (QString::compare(doc.getLessonDescr(x.getLesson()).upper(),
+          : (TQString::compare(doc.getLessonDescr(x.getLesson()).upper(),
                               doc.getLessonDescr(y.getLesson()).upper() ) > 0);
       else
         return
           !dir
-          ? (QString::compare(x.getOriginal().upper(),
+          ? (TQString::compare(x.getOriginal().upper(),
                               y.getOriginal().upper() ) < 0)
-          : (QString::compare(x.getOriginal().upper(),
+          : (TQString::compare(x.getOriginal().upper(),
                               y.getOriginal().upper() ) > 0);
     }
 
@@ -591,9 +591,9 @@ public:
       else
         return
           !dir
-          ? (QString::compare(x.getOriginal().upper(),
+          ? (TQString::compare(x.getOriginal().upper(),
                               y.getOriginal().upper() ) < 0)
-          : (QString::compare(x.getOriginal().upper(),
+          : (TQString::compare(x.getOriginal().upper(),
                               y.getOriginal().upper() ) > 0);
     }
 
@@ -615,9 +615,9 @@ public:
     {
       return
         !dir
-        ? (QString::compare(x.getTranslation(index).upper(),
+        ? (TQString::compare(x.getTranslation(index).upper(),
                             y.getTranslation(index).upper() ) < 0)
-        : (QString::compare(x.getTranslation(index).upper(),
+        : (TQString::compare(x.getTranslation(index).upper(),
                             y.getTranslation(index).upper() ) > 0);
     }
 
@@ -740,7 +740,7 @@ void kvoctrainDoc::resetEntry (int index, int lesson)
 }
 
 
-QString kvoctrainDoc::getLessonDescr(int idx) const
+TQString kvoctrainDoc::getLessonDescr(int idx) const
 {
   if (idx == 0)
     return i18n("<no lesson>");
@@ -778,7 +778,7 @@ void kvoctrainDoc::setLessonsInQuery(vector<int> lesson_iq)
 }
 
 
-QString kvoctrainDoc::getTitle() const
+TQString kvoctrainDoc::getTitle() const
 {
   if (doctitle.isEmpty())
     return doc_url.fileName();
@@ -787,49 +787,49 @@ QString kvoctrainDoc::getTitle() const
 }
 
 
-QString kvoctrainDoc::getAuthor() const
+TQString kvoctrainDoc::getAuthor() const
 {
   return author;
 }
 
 
-QString kvoctrainDoc::getLicense() const
+TQString kvoctrainDoc::getLicense() const
 {
   return license;
 }
 
 
-QString kvoctrainDoc::getDocRemark() const
+TQString kvoctrainDoc::getDocRemark() const
 {
   return doc_remark;
 }
 
 
-void kvoctrainDoc::setTitle(const QString & title)
+void kvoctrainDoc::setTitle(const TQString & title)
 {
   doctitle = title.stripWhiteSpace();
 }
 
 
-void kvoctrainDoc::setAuthor(const QString & s)
+void kvoctrainDoc::setAuthor(const TQString & s)
 {
   author = s.stripWhiteSpace();
 }
 
 
-void kvoctrainDoc::setLicense(const QString & s)
+void kvoctrainDoc::setLicense(const TQString & s)
 {
   license = s.stripWhiteSpace();
 }
 
 
-void kvoctrainDoc::setDocRemark(const QString & s)
+void kvoctrainDoc::setDocRemark(const TQString & s)
 {
   doc_remark = s.stripWhiteSpace();
 }
 
 
-int kvoctrainDoc::search(QString substr, int id,
+int kvoctrainDoc::search(TQString substr, int id,
                          int first, int last,
                          bool word_start,
                          bool)
@@ -877,12 +877,12 @@ int kvoctrainDoc::search(QString substr, int id,
 #define _BITMASK    0x3F
 #define _BITUSED    6
 
-QString kvoctrainDoc::compressDate(unsigned long l) const
+TQString kvoctrainDoc::compressDate(unsigned long l) const
 {
    if (l == 0)
      return "";
 
-   QString res;
+   TQString res;
    if (l <= KVD_ZERO_TIME)
      l = 1;
    else
@@ -896,7 +896,7 @@ QString kvoctrainDoc::compressDate(unsigned long l) const
 }
 
 
-unsigned long kvoctrainDoc::decompressDate(QString s) const
+unsigned long kvoctrainDoc::decompressDate(TQString s) const
 {
    if (s.isEmpty())
      return 0;
@@ -912,13 +912,13 @@ unsigned long kvoctrainDoc::decompressDate(QString s) const
 }
 
 
-kvoctrainDoc::FileType kvoctrainDoc::detectFT(const QString &filename)
+kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename)
 {
-   QFile f( filename );
+   TQFile f( filename );
    if (!f.open( IO_ReadOnly ))
      return csv;
 
-   QDataStream is( &f );
+   TQDataStream is( &f );
 
    Q_INT8 c1, c2, c3, c4, c5;
    is >> c1
@@ -927,8 +927,8 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const QString &filename)
       >> c4
       >> c5;  // guess filetype by first x bytes
 
-   QTextStream ts (&f);
-   QString line;
+   TQTextStream ts (&f);
+   TQString line;
    line = ts.readLine();
    line.insert (0, c5);
    line.insert (0, c4);
@@ -949,7 +949,7 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const QString &filename)
    if (line == LEX_IDENT_50)
      return vt_lex;
 
-   if (c1 == '"' && (line.contains('"') == 1 || line.contains(QRegExp("\",[0-9]"))))
+   if (c1 == '"' && (line.contains('"') == 1 || line.contains(TQRegExp("\",[0-9]"))))
      return vt_voc;
 
    return csv;
@@ -968,9 +968,9 @@ public:
 
   bool operator< (const expRef& y) const
     {
-      QString s1 = exp->getOriginal();
-      QString s2 = y.exp->getOriginal();
-      int cmp = QString::compare(s1.upper(), s2.upper());
+      TQString s1 = exp->getOriginal();
+      TQString s2 = y.exp->getOriginal();
+      int cmp = TQString::compare(s1.upper(), s2.upper());
       if (cmp != 0)
         return cmp < 0;
 
@@ -978,7 +978,7 @@ public:
 
         s1 = exp->getTranslation(i);
         s2 = y.exp->getTranslation(i);
-        cmp = QString::compare(s1.upper(), s2.upper() );
+        cmp = TQString::compare(s1.upper(), s2.upper() );
         if (cmp != 0)
           return cmp < 0;
       }
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
index d0defb5a..2f2c5f99 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
@@ -31,7 +31,7 @@
 #include <config.h>
 #endif
 
-#include <qobject.h>
+#include <tqobject.h>
 
 #include <kurl.h>
 
@@ -265,7 +265,7 @@ class kvoctrainDoc : public QObject
    * @param obj calling object
    * @param url URL of file to parse
    */
-  kvoctrainDoc(QObject* obj, const KURL& url);
+  kvoctrainDoc(TQObject* obj, const KURL& url);
 
   /** Destructor for the fileclass of the application */
   ~kvoctrainDoc();
@@ -325,25 +325,25 @@ class kvoctrainDoc : public QObject
 
   /** returns original�s identifier
    */
-  QString getOriginalIdent () const;
+  TQString getOriginalIdent () const;
 
   /** set original�s identifier
    */
-  void setOriginalIdent (const QString &id);
+  void setOriginalIdent (const TQString &id);
 
   /** returns identifier of translation x
    *
    * @param index            number of translation 1..x
    * @result                 ident string: de=german, en=englisch, ..
    */
-  QString getIdent (int index) const;
+  TQString getIdent (int index) const;
 
   /** sets identifier of translation
    *
    * @param index            number of translation 1..x
    * @param lang             ident string: de=german, en=englisch, ..
    */
-  void setIdent (int index, const QString &lang);
+  void setIdent (int index, const TQString &lang);
 
   /** removes identifier an the according translation in all entries
    *
@@ -356,67 +356,67 @@ class kvoctrainDoc : public QObject
    * @param lang             identifier of language
    * @result                 index of translation, 0=original, -1=none
    */
-  int findIdent (const QString &lang) const;
+  int findIdent (const TQString &lang) const;
 
   /** returns attribute string
    *
    * @param index            number of attribute
    * @result                 string
    */
-  QString getTypeName (int index) const;
+  TQString getTypeName (int index) const;
 
   /** sets attribute string
    *
    * @param index            number of attribute
    * @param str              name of attribute
    */
-  void setTypeName (int index, QString &str);
+  void setTypeName (int index, TQString &str);
 
   /** gets descr of types  */
-  inline vector<QString> getTypeDescr() const { return type_descr; }
+  inline vector<TQString> getTypeDescr() const { return type_descr; }
 
   /** sets descr of types  */
-  inline void setTypeDescr(vector<QString> names) { type_descr = names; }
+  inline void setTypeDescr(vector<TQString> names) { type_descr = names; }
 
   /** returns tense string
    *
    * @param index            number of tense
    * @result                 string
    */
-  QString getTenseName (int index) const;
+  TQString getTenseName (int index) const;
 
   /** sets tense string
    *
    * @param index            number of tense
    * @param str              name of tense
    */
-  void setTenseName (int index, QString &str);
+  void setTenseName (int index, TQString &str);
 
   /** gets descr of tenses  */
-  inline vector<QString> getTenseDescr() const { return tense_descr; }
+  inline vector<TQString> getTenseDescr() const { return tense_descr; }
 
   /** sets descr of tenses  */
-  inline void setTenseDescr(vector<QString> names) { tense_descr = names; }
+  inline void setTenseDescr(vector<TQString> names) { tense_descr = names; }
 
   /** returns usage string
    *
    * @param index            number of usage
    * @result                 string
    */
-  QString getUsageName (int index) const;
+  TQString getUsageName (int index) const;
 
   /** sets usage string
    *
    * @param index            number of usage
    * @param str              name of usage
    */
-  void setUsageName (int index, QString &str);
+  void setUsageName (int index, TQString &str);
 
   /** gets descr of usages  */
-  inline vector<QString> getUsageDescr() const { return usage_descr; }
+  inline vector<TQString> getUsageDescr() const { return usage_descr; }
 
   /** sets descr of usages  */
-  inline void setUsageDescr(vector<QString> names) { usage_descr = names; }
+  inline void setUsageDescr(vector<TQString> names) { usage_descr = names; }
 
 
   /** saves the data under the given name
@@ -424,7 +424,7 @@ class kvoctrainDoc : public QObject
    * @param url     if url is empty (or NULL) actual name is preserved
    * @result         true if successful
    */
-  bool saveAs (QObject *parent, const KURL & url, QString title, FileType ft);
+  bool saveAs (TQObject *parent, const KURL & url, TQString title, FileType ft);
 
   /** returns count of entries
    */
@@ -444,7 +444,7 @@ class kvoctrainDoc : public QObject
 
   /** append new lang ident
    */
-  inline void appendLang(const QString & id) { langs.push_back(id); }
+  inline void appendLang(const TQString & id) { langs.push_back(id); }
 
   /** returns pointer to expression object x
    *
@@ -464,7 +464,7 @@ class kvoctrainDoc : public QObject
    * @param tolerant
    * @result          index of found entry, -1 if none
    */
-  int search(QString substr, int id,
+  int search(TQString substr, int id,
              int first=0, int last=-1, bool word_start = false, bool tolerant=false);
 
   /** returns url of xml file  */
@@ -474,34 +474,34 @@ class kvoctrainDoc : public QObject
   inline void setURL(const KURL& url) {doc_url = url;}
 
   /** returns title of xml file  */
-  QString getTitle() const;
+  TQString getTitle() const;
 
   /** returns author of file  */
-  QString getAuthor() const;
+  TQString getAuthor() const;
 
   /** returns license of file  */
-  QString getLicense() const;
+  TQString getLicense() const;
 
   /** returns remark of file  */
-  QString getDocRemark() const;
+  TQString getDocRemark() const;
 
-  inline void getQueryLang(QString &org, QString &trans) const
+  inline void getQueryLang(TQString &org, TQString &trans) const
     { org = queryorg; trans = querytrans; }
 
-  inline void setQueryLang(const QString &org, const QString &trans)
+  inline void setQueryLang(const TQString &org, const TQString &trans)
     { queryorg = org; querytrans = trans; }
 
   /** sets title of xml file  */
-  void setTitle(const QString & title);
+  void setTitle(const TQString & title);
 
   /** sets author of file  */
-  void setAuthor(const QString & author);
+  void setAuthor(const TQString & author);
 
   /** sets license of file  */
-  void setLicense(const QString & license);
+  void setLicense(const TQString & license);
 
   /** sets remark of file  */
-  void setDocRemark(const QString & rem);
+  void setDocRemark(const TQString & rem);
 
   /** gets version of loaded file  */
   void getVersion(int &major, int &minor, int &patch);
@@ -515,7 +515,7 @@ class kvoctrainDoc : public QObject
   inline void setCurrentLesson(int lesson) { current_lesson = lesson; }
 
   /** returns descr of lesson  */
-  QString getLessonDescr(int index) const;
+  TQString getLessonDescr(int index) const;
 
   /** returns lessons in current query  */
   vector<int> getLessonsInQuery() const;
@@ -523,12 +523,12 @@ class kvoctrainDoc : public QObject
   /** sets lessons in current query  */
   void setLessonsInQuery(vector<int>);
 
-  inline vector<QString> getLessonDescr() const { return lesson_descr; }
+  inline vector<TQString> getLessonDescr() const { return lesson_descr; }
 
   inline int numLessons () const {return (int) lesson_descr.size(); }
 
   /** sets descr of lesson  */
-  inline void setLessonDescr(vector<QString> names) { lesson_descr = names; }
+  inline void setLessonDescr(vector<TQString> names) { lesson_descr = names; }
 
   /** returns pointer to conjugations if available
    *
@@ -557,10 +557,10 @@ class kvoctrainDoc : public QObject
   void setArticle(int index, const Article &art);
 
   /** compress date */
-  QString compressDate(unsigned long) const;
+  TQString compressDate(unsigned long) const;
 
   /** decompress date */
-  unsigned long decompressDate(QString) const;
+  unsigned long decompressDate(TQString) const;
 
   /** returns recommended size
    *
@@ -576,16 +576,16 @@ class kvoctrainDoc : public QObject
    */
   void setSizeHint (int index, const int width);
 
-  bool unknownAttribute (int line, const QString &name, const QString &attr);
-  void unknownElement (int line, const QString &elem );
-  void errorKvtMl (int line, const QString &text );
-  void warningKvtMl (int line, const QString &text );
+  bool unknownAttribute (int line, const TQString &name, const TQString &attr);
+  void unknownElement (int line, const TQString &elem );
+  void errorKvtMl (int line, const TQString &text );
+  void warningKvtMl (int line, const TQString &text );
 
-  void errorLex (int line, const QString &text );
+  void errorLex (int line, const TQString &text );
 
-  void errorCsv (int line, const QString &text );
+  void errorCsv (int line, const TQString &text );
 
-  FileType detectFT(const QString &filename);
+  FileType detectFT(const TQString &filename);
 
   friend class QueryManager;
 
@@ -598,14 +598,14 @@ protected:
   void Init();
 
   /** sets version of loaded file  */
-  void setVersion(const QString & ver);
+  void setVersion(const TQString & ver);
 
-  bool saveToKvtMl     (QTextStream& os, QString &title);
-  bool loadFromKvtMl   (QTextStream& is);
+  bool saveToKvtMl     (TQTextStream& os, TQString &title);
+  bool loadFromKvtMl   (TQTextStream& is);
   bool parseBody_kvtml (XmlElement elem, XmlReader& xml);
   bool parseBody_e     (XmlElement elem, XmlReader& xml);
-  bool extract_simple_tag (QString tag_name, XmlReader& xml,
-                           XmlElement &elem, QString &data,
+  bool extract_simple_tag (TQString tag_name, XmlReader& xml,
+                           XmlElement &elem, TQString &data,
                            bool check_empty = true);
 
   bool extract_T_GROUP_attr (XmlReader &xml,
@@ -614,23 +614,23 @@ protected:
                              XmlElement &elem, int &no);
   bool extract_O_T_attr (XmlReader &xml,
                          XmlElement &elem,
-                         QString &lang,
+                         TQString &lang,
                          grade_t &grade, grade_t &rev_grade,
                          int &count, int &rev_count,
                          time_t &date, time_t &rev_date,
-                         QString &remark,
+                         TQString &remark,
                          int &bcount, int &rev_bcount,
-                         QString &query_id,
-                         QString &pronunce,
+                         TQString &query_id,
+                         TQString &pronunce,
                          int &width,
-                         QString &type,
-                         QString &faux_ami_f,
-                         QString &faux_ami_t,
-                         QString &synonym,
-                         QString &example,
-                         QString &antonym,
-                         QString &usage,
-                         QString &paraphrase);
+                         TQString &type,
+                         TQString &faux_ami_f,
+                         TQString &faux_ami_t,
+                         TQString &synonym,
+                         TQString &example,
+                         TQString &antonym,
+                         TQString &usage,
+                         TQString &paraphrase);
   bool extract_L_DESCR_attr (XmlReader &xml,
                              XmlElement &elem, int &no,
                              bool &isCurr, bool &inQuery);
@@ -639,20 +639,20 @@ protected:
                            int          &lesson,
                            bool         &sel,
                            bool         &active,
-                           QString      &type);
-  bool check_Empty_attr (QString tag_name,
+                           TQString      &type);
+  bool check_Empty_attr (TQString tag_name,
                          XmlReader &xml,
                          XmlElement &elem);
   bool extract_CON_E_attr (XmlReader& xml,
                            XmlElement &elem,
-                           QString &lang);
+                           TQString &lang);
   bool extract_T_attr (XmlReader &xml,
                        XmlElement &elem,
-                       QString &name);
+                       TQString &name);
   bool extract_BOOL_attr (XmlReader &xml,
                           XmlElement &elem,
-                          const QString &tag_name,
-                          const QString &attr_name,
+                          const TQString &tag_name,
+                          const TQString &attr_name,
                           bool &flag);
   bool extract_L_GROUP_attr (XmlReader &xml,
                              XmlElement &elem,
@@ -672,11 +672,11 @@ protected:
   bool loadArticleKvtMl  (XmlElement elem, XmlReader& xml);
   bool saveConjugHeader  (vector<Conjugation> &curr_conjug,
                           XmlWriter &xml);
-  bool saveConjug        (const Conjugation &curr_conjug, QString type,
-                          XmlWriter &xml, QString identstr);
+  bool saveConjug        (const Conjugation &curr_conjug, TQString type,
+                          XmlWriter &xml, TQString identstr);
   bool saveConjugEntry   (Conjugation &curr_conjug,
                           XmlWriter &xml, int ident);
-  bool loadConjugKvtMl   (vector<Conjugation> &curr_conjug, const QString &entry_tag,
+  bool loadConjugKvtMl   (vector<Conjugation> &curr_conjug, const TQString &entry_tag,
                           XmlElement elem, XmlReader& xml);
 
   bool saveComparison    (const Comparison &comp, XmlWriter &xml, int ident);
@@ -685,28 +685,28 @@ protected:
   bool saveMultipleChoice(const MultipleChoice &mc, XmlWriter &xml, int ident);
   bool loadMultipleChoice(MultipleChoice &mc, XmlElement elem, XmlReader &xml);
 
-  bool saveToLex     (QTextStream& os, QString &title);
-  bool loadFromLex   (QTextStream& is);
-  bool loadLessonLex (QTextStream& is);
-  bool saveLessonLex (QTextStream& os);
-  bool saveTypeNameLex   (QTextStream& os);
-  bool loadTypeNameLex   (QTextStream& is);
-
-  bool saveToCsv     (QTextStream& os, QString &title);
-  bool loadFromCsv   (QTextStream& is);
-  bool loadLessonCsv (QTextStream& is);
-  bool saveLessonCsv (QTextStream& os);
-  bool saveTypeNameCsv   (QTextStream& os);
-  bool loadTypeNameCsv   (QTextStream& is);
-
-  bool saveTypeNameVcb (QTextStream &os);
-  bool loadTypeNameVcb (QTextStream &is);
-  bool saveLessonVcb (QTextStream &os);
-  bool loadLessonVcb (QTextStream &is);
-  bool saveToVcb (QTextStream& os, QString &title);
-  bool loadFromVcb (QTextStream& is);
-  bool loadFromVoc(QTextStream& is);
-  void errorVcb (int line, const QString &text );
+  bool saveToLex     (TQTextStream& os, TQString &title);
+  bool loadFromLex   (TQTextStream& is);
+  bool loadLessonLex (TQTextStream& is);
+  bool saveLessonLex (TQTextStream& os);
+  bool saveTypeNameLex   (TQTextStream& os);
+  bool loadTypeNameLex   (TQTextStream& is);
+
+  bool saveToCsv     (TQTextStream& os, TQString &title);
+  bool loadFromCsv   (TQTextStream& is);
+  bool loadLessonCsv (TQTextStream& is);
+  bool saveLessonCsv (TQTextStream& os);
+  bool saveTypeNameCsv   (TQTextStream& os);
+  bool loadTypeNameCsv   (TQTextStream& is);
+
+  bool saveTypeNameVcb (TQTextStream &os);
+  bool loadTypeNameVcb (TQTextStream &is);
+  bool saveLessonVcb (TQTextStream &os);
+  bool loadLessonVcb (TQTextStream &is);
+  bool saveToVcb (TQTextStream& os, TQString &title);
+  bool loadFromVcb (TQTextStream& is);
+  bool loadFromVoc(TQTextStream& is);
+  void errorVcb (int line, const TQString &text );
 
  private:
   bool                  dirty;
@@ -718,26 +718,26 @@ protected:
   bool                  sort_allowed;
 
   // save these to document
-  vector<QString>        langs;      //0= origin, 1,.. translations
+  vector<TQString>        langs;      //0= origin, 1,.. translations
   int                    cols,
                          lines;
   int                    current_lesson;
   vector<int>            extraSizehints;
   vector<int>            sizehints;
-  QString                generator;
-  QString                queryorg,
+  TQString                generator;
+  TQString                queryorg,
                          querytrans;
   vector<kvoctrainExpr>  vocabulary;
   vector<bool>           lessons_in_query;
-  vector<QString>        lesson_descr;
-  vector<QString>        type_descr;
-  vector<QString>        tense_descr;
-  vector<QString>        usage_descr;
-  QString                doctitle;
-  QString                author;
-  QString                license;
-  QString                doc_remark;
-  QString                doc_version;
+  vector<TQString>        lesson_descr;
+  vector<TQString>        type_descr;
+  vector<TQString>        tense_descr;
+  vector<TQString>        usage_descr;
+  TQString                doctitle;
+  TQString                author;
+  TQString                license;
+  TQString                doc_remark;
+  TQString                doc_version;
 
   vector<Article>        articles;
   vector<Conjugation>    conjugations;
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp
index 2faba172..5ce499d1 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp
@@ -41,7 +41,7 @@ void kvoctrainExpr::Init()
 }
 
 
-kvoctrainExpr::kvoctrainExpr (QString &expr, int _lesson)
+kvoctrainExpr::kvoctrainExpr (TQString &expr, int _lesson)
 {
   Init();
   setOriginal(expr.stripWhiteSpace() );
@@ -55,10 +55,10 @@ kvoctrainExpr::kvoctrainExpr ()
 }
 
 
-kvoctrainExpr::kvoctrainExpr (QString &s, QString separator, int _lesson)
+kvoctrainExpr::kvoctrainExpr (TQString &s, TQString separator, int _lesson)
 {
   Init();
-  QString se;
+  TQString se;
   lesson = _lesson;
 
   if (separator.length() ) {
@@ -97,7 +97,7 @@ int kvoctrainExpr::numTranslations() const
 }
 
 
-QString kvoctrainExpr::getRemark (int idx) const
+TQString kvoctrainExpr::getRemark (int idx) const
 {
   if (idx >= (int)remarks.size() || idx < 0) {
     return "";
@@ -108,7 +108,7 @@ QString kvoctrainExpr::getRemark (int idx) const
 }
 
 
-void kvoctrainExpr::setRemark (int idx, const QString & expr)
+void kvoctrainExpr::setRemark (int idx, const TQString & expr)
 {
   if ( idx < 0) return;
 
@@ -121,7 +121,7 @@ void kvoctrainExpr::setRemark (int idx, const QString & expr)
 }
 
 
-void kvoctrainExpr::setFauxAmi (int idx, const QString & expr, bool rev_ami)
+void kvoctrainExpr::setFauxAmi (int idx, const TQString & expr, bool rev_ami)
 {
   if (idx < 1) return;
 
@@ -145,7 +145,7 @@ void kvoctrainExpr::setFauxAmi (int idx, const QString & expr, bool rev_ami)
 }
 
 
-QString kvoctrainExpr::getFauxAmi (int idx, bool rev_ami) const
+TQString kvoctrainExpr::getFauxAmi (int idx, bool rev_ami) const
 {
   if (rev_ami) {
     if (idx >= (int)rev_fauxAmi.size() || idx < 1 ) {
@@ -163,7 +163,7 @@ QString kvoctrainExpr::getFauxAmi (int idx, bool rev_ami) const
 }
 
 
-void kvoctrainExpr::setSynonym (int idx, const QString & expr)
+void kvoctrainExpr::setSynonym (int idx, const TQString & expr)
 {
   if ( idx < 0) return;
 
@@ -176,7 +176,7 @@ void kvoctrainExpr::setSynonym (int idx, const QString & expr)
 }
 
 
-QString kvoctrainExpr::getSynonym (int idx) const
+TQString kvoctrainExpr::getSynonym (int idx) const
 {
   if (idx >= (int)synonym.size() || idx < 0) {
     return "";
@@ -187,7 +187,7 @@ QString kvoctrainExpr::getSynonym (int idx) const
 }
 
 
-void kvoctrainExpr::setExample (int idx, const QString & expr)
+void kvoctrainExpr::setExample (int idx, const TQString & expr)
 {
   if ( idx < 0) return;
 
@@ -200,7 +200,7 @@ void kvoctrainExpr::setExample (int idx, const QString & expr)
 }
 
 
-QString kvoctrainExpr::getExample (int idx) const
+TQString kvoctrainExpr::getExample (int idx) const
 {
   if (idx >= (int)example.size() || idx < 0) {
     return "";
@@ -211,7 +211,7 @@ QString kvoctrainExpr::getExample (int idx) const
 }
 
 
-void kvoctrainExpr::setUsageLabel (int idx, const QString & expr)
+void kvoctrainExpr::setUsageLabel (int idx, const TQString & expr)
 {
   if ( idx < 0) return;
 
@@ -224,7 +224,7 @@ void kvoctrainExpr::setUsageLabel (int idx, const QString & expr)
 }
 
 
-QString kvoctrainExpr::getUsageLabel (int idx) const
+TQString kvoctrainExpr::getUsageLabel (int idx) const
 {
   if (idx >= (int)usageLabels.size() || idx < 0) {
     return "";
@@ -235,7 +235,7 @@ QString kvoctrainExpr::getUsageLabel (int idx) const
 }
 
 
-void kvoctrainExpr::setParaphrase (int idx, const QString & expr)
+void kvoctrainExpr::setParaphrase (int idx, const TQString & expr)
 {
   if ( idx < 0) return;
 
@@ -248,7 +248,7 @@ void kvoctrainExpr::setParaphrase (int idx, const QString & expr)
 }
 
 
-QString kvoctrainExpr::getParaphrase (int idx) const
+TQString kvoctrainExpr::getParaphrase (int idx) const
 {
   if (idx >= (int)paraphrases.size() || idx < 0) {
     return "";
@@ -259,7 +259,7 @@ QString kvoctrainExpr::getParaphrase (int idx) const
 }
 
 
-void kvoctrainExpr::setAntonym (int idx, const QString & expr)
+void kvoctrainExpr::setAntonym (int idx, const TQString & expr)
 {
   if ( idx < 0) return;
 
@@ -272,7 +272,7 @@ void kvoctrainExpr::setAntonym (int idx, const QString & expr)
 }
 
 
-QString kvoctrainExpr::getAntonym (int idx) const
+TQString kvoctrainExpr::getAntonym (int idx) const
 {
   if (idx >= (int)antonym.size() || idx < 0) {
     return "";
@@ -355,7 +355,7 @@ MultipleChoice kvoctrainExpr::getMultipleChoice (int idx) const
 }
 
 
-QString kvoctrainExpr::getPronunce (int idx) const
+TQString kvoctrainExpr::getPronunce (int idx) const
 {
   if (idx >= (int)pronunces.size() || idx < 0) {
     return "";
@@ -366,7 +366,7 @@ QString kvoctrainExpr::getPronunce (int idx) const
 }
 
 
-void kvoctrainExpr::setPronunce (int idx, const QString & expr)
+void kvoctrainExpr::setPronunce (int idx, const TQString & expr)
 {
   if ( idx < 0) return;
 
@@ -379,7 +379,7 @@ void kvoctrainExpr::setPronunce (int idx, const QString & expr)
 }
 
 
-void kvoctrainExpr::addTranslation (QString expr,
+void kvoctrainExpr::addTranslation (TQString expr,
                                     grade_t grade, grade_t rev_grade)
 {
   if (grade > KV_MAX_GRADE)
@@ -394,7 +394,7 @@ void kvoctrainExpr::addTranslation (QString expr,
 }
 
 
-QString kvoctrainExpr::getTranslation (int idx) const
+TQString kvoctrainExpr::getTranslation (int idx) const
 {
   if (idx > (int)translations.size() || idx < 1)
     return "";
@@ -473,7 +473,7 @@ void kvoctrainExpr::removeTranslation (int idx)
 }
 
 
-void kvoctrainExpr::setTranslation (int idx, const QString & expr)
+void kvoctrainExpr::setTranslation (int idx, const TQString & expr)
 {
   if ( idx <= 0) return;
 
@@ -487,9 +487,9 @@ void kvoctrainExpr::setTranslation (int idx, const QString & expr)
 }
 
 
-QString kvoctrainExpr::gradeStr (int idx, bool rev_grade) const
+TQString kvoctrainExpr::gradeStr (int idx, bool rev_grade) const
 {
-  QString s;
+  TQString s;
   s.setNum(getGrade(idx, rev_grade));
   return s;
 }
@@ -731,7 +731,7 @@ void kvoctrainExpr::setQueryDate (int idx, time_t date, bool rev_date)
 bool kvoctrainExpr::uniqueType () const
 {
   bool unique = true;
-  QString type0 = getType(0);
+  TQString type0 = getType(0);
   for (int i = 1; i < numTranslations(); i++)
     if (type0 != getType(i) )
       unique = false;
@@ -739,7 +739,7 @@ bool kvoctrainExpr::uniqueType () const
 }
 
 
-QString kvoctrainExpr::getType (int idx) const
+TQString kvoctrainExpr::getType (int idx) const
 {
   if (idx >= (int)exprtypes.size() || idx < 0) {
     return "";
@@ -767,13 +767,13 @@ void kvoctrainExpr::incBadCount (int index, bool rev_count)
 }
 
 
-void kvoctrainExpr::setOriginal ( const QString & expr)
+void kvoctrainExpr::setOriginal ( const TQString & expr)
 {
   origin = expr;
 }
 
 
-QString kvoctrainExpr::getOriginal () const
+TQString kvoctrainExpr::getOriginal () const
 {
   return origin;
 }
@@ -785,7 +785,7 @@ void kvoctrainExpr::setLesson (int l)
 }
 
 
-void kvoctrainExpr::setType (int idx, const QString &type)
+void kvoctrainExpr::setType (int idx, const TQString &type)
 {
   if ( idx < 0) return;
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
index ecdefa4d..f31cd1e9 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
@@ -81,20 +81,20 @@ class kvoctrainExpr
 
   kvoctrainExpr ();
 
-  kvoctrainExpr (QString &s, QString separator, int lesson = 0);
+  kvoctrainExpr (TQString &s, TQString separator, int lesson = 0);
 
   /** Constructor for an expression in different languages
    *
    * @param expr             expression
    */
-  kvoctrainExpr (QString &expr, int lesson = 0);
+  kvoctrainExpr (TQString &expr, int lesson = 0);
 
   /** adds a new translation of this entry
    * @param expr             translation
    * @param grade            grade of knowledge of this translation
    * @param rev_grade        dito, in opposite direction
    */
-  void addTranslation (QString expr, grade_t grade=KV_NORM_GRADE,
+  void addTranslation (TQString expr, grade_t grade=KV_NORM_GRADE,
                                      grade_t rev_grade=KV_NORM_GRADE);
 
   /** removes translation
@@ -113,11 +113,11 @@ class kvoctrainExpr
 
   /** returns original expression of this entry
    */
-  QString getOriginal () const;
+  TQString getOriginal () const;
 
   /** sets original expression of this entry
    */
-  void setOriginal (const QString & expr);
+  void setOriginal (const TQString & expr);
 
   /** returns number of max. translations of all expressions
    */
@@ -144,42 +144,42 @@ class kvoctrainExpr
    * @param index            number of translation
    * @result                 expression or "" if no translation available
    */
-  QString getTranslation (int index) const;
+  TQString getTranslation (int index) const;
 
   /** sets translation of this expression
    *
    * @param index            number of translation
    * @param expr             expression of this index
    */
-  void setTranslation (int index, const QString & expr);
+  void setTranslation (int index, const TQString & expr);
 
   /** sets remark of this expression
    *
    * @param index            index of expression
    * @param expr             remark of this index
    */
-  void setPronunce (int index, const QString & expr);
+  void setPronunce (int index, const TQString & expr);
 
   /** returns pronunciation of this expression
    *
    * @param index            index of expression
    * @result                 pronunciation or "" if none available
    */
-  QString getPronunce (int index) const;
+  TQString getPronunce (int index) const;
 
   /** returns remarks of this expression
    *
    * @param index            index of expression
    * @result                 remark or "" if no remark available
    */
-  QString getRemark (int index) const;
+  TQString getRemark (int index) const;
 
   /** sets remark of this expression
    *
    * @param index            index of expression
    * @param expr             remark of this index
    */
-  void setRemark (int index, const QString & expr);
+  void setRemark (int index, const TQString & expr);
 
 
   /** sets false friend of this expression
@@ -188,7 +188,7 @@ class kvoctrainExpr
    * @param expr             false friend of this index
    * @param rev_grade        dito, in opposite direction
    */
-  void setFauxAmi (int index, const QString & expr, bool rev_ami = false);
+  void setFauxAmi (int index, const TQString & expr, bool rev_ami = false);
 
 
   /** returns false friend of this expression
@@ -197,14 +197,14 @@ class kvoctrainExpr
    * @param rev_grade        dito, in opposite direction
    * @result                 false friend or "" if no string available
    */
-  QString getFauxAmi (int index, bool rev_ami = false) const;
+  TQString getFauxAmi (int index, bool rev_ami = false) const;
 
   /** sets synonym this expression
    *
    * @param index            index of expression
    * @param expr             synonym of this index
    */
-  void setSynonym (int index, const QString & expr);
+  void setSynonym (int index, const TQString & expr);
 
 
   /** returns synonym of this expression
@@ -212,14 +212,14 @@ class kvoctrainExpr
    * @param index            index of expression
    * @result                 synonym or "" if no string available
    */
-  QString getSynonym (int index) const;
+  TQString getSynonym (int index) const;
 
   /** sets example this expression
    *
    * @param index            index of expression
    * @param expr             example of this index
    */
-  void setExample (int index, const QString & expr);
+  void setExample (int index, const TQString & expr);
 
 
   /** returns example of this expression
@@ -227,14 +227,14 @@ class kvoctrainExpr
    * @param index            index of expression
    * @result                 example or "" if no string available
    */
-  QString getExample (int index) const;
+  TQString getExample (int index) const;
 
   /** sets usage label this expression
    *
    * @param index            index of expression
    * @param usage            usage label of this index
    */
-  void setUsageLabel (int index, const QString & usage);
+  void setUsageLabel (int index, const TQString & usage);
 
 
   /** returns usage label of this expression
@@ -242,14 +242,14 @@ class kvoctrainExpr
    * @param index            index of expression
    * @result                 usage or "" if no string available
    */
-  QString getUsageLabel (int index) const;
+  TQString getUsageLabel (int index) const;
 
   /** sets paraphrase of this expression
    *
    * @param index            index of expression
    * @param usage            paraphrase of this index
    */
-  void setParaphrase (int index, const QString & usage);
+  void setParaphrase (int index, const TQString & usage);
 
 
   /** returns paraphrase of this expression
@@ -257,14 +257,14 @@ class kvoctrainExpr
    * @param index            index of expression
    * @result                 paraphrase or "" if no string available
    */
-  QString getParaphrase (int index) const;
+  TQString getParaphrase (int index) const;
 
   /** sets antonym this expression
    *
    * @param index            index of expression
    * @param expr             antonym of this index
    */
-  void setAntonym (int index, const QString & expr);
+  void setAntonym (int index, const TQString & expr);
 
 
   /** returns antonym of this expression
@@ -272,13 +272,13 @@ class kvoctrainExpr
    * @param index            index of expression
    * @result                 antonym or "" if no string available
    */
-  QString getAntonym (int index) const;
+  TQString getAntonym (int index) const;
 
   /** returns type of this expression
    *
    * @result                 type or "" if no type available
    */
-  QString getType (int index) const;
+  TQString getType (int index) const;
 
   /** all langs have same type ?
    *
@@ -291,7 +291,7 @@ class kvoctrainExpr
    * @param index            index of type
    * @param type             type of this expression ("" = none)
    */
-  void setType (int index, const QString &type);
+  void setType (int index, const TQString &type);
 
   /** returns grade of given translation as string
    *
@@ -299,7 +299,7 @@ class kvoctrainExpr
    * @param rev_grade        dito, in opposite direction
    * @result                 number of knowlegde: 0=known, x=numbers not knows
    */
-  QString gradeStr (int index, bool rev_grade = false) const;
+  TQString gradeStr (int index, bool rev_grade = false) const;
 
   /** sets grade of given translation
    *
@@ -430,20 +430,20 @@ class kvoctrainExpr
   void Init();
 
  private:
-  QString            origin;
+  TQString            origin;
 
   // all these vectors must be deleted in removeTranslation()
-  vector<QString>     exprtypes;
-  vector<QString>     translations;
-  vector<QString>     remarks;
-  vector<QString>     usageLabels;
-  vector<QString>     paraphrases;
-  vector<QString>     fauxAmi;
-  vector<QString>     rev_fauxAmi;
-  vector<QString>     synonym;
-  vector<QString>     example;
-  vector<QString>     antonym;
-  vector<QString>     pronunces;
+  vector<TQString>     exprtypes;
+  vector<TQString>     translations;
+  vector<TQString>     remarks;
+  vector<TQString>     usageLabels;
+  vector<TQString>     paraphrases;
+  vector<TQString>     fauxAmi;
+  vector<TQString>     rev_fauxAmi;
+  vector<TQString>     synonym;
+  vector<TQString>     example;
+  vector<TQString>     antonym;
+  vector<TQString>     pronunces;
   vector<grade_t>     grades;
   vector<grade_t>     rev_grades;
   vector<count_t>     qcounts;
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.h
index d78b6c7e..df0d4031 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.h
@@ -95,7 +95,7 @@ protected:
   Token readComment ();
 
 private:
-//  QIODevice *strm;
+//  TQIODevice *strm;
   KOXML_STRING   last_chars;
   KOXML_ISTREAM &istrm;
   KOXML_STRING   elem;
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
index d73bce59..2c95a515 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
@@ -172,7 +172,7 @@ public:
   /**
    * Get the raw output stream.
    */
-  inline QIODevice *stream () { return strm.device(); }
+  inline TQIODevice *stream () { return strm.device(); }
 #endif
 
 private:
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h
index 2f0daecb..4587e25d 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h
@@ -8,11 +8,11 @@
 
 #ifndef KOXML_USE_STL
 
-# include <qtextstream.h>
+# include <tqtextstream.h>
 # define KOXML_ISTREAM QTextStream
 # define KOXML_OSTREAM QTextStream
 
-# include <qstring.h>
+# include <tqstring.h>
 # define KOXML_STRING  QString
 
 // Unicode character
diff --git a/kvoctrain/kvoctrain/kvt-core/langset.cpp b/kvoctrain/kvoctrain/kvt-core/langset.cpp
index 644878e7..633e6f59 100644
--- a/kvoctrain/kvoctrain/kvt-core/langset.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/langset.cpp
@@ -27,8 +27,8 @@
 
 #include "langset.h"
 
-// void LangSet::addSet (QString _shortId, QString _longId,
-//                       QString _PixMapFile, const QString& keyboardLayout)
+// void LangSet::addSet (TQString _shortId, TQString _longId,
+//                       TQString _PixMapFile, const TQString& keyboardLayout)
 // {
 //   LangDef def;
 //   def.shortId = _shortId;
@@ -40,9 +40,9 @@
 // }
 
 
-void LangSet::addSet (QString _shortId, QString _longId,
-                      QString _PixMapFile, const QString& _shortId2,
-		      const QString& keyboardLayout)
+void LangSet::addSet (TQString _shortId, TQString _longId,
+                      TQString _PixMapFile, const TQString& _shortId2,
+		      const TQString& keyboardLayout)
 
 {
   LangDef def;
@@ -77,52 +77,52 @@ void LangSet::erase (int idx)
 }
 
 
-QString LangSet::shortId (int index) const
+TQString LangSet::shortId (int index) const
 {
   if (index >= 0 && index < (int) langs.size() )
     return langs[index].shortId;
 
-  return QString::null;
+  return TQString::null;
 }
 
 
-QString LangSet::shortId2 (int index) const
+TQString LangSet::shortId2 (int index) const
 {
   if (index >= 0 && index < (int) langs.size() )
     return langs[index].shortId2;
 
-  return QString::null;
+  return TQString::null;
 }
 
 
-QString LangSet::longId (int index) const
+TQString LangSet::longId (int index) const
 {
   if (index >= 0 && index < (int) langs.size() )
     return langs[index].longId;
 
-  return QString::null;
+  return TQString::null;
 }
 
 
-QString LangSet::PixMapFile (int index) const
+TQString LangSet::PixMapFile (int index) const
 {
   if (index >= 0 && index < (int) langs.size() )
     return langs[index].PixMapFile;
   return "";
 }
 
-QString LangSet::keyboardLayout (int index) const
+TQString LangSet::keyboardLayout (int index) const
 {
   if (index >= 0 && index < (int) langs.size()) {
     return langs[index].keyboardLayout;
   }
   else {
-    return QString::null;
+    return TQString::null;
   }
 }
 
 
-QString LangSet::findShortId (const QString &_longId) const
+TQString LangSet::findShortId (const TQString &_longId) const
 {
   if (_longId.isEmpty())
     return "";
@@ -131,11 +131,11 @@ QString LangSet::findShortId (const QString &_longId) const
     if (_longId == langs[i].longId)
       return langs[i].shortId;
 
-  return QString::null;
+  return TQString::null;
 }
 
 
-QString LangSet::findLongId (const QString &_shortId) const
+TQString LangSet::findLongId (const TQString &_shortId) const
 {
   if (_shortId.isEmpty())
     return "";
@@ -145,11 +145,11 @@ QString LangSet::findLongId (const QString &_shortId) const
         || _shortId == langs[i].shortId2)
       return langs[i].longId;
 
-  return QString::null;
+  return TQString::null;
 }
 
 
-int LangSet::indexShortId (QString _shortId) const
+int LangSet::indexShortId (TQString _shortId) const
 {
   if (_shortId.isEmpty())
     return -1;
@@ -163,7 +163,7 @@ int LangSet::indexShortId (QString _shortId) const
 }
 
 
-int LangSet::indexLongId (QString _longId) const
+int LangSet::indexLongId (TQString _longId) const
 {
   if (_longId.isEmpty())
     return -1;
@@ -176,7 +176,7 @@ int LangSet::indexLongId (QString _longId) const
 }
 
 
-int LangSet::indexPixMapFile (QString PixMapFile) const
+int LangSet::indexPixMapFile (TQString PixMapFile) const
 {
    int id = -1;
    for (int i = 0; i < (int) langs.size(); i++)
@@ -185,34 +185,34 @@ int LangSet::indexPixMapFile (QString PixMapFile) const
    return id;
 }
 
-void LangSet::setShortId (const QString & s, int index)
+void LangSet::setShortId (const TQString & s, int index)
 {
   if (index < (int) langs.size() )
     langs[index].shortId = s;
 }
 
 
-void LangSet::setShortId2 (const QString & s, int index)
+void LangSet::setShortId2 (const TQString & s, int index)
 {
   if (index < (int) langs.size() )
     langs[index].shortId2 = s;
 }
 
 
-void LangSet::setLongId (const QString & s, int index)
+void LangSet::setLongId (const TQString & s, int index)
 {
   if (index < (int) langs.size() )
     langs[index].longId = s;
 }
 
 
-void LangSet::setPixMapFile (const QString & s, int index)
+void LangSet::setPixMapFile (const TQString & s, int index)
 {
   if (index < (int) langs.size() )
     langs[index].PixMapFile = s;
 }
 
-void LangSet::setKeyboardLayout(const QString& layout, int index)
+void LangSet::setKeyboardLayout(const TQString& layout, int index)
 {
   if (index < (int) langs.size()) {
     langs[index].keyboardLayout = layout;
diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h
index f0da2a5a..526f330d 100644
--- a/kvoctrain/kvoctrain/kvt-core/langset.h
+++ b/kvoctrain/kvoctrain/kvt-core/langset.h
@@ -32,7 +32,7 @@
 #include <vector>
 using namespace std;
 
-#include <qstring.h>
+#include <tqstring.h>
 
 
 class LangSet
@@ -41,13 +41,13 @@ class LangSet
 
    LangSet () {}
 
-   void addSet (QString shortId, QString longId, QString PixMapFile,
-		const QString& shortId2 = QString::null,
-		const QString& keyboardLayout = QString::null);
+   void addSet (TQString shortId, TQString longId, TQString PixMapFile,
+		const TQString& shortId2 = TQString::null,
+		const TQString& keyboardLayout = TQString::null);
 
-/*    void addSet (QString shortId, QString shortId2, QString longId, */
-/* 		QString PixMapFile,  */
-/* 		const QString& keyboardLayout = QString::null); */
+/*    void addSet (TQString shortId, TQString shortId2, TQString longId, */
+/* 		TQString PixMapFile,  */
+/* 		const TQString& keyboardLayout = TQString::null); */
 
    void appendSet(const LangSet &set);
 
@@ -55,30 +55,30 @@ class LangSet
    void erase (int idx);
    void clear ();
 
-   QString shortId (int index) const;
-   QString shortId2 (int index) const;
-   QString longId (int index) const;
-   QString PixMapFile (int index) const;
-   QString keyboardLayout (int index) const;
+   TQString shortId (int index) const;
+   TQString shortId2 (int index) const;
+   TQString longId (int index) const;
+   TQString PixMapFile (int index) const;
+   TQString keyboardLayout (int index) const;
 
-   int indexShortId (QString shortId) const;
-   int indexLongId (QString longId) const;
-   int indexPixMapFile (QString PixMapFile) const;
+   int indexShortId (TQString shortId) const;
+   int indexLongId (TQString longId) const;
+   int indexPixMapFile (TQString PixMapFile) const;
    // doesn't make sense for keyboard layouts since there is no 1-to-1 relation to languages
 
-   void setShortId (const QString & shortId, int index);
-   void setShortId2 (const QString & shortId2, int index);
-   void setLongId (const QString & longId, int index);
-   void setPixMapFile (const QString & PixMapFile, int index);
-   void setKeyboardLayout(const QString & layout, int index);
+   void setShortId (const TQString & shortId, int index);
+   void setShortId2 (const TQString & shortId2, int index);
+   void setLongId (const TQString & longId, int index);
+   void setPixMapFile (const TQString & PixMapFile, int index);
+   void setKeyboardLayout(const TQString & layout, int index);
 
-   QString findShortId (const QString & longId)  const;
-   QString findLongId  (const QString & shortId) const;
+   TQString findShortId (const TQString & longId)  const;
+   TQString findLongId  (const TQString & shortId) const;
 
  private:
 
    struct LangDef {
-     QString shortId,
+     TQString shortId,
              shortId2,
              longId,
        PixMapFile,
diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp
index b1004c56..2714cf76 100644
--- a/kvoctrain/kvoctrain/kvtnewstuff.cpp
+++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp
@@ -10,7 +10,7 @@
 //
 //
 
-#include <qdir.h>
+#include <tqdir.h>
 
 #include <kprocess.h>
 #include <klocale.h>
@@ -22,13 +22,13 @@
 #include "kvtnewstuff.h"
 #include "prefs.h"
 
-KVTNewStuff::KVTNewStuff(QWidget *parent, const char * /*name*/) : QObject(), KNewStuff("kdeedu/vocabulary", parent)
+KVTNewStuff::KVTNewStuff(TQWidget *parent, const char * /*name*/) : TQObject(), KNewStuff("kdeedu/vocabulary", parent)
 {
   m_app = (kvoctrainApp*) parent;
 }
 
 
-bool KVTNewStuff::install(const QString & fileName)
+bool KVTNewStuff::install(const TQString & fileName)
 {
   if (m_app->queryExit())
     m_app->loadfileFromPath(fileName, true);
@@ -36,54 +36,54 @@ bool KVTNewStuff::install(const QString & fileName)
 }
 
 
-bool KVTNewStuff::createUploadFile(const QString & /*fileName*/)
+bool KVTNewStuff::createUploadFile(const TQString & /*fileName*/)
 {
   return true;
 }
 
 
-QString KVTNewStuff::destinationPath(KNS::Entry * entry)
+TQString KVTNewStuff::destinationPath(KNS::Entry * entry)
 {
   if (entry)
   {
     KURL url = entry->payload();
-    QString fileName = url.fileName();
+    TQString fileName = url.fileName();
 
-    QString path = Prefs::installPath(); //default is Vocabularies which will be created in the user's home directory
-    QString file;
+    TQString path = Prefs::installPath(); //default is Vocabularies which will be created in the user's home directory
+    TQString file;
 
     if (path.isEmpty())
       file = KNewStuff::downloadDestination(entry); //fall back on a temp file, should never happen
     else
     {
-      file = QDir::home().path() + "/" + path + "/";
+      file = TQDir::home().path() + "/" + path + "/";
       KStandardDirs::makeDir(file); //ensure the directory exists
       file += fileName;
     }
     return file;
   }
   else
-    return QString::null;
+    return TQString::null;
 }
 
 
-QString KVTNewStuff::downloadDestination(KNS::Entry * entry)
+TQString KVTNewStuff::downloadDestination(KNS::Entry * entry)
 {
-  QString file = destinationPath(entry);
+  TQString file = destinationPath(entry);
 
   if (KStandardDirs::exists(file))
   {
     int result = KMessageBox::warningContinueCancel(parentWidget(),
         i18n("The file '%1' already exists. Do you want to overwrite it?")
         .arg(file),
-        QString::null, i18n("Overwrite") );
+        TQString::null, i18n("Overwrite") );
     if (result == KMessageBox::Cancel)
-      return QString::null;
+      return TQString::null;
   }
   KMessageBox::information(parentWidget(),
     i18n("<qt>The selected file will now be downloaded and saved as\n<b>'%1'</b>.</qt>")
     .arg(file),
-    QString::null,
+    TQString::null,
     "NewStuffDownloadLocation");
   return file;
 }
diff --git a/kvoctrain/kvoctrain/kvtnewstuff.h b/kvoctrain/kvoctrain/kvtnewstuff.h
index 9953ac1a..1649868a 100644
--- a/kvoctrain/kvoctrain/kvtnewstuff.h
+++ b/kvoctrain/kvoctrain/kvtnewstuff.h
@@ -19,11 +19,11 @@ class kvoctrainApp;
 /**
 @author Peter Hedlund
 */
-class KVTNewStuff : public QObject, public KNewStuff
+class KVTNewStuff : public TQObject, public KNewStuff
 {
 Q_OBJECT
 public:
-  KVTNewStuff(QWidget *parent = 0, const char *name = 0);
+  KVTNewStuff(TQWidget *parent = 0, const char *name = 0);
 
   /**
     Installs a downloaded file according to the application's configuration.
@@ -31,7 +31,7 @@ public:
     @param fileName filename of the donwloaded file
     @return @c true in case of installation success, @c false otherwise
   */
-  bool install(const QString &fileName);
+  bool install(const TQString &fileName);
 
   /**
     Creates a file suitable for upload.
@@ -41,7 +41,7 @@ public:
     @param fileName the name of the file to upload after its creation
     @return @c true in case of creation success, @c false otherwise
   */
-  bool createUploadFile(const QString &fileName);
+  bool createUploadFile(const TQString &fileName);
 
   /**
     Queries the preferred destination file for a download.
@@ -49,10 +49,10 @@ public:
     @param entry a Hotstuff data entry
     @return destination filename, or 0 to return directory only
   */
-  QString downloadDestination(KNS::Entry *entry);
+  TQString downloadDestination(KNS::Entry *entry);
 
 private:
-  QString destinationPath(KNS::Entry *entry);
+  TQString destinationPath(KNS::Entry *entry);
 
   kvoctrainApp * m_app;
 };
diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
index c643ba01..69deae26 100644
--- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
@@ -34,14 +34,14 @@
 #include <klocale.h>
 #include <kprogress.h>
 
-#include <qtimer.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qlabel.h>
+#include <tqtimer.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqlabel.h>
 
 AdjQueryDlg::AdjQueryDlg
 (
-  QString type,
+  TQString type,
   int entry,
   int col,
   int query_cycle,
@@ -55,18 +55,18 @@ AdjQueryDlg::AdjQueryDlg
   mw = new AdjQueryDlgForm(this);
   setMainWidget(mw);
 
-  connect(mw->dont_know, SIGNAL(clicked()), SLOT(dontKnowClicked()) );
-  connect(mw->know_it, SIGNAL(clicked()), SLOT(knowItClicked()) );
-  connect(mw->verify, SIGNAL(clicked()), SLOT(verifyClicked()) );
-  connect(mw->show_all, SIGNAL(clicked()), SLOT(showAllClicked()) );
+  connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) );
+  connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) );
+  connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) );
+  connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) );
 
-  connect(mw->lev1Field, SIGNAL(returnPressed()), SLOT(returnPressed()) );
-  connect(mw->lev2Field, SIGNAL(returnPressed()), SLOT(returnPressed()) );
-  connect(mw->lev3Field, SIGNAL(returnPressed()), SLOT(returnPressed()) );
+  connect(mw->lev1Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) );
+  connect(mw->lev2Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) );
+  connect(mw->lev3Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) );
 
-  connect(mw->lev1Field, SIGNAL(textChanged(const QString&)), SLOT(lev1Changed(const QString&)) );
-  connect(mw->lev2Field, SIGNAL(textChanged(const QString&)), SLOT(lev2Changed(const QString&)) );
-  connect(mw->lev3Field, SIGNAL(textChanged(const QString&)), SLOT(lev3Changed(const QString&)) );
+  connect(mw->lev1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev1Changed(const TQString&)) );
+  connect(mw->lev2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev2Changed(const TQString&)) );
+  connect(mw->lev3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev3Changed(const TQString&)) );
 
   qtimer = 0;
 
@@ -87,7 +87,7 @@ AdjQueryDlg::~AdjQueryDlg()
 }
 
 
-void AdjQueryDlg::setQuery(QString,
+void AdjQueryDlg::setQuery(TQString,
                            int entry,
                            int col,
                            int q_cycle,
@@ -106,7 +106,7 @@ void AdjQueryDlg::setQuery(QString,
    mw->timelabel->setEnabled(Prefs::showCounter());
    comp = _comp;
    mw->show_all->setDefault(true);
-   QString s;
+   TQString s;
    s.setNum (q_cycle);
    mw->progCount->setText (s);
 
@@ -136,8 +136,8 @@ void AdjQueryDlg::setQuery(QString,
    int mqtime = Prefs::maxTimePer();
    if (mqtime > 0) {
      if (qtimer == 0) {
-       qtimer = new QTimer( this );
-       connect( qtimer, SIGNAL(timeout()), this, SLOT(timeoutReached()) );
+       qtimer = new TQTimer( this );
+       connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) );
      }
 
      if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) {
@@ -247,7 +247,7 @@ void AdjQueryDlg::slotUser2()
 }
 
 
-void AdjQueryDlg::keyPressEvent( QKeyEvent *e )
+void AdjQueryDlg::keyPressEvent( TQKeyEvent *e )
 {
   switch( e->key() )
   {
@@ -279,21 +279,21 @@ void AdjQueryDlg::returnPressed()
 }
 
 
-void AdjQueryDlg::lev1Changed(const QString&)
+void AdjQueryDlg::lev1Changed(const TQString&)
 {
   mw->verify->setDefault(true);
   resetField (mw->lev1Field);
 }
 
 
-void AdjQueryDlg::lev2Changed(const QString&)
+void AdjQueryDlg::lev2Changed(const TQString&)
 {
   mw->verify->setDefault(true);
   resetField (mw->lev2Field);
 }
 
 
-void AdjQueryDlg::lev3Changed(const QString&)
+void AdjQueryDlg::lev3Changed(const TQString&)
 {
   mw->verify->setDefault(true);
   resetField (mw->lev3Field);
diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h
index 29561404..fd26f7bf 100644
--- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h
+++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h
@@ -37,7 +37,7 @@ class AdjQueryDlg : public QueryDlgBase
 public:
   AdjQueryDlg
   (
-    QString type,
+    TQString type,
     int entry,
     int col,
     int query_cycle,
@@ -49,7 +49,7 @@ public:
 
   ~AdjQueryDlg();
 
-  void setQuery(QString type,
+  void setQuery(TQString type,
               int entry,
               int col,
               int query_cycle,
@@ -63,13 +63,13 @@ public slots:
   virtual void initFocus() const;
 
 protected:
-  void keyPressEvent(QKeyEvent *e);
+  void keyPressEvent(TQKeyEvent *e);
   void resetAllFields();
 
 protected slots:
-  void lev1Changed(const QString&);
-  void lev2Changed(const QString&);
-  void lev3Changed(const QString&);
+  void lev1Changed(const TQString&);
+  void lev2Changed(const TQString&);
+  void lev3Changed(const TQString&);
   void showAllClicked();
   void slotUser2();
   void knowItClicked();
diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
index a35ffa83..244141e0 100644
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
@@ -33,15 +33,15 @@
 #include <kapplication.h>
 #include <kprogress.h>
 
-#include <qtimer.h>
-#include <qradiobutton.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qbuttongroup.h>
+#include <tqtimer.h>
+#include <tqradiobutton.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
+#include <tqbuttongroup.h>
 
 ArtQueryDlg::ArtQueryDlg
 (
-        QString type,
+        TQString type,
         int entry,
         int col,
         int query_cycle,
@@ -61,14 +61,14 @@ ArtQueryDlg::ArtQueryDlg
   mw->artGroup->insert (mw->male);
   mw->artGroup->insert (mw->rb_fem);
 
-  connect(mw->dont_know, SIGNAL(clicked()), SLOT(dontKnowClicked()) );
-  connect(mw->know_it, SIGNAL(clicked()), SLOT(knowItClicked()) );
-  connect(mw->verify, SIGNAL(clicked()), SLOT(verifyClicked()) );
-  connect(mw->show_all, SIGNAL(clicked()), SLOT(showAllClicked()) );
+  connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) );
+  connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) );
+  connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) );
+  connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) );
 
-  connect(mw->natural, SIGNAL(clicked()), SLOT(slotNaturalClicked()) );
-  connect(mw->male, SIGNAL(clicked()), SLOT(slotMaleClicked()) );
-  connect(mw->rb_fem, SIGNAL(clicked()), SLOT(slotFemClicked()) );
+  connect(mw->natural, TQT_SIGNAL(clicked()), TQT_SLOT(slotNaturalClicked()) );
+  connect(mw->male, TQT_SIGNAL(clicked()), TQT_SLOT(slotMaleClicked()) );
+  connect(mw->rb_fem, TQT_SIGNAL(clicked()), TQT_SLOT(slotFemClicked()) );
 
   setQuery (type, entry, col, query_cycle, query_num, query_startnum, exp, doc, articles);
   mw->countbar->setFormat("%v/%m");
@@ -83,7 +83,7 @@ ArtQueryDlg::~ArtQueryDlg()
 }
 
 
-void ArtQueryDlg::setQuery(QString,
+void ArtQueryDlg::setQuery(TQString,
                            int entry,
                            int col,
                            int q_cycle,
@@ -103,18 +103,18 @@ void ArtQueryDlg::setQuery(QString,
    mw->show_all->setDefault(true);
    articles = art;
 
-   QString s;
+   TQString s;
    if (col == 0)
      s = exp->getOriginal().stripWhiteSpace();
    else
      s = exp->getTranslation(q_ocol).stripWhiteSpace();
 
-   QString def, indef;
+   TQString def, indef;
    bool removed = false;
 
    articles.female(def, indef);
    mw->rb_fem->setText (i18n("&female:\t")+def+" / "+indef);
-   mw->rb_fem->setEnabled (!QString(def+indef).isEmpty() );
+   mw->rb_fem->setEnabled (!TQString(def+indef).isEmpty() );
    if (!removed && s.find(def+" ") == 0) {
      s.remove (0, def.length()+1);
      removed = true;
@@ -126,7 +126,7 @@ void ArtQueryDlg::setQuery(QString,
 
    articles.male(def, indef);
    mw->male->setText (i18n("&male:\t")+def+" / "+indef);
-   mw->male->setEnabled (!QString(def+indef).isEmpty() );
+   mw->male->setEnabled (!TQString(def+indef).isEmpty() );
    if (!removed && s.find(def+" ") == 0) {
      s.remove (0, def.length()+1);
      removed = true;
@@ -138,7 +138,7 @@ void ArtQueryDlg::setQuery(QString,
 
    articles.natural(def, indef);
    mw->natural->setText (i18n("&natural:\t")+def+" / "+indef);
-   mw->natural->setEnabled (!QString(def+indef).isEmpty() );
+   mw->natural->setEnabled (!TQString(def+indef).isEmpty() );
    if (!removed && s.find(def+" ") == 0) {
      s.remove (0, def.length()+1);
      removed = true;
@@ -157,8 +157,8 @@ void ArtQueryDlg::setQuery(QString,
    int mqtime = Prefs::maxTimePer();
    if (mqtime > 0) {
      if (qtimer == 0) {
-       qtimer = new QTimer( this );
-       connect( qtimer, SIGNAL(timeout()), this, SLOT(timeoutReached()) );
+       qtimer = new TQTimer( this );
+       connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) );
      }
 
      if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) {
@@ -284,7 +284,7 @@ void ArtQueryDlg::slotUser2()
 }
 
 
-void ArtQueryDlg::keyPressEvent( QKeyEvent *e )
+void ArtQueryDlg::keyPressEvent( TQKeyEvent *e )
 {
   switch( e->key() )
   {
diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h
index 61d84103..a2884d05 100644
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h
@@ -36,7 +36,7 @@ class ArtQueryDlg : public QueryDlgBase
 
 public:
   ArtQueryDlg(
-              QString type,
+              TQString type,
               int entry,
               int col,
               int query_cycle,
@@ -48,7 +48,7 @@ public:
 
   ~ArtQueryDlg();
 
-  void setQuery (QString type,
+  void setQuery (TQString type,
               int entry,
               int col,
               int query_cycle,
@@ -62,7 +62,7 @@ public slots:
   virtual void initFocus() const;
 
 protected:
-  void keyPressEvent( QKeyEvent *e );
+  void keyPressEvent( TQKeyEvent *e );
 
 protected slots:
   void showMoreClicked();
diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
index 596492ad..ac4345a1 100644
--- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
@@ -33,18 +33,18 @@
 #include <kdebug.h>
 #include <kprogress.h>
 
-#include <qtimer.h>
-#include <qlabel.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
-#include <qpushbutton.h>
+#include <tqtimer.h>
+#include <tqlabel.h>
+#include <tqradiobutton.h>
+#include <tqbuttongroup.h>
+#include <tqpushbutton.h>
 
 #include <algorithm>
 using namespace std;
 
 MCQueryDlg::MCQueryDlg(
-                   QString org,
-                   QString trans,
+                   TQString org,
+                   TQString trans,
                    int entry,
                    int orgcol,
                    int transcol,
@@ -64,15 +64,15 @@ MCQueryDlg::MCQueryDlg(
   mw->transgroup->insert(mw->rb_trans4);
   mw->transgroup->insert(mw->rb_trans5);
 
-  connect( mw->dont_know, SIGNAL(clicked()), SLOT(dontKnowClicked()) );
-  connect( mw->know_it, SIGNAL(clicked()), SLOT(knowItClicked()) );
-// connect( verify, SIGNAL(clicked()), SLOT(verifyClicked()) );
-  connect( mw->show_all, SIGNAL(clicked()), SLOT(showItClicked()) );
-  connect( mw->rb_trans5, SIGNAL(clicked()), SLOT(trans5clicked()) );
-  connect( mw->rb_trans4, SIGNAL(clicked()), SLOT(trans4clicked()) );
-  connect( mw->rb_trans3, SIGNAL(clicked()), SLOT(trans3clicked()) );
-  connect( mw->rb_trans2, SIGNAL(clicked()), SLOT(trans2clicked()) );
-  connect( mw->rb_trans1, SIGNAL(clicked()), SLOT(trans1clicked()) );
+  connect( mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) );
+  connect( mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) );
+// connect( verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) );
+  connect( mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showItClicked()) );
+  connect( mw->rb_trans5, TQT_SIGNAL(clicked()), TQT_SLOT(trans5clicked()) );
+  connect( mw->rb_trans4, TQT_SIGNAL(clicked()), TQT_SLOT(trans4clicked()) );
+  connect( mw->rb_trans3, TQT_SIGNAL(clicked()), TQT_SLOT(trans3clicked()) );
+  connect( mw->rb_trans2, TQT_SIGNAL(clicked()), TQT_SLOT(trans2clicked()) );
+  connect( mw->rb_trans1, TQT_SIGNAL(clicked()), TQT_SLOT(trans1clicked()) );
 
   qtimer = 0;
 
@@ -89,8 +89,8 @@ MCQueryDlg::~MCQueryDlg()
 }
 
 
-void MCQueryDlg::setQuery(QString org,
-                         QString trans,
+void MCQueryDlg::setQuery(TQString org,
+                         TQString trans,
                          int entry,
                          int orgcol,
                          int transcol,
@@ -111,7 +111,7 @@ void MCQueryDlg::setQuery(QString org,
    mw->orgField->setFont(Prefs::tableFont());
    mw->orgField->setText (org);
    mw->show_all->setDefault(true);
-   QString s;
+   TQString s;
    s.setNum (q_cycle);
    mw->progCount->setText (s);
 
@@ -120,8 +120,8 @@ void MCQueryDlg::setQuery(QString org,
    int mqtime = Prefs::maxTimePer();
    if (mqtime > 0) {
      if (qtimer == 0) {
-       qtimer = new QTimer( this );
-       connect( qtimer, SIGNAL(timeout()), this, SLOT(timeoutReached()) );
+       qtimer = new TQTimer( this );
+       connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) );
      }
 
      if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) {
@@ -136,7 +136,7 @@ void MCQueryDlg::setQuery(QString org,
    else
      mw->timebar->setEnabled(false);
 
-   vector<QString> strings;
+   vector<TQString> strings;
    button_ref.clear();
    button_ref.push_back(RB_Label(mw->rb_trans1, mw->trans1));
    button_ref.push_back(RB_Label(mw->rb_trans2, mw->trans2));
@@ -158,7 +158,7 @@ void MCQueryDlg::setQuery(QString org,
    std::random_shuffle(strings.begin(), strings.end());
 
    // always include false friend
-   QString ff;
+   TQString ff;
    if (q_tcol != 0)
      ff = exp->getFauxAmi (q_tcol, false).stripWhiteSpace();
    else
@@ -390,7 +390,7 @@ void MCQueryDlg::slotUser2()
 }
 
 
-void MCQueryDlg::keyPressEvent( QKeyEvent *e )
+void MCQueryDlg::keyPressEvent( TQKeyEvent *e )
 {
   switch( e->key() )
   {
diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h
index 4e94f9db..4fcbccf7 100644
--- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h
+++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h
@@ -36,8 +36,8 @@ class MCQueryDlg : public QueryDlgBase
 
 public:
   MCQueryDlg(
-            QString org,
-            QString trans,
+            TQString org,
+            TQString trans,
             int entry,
             int orgcol,
             int transcol,
@@ -49,8 +49,8 @@ public:
 
   ~MCQueryDlg();
 
-  void setQuery(QString org,
-                QString trans,
+  void setQuery(TQString org,
+                TQString trans,
                 int entry,
                 int orgcol,
                 int transcol,
@@ -64,7 +64,7 @@ public slots:
   virtual void initFocus() const;
 
 protected:
-  void keyPressEvent(QKeyEvent *e);
+  void keyPressEvent(TQKeyEvent *e);
 
 public slots:
   void showItClicked();
diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
index 97b47c57..d70b92ed 100644
--- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
@@ -25,15 +25,15 @@
 
 #include "QueryDlgBase.h"
 
-#include <qlineedit.h>
-#include <qmultilineedit.h>
-#include <qradiobutton.h>
+#include <tqlineedit.h>
+#include <tqmultilineedit.h>
+#include <tqradiobutton.h>
 
 #include <LineList.h>
 
 #include <klocale.h>
 
-QueryDlgBase::QueryDlgBase(const QString & caption, QWidget *parent, const char *name, bool modal)
+QueryDlgBase::QueryDlgBase(const TQString & caption, TQWidget *parent, const char *name, bool modal)
   : KDialogBase(Swallow, caption, User1|User2, NoDefault, parent, name, modal, false,
     KGuiItem(i18n("&Stop Query")), KGuiItem(i18n("&Edit Expression...")))
 {
@@ -54,29 +54,29 @@ void QueryDlgBase::initFocus() const
 }
 
 
-bool QueryDlgBase::smartCompare (const QString& s1, const QString &s2,
+bool QueryDlgBase::smartCompare (const TQString& s1, const TQString &s2,
                                  int ) const
 {
   return s1.stripWhiteSpace() == s2.stripWhiteSpace();
 }
 
 
-bool QueryDlgBase::verifyField(QLineEdit *field, const QString &really)
+bool QueryDlgBase::verifyField(TQLineEdit *field, const TQString &really)
 {
   if (!field->isEnabled() )
     return true;
 
-  QColorGroup u_normal = field->colorGroup();
-  u_normal.setColor(QColorGroup::Text, QColor(0xff, 0x00, 0x00));
-  QColorGroup k_normal = field->colorGroup();
-  k_normal.setColor(QColorGroup::Text, QColor(0x00, 0x80, 0x00));
+  TQColorGroup u_normal = field->colorGroup();
+  u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00));
+  TQColorGroup k_normal = field->colorGroup();
+  k_normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x80, 0x00));
 
-  QPalette known_pal( field->palette());
-  QPalette unknown_pal( field->palette());
+  TQPalette known_pal( field->palette());
+  TQPalette unknown_pal( field->palette());
 
-  QFont ft = field->font();
-  if (ft.weight() != QFont::Bold) {
-    ft.setWeight(QFont::Bold);
+  TQFont ft = field->font();
+  if (ft.weight() != TQFont::Bold) {
+    ft.setWeight(TQFont::Bold);
     field->setFont(ft);
   }
 
@@ -103,14 +103,14 @@ bool QueryDlgBase::verifyField(QLineEdit *field, const QString &really)
 }
 
 
-void QueryDlgBase::resetField(QLineEdit *field)
+void QueryDlgBase::resetField(TQLineEdit *field)
 {
   if (!field->isEnabled() )
     return;
-  QColorGroup normal = field->colorGroup();
-  normal.setColor(QColorGroup::Text, QColor(0x00, 0x00, 0x00));
+  TQColorGroup normal = field->colorGroup();
+  normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x00, 0x00));
 
-  QPalette pal( field->palette());
+  TQPalette pal( field->palette());
   // replace text colors
 
   if ( pal.inactive() != normal
@@ -120,29 +120,29 @@ void QueryDlgBase::resetField(QLineEdit *field)
     field->setPalette( pal );
   }
 
-  QFont ft = field->font();
-  if (ft.weight() != QFont::Normal) {
-    ft.setWeight(QFont::Normal);
+  TQFont ft = field->font();
+  if (ft.weight() != TQFont::Normal) {
+    ft.setWeight(TQFont::Normal);
     field->setFont(ft);
   }
 }
 
 
-bool QueryDlgBase::verifyField(QMultiLineEdit *field, const QString &really, bool mixed)
+bool QueryDlgBase::verifyField(TQMultiLineEdit *field, const TQString &really, bool mixed)
 {
   if (!field->isEnabled())
     return true;
-  QColorGroup u_normal = field->colorGroup();
-  u_normal.setColor(QColorGroup::Text, QColor(0xff, 0x00, 0x00));
-  QColorGroup k_normal = field->colorGroup();
-  k_normal.setColor(QColorGroup::Text, QColor(0x00, 0x80, 0x00));
+  TQColorGroup u_normal = field->colorGroup();
+  u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00));
+  TQColorGroup k_normal = field->colorGroup();
+  k_normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x80, 0x00));
 
-  QPalette known_pal( field->palette());
-  QPalette unknown_pal( field->palette());
+  TQPalette known_pal( field->palette());
+  TQPalette unknown_pal( field->palette());
 
-  QFont ft = field->font();
-  if (ft.weight() != QFont::Bold) {
-    ft.setWeight(QFont::Bold);
+  TQFont ft = field->font();
+  if (ft.weight() != TQFont::Bold) {
+    ft.setWeight(TQFont::Bold);
     field->setFont(ft);
   }
 
@@ -191,14 +191,14 @@ bool QueryDlgBase::verifyField(QMultiLineEdit *field, const QString &really, boo
 }
 
 
-void QueryDlgBase::resetField(QMultiLineEdit *field)
+void QueryDlgBase::resetField(TQMultiLineEdit *field)
 {
   if (!field->isEnabled() )
     return;
-  QColorGroup normal = field->colorGroup();
-  normal.setColor(QColorGroup::Text, QColor(0x00, 0x00, 0x00));
+  TQColorGroup normal = field->colorGroup();
+  normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x00, 0x00));
 
-  QPalette pal( field->palette());
+  TQPalette pal( field->palette());
   // replace text colors
 
   if ( pal.inactive() != normal
@@ -208,39 +208,39 @@ void QueryDlgBase::resetField(QMultiLineEdit *field)
     field->setPalette( pal );
   }
 
-  QFont ft = field->font();
-  if (ft.weight() != QFont::Normal) {
-    ft.setWeight(QFont::Normal);
+  TQFont ft = field->font();
+  if (ft.weight() != TQFont::Normal) {
+    ft.setWeight(TQFont::Normal);
     field->setFont(ft);
   }
 }
 
 
-void QueryDlgBase::verifyButton(QRadioButton *radio, bool is_ok, QWidget *widget2)
+void QueryDlgBase::verifyButton(TQRadioButton *radio, bool is_ok, TQWidget *widget2)
 {
   if (!radio->isEnabled() )
     return;
 
-  QColorGroup u_normal = radio->colorGroup();
-  u_normal.setColor(QColorGroup::Foreground, QColor(0xff, 0x00, 0x00));
-  QColorGroup k_normal = radio->colorGroup();
-  k_normal.setColor(QColorGroup::Foreground, QColor(0x00, 0x80, 0x00));
+  TQColorGroup u_normal = radio->colorGroup();
+  u_normal.setColor(TQColorGroup::Foreground, TQColor(0xff, 0x00, 0x00));
+  TQColorGroup k_normal = radio->colorGroup();
+  k_normal.setColor(TQColorGroup::Foreground, TQColor(0x00, 0x80, 0x00));
 
-  QPalette known_pal( radio->palette());
-  QPalette unknown_pal( radio->palette());
+  TQPalette known_pal( radio->palette());
+  TQPalette unknown_pal( radio->palette());
 
   // replace text colors
 
-  QFont ft = radio->font();
-  if (ft.weight() != QFont::Bold) {
-    ft.setWeight(QFont::Bold);
+  TQFont ft = radio->font();
+  if (ft.weight() != TQFont::Bold) {
+    ft.setWeight(TQFont::Bold);
     radio->setFont(ft);
   }
 
   if (widget2 != 0) {
     ft = widget2->font();
-    if (ft.weight() != QFont::Bold) {
-      ft.setWeight(QFont::Bold);
+    if (ft.weight() != TQFont::Bold) {
+      ft.setWeight(TQFont::Bold);
       widget2->setFont(ft);
     }
   }
@@ -269,14 +269,14 @@ void QueryDlgBase::verifyButton(QRadioButton *radio, bool is_ok, QWidget *widget
 
 
 
-void QueryDlgBase::resetButton(QRadioButton *radio, QWidget *widget2)
+void QueryDlgBase::resetButton(TQRadioButton *radio, TQWidget *widget2)
 {
   if (!radio->isEnabled() )
     return;
-  QColorGroup normal = radio->colorGroup();
-  normal.setColor(QColorGroup::Foreground, QColor(0x00, 0x00, 0x00));
+  TQColorGroup normal = radio->colorGroup();
+  normal.setColor(TQColorGroup::Foreground, TQColor(0x00, 0x00, 0x00));
 
-  QPalette pal(radio->palette());
+  TQPalette pal(radio->palette());
   // replace text colors, avoid flickering
   if ( pal.inactive() != normal
       || pal.active() != normal) {
@@ -287,40 +287,40 @@ void QueryDlgBase::resetButton(QRadioButton *radio, QWidget *widget2)
       widget2->setPalette( pal );
   }
 
-  QFont ft = radio->font();
-  if (ft.weight() != QFont::Normal) {
-    ft.setWeight(QFont::Normal);
+  TQFont ft = radio->font();
+  if (ft.weight() != TQFont::Normal) {
+    ft.setWeight(TQFont::Normal);
     radio->setFont(ft);
   }
 
   if (widget2 != 0) {
     ft = widget2->font();
-    if (ft.weight() != QFont::Normal) {
-      ft.setWeight(QFont::Normal);
+    if (ft.weight() != TQFont::Normal) {
+      ft.setWeight(TQFont::Normal);
       widget2->setFont(ft);
     }
   }
 }
 
 
-QString  QueryDlgBase::getOKComment(int percent_done)
+TQString  QueryDlgBase::getOKComment(int percent_done)
 {
   return i18n("Well done, you knew the correct answer. %1% done.").arg(percent_done);
 }
 
 
-QString  QueryDlgBase::getTimeoutComment(int percent_done)
+TQString  QueryDlgBase::getTimeoutComment(int percent_done)
 {
   return i18n("You waited too long to enter the correct answer. %1% done.").arg(percent_done);
 }
 
 
-QString  QueryDlgBase::getNOKComment(int percent_done)
+TQString  QueryDlgBase::getNOKComment(int percent_done)
 {
   return i18n("Your answer was wrong. %1% done.").arg(percent_done);
 }
 
-void QueryDlgBase::closeEvent(QCloseEvent * /*e*/)
+void QueryDlgBase::closeEvent(TQCloseEvent * /*e*/)
 {
   emit sigQueryChoice(StopIt);
 }
diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h
index 6f62ddf0..4c67b096 100644
--- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h
+++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h
@@ -51,27 +51,27 @@ class QueryDlgBase : public KDialogBase
 public:
   enum Result { Unknown, Known, Timeout, StopIt };
 
-  QueryDlgBase(const QString & caption, QWidget *parent = 0, const char *name = 0, bool modal = false);
+  QueryDlgBase(const TQString & caption, TQWidget *parent = 0, const char *name = 0, bool modal = false);
 
   virtual ~QueryDlgBase ();
 
-  bool smartCompare (const QString&, const QString&, int level) const;
+  bool smartCompare (const TQString&, const TQString&, int level) const;
 
-  bool verifyField(QLineEdit *field, const QString &really);
-  void resetField (QLineEdit *field);
+  bool verifyField(TQLineEdit *field, const TQString &really);
+  void resetField (TQLineEdit *field);
 
-  bool verifyField(QMultiLineEdit *field, const QString &really,
+  bool verifyField(TQMultiLineEdit *field, const TQString &really,
                     bool mixed);
-  void resetField (QMultiLineEdit *field);
+  void resetField (TQMultiLineEdit *field);
 
-  void verifyButton(QRadioButton *radio, bool is_ok, QWidget *widget2 = 0);
-  void resetButton (QRadioButton *radio, QWidget *widget2 = 0);
+  void verifyButton(TQRadioButton *radio, bool is_ok, TQWidget *widget2 = 0);
+  void resetButton (TQRadioButton *radio, TQWidget *widget2 = 0);
 
   // Show string after selceting known/unknown
   // depending on progress and randomness
-  QString  getOKComment(int percent);
-  QString  getNOKComment(int percent);
-  QString  getTimeoutComment(int percent);
+  TQString  getOKComment(int percent);
+  TQString  getNOKComment(int percent);
+  TQString  getTimeoutComment(int percent);
 
   int getRandom(int range)
     {
@@ -86,15 +86,15 @@ signals:
   void sigEditEntry(int row, int col);
 
 protected:
-  virtual void closeEvent(QCloseEvent*e);
+  virtual void closeEvent(TQCloseEvent*e);
   virtual void slotUser1();
 
   struct RB_Label {
-    RB_Label (QRadioButton* _rb, QLabel *_label)
+    RB_Label (TQRadioButton* _rb, TQLabel *_label)
       : rb(_rb), label(_label) {}
 
-    QRadioButton  *rb;
-    QLabel        *label;
+    TQRadioButton  *rb;
+    TQLabel        *label;
   };
 
   int            q_row,
@@ -102,8 +102,8 @@ protected:
                  q_tcol;
   kvoctrainDoc  *kv_doc;
   kvoctrainExpr *kv_exp;
-  QString        translation;
-  QTimer        *qtimer;
+  TQString        translation;
+  TQTimer        *qtimer;
   int            timercount;
 };
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
index be309563..8f1e315f 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
@@ -33,31 +33,31 @@
 #include <kapplication.h>
 #include <kprogress.h>
 
-#include <qcheckbox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qregexp.h>
-#include <qtimer.h>
-
-QStringList RandomQueryDlg::extractTranslations (QString trans)
+#include <tqcheckbox.h>
+#include <tqgroupbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
+#include <tqregexp.h>
+#include <tqtimer.h>
+
+TQStringList RandomQueryDlg::extractTranslations (TQString trans)
 {
-   QRegExp full_stop ("^(.*[^\\. ])\\.* *$");
+   TQRegExp full_stop ("^(.*[^\\. ])\\.* *$");
    //full_stop.setMinimal (true);
    if ( full_stop.search (trans) >= 0 )
      trans = full_stop.cap (1);
    int i;
-   QStringList translations;
+   TQStringList translations;
    if ( Prefs::periods() )
      for ( i = fields - 1; i > 0; i -- )
      {
-       QString regexp ("^ *");
+       TQString regexp ("^ *");
        for ( int j = 0; j < i; j ++ )
          regexp += "([^ ][^.]*)\\.[. ]*";
        regexp += "([^. ].*)$";
-       QRegExp regex (regexp);
+       TQRegExp regex (regexp);
        if ( regex.search (trans) >= 0 )
        {
          translations = regex.capturedTexts();
@@ -70,11 +70,11 @@ QStringList RandomQueryDlg::extractTranslations (QString trans)
      translations.clear();
      for ( i = fields - 1; i > 0; i -- )
      {
-       QString regexp ("^ *");
+       TQString regexp ("^ *");
        for ( int j = 0; j < i; j ++ )
          regexp += "([^ ][^:]*):[: ]*";
        regexp += "([^: ].*)$";
-       QRegExp regex (regexp);
+       TQRegExp regex (regexp);
        if ( regex.search (trans) >= 0 )
        {
          translations = regex.capturedTexts();
@@ -88,11 +88,11 @@ QStringList RandomQueryDlg::extractTranslations (QString trans)
      translations.clear();
      for ( i = fields - 1; i > 0; i -- )
      {
-       QString regexp ("^ *");
+       TQString regexp ("^ *");
        for ( int j = 0; j < i; j ++ )
          regexp += "([^ ][^;]*);[; ]*";
        regexp += "([^; ].*)$";
-       QRegExp regex (regexp);
+       TQRegExp regex (regexp);
        if ( regex.search (trans) >= 0 )
        {
          translations = regex.capturedTexts();
@@ -106,11 +106,11 @@ QStringList RandomQueryDlg::extractTranslations (QString trans)
      translations.clear();
      for ( i = fields - 1; i > 0; i -- )
      {
-       QString regexp ("^ *");
+       TQString regexp ("^ *");
        for ( int j = 0; j < i; j ++ )
          regexp += "([^ ][^,]*),[, ]*";
        regexp += "([^, ].*)$";
-       QRegExp regex (regexp);
+       TQRegExp regex (regexp);
        if ( regex.search (trans) >= 0 )
        {
          translations = regex.capturedTexts();
@@ -120,13 +120,13 @@ QStringList RandomQueryDlg::extractTranslations (QString trans)
      }
    }
    if ( translations.count() <= 1 )
-     translations = QStringList (trans);
+     translations = TQStringList (trans);
    return translations;
 }
 
 RandomQueryDlg::RandomQueryDlg(
-                   QString org,
-                   QString trans,
+                   TQString org,
+                   TQString trans,
                    int entry,
                    int orgcol,
                    int transcol,
@@ -140,14 +140,14 @@ RandomQueryDlg::RandomQueryDlg(
   mw = new QueryDlgForm(this);
   setMainWidget(mw);
 
-  connect( mw->c_type, SIGNAL(clicked()), SLOT(slotTypeClicked()) );
-  connect( mw->c_remark, SIGNAL(clicked()), SLOT(slotRemClicked()) );
-  connect( mw->c_falsefriend, SIGNAL(clicked()), SLOT(slotFFClicked()) );
-  connect( mw->dont_know, SIGNAL(clicked()), SLOT(dontKnowClicked()) );
-  connect( mw->know_it, SIGNAL(clicked()), SLOT(knowItClicked()) );
-  connect( mw->verify, SIGNAL(clicked()), SLOT(verifyClicked()) );
-  connect( mw->show_all, SIGNAL(clicked()), SLOT(showAllClicked()) );
-  connect( mw->show_more, SIGNAL(clicked()), SLOT(showMoreClicked()) );
+  connect( mw->c_type, TQT_SIGNAL(clicked()), TQT_SLOT(slotTypeClicked()) );
+  connect( mw->c_remark, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemClicked()) );
+  connect( mw->c_falsefriend, TQT_SIGNAL(clicked()), TQT_SLOT(slotFFClicked()) );
+  connect( mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) );
+  connect( mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) );
+  connect( mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) );
+  connect( mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) );
+  connect( mw->show_more, TQT_SIGNAL(clicked()), TQT_SLOT(showMoreClicked()) );
 
   mw->show_more -> setEnabled (Prefs::showMore());
   mw->know_it -> setEnabled (Prefs::iKnow());
@@ -159,7 +159,7 @@ RandomQueryDlg::RandomQueryDlg(
   else if ( fields > 10 )
     fields = 10;
 
-  QVBoxLayout * vb = new QVBoxLayout(mw->TranslationFrame, 0, KDialog::spacingHint());
+  TQVBoxLayout * vb = new TQVBoxLayout(mw->TranslationFrame, 0, KDialog::spacingHint());
 
   bool suggestions = Prefs::suggestions();
   int i;
@@ -167,25 +167,25 @@ RandomQueryDlg::RandomQueryDlg(
   {
     for ( i = 0; i < fields; i ++ )
     {
-      transCombos.append (new QComboBox (false, mw->TranslationFrame, QCString ("transCombo") + QCString().setNum (i)));
-      transCombos.at(i) -> setSizePolicy (QSizePolicy ((QSizePolicy::SizeType)7, (QSizePolicy::SizeType)1, 0, 0, transCombos.at(i) -> sizePolicy().hasHeightForWidth()));
+      transCombos.append (new TQComboBox (false, mw->TranslationFrame, TQCString ("transCombo") + TQCString().setNum (i)));
+      transCombos.at(i) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transCombos.at(i) -> sizePolicy().hasHeightForWidth()));
       transCombos.at(i) -> setEditable (true);
-      transCombos.at(i) -> setInsertionPolicy (QComboBox::NoInsertion);
+      transCombos.at(i) -> setInsertionPolicy (TQComboBox::NoInsertion);
       transCombos.at(i) -> setDuplicatesEnabled (false);
       vb->addWidget(transCombos.at(i));
-      connect (transCombos.at(i), SIGNAL (textChanged (const QString&)), SLOT (slotTransChanged (const QString&)));
-      connect (transCombos.at(i) -> lineEdit(), SIGNAL (lostFocus()), SLOT (slotTransLostFocus()));
+      connect (transCombos.at(i), TQT_SIGNAL (textChanged (const TQString&)), TQT_SLOT (slotTransChanged (const TQString&)));
+      connect (transCombos.at(i) -> lineEdit(), TQT_SIGNAL (lostFocus()), TQT_SLOT (slotTransLostFocus()));
     }
   }
   else
   {
     for ( i = 0; i < fields; i ++ )
     {
-      transFields.append (new QLineEdit (mw->TranslationFrame, QCString ("transField") + QCString().setNum (i)));
-      transFields.at(i) -> setSizePolicy (QSizePolicy ((QSizePolicy::SizeType)7, (QSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth()));
+      transFields.append (new TQLineEdit (mw->TranslationFrame, TQCString ("transField") + TQCString().setNum (i)));
+      transFields.at(i) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth()));
       vb->addWidget(transFields.at(i));
-      connect (transFields.at(i), SIGNAL (textChanged (const QString&)), SLOT (slotTransChanged (const QString&)));
-      connect (transFields.at(i), SIGNAL (lostFocus()), SLOT (slotTransLostFocus()));
+      connect (transFields.at(i), TQT_SIGNAL (textChanged (const TQString&)), TQT_SLOT (slotTransChanged (const TQString&)));
+      connect (transFields.at(i), TQT_SIGNAL (lostFocus()), TQT_SLOT (slotTransLostFocus()));
     }
   }
 
@@ -201,7 +201,7 @@ RandomQueryDlg::RandomQueryDlg(
     ProgressDlg* pdlg = 0;
     if ( split && kv_doc -> numEntries() >= 500 )
     {
-      pdlg = new ProgressDlg (QString(), QString(), kapp -> makeStdCaption (i18n("Loading Random Query")));
+      pdlg = new ProgressDlg (TQString(), TQString(), kapp -> makeStdCaption (i18n("Loading Random Query")));
       pdlg -> resize (pdlg -> width(), pdlg -> minimumSize().height());
       pdlg -> show();
       kapp -> processEvents();
@@ -243,8 +243,8 @@ RandomQueryDlg::~RandomQueryDlg()
 }
 
 
-void RandomQueryDlg::setQuery(QString org,
-                         QString trans,
+void RandomQueryDlg::setQuery(TQString org,
+                         TQString trans,
                          int entry,
                          int orgcol,
                          int transcol,
@@ -297,7 +297,7 @@ void RandomQueryDlg::setQuery(QString org,
    mw->orgField->setFont(Prefs::tableFont());
    mw->orgField->setText (org);
    mw->show_all->setDefault(true);
-   QString s;
+   TQString s;
    s.setNum (q_cycle);
    mw->progCount->setText (s);
 
@@ -315,8 +315,8 @@ void RandomQueryDlg::setQuery(QString org,
    int mqtime = Prefs::maxTimePer();
    if (mqtime > 0) {
      if (qtimer == 0) {
-       qtimer = new QTimer( this );
-       connect( qtimer, SIGNAL(timeout()), this, SLOT(timeoutReached()) );
+       qtimer = new TQTimer( this );
+       connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) );
      }
 
      if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) {
@@ -348,11 +348,11 @@ void RandomQueryDlg::initFocus() const
 
 void RandomQueryDlg::verifyClicked()
 {
-  QStringList trans (translations);
+  TQStringList trans (translations);
   uint i, j;
   if ( Prefs::suggestions() )
   {
-    QPtrList<QComboBox> combos (transCombos);
+    TQPtrList<TQComboBox> combos (transCombos);
     for ( i = combos.count() - 1; i >= translations.count(); i -- )
       combos.remove (i);
     for ( i = 0; i < combos.count(); i ++ )
@@ -381,7 +381,7 @@ void RandomQueryDlg::verifyClicked()
   }
   else
   {
-    QPtrList<QLineEdit> fields (transFields);
+    TQPtrList<TQLineEdit> fields (transFields);
     for ( i = fields.count() - 1; i >= translations.count(); i -- )
       fields.remove (i);
     for ( i = 0; i < fields.count(); i ++ )
@@ -415,7 +415,7 @@ void RandomQueryDlg::showMoreClicked()
   if ( Prefs::suggestions() )
     for ( uint i = 0; i < translations.count(); i ++ )
     {
-      QComboBox* combo = transCombos.at(i);
+      TQComboBox* combo = transCombos.at(i);
       if ( ! smartCompare (combo -> currentText(), translations[i], 0) )
       {
         uint length = combo -> currentText().length() + 1;
@@ -437,7 +437,7 @@ void RandomQueryDlg::showMoreClicked()
   else
     for ( uint i = 0; i < translations.count(); i ++ )
     {
-      QLineEdit* field = transFields.at(i);
+      TQLineEdit* field = transFields.at(i);
       if ( ! smartCompare (field -> text(), translations[i], 0) )
       {
         uint length = field -> text().length() + 1;
@@ -482,23 +482,23 @@ void RandomQueryDlg::showAllClicked()
 }
 
 
-void RandomQueryDlg::slotTransChanged(const QString&)
+void RandomQueryDlg::slotTransChanged(const TQString&)
 {
   mw->verify->setDefault(true);
   bool suggestions = Prefs::suggestions();
-  if ( suggestions && sender() && sender() -> isA ("QComboBox") )
+  if ( suggestions && sender() && sender() -> isA ("TQComboBox") )
   {
-    QLineEdit* edit = ((QComboBox*) sender()) -> lineEdit();
+    TQLineEdit* edit = ((TQComboBox*) sender()) -> lineEdit();
     resetField (edit);
     suggestion_hint = ! edit -> text().isEmpty() && edit -> text().length() <= 10;
     if ( suggestion_hint )
-      mw->status -> setText (QString (i18n("Press F5 for a list of translations starting with '%1'\n"
+      mw->status -> setText (TQString (i18n("Press F5 for a list of translations starting with '%1'\n"
         "Press F6 for a list of translations containing '%2'")).arg (edit -> text()).arg (edit -> text()));
     else
       mw->status -> clear();
   }
-  else if ( ! suggestions && sender() && sender() -> isA ("QLineEdit") )
-    resetField ((QLineEdit*) sender());
+  else if ( ! suggestions && sender() && sender() -> isA ("TQLineEdit") )
+    resetField ((TQLineEdit*) sender());
 }
 
 void RandomQueryDlg::slotTransLostFocus()
@@ -551,7 +551,7 @@ void RandomQueryDlg::dontKnowClicked()
 
 void RandomQueryDlg::setHintFields()
 {
-   QString s;
+   TQString s;
    kvoctrainExpr *exp = kv_doc->getEntry(q_row);
 
    s = exp->getRemark(q_ocol);
@@ -627,11 +627,11 @@ void RandomQueryDlg::slotTypeClicked()
 }
 
 
-void RandomQueryDlg::keyPressEvent( QKeyEvent *e )
+void RandomQueryDlg::keyPressEvent( TQKeyEvent *e )
 {
   if ( Prefs::suggestions() )
   {
-    QComboBox* combo = 0;
+    TQComboBox* combo = 0;
     if ( e -> key() == Key_F4 || e -> key() == Key_F5 || e -> key() == Key_F6 )
       for ( uint i = 0; i < translations.count(); i ++ )
         if ( transCombos.at(i) -> hasFocus() )
@@ -645,11 +645,11 @@ void RandomQueryDlg::keyPressEvent( QKeyEvent *e )
       case Key_F6:
         if ( combo && ! combo -> currentText().isEmpty() )
         {
-          QString curText (combo -> currentText());
+          TQString curText (combo -> currentText());
           combo -> clear();
           for ( uint i = 0; i < vocabulary.count(); i ++ )
           {
-            QString trans (vocabulary[i]);
+            TQString trans (vocabulary[i]);
             if ( (e -> key() == Key_F5 && trans.startsWith (curText, false)
                 || e -> key() == Key_F6 && trans.contains (curText, false)) )
               combo -> insertItem (trans);
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h
index 92ab7fd7..e1fd7362 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h
@@ -30,8 +30,8 @@
 #include "RandomQueryDlgForm.h"
 #include "QueryDlgBase.h"
 
-#include <qcombobox.h>
-#include <qlineedit.h>
+#include <tqcombobox.h>
+#include <tqlineedit.h>
 
 class kvoctrainDoc;
 
@@ -41,8 +41,8 @@ class RandomQueryDlg : public QueryDlgBase
 
 public:
   RandomQueryDlg(
-                 QString org,
-                 QString trans,
+                 TQString org,
+                 TQString trans,
                  int entry,
                  int orgcol,
                  int transcol,
@@ -54,8 +54,8 @@ public:
 
   ~RandomQueryDlg();
 
-  void setQuery(QString org,
-                      QString trans,
+  void setQuery(TQString org,
+                      TQString trans,
                       int entry,
                       int orgcol,
                       int transcol,
@@ -76,25 +76,25 @@ public slots:
   void dontKnowClicked();
   void timeoutReached();
   void slotUser2();
-  void slotTransChanged(const QString&);
+  void slotTransChanged(const TQString&);
   void slotTransLostFocus();
   void slotFFClicked();
   void slotTypeClicked();
   void slotRemClicked();
 
 protected:
-  virtual void keyPressEvent(QKeyEvent *e);
+  virtual void keyPressEvent(TQKeyEvent *e);
 
   void setHintFields();
-  QStringList extractTranslations (QString trans);
+  TQStringList extractTranslations (TQString trans);
 
   kvoctrainDoc * kv_doc;
 
-  QPtrList<QComboBox> transCombos;
-  QPtrList<QLineEdit> transFields;
+  TQPtrList<TQComboBox> transCombos;
+  TQPtrList<TQLineEdit> transFields;
 
-  QStringList translations;
-  QStringList vocabulary;
+  TQStringList translations;
+  TQStringList vocabulary;
 
   bool suggestion_hint;
   int  fields;
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
index 47421e7a..1c6f8469 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
@@ -27,10 +27,10 @@
 
 #include <kv_resource.h>
 
-#include <qtimer.h>
-#include <qmultilineedit.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
+#include <tqtimer.h>
+#include <tqmultilineedit.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
 
 #include <kapplication.h>
 #include <kstandarddirs.h>
@@ -51,12 +51,12 @@ SimpleQueryDlg::SimpleQueryDlg(
   mw = new SimpleQueryDlgForm(this);
   setMainWidget(mw);
 
-  connect(mw->dont_know, SIGNAL(clicked()), SLOT(dontKnowClicked()) );
-  connect(mw->know_it, SIGNAL(clicked()), SLOT(knowItClicked()) );
-  connect(mw->verify, SIGNAL(clicked()), SLOT(verifyClicked()) );
-  connect(mw->show_all, SIGNAL(clicked()), SLOT(showAllClicked()) );
-  connect(mw->show_more, SIGNAL(clicked()), SLOT(showMoreClicked()) );
-  connect(mw->answerField, SIGNAL(textChanged()), SLOT(slotAnswerChanged()) );
+  connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) );
+  connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) );
+  connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) );
+  connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) );
+  connect(mw->show_more, TQT_SIGNAL(clicked()), TQT_SLOT(showMoreClicked()) );
+  connect(mw->answerField, TQT_SIGNAL(textChanged()), TQT_SLOT(slotAnswerChanged()) );
 
   kv_doc = 0;
   qtimer = 0;
@@ -100,7 +100,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype,
    mw->answerField->setFont(Prefs::tableFont());
    mw->answerField->setText("");
 
-   QString s;
+   TQString s;
    switch (querytype)
    {
      case QT_Synonym:
@@ -169,8 +169,8 @@ void SimpleQueryDlg::setQuery(QueryType _querytype,
 
    if (mqtime > 0) {
      if (qtimer == 0) {
-       qtimer = new QTimer( this );
-       connect( qtimer, SIGNAL(timeout()), this, SLOT(timeoutReached()) );
+       qtimer = new TQTimer( this );
+       connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) );
      }
 
      if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) {
@@ -295,7 +295,7 @@ void SimpleQueryDlg::slotUser2()
 }
 
 
-void SimpleQueryDlg::keyPressEvent(QKeyEvent *e)
+void SimpleQueryDlg::keyPressEvent(TQKeyEvent *e)
 {
   switch( e->key() )
   {
@@ -323,7 +323,7 @@ void SimpleQueryDlg::keyPressEvent(QKeyEvent *e)
 
 void SimpleQueryDlg::setQueryFieldWordwrap()
 {
-  QFontMetrics fm(Prefs::tableFont());
+  TQFontMetrics fm(Prefs::tableFont());
   int w = fm.width(mw->queryField->text());
   int w2 = mw->width();
   if (w > w2)
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h
index adf9827b..9d88cf4a 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h
@@ -59,7 +59,7 @@ public slots:
   virtual void initFocus() const;
 
 protected:
-  void keyPressEvent( QKeyEvent *e );
+  void keyPressEvent( TQKeyEvent *e );
 
 public slots:
   void showMoreClicked();
@@ -72,7 +72,7 @@ public slots:
   void timeoutReached();
 
 protected:
-  QString answerstring;
+  TQString answerstring;
   QueryType querytype;
 
 private:
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
index 8a33d2c3..72d749a2 100644
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
@@ -32,14 +32,14 @@
 #include <klocale.h>
 #include <kprogress.h>
 
-#include <qtimer.h>
-#include <qpushbutton.h>
-#include <qlabel.h>
-#include <qlineedit.h>
+#include <tqtimer.h>
+#include <tqpushbutton.h>
+#include <tqlabel.h>
+#include <tqlineedit.h>
 
 VerbQueryDlg::VerbQueryDlg
 (
-  QString type,
+  TQString type,
         int entry,
         int col,
         int query_cycle,
@@ -54,32 +54,32 @@ VerbQueryDlg::VerbQueryDlg
   mw = new VerbQueryDlgForm(this);
   setMainWidget(mw);
 
-  connect(mw->dont_know, SIGNAL(clicked()), SLOT(dontKnowClicked()) );
-  connect(mw->know_it, SIGNAL(clicked()), SLOT(knowItClicked()) );
-  connect(mw->verify, SIGNAL(clicked()), SLOT(verifyClicked()) );
-  connect(mw->show_all, SIGNAL(clicked()), SLOT(showAllClicked()) );
-
-  connect(mw->p3pmField, SIGNAL(returnPressed()), SLOT(slotReturnPressed()) );
-  connect(mw->p3pnField, SIGNAL(returnPressed()), SLOT(slotReturnPressed()) );
-  connect(mw->p3snField, SIGNAL(returnPressed()), SLOT(slotReturnPressed()) );
-  connect(mw->p3smField, SIGNAL(returnPressed()), SLOT(slotReturnPressed()) );
-  connect(mw->p3pfField, SIGNAL(returnPressed()), SLOT(slotReturnPressed()) );
-  connect(mw->p3sfField, SIGNAL(returnPressed()), SLOT(slotReturnPressed()) );
-  connect(mw->p2pField, SIGNAL(returnPressed()), SLOT(slotReturnPressed()) );
-  connect(mw->p2sField, SIGNAL(returnPressed()), SLOT(slotReturnPressed()) );
-  connect(mw->p1pField, SIGNAL(returnPressed()), SLOT(slotReturnPressed()) );
-  connect(mw->p1sField, SIGNAL(returnPressed()), SLOT(slotReturnPressed()) );
-
-  connect(mw->p3pmField, SIGNAL(textChanged(const QString&)), SLOT(slotP3pmChanged(const QString&)) );
-  connect(mw->p3snField, SIGNAL(textChanged(const QString&)), SLOT(slotP3snChanged(const QString&)) );
-  connect(mw->p3pnField, SIGNAL(textChanged(const QString&)), SLOT(slotP3pnChanged(const QString&)) );
-  connect(mw->p3smField, SIGNAL(textChanged(const QString&)), SLOT(slotP3smChanged(const QString&)) );
-  connect(mw->p3pfField, SIGNAL(textChanged(const QString&)), SLOT(slotP3pfChanged(const QString&)) );
-  connect(mw->p3sfField, SIGNAL(textChanged(const QString&)), SLOT(slotP3sfChanged(const QString&)) );
-  connect(mw->p2pField, SIGNAL(textChanged(const QString&)), SLOT(slotP2pChanged(const QString&)) );
-  connect(mw->p2sField, SIGNAL(textChanged(const QString&)), SLOT(slotP2sChanged(const QString&)) );
-  connect(mw->p1pField, SIGNAL(textChanged(const QString&)), SLOT(slotP1pChanged(const QString&)) );
-  connect(mw->p1sField, SIGNAL(textChanged(const QString&)), SLOT(slotP1sChanged(const QString&)) );
+  connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) );
+  connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) );
+  connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) );
+  connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) );
+
+  connect(mw->p3pmField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
+  connect(mw->p3pnField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
+  connect(mw->p3snField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
+  connect(mw->p3smField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
+  connect(mw->p3pfField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
+  connect(mw->p3sfField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
+  connect(mw->p2pField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
+  connect(mw->p2sField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
+  connect(mw->p1pField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
+  connect(mw->p1sField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
+
+  connect(mw->p3pmField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pmChanged(const TQString&)) );
+  connect(mw->p3snField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3snChanged(const TQString&)) );
+  connect(mw->p3pnField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pnChanged(const TQString&)) );
+  connect(mw->p3smField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3smChanged(const TQString&)) );
+  connect(mw->p3pfField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pfChanged(const TQString&)) );
+  connect(mw->p3sfField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3sfChanged(const TQString&)) );
+  connect(mw->p2pField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP2pChanged(const TQString&)) );
+  connect(mw->p2sField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP2sChanged(const TQString&)) );
+  connect(mw->p1pField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP1pChanged(const TQString&)) );
+  connect(mw->p1sField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP1sChanged(const TQString&)) );
 
   qtimer = 0;
 
@@ -102,7 +102,7 @@ void VerbQueryDlg::initFocus() const
 }
 
 
-void VerbQueryDlg::setQuery(QString,
+void VerbQueryDlg::setQuery(TQString,
                             int entry,
                             int col,
                             int q_cycle,
@@ -122,7 +122,7 @@ void VerbQueryDlg::setQuery(QString,
    mw->timebar->setEnabled(Prefs::showCounter());
    mw->timelabel->setEnabled(Prefs::showCounter());
    mw->show_all->setDefault(true);
-   QString s;
+   TQString s;
    s.setNum (q_cycle);
    mw->progCount->setText (s);
 
@@ -145,8 +145,8 @@ void VerbQueryDlg::setQuery(QString,
 
    if (mqtime > 0) { // more than 1000 milli-seconds
      if (qtimer == 0) {
-       qtimer = new QTimer( this );
-       connect( qtimer, SIGNAL(timeout()), this, SLOT(timeoutReached()) );
+       qtimer = new TQTimer( this );
+       connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) );
      }
 
      if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) {
@@ -169,7 +169,7 @@ void VerbQueryDlg::setQuery(QString,
 bool VerbQueryDlg::next()
 {
   resetAllFields();
-  QString s, type;
+  TQString s, type;
   if (q_ocol == 0)
     s = kv_exp->getOriginal();
   else
@@ -179,8 +179,8 @@ bool VerbQueryDlg::next()
     current++;
 
   type = conjugations.getType(current);
-  QString format = i18n("Current tense is: %1.");
-  QString msg = format.arg(conjugations.getName(type));
+  TQString format = i18n("Current tense is: %1.");
+  TQString msg = format.arg(conjugations.getName(type));
 
   mw->instructionLabel->setText (msg);
   mw->baseLabel->setText (s);
@@ -236,7 +236,7 @@ void VerbQueryDlg::showAllClicked()
   resetAllFields();
   mw->dont_know->setDefault(true);
 
-  QString type = conjugations.getType (current);
+  TQString type = conjugations.getType (current);
 
   mw->p1sField->setText  (conjugations.pers1Singular(type));
   mw->p2sField->setText  (conjugations.pers2Singular(type));
@@ -275,7 +275,7 @@ void VerbQueryDlg::showAllClicked()
 
 void VerbQueryDlg::verifyClicked()
 {
-  QString type = conjugations.getType(current);
+  TQString type = conjugations.getType(current);
 
   bool known = true;
 
@@ -412,7 +412,7 @@ void VerbQueryDlg::slotUser2()
 }
 
 
-void VerbQueryDlg::keyPressEvent( QKeyEvent *e )
+void VerbQueryDlg::keyPressEvent( TQKeyEvent *e )
 {
   switch( e->key() )
   {
@@ -439,14 +439,14 @@ void VerbQueryDlg::keyPressEvent( QKeyEvent *e )
 }
 
 
-void VerbQueryDlg::slotP3pfChanged(const QString&)
+void VerbQueryDlg::slotP3pfChanged(const TQString&)
 {
   mw->verify->setDefault(true);
   resetField(mw->p3pfField);
 }
 
 
-void VerbQueryDlg::slotP3snChanged(const QString&)
+void VerbQueryDlg::slotP3snChanged(const TQString&)
 {
   mw->verify->setDefault(true);
   resetField(mw->p3snField);
@@ -458,56 +458,56 @@ void VerbQueryDlg::slotReturnPressed()
 }
 
 
-void VerbQueryDlg::slotP3smChanged(const QString&)
+void VerbQueryDlg::slotP3smChanged(const TQString&)
 {
   mw->verify->setDefault(true);
   resetField(mw->p3smField);
 }
 
 
-void VerbQueryDlg::slotP3pnChanged(const QString&)
+void VerbQueryDlg::slotP3pnChanged(const TQString&)
 {
   mw->verify->setDefault(true);
   resetField(mw->p3pnField);
 }
 
 
-void VerbQueryDlg::slotP3sfChanged(const QString&)
+void VerbQueryDlg::slotP3sfChanged(const TQString&)
 {
   mw->verify->setDefault(true);
   resetField(mw->p3sfField);
 }
 
 
-void VerbQueryDlg::slotP1sChanged(const QString&)
+void VerbQueryDlg::slotP1sChanged(const TQString&)
 {
   mw->verify->setDefault(true);
   resetField(mw->p1sField);
 }
 
 
-void VerbQueryDlg::slotP2sChanged(const QString&)
+void VerbQueryDlg::slotP2sChanged(const TQString&)
 {
   mw->verify->setDefault(true);
   resetField(mw->p2sField);
 }
 
 
-void VerbQueryDlg::slotP3pmChanged(const QString&)
+void VerbQueryDlg::slotP3pmChanged(const TQString&)
 {
   mw->verify->setDefault(true);
   resetField(mw->p3pmField);
 }
 
 
-void VerbQueryDlg::slotP1pChanged(const QString&)
+void VerbQueryDlg::slotP1pChanged(const TQString&)
 {
   mw->verify->setDefault(true);
   resetField(mw->p1pField);
 }
 
 
-void VerbQueryDlg::slotP2pChanged(const QString&)
+void VerbQueryDlg::slotP2pChanged(const TQString&)
 {
   mw->verify->setDefault(true);
   resetField(mw->p2pField);
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h
index e972eb2a..910cd89a 100644
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h
@@ -37,7 +37,7 @@ class VerbQueryDlg : public QueryDlgBase
 public:
 
   VerbQueryDlg(
-                QString type,
+                TQString type,
                 int entry,
                 int col,
                 int query_cycle,
@@ -50,7 +50,7 @@ public:
 
   ~VerbQueryDlg();
 
-  void setQuery(QString type,
+  void setQuery(TQString type,
                 int entry,
                 int col,
                 int query_cycle,
@@ -66,25 +66,25 @@ public slots:
 
 protected:
   bool next();
-  void keyPressEvent( QKeyEvent *e );
+  void keyPressEvent( TQKeyEvent *e );
   void resetAllFields();
 
 protected slots:
   void slotUser2();
-  void slotP3pfChanged(const QString&);
-  void slotP3snChanged(const QString&);
+  void slotP3pfChanged(const TQString&);
+  void slotP3snChanged(const TQString&);
   void showAllClicked();
   void slotReturnPressed();
-  void slotP3smChanged(const QString&);
+  void slotP3smChanged(const TQString&);
   void knowItClicked();
   void dontKnowClicked();
-  void slotP3pnChanged(const QString&);
-  void slotP3sfChanged(const QString&);
-  void slotP1sChanged(const QString&);
-  void slotP2sChanged(const QString&);
-  void slotP3pmChanged(const QString&);
-  void slotP1pChanged(const QString&);
-  void slotP2pChanged(const QString&);
+  void slotP3pnChanged(const TQString&);
+  void slotP3sfChanged(const TQString&);
+  void slotP1sChanged(const TQString&);
+  void slotP2sChanged(const TQString&);
+  void slotP3pmChanged(const TQString&);
+  void slotP1pChanged(const TQString&);
+  void slotP2pChanged(const TQString&);
   void verifyClicked();
   void timeoutReached();
 
diff --git a/kvoctrain/kvoctrain/spotlight2kvtml.cpp b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
index c0d4ab90..c6f9c565 100644
--- a/kvoctrain/kvoctrain/spotlight2kvtml.cpp
+++ b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
@@ -23,7 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qfile.h>
+#include <tqfile.h>
 
 #include <vector>
 #include <iostream>
@@ -42,20 +42,20 @@ using namespace std;
 
 #define SPOT_VERSION   "v0.2.1"
 
-vector<QString> lesson_names;
+vector<TQString> lesson_names;
 
 struct spotty {
-  QString  type;
+  TQString  type;
   int      lesson;
-  QString  en_rem,      // possibly remarks
+  TQString  en_rem,      // possibly remarks
            de_rem;
-  QString  en,
+  TQString  en,
            de;
 };
 
 vector<spotty> spottys;
 
-void writeSpotty (QTextStream &os, spotty& spot_line, bool first) {
+void writeSpotty (TQTextStream &os, spotty& spot_line, bool first) {
    os << " <e";
 
    if (spot_line.lesson != 0 )
@@ -84,11 +84,11 @@ void writeSpotty (QTextStream &os, spotty& spot_line, bool first) {
 }
 
 
-void readToMem (QTextStream &is, QString month, QString year)
+void readToMem (TQTextStream &is, TQString month, TQString year)
 {
-   QString line;
+   TQString line;
    bool    lesson_pending = false;
-   QString lesson_str;
+   TQString lesson_str;
    spotty spot;
 
    bool first_line = true;
@@ -219,7 +219,7 @@ void readToMem (QTextStream &is, QString month, QString year)
    }
 }
 
-void writeToKvtml(QTextStream &os, QString month, QString year)
+void writeToKvtml(TQTextStream &os, TQString month, TQString year)
 {
    os <<
            "<?xml version=\"1.0\"?>\n"
@@ -308,8 +308,8 @@ int main(int argc, char **argv)
     exit (1);
   }
 
-  QString spot (argv[1]);
-  QString kvtml;
+  TQString spot (argv[1]);
+  TQString kvtml;
 
   int dot = spot.findRev('.');
   if (dot < 0) {
@@ -321,9 +321,9 @@ int main(int argc, char **argv)
     kvtml += "." KVTML_EXT;
   }
 
-  QFile fs(spot);
+  TQFile fs(spot);
   fs.open( IO_ReadOnly );
-  QTextStream is( &fs );
+  TQTextStream is( &fs );
   readToMem (is, argv[2], argv[3]);
   fs.close();
 
@@ -332,9 +332,9 @@ int main(int argc, char **argv)
     exit (1);
   }
 
-  QFile fk(kvtml);
+  TQFile fk(kvtml);
   fk.open( IO_WriteOnly );
-  QTextStream os( &fk );
+  TQTextStream os( &fk );
   writeToKvtml(os, argv[2], argv[3]);
   fk.close();
 
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp
index d9fdea3f..4537b42f 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp
@@ -27,18 +27,18 @@
 
 #include <kvoctraindoc.h>
 
-#include <qlabel.h>
-#include <qvaluevector.h>
+#include <tqlabel.h>
+#include <tqvaluevector.h>
 
-GenStatPage::GenStatPage(kvoctrainDoc *doc, QWidget* parent, const char* name): GenStatPageForm( parent, name )
+GenStatPage::GenStatPage(kvoctrainDoc *doc, TQWidget* parent, const char* name): GenStatPageForm( parent, name )
 {
   l_filename->setText(doc->URL().path());
   l_title->setText(doc->getTitle());
   l_author->setText(doc->getAuthor());
-  QString s;
+  TQString s;
   s.setNum(doc->numEntries());
   kcfg_entriesPerLesson->setText(s);
-  vector<QString> lesson = doc->getLessonDescr();
+  vector<TQString> lesson = doc->getLessonDescr();
   s.setNum(lesson.size());
   l_lessons->setText(s);
 }
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h
index b868741f..38cb7854 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h
+++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h
@@ -37,7 +37,7 @@ class GenStatPage : public GenStatPageForm
 
 public:
 
-  GenStatPage(kvoctrainDoc *doc, QWidget* parent = NULL, const char* name = NULL);
+  GenStatPage(kvoctrainDoc *doc, TQWidget* parent = NULL, const char* name = NULL);
 
 };
 #endif // GenStatPage_included
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
index 79bdcb99..7fd6bbb0 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
@@ -23,7 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qlayout.h>
+#include <tqlayout.h>
 
 #include "StatistikDlg.h"
 #include "StatistikPage.h"
@@ -34,28 +34,28 @@
 #include <langset.h>
 #include <kvoctraindoc.h>
 
-StatistikDlg::StatistikDlg(LangSet &langset, kvoctrainDoc *doc, QWidget *parent, const char *name, bool modal)
+StatistikDlg::StatistikDlg(LangSet &langset, kvoctrainDoc *doc, TQWidget *parent, const char *name, bool modal)
   : KDialogBase(Tabbed, i18n("Document Statistics"), Close, Close, parent, name, modal)
 {
-  QFrame * page;
-  QVBoxLayout * topLayout;
+  TQFrame * page;
+  TQVBoxLayout * topLayout;
   StatistikPage *spage;
 
   page = addPage(i18n("General"));
-  topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+  topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
   GenStatPage *gspage = new GenStatPage (doc, page, name);
   topLayout->addWidget(gspage);
 
   for (int i = 1; i < (int) doc->numLangs(); i++)
   {
-    QString s = langset.findLongId(doc->getIdent(i));
+    TQString s = langset.findLongId(doc->getIdent(i));
     if (s.isEmpty() )
       s = doc->getIdent(i);
     else
       s = i18n(s.local8Bit());
 
     page = addPage(s);
-    topLayout = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+    topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
     spage = new StatistikPage (i, doc, page, name);
     topLayout->addWidget(spage);
   }
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h
index 4f519550..3199ae27 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h
@@ -40,7 +40,7 @@ class StatistikDlg : public KDialogBase
   Q_OBJECT
 
 public:
-  StatistikDlg(LangSet &langset, kvoctrainDoc *doc, QWidget *parent = NULL, const char *name = NULL, bool modal = true);
+  StatistikDlg(LangSet &langset, kvoctrainDoc *doc, TQWidget *parent = NULL, const char *name = NULL, bool modal = true);
 
 };
 
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
index 6541d085..7453b75c 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
@@ -32,8 +32,8 @@
 #include <kvoctraindoc.h>
 #include <prefs.h>
 
-#include <qcursor.h>
-#include <qpainter.h>
+#include <tqcursor.h>
+#include <tqpainter.h>
 
 #define MIN_COL_WIDTH      2
 #define PIX_SHIFT          2
@@ -50,7 +50,7 @@
 class GradeListItem : public QListViewItem
 {
 public:
-  inline GradeListItem (QListView* parent, int _lesson): QListViewItem(parent), lesson(_lesson) {}
+  inline GradeListItem (TQListView* parent, int _lesson): TQListViewItem(parent), lesson(_lesson) {}
   inline int getLesson() const { return lesson; }
 
 private:
@@ -58,7 +58,7 @@ private:
 };
 
 
-StatistikPage::StatistikPage(int col, kvoctrainDoc  *_doc, QWidget *parent, const char *name)
+StatistikPage::StatistikPage(int col, kvoctrainDoc  *_doc, TQWidget *parent, const char *name)
   : StatistikPageForm( parent, name ), doc(_doc)
 {
   StatListView->setColumnWidth(0, SIZE_GRADE + 10);
@@ -66,7 +66,7 @@ StatistikPage::StatistikPage(int col, kvoctrainDoc  *_doc, QWidget *parent, cons
   StatListView->setColumnWidth(2, SIZE_COUNT);
   StatListView->setColumnWidth(3, SIZE_LESSON);
 
-  vector<QString> lesson = doc->getLessonDescr();
+  vector<TQString> lesson = doc->getLessonDescr();
 
   fsc.resize(lesson.size()+1);
   tsc.resize(lesson.size()+1);
@@ -85,8 +85,8 @@ StatistikPage::StatistikPage(int col, kvoctrainDoc  *_doc, QWidget *parent, cons
     }
   }
   setupPixmaps();
-  connect(StatListView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint& , int ) ),
-          this, SLOT( slotRMB( QListViewItem *, const QPoint &, int ) ) );
+  connect(StatListView, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint& , int ) ),
+          this, TQT_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) );
 }
 
 
@@ -97,9 +97,9 @@ void StatistikPage::setupPixmaps()
   GradeListItem lvi (StatListView, 0);
   height = lvi.height();
   for (int entry = 0; entry < (int) fsc.size(); entry++) {
-    QPainter p;
-    QColor color;
-    QPixmap fpix (SIZE_GRADE, height);
+    TQPainter p;
+    TQColor color;
+    TQPixmap fpix (SIZE_GRADE, height);
     p.begin( &fpix);
     p.eraseRect (0, 0, fpix.width(), fpix.height());
     p.setPen( black );
@@ -158,7 +158,7 @@ void StatistikPage::setupPixmaps()
     p.end();
     from_pix.push_back(fpix);
 
-    QPixmap tpix (SIZE_GRADE, height);
+    TQPixmap tpix (SIZE_GRADE, height);
     p.begin( &tpix );
     p.eraseRect (0, 0, tpix.width(), tpix.height());
     p.setPen( black );
@@ -218,9 +218,9 @@ void StatistikPage::setupPixmaps()
   }
 
   // setup rows with pixmaps and strings
-  vector<QString> lesson = doc->getLessonDescr();
+  vector<TQString> lesson = doc->getLessonDescr();
 
-  QString s;
+  TQString s;
 
   GradeListItem *plvi = new GradeListItem(StatListView, 0);
   plvi->setPixmap (TB_FGRADE, from_pix[0]);
@@ -242,7 +242,7 @@ void StatistikPage::setupPixmaps()
 }
 
 
-void StatistikPage::slotRMB( QListViewItem* Item, const QPoint & /*point*/, int col)
+void StatistikPage::slotRMB( TQListViewItem* Item, const TQPoint & /*point*/, int col)
 {
   if( Item != 0)
     slotPopupMenu(((GradeListItem*)Item)->getLesson(), col);
@@ -274,16 +274,16 @@ void StatistikPage::slotPopupMenu(int row, int col)
 
   KPopupMenu *header_m = new KPopupMenu(i18n("Number of Entries per Grade"));
 
-  header_m->insertItem (i18n(KV_NORM_TEXT) + "\t" + QString::number(sc->grade[KV_NORM_GRADE]) );
-  header_m->insertItem (i18n(KV_LEV1_TEXT) + "\t" + QString::number(sc->grade[KV_LEV1_GRADE]) );
-  header_m->insertItem (i18n(KV_LEV2_TEXT) + "\t" + QString::number(sc->grade[KV_LEV2_GRADE]) );
-  header_m->insertItem (i18n(KV_LEV3_TEXT) + "\t" + QString::number(sc->grade[KV_LEV3_GRADE]) );
-  header_m->insertItem (i18n(KV_LEV4_TEXT) + "\t" + QString::number(sc->grade[KV_LEV4_GRADE]) );
-  header_m->insertItem (i18n(KV_LEV5_TEXT) + "\t" + QString::number(sc->grade[KV_LEV5_GRADE]) );
-  header_m->insertItem (i18n(KV_LEV6_TEXT) + "\t" + QString::number(sc->grade[KV_LEV6_GRADE]) );
-  header_m->insertItem (i18n(KV_LEV7_TEXT) + "\t" + QString::number(sc->grade[KV_LEV7_GRADE]) );
+  header_m->insertItem (i18n(KV_NORM_TEXT) + "\t" + TQString::number(sc->grade[KV_NORM_GRADE]) );
+  header_m->insertItem (i18n(KV_LEV1_TEXT) + "\t" + TQString::number(sc->grade[KV_LEV1_GRADE]) );
+  header_m->insertItem (i18n(KV_LEV2_TEXT) + "\t" + TQString::number(sc->grade[KV_LEV2_GRADE]) );
+  header_m->insertItem (i18n(KV_LEV3_TEXT) + "\t" + TQString::number(sc->grade[KV_LEV3_GRADE]) );
+  header_m->insertItem (i18n(KV_LEV4_TEXT) + "\t" + TQString::number(sc->grade[KV_LEV4_GRADE]) );
+  header_m->insertItem (i18n(KV_LEV5_TEXT) + "\t" + TQString::number(sc->grade[KV_LEV5_GRADE]) );
+  header_m->insertItem (i18n(KV_LEV6_TEXT) + "\t" + TQString::number(sc->grade[KV_LEV6_GRADE]) );
+  header_m->insertItem (i18n(KV_LEV7_TEXT) + "\t" + TQString::number(sc->grade[KV_LEV7_GRADE]) );
 
-  header_m->exec(QCursor::pos()+QPoint(10, 0));
+  header_m->exec(TQCursor::pos()+TQPoint(10, 0));
 }
 
 #include "StatistikPage.moc"
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h
index a5a7d166..0e15231e 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h
@@ -30,7 +30,7 @@
 
 #include <kvoctrainexpr.h>
 
-#include <qlistview.h>
+#include <tqlistview.h>
 
 class kvoctrainDoc;
 class GradeCols;
@@ -40,11 +40,11 @@ class StatistikPage : public StatistikPageForm
   Q_OBJECT
 
 public:
-  StatistikPage(int col, kvoctrainDoc *doc, QWidget *parent = NULL, const char *name = NULL);
+  StatistikPage(int col, kvoctrainDoc *doc, TQWidget *parent = NULL, const char *name = NULL);
 
 public slots:
   void slotPopupMenu(int row, int col);
-  void slotRMB( QListViewItem* Item, const QPoint & point, int );
+  void slotRMB( TQListViewItem* Item, const TQPoint & point, int );
 
 protected:
   void setupPixmaps();
@@ -63,7 +63,7 @@ protected:
 
   int calc_width (struct StatistikPage::stat_counter *gc, int grade, int max_width);
 
-  vector<QPixmap>  from_pix, to_pix;
+  vector<TQPixmap>  from_pix, to_pix;
   kvoctrainDoc    *doc;
 
   vector<stat_counter>  fsc;
diff --git a/kvoctrain/kvoctrain/tools/extractlang.cpp b/kvoctrain/kvoctrain/tools/extractlang.cpp
index 6123214c..a775274e 100644
--- a/kvoctrain/kvoctrain/tools/extractlang.cpp
+++ b/kvoctrain/kvoctrain/tools/extractlang.cpp
@@ -1,5 +1,5 @@
-#include <qtextstream.h>
-#include <qstring.h>
+#include <tqtextstream.h>
+#include <tqstring.h>
 
 ///////////////////////////////////////////////////////////
 //
@@ -14,16 +14,16 @@
 //
 ///////////////////////////////////////////////////////////
 
-QString twoLangs;
-QString threeLangs;
+TQString twoLangs;
+TQString threeLangs;
 
-void parseLanguage(QString name, QString three, QString two)
+void parseLanguage(TQString name, TQString three, TQString two)
 {
   int star = three.find('*');
   if (star > 0)
     three.remove(star, 1);
 
-  QString three_1 = three;
+  TQString three_1 = three;
 
   int slash = three_1.find('/');
   if (slash > 0) {
@@ -59,11 +59,11 @@ void parseLanguage(QString name, QString three, QString two)
   threeLangs.append("\")}},\n");
 }
 
-QString parseTD(QString& line)
+TQString parseTD(TQString& line)
 {
-  QCString cline = line.local8Bit();
+  TQCString cline = line.local8Bit();
   uint clineLength = cline.length();
-  QCString result = cline;
+  TQCString result = cline;
   int pos = -1;
   bool inTag = false;
 
@@ -80,15 +80,15 @@ QString parseTD(QString& line)
 	}
     }
 
-  QString retVal(result);
+  TQString retVal(result);
   retVal = retVal.left(pos+1);
 
   return retVal.simplifyWhiteSpace();
 }
 
-bool parseTR(QString& line, QTextIStream& in)
+bool parseTR(TQString& line, TQTextIStream& in)
 {
-  QString text[4];
+  TQString text[4];
 
   line = in.readLine();
   if (line.isNull())
@@ -119,11 +119,11 @@ bool parseTR(QString& line, QTextIStream& in)
 
 int main()
 {
-  QString line;
+  TQString line;
   bool readNext = true;
 
-  QTextIStream in(stdin);
-  QTextOStream out(stdout);
+  TQTextIStream in(stdin);
+  TQTextOStream out(stdout);
 
   while (!in.atEnd())
     {
author	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2010-07-31 19:39:55 +0000
committer	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2010-07-31 19:39:55 +0000
commit	0a6e0958c03e41c87b15557b6f407874f20c2f8d (patch)
tree	2cdd58c4013b1be09cfcbb4ddae2b05712b9aeee /kvoctrain
parent	83f9dfafc157ff7823804b3ff457b43d021a5b4b (diff)
download	tdeedu-0a6e0958c03e41c87b15557b6f407874f20c2f8d.tar.gz tdeedu-0a6e0958c03e41c87b15557b6f407874f20c2f8d.zip