TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


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

156 files changed, 1591 insertions, 1547 deletions

diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp
index 7bdfe888..246589da 100644
--- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp
@@ -34,8 +34,8 @@
 #include <kstandarddirs.h>
 
 
-ProgressDlg::ProgressDlg(const TQString &doctitle, const TQString &filename, const TQString &title, TQWidget* parent, const char* name)
-  : ProgressDlgForm( parent, name )
+ProgressDlg::ProgressDlg(const TQString &doctitle, const TQString &filename, const TQString &title, TQWidget* tqparent, const char* name)
+  : ProgressDlgForm( tqparent, name )
 {
   doc = 0;
   setCaption (title);
diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h
index 43242aa2..c9eba176 100644
--- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h
+++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h
@@ -35,6 +35,7 @@ class kvoctrainDoc;
 class ProgressDlg : public ProgressDlgForm
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -43,7 +44,7 @@ public:
         const TQString &doctitle,
         const TQString &filename,
         const TQString &title,
-        TQWidget* parent = NULL,
+        TQWidget* tqparent = NULL,
         const char* name = NULL
     );
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui
index 2c5d44cb..c0f63a5b 100644
--- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ProgressDlgForm</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -12,7 +12,7 @@
             <height>127</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>400</width>
             <height>120</height>
@@ -25,7 +25,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QFrame" row="0" column="0">
+        <widget class="TQFrame" row="0" column="0">
             <property name="name">
                 <cstring>Frame3</cstring>
             </property>
@@ -42,7 +42,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -54,7 +54,7 @@
                         <string>Filename:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -66,7 +66,7 @@
                         <string>Title:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>l_file</cstring>
                     </property>
@@ -82,7 +82,7 @@
                         <string>file.kvtml</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="1">
+                <widget class="TQLabel" row="1" column="1">
                     <property name="name">
                         <cstring>l_title</cstring>
                     </property>
@@ -110,14 +110,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QProgressBar" row="2" column="0">
+        <widget class="TQProgressBar" row="2" column="0">
             <property name="name">
                 <cstring>progress</cstring>
             </property>
@@ -129,7 +129,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>340</width>
                     <height>22</height>
@@ -138,5 +138,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
index 26834bea..7f24d5ad 100644
--- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
@@ -74,8 +74,8 @@ static ListRef date_itemlist [] =
 };
 
 
-BlockOptions::BlockOptions(TQWidget* parent, const char* name, WFlags fl)
-: BlockOptionsBase(parent, name, fl)
+BlockOptions::BlockOptions(TQWidget* tqparent, const char* name, WFlags fl)
+: BlockOptionsBase(tqparent, name, fl)
 {
    connect(expire1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
    connect(block1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
@@ -251,7 +251,7 @@ void BlockOptions::checkValidity()
         if (!found)
           message.append(i18n("Illogical blocking times.\n"));
         found = true;
-        message.append(i18n("The time for level %1 should be lower than the time for level %2.\n").arg(i).arg(i + 1));
+        message.append(i18n("The time for level %1 should be lower than the time for level %2.\n").tqarg(i).tqarg(i + 1));
       }
     }
   }
@@ -270,7 +270,7 @@ void BlockOptions::checkValidity()
         if (!found)
           message.append(i18n("\nIllogical expiration times.\n"));
         found = true;
-        message.append(i18n("The time for level %1 should be lower than the time for level %2.\n").arg(i).arg(i + 1));
+        message.append(i18n("The time for level %1 should be lower than the time for level %2.\n").tqarg(i).tqarg(i + 1));
       }
       }
   }
@@ -290,7 +290,7 @@ void BlockOptions::checkValidity()
         if (!found)
           message.append(i18n("\nIllogical blocking vs. expiration times.\n"));
         found = true;
-        message.append(i18n("The blocking time at level %1 should be lower than the expiration time.\n").arg(i + 1));
+        message.append(i18n("The blocking time at level %1 should be lower than the expiration time.\n").tqarg(i + 1));
       }
     }
   }
diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.h b/kvoctrain/kvoctrain/common-dialogs/blockoptions.h
index a0128dda..4895e244 100644
--- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.h
@@ -36,9 +36,10 @@ class TQComboBox;
 class BlockOptions : public BlockOptionsBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  BlockOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  BlockOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
   void updateWidgets();
   bool hasChanged();
   bool isDefault();
diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui
index 2bd5c449..35b01c01 100644
--- a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>BlockOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>BlockOptionsBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -19,17 +19,17 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QComboBox" row="6" column="2">
+        <widget class="TQComboBox" row="6" column="2">
             <property name="name">
                 <cstring>expire2</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="1" column="2">
+        <widget class="TQComboBox" row="1" column="2">
             <property name="name">
                 <cstring>expire7</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="6" column="0">
+        <widget class="TQLabel" row="6" column="0">
             <property name="name">
                 <cstring>l_lev2</cstring>
             </property>
@@ -40,12 +40,12 @@
                 <cstring>block2</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="7" column="2">
+        <widget class="TQComboBox" row="7" column="2">
             <property name="name">
                 <cstring>expire1</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>l_lev5</cstring>
             </property>
@@ -56,7 +56,7 @@
                 <cstring>block5</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>l_lev6</cstring>
             </property>
@@ -67,7 +67,7 @@
                 <cstring>block6</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox" row="0" column="2">
+        <widget class="TQCheckBox" row="0" column="2">
             <property name="name">
                 <cstring>kcfg_Expire</cstring>
             </property>
@@ -83,12 +83,12 @@
                 <string>E&amp;xpiring</string>
             </property>
         </widget>
-        <widget class="QComboBox" row="4" column="1">
+        <widget class="TQComboBox" row="4" column="1">
             <property name="name">
                 <cstring>block4</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox" row="0" column="1">
+        <widget class="TQCheckBox" row="0" column="1">
             <property name="name">
                 <cstring>kcfg_Block</cstring>
             </property>
@@ -104,12 +104,12 @@
                 <string>Bl&amp;ocking</string>
             </property>
         </widget>
-        <widget class="QComboBox" row="7" column="1">
+        <widget class="TQComboBox" row="7" column="1">
             <property name="name">
                 <cstring>block1</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="1" column="1">
+        <widget class="TQComboBox" row="1" column="1">
             <property name="name">
                 <cstring>block7</cstring>
             </property>
@@ -122,12 +122,12 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QComboBox" row="2" column="2">
+        <widget class="TQComboBox" row="2" column="2">
             <property name="name">
                 <cstring>expire6</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>l_lev4</cstring>
             </property>
@@ -138,7 +138,7 @@
                 <cstring>block4</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>l_lev7</cstring>
             </property>
@@ -149,27 +149,27 @@
                 <cstring>block7</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="3" column="2">
+        <widget class="TQComboBox" row="3" column="2">
             <property name="name">
                 <cstring>expire5</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="5" column="1">
+        <widget class="TQComboBox" row="5" column="1">
             <property name="name">
                 <cstring>block3</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="6" column="1">
+        <widget class="TQComboBox" row="6" column="1">
             <property name="name">
                 <cstring>block2</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="4" column="2">
+        <widget class="TQComboBox" row="4" column="2">
             <property name="name">
                 <cstring>expire4</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="7" column="0">
+        <widget class="TQLabel" row="7" column="0">
             <property name="name">
                 <cstring>l_lev1</cstring>
             </property>
@@ -190,24 +190,24 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QComboBox" row="5" column="2">
+        <widget class="TQComboBox" row="5" column="2">
             <property name="name">
                 <cstring>expire3</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="3" column="1">
+        <widget class="TQComboBox" row="3" column="1">
             <property name="name">
                 <cstring>block5</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="2" column="1">
+        <widget class="TQComboBox" row="2" column="1">
             <property name="name">
                 <cstring>block6</cstring>
             </property>
@@ -220,7 +220,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>l_lev3</cstring>
             </property>
@@ -241,7 +241,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>380</width>
                     <height>30</height>
@@ -268,5 +268,5 @@
     <tabstop>block1</tabstop>
     <tabstop>expire1</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp b/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp
index e69d5c99..1f9c8bd7 100644
--- a/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp
@@ -29,8 +29,8 @@
 
 #include "generaloptions.h"
 
-GeneralOptions::GeneralOptions(TQWidget* parent, const char* name, WFlags fl)
-: GeneralOptionsBase(parent,name,fl)
+GeneralOptions::GeneralOptions(TQWidget* tqparent, const char* name, WFlags fl)
+: GeneralOptionsBase(tqparent,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 434dd669..7b1a7191 100644
--- a/kvoctrain/kvoctrain/common-dialogs/generaloptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/generaloptions.h
@@ -31,9 +31,10 @@
 class GeneralOptions : public GeneralOptionsBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  GeneralOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  GeneralOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
 };
 
 #endif
diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui
index 3e8b5425..51f26f81 100644
--- a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>GeneralOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>GeneralOptionsBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>kcfg_AutoSave</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <string>Your work will be automatically saved if you check this option</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="1" column="0">
+        <widget class="TQCheckBox" row="1" column="0">
             <property name="name">
                 <cstring>kcfg_AutoBackup</cstring>
             </property>
@@ -58,7 +58,7 @@
                 <number>5</number>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="2">
+        <widget class="TQLabel" row="1" column="2">
             <property name="name">
                 <cstring>lblBackupInterva</cstring>
             </property>
@@ -69,7 +69,7 @@
                 <cstring>kIntSpinBox1</cstring>
             </property>
         </widget>
-        <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>kcfg_SmartAppend</cstring>
             </property>
@@ -83,7 +83,7 @@
                 <string>If this feature is activated, you will repeatedly be prompted with the entry dialog. After entering the first original you have to enter the corresponding translations. Afterwards you proceed with the next original and its translations until you stop by pressing the ESC key.</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3">
+        <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>kcfg_AutoEntryApply</cstring>
             </property>
@@ -97,7 +97,7 @@
                 <string>If checked, you will not be asked if you really want this change; it will be applied automatically.</string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="4" column="0" rowspan="1" colspan="3">
+        <widget class="TQButtonGroup" row="4" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>kcfg_HeaderResizeMode</cstring>
             </property>
@@ -111,7 +111,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>hb_auto</cstring>
                     </property>
@@ -125,7 +125,7 @@
                         <string>KVocTrain makes each column the same width except the leftmost with the lesson names, which is half the size of the others. The second column, which contains the picture that describes the state of the row, has a fixed width.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>hb_percent</cstring>
                     </property>
@@ -139,7 +139,7 @@
                         <string>If this is checked, the columns resize by the same amount as the window</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>hb_fixed</cstring>
                     </property>
@@ -165,7 +165,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>51</width>
                     <height>123</height>
@@ -182,7 +182,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp
index ea11654b..6af8cc3b 100644
--- a/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp
@@ -28,8 +28,8 @@
 
 #include "groupoptions.h"
 
-GroupOptions::GroupOptions(TQWidget* parent, const char* name, WFlags fl)
-: GroupOptionsBase(parent,name,fl)
+GroupOptions::GroupOptions(TQWidget* tqparent, const char* name, WFlags fl)
+: GroupOptionsBase(tqparent,name,fl)
 {
 
 }
diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptions.h b/kvoctrain/kvoctrain/common-dialogs/groupoptions.h
index 6db54524..b77f10c2 100644
--- a/kvoctrain/kvoctrain/common-dialogs/groupoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/groupoptions.h
@@ -31,9 +31,10 @@
 class GroupOptions : public GroupOptionsBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  GroupOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  GroupOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateButtons();
 };
diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui
index ee90fe3a..a7687d8b 100644
--- a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>GroupOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>GroupOptionsBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>l_name</cstring>
             </property>
@@ -30,15 +30,15 @@
                 <cstring>ps_name</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>ps_store</cstring>
                     </property>
@@ -54,7 +54,7 @@
                         <string>&amp;Save</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>ps_recall</cstring>
                     </property>
@@ -70,7 +70,7 @@
                         <string>&amp;Load</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>ps_new</cstring>
                     </property>
@@ -86,7 +86,7 @@
                         <string>&amp;New</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>ps_del</cstring>
                     </property>
@@ -104,7 +104,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QComboBox" row="0" column="1">
+        <widget class="TQComboBox" row="0" column="1">
             <property name="name">
                 <cstring>ps_name</cstring>
             </property>
@@ -127,7 +127,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>150</width>
                     <height>16</height>
@@ -143,5 +143,5 @@
     <tabstop>ps_new</tabstop>
     <tabstop>ps_del</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg
index 32469ed7..2aea0769 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg
@@ -221,7 +221,7 @@
     </entry>
     <entry name="TypeItem" type="String">
       <label></label>
-      <default code="true">QString::null</default>
+      <default code="true">TQString::null</default>
     </entry>
     <entry name="BlockItem$(Grade)" type="Int" key="BlockItem$(Grade)">
       <parameter name="Grade" type="Int" max="7"/>
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
index 73db49ce..005607a0 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
@@ -54,10 +54,10 @@ 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, TQWidget *parent,
+KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *tqparent,
   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)
+  : KConfigDialog(tqparent, name, config, dialogType, Default|Ok|Apply|Cancel|Help|User1, Ok, true), m_langSet(ls)
 {
   m_config = config;
   m_queryManager = m;
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
index 3aaf994d..6909d0df 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
@@ -41,12 +41,13 @@ class KComboBox;
 class KVocTrainPrefs : public KConfigDialog
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
    * Creates a configuration dialog.
    */
-  KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *parent=0,
+  KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *tqparent=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 5da383b0..36f61b00 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -677,8 +677,8 @@ KV_ISO639_Code kv_iso639_2[] = {
 };
 */
 
-LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char* name, WFlags fl)
-  : LanguageOptionsBase(parent, name, fl), m_langSet(langset)
+LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* tqparent, const char* name, WFlags fl)
+  : LanguageOptionsBase(tqparent, name, fl), m_langSet(langset)
 {
   langset_popup = 0;
 
@@ -689,7 +689,7 @@ LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char
   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&)));
+  connect(d_kbtqlayout, 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
@@ -768,13 +768,13 @@ void LanguageOptions::slotDeleteClicked()
   enableLangWidgets();
 
   // doesn't work yet
-  if (d_shortName->count() != 0 && d_kblayout->isEnabled())
+  if (d_shortName->count() != 0 && d_kbtqlayout->isEnabled())
   {
-    for (int i = 0; i < d_kblayout->count(); i++)
+    for (int i = 0; i < d_kbtqlayout->count(); i++)
     {
-      if (d_kblayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem()))
+      if (d_kbtqlayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem()))
       {
-        d_kblayout->setCurrentItem(i);
+        d_kbtqlayout->setCurrentItem(i);
         break;
       }
     }
@@ -782,9 +782,9 @@ void LanguageOptions::slotDeleteClicked()
 }
 
 
-void LanguageOptions::slotKeyboardLayoutChanged(const TQString& layout)
+void LanguageOptions::slotKeyboardLayoutChanged(const TQString& tqlayout)
 {
-  m_langSet.setKeyboardLayout(layout, d_shortName->currentItem());
+  m_langSet.setKeyboardLayout(tqlayout, d_shortName->currentItem());
   emit widgetModified();
   m_hasChanged = true;
 }
@@ -812,22 +812,22 @@ void LanguageOptions::enableLangWidgets()
     }
     else
     {
-      if (replyType == "TQStringList")
+      if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING)
       {
-        TQStringList layouts;
+        TQStringList tqlayouts;
         TQDataStream stream(replyData, IO_ReadOnly);
-        stream >> layouts;
-        layouts.prepend(TQString::null);
-        d_kblayout->clear();
-        d_kblayout->insertStringList(layouts);
+        stream >> tqlayouts;
+        tqlayouts.prepend(TQString());
+        d_kbtqlayout->clear();
+        d_kbtqlayout->insertStringList(tqlayouts);
       }
     }
   }
   else
   {
     //kdDebug() << "kxkb not enabled" << endl;
-    d_kblayout->clear();
-    d_kblayout->setEnabled(false);
+    d_kbtqlayout->clear();
+    d_kbtqlayout->setEnabled(false);
   }
 }
 
@@ -898,22 +898,22 @@ void LanguageOptions::slotShortActivated(const TQString& _id)
      else
        b_langPixmap->setText (i18n("No Picture Selected"));
 
-     TQString layout = m_langSet.keyboardLayout(d_shortName->currentItem());
+     TQString tqlayout = m_langSet.keyboardLayout(d_shortName->currentItem());
 
-     //kdDebug() << "layout to select " << layout << endl;
+     //kdDebug() << "tqlayout to select " << tqlayout << endl;
 
-     for (int i = 0; i < d_kblayout->count(); i++)
+     for (int i = 0; i < d_kbtqlayout->count(); i++)
      {
-      if (d_kblayout->text(i) == layout)
+      if (d_kbtqlayout->text(i) == tqlayout)
        {
-        d_kblayout->setCurrentItem(i);
+        d_kbtqlayout->setCurrentItem(i);
         break;
        }
      }
      // not found
-     if (d_kblayout->currentText() != layout)
+     if (d_kbtqlayout->currentText() != tqlayout)
      {
-       d_kblayout->setCurrentItem(0);
+       d_kbtqlayout->setCurrentItem(0);
      }
    }
 }
@@ -1015,8 +1015,8 @@ void LanguageOptions::loadCountryData()
   locale.setLanguage(curr_lang);
   KGlobal::_locale = &locale;
 
-  TQString sub = TQString::fromLatin1("l10n/");
-  TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop"));
+  TQString sub = TQString::tqfromLatin1("l10n/");
+  TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop"));
   regionlist.sort();
 
   TQMap<TQString, Region>  regions;
@@ -1026,44 +1026,44 @@ void LanguageOptions::loadCountryData()
     TQString tag = *it;
     int index;
 
-    index = tag.findRev('/');
+    index = tag.tqfindRev('/');
     if (index != -1) tag = tag.mid(index + 1);
 
-    index = tag.findRev('.');
+    index = tag.tqfindRev('.');
     if (index != -1) tag.truncate(index);
 
     KSimpleConfig entry(*it);
-    entry.setGroup(TQString::fromLatin1("KCM Locale"));
-    TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+    entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
+    TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
 
     regions.insert(tag, Region(name));
   }
 
   // add all languages to the list
-  TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop"));
+  TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*/entry.desktop"));
 
   int idx = 0;
   for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit)
   {
     KSimpleConfig entry(*sit);
-    entry.setGroup(TQString::fromLatin1("KCM Locale"));
-    TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
-    TQString submenu = entry.readEntry(TQString::fromLatin1("Region"));
+    entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
+    TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
+    TQString submenu = entry.readEntry(TQString::tqfromLatin1("Region"));
 
     TQString tag = *sit;
-    int index = tag.findRev('/');
+    int index = tag.tqfindRev('/');
     tag.truncate(index);
-    index = tag.findRev('/');
+    index = tag.tqfindRev('/');
     tag = tag.mid(index+1);
 
     if (tag == "C")
       continue;
 
-    TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::fromLatin1("Languages")));
+    TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::tqfromLatin1("Languages")));
     TQValueList<int> langs;
 
     TQString pixmap = *sit;
-    index = pixmap.findRev('/');
+    index = pixmap.tqfindRev('/');
     pixmap.truncate(index);
     pixmap += "/flag.png";
 
@@ -1071,8 +1071,8 @@ void LanguageOptions::loadCountryData()
     {
       // Treat ie "en_GB" and "en_USE" as "en" because the language list
       // only contains the first letters
-      if ((*it).find("_"))
-        *it = (*it).left((*it).find("_"));
+      if ((*it).tqfind("_"))
+        *it = (*it).left((*it).tqfind("_"));
 
       int id = global_langset.indexShortId(*it);
       if (id > 0)
@@ -1126,7 +1126,7 @@ void LanguageOptions::loadCountryData()
 
 void LanguageOptions::slotLangFromGlobalActivated(int i)
 {
-  if (countryIdMap.contains(i))
+  if (countryIdMap.tqcontains(i))
   {
     Country c = countryIdMap[i];
     bool first = true;
@@ -1178,7 +1178,7 @@ 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)
   {
     TQString s = i18n(kv_iso639_1[id].langname);
-    global_langset.addSet(kv_iso639_1[id].iso1code, s, TQString::null, kv_iso639_1[id].iso2code);
+    global_langset.addSet(kv_iso639_1[id].iso1code, s, TQString(), kv_iso639_1[id].iso2code);
   }
 }
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.h b/kvoctrain/kvoctrain/common-dialogs/languageoptions.h
index 5da2bd88..d239f06f 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.h
@@ -34,9 +34,10 @@
 class LanguageOptions : public LanguageOptionsBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  LanguageOptions(LangSet & langset, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  LanguageOptions(LangSet & langset, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
   virtual ~LanguageOptions ();
 
   LangSet getLangSet () const;
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
index 84698be7..c4718342 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>LanguageOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>LanguageOptionsBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>GroupBox3</cstring>
             </property>
@@ -39,7 +39,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton" row="0" column="2">
+                <widget class="TQPushButton" row="0" column="2">
                     <property name="name">
                         <cstring>b_langDel</cstring>
                     </property>
@@ -53,7 +53,7 @@
                         <string>By clicking on this button you can delete the selected language.</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="1">
+                <widget class="TQLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>e_shortName2</cstring>
                     </property>
@@ -72,7 +72,7 @@
                         <string>An alternative language code is set here but you can change it if you want</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="2" column="1">
+                <widget class="TQLineEdit" row="2" column="1">
                     <property name="name">
                         <cstring>e_langLong</cstring>
                     </property>
@@ -93,7 +93,7 @@
                 </widget>
                 <widget class="KComboBox" row="4" column="1">
                     <property name="name">
-                        <cstring>d_kblayout</cstring>
+                        <cstring>d_kbtqlayout</cstring>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Select a language or use the Add New Language Code to add one.</string>
@@ -102,7 +102,7 @@
                         <string>You can select a language with the drop down box or use the Add New Language Code dialog below to add one.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="3" column="1">
+                <widget class="TQPushButton" row="3" column="1">
                     <property name="name">
                         <cstring>b_langPixmap</cstring>
                     </property>
@@ -127,7 +127,7 @@
                         <string>You can select a language with the drop down box or use the Add New Language Code dialog below to add one.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>label_shortName</cstring>
                     </property>
@@ -152,7 +152,7 @@
                         <string>Each column can be assigned a language. This is internally done with the usual international language codes.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>label_shortName2</cstring>
                     </property>
@@ -169,7 +169,7 @@
                         <string>Sometimes it may be useful to have a second language code because some languages have the usual short code and one or two longer codes.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>label_langLong</cstring>
                     </property>
@@ -186,7 +186,7 @@
                         <string>Here you can give the language code a descriptive name in your own language which is shown in the header buttons in the main view. </string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>label_langPixmap</cstring>
                     </property>
@@ -203,9 +203,9 @@
                         <string>Choose a picture to represent the language above.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
-                        <cstring>label_kblayout</cstring>
+                        <cstring>label_kbtqlayout</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
@@ -216,10 +216,10 @@
                         </sizepolicy>
                     </property>
                     <property name="text">
-                        <string>Keyboard layout:</string>
+                        <string>Keyboard tqlayout:</string>
                     </property>
                     <property name="buddy" stdset="0">
-                        <cstring>d_kblayout</cstring>
+                        <cstring>d_kbtqlayout</cstring>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>You can assign a language to each column</string>
@@ -230,7 +230,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -247,7 +247,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton" row="1" column="0" rowspan="1" colspan="2">
+                <widget class="TQPushButton" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>b_lang_kde</cstring>
                     </property>
@@ -261,7 +261,7 @@
                         <string>Pressing this button opens a menu that contains all the countries that are known in your KDE installation. Ordered by country you can add your desired language properties to your personal list.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="0" rowspan="1" colspan="2">
+                <widget class="TQPushButton" row="2" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>b_lang_iso1</cstring>
                     </property>
@@ -278,7 +278,7 @@
                         <string>Pressing this button opens a menu that contains all the language codes that are covered by "ISO639-1"</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="1">
+                <widget class="TQPushButton" row="0" column="1">
                     <property name="name">
                         <cstring>b_langNew</cstring>
                     </property>
@@ -292,7 +292,7 @@
                         <string>This button becomes available when you type a language code in the field.</string>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="0">
+                <widget class="TQLineEdit" row="0" column="0">
                     <property name="name">
                         <cstring>e_newName</cstring>
                     </property>
@@ -323,7 +323,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>390</width>
                     <height>20</height>
@@ -337,14 +337,14 @@
     <tabstop>e_shortName2</tabstop>
     <tabstop>e_langLong</tabstop>
     <tabstop>b_langPixmap</tabstop>
-    <tabstop>d_kblayout</tabstop>
+    <tabstop>d_kbtqlayout</tabstop>
     <tabstop>b_langDel</tabstop>
     <tabstop>e_newName</tabstop>
     <tabstop>b_langNew</tabstop>
     <tabstop>b_lang_kde</tabstop>
     <tabstop>b_lang_iso1</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
index ca79f2d5..a273088b 100644
--- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
@@ -50,8 +50,8 @@ static const char *separator_id[] =
   0
 };
 
-PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* parent, const char* name, WFlags fl)
-: PasteOptionsBase(parent,name,fl), m_langSet(langset)
+PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* tqparent, const char* name, WFlags fl)
+: PasteOptionsBase(tqparent,name,fl), m_langSet(langset)
 {
   OrderList->setEnabled(!kcfg_UseCurrent->isChecked());
   UpButton->setEnabled(!kcfg_UseCurrent->isChecked());
diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h
index 587f3c09..f7ef34d3 100644
--- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h
@@ -34,9 +34,10 @@ class kvoctrainDoc;
 class PasteOptions : public PasteOptionsBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateWidgets();
   bool hasChanged();
diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui
index 3ee107fc..ad0b78ac 100644
--- a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>PasteOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PasteOptionsBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>label_sep</cstring>
             </property>
@@ -37,7 +37,7 @@
             <property name="name">
                 <cstring>SeparatorCombo</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>140</width>
                     <height>0</height>
@@ -60,14 +60,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>310</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>label_order</cstring>
             </property>
@@ -84,7 +84,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QListBox" row="1" column="0" rowspan="4" colspan="1">
+                <widget class="TQListBox" row="1" column="0" rowspan="4" colspan="1">
                     <property name="name">
                         <cstring>OrderList</cstring>
                     </property>
@@ -97,7 +97,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="3" column="1">
+                <widget class="TQPushButton" row="3" column="1">
                     <property name="name">
                         <cstring>DownButton</cstring>
                     </property>
@@ -105,7 +105,7 @@
                         <string>&amp;Down</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="1">
+                <widget class="TQPushButton" row="2" column="1">
                     <property name="name">
                         <cstring>SkipButton</cstring>
                     </property>
@@ -113,7 +113,7 @@
                         <string>S&amp;kip</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="1">
+                <widget class="TQPushButton" row="1" column="1">
                     <property name="name">
                         <cstring>UpButton</cstring>
                     </property>
@@ -121,7 +121,7 @@
                         <string>&amp;Up</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_UseCurrent</cstring>
                     </property>
@@ -145,7 +145,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>21</width>
                             <height>21</height>
@@ -164,7 +164,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>80</width>
                     <height>31</height>
@@ -207,7 +207,7 @@
     <tabstop>SkipButton</tabstop>
     <tabstop>DownButton</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
 </includehints>
diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
index 6660561f..ec273397 100644
--- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
@@ -39,8 +39,8 @@ SettingsProfile::SettingsProfile(TQString n, TQString q, TQString t, TQString b)
 {
 }
 
-ProfilesDialog::ProfilesDialog(QueryManager * m, TQWidget *parent, const char *name, bool modal)
- : KDialogBase(Swallow, i18n("Profiles"), Close, Close, parent, name, modal, false)
+ProfilesDialog::ProfilesDialog(QueryManager * m, TQWidget *tqparent, const char *name, bool modal)
+ : KDialogBase(Swallow, i18n("Profiles"), Close, Close, tqparent, name, modal, false)
 {
   m_queryManager = m;
   mw = new GroupOptions(this);
@@ -82,7 +82,7 @@ void ProfilesDialog::slotNewGroup()
 {
   bool ok;
   TQString newGroupName = KInputDialog::getText(i18n("Profile Description"),
-    i18n("Enter profile description:"), TQString::null, &ok);
+    i18n("Enter profile description:"), TQString(), &ok);
 
   if (ok)
   {
@@ -113,7 +113,7 @@ void ProfilesDialog::slotStoreGroup()
 
 static bool extract (TQString &line, TQString &ret)
 {
-  int lim = line.find (",");
+  int lim = line.tqfind (",");
   if (lim < 0)
   {
     ret = "";
@@ -178,7 +178,7 @@ void ProfilesDialog::selectProfile(int profile)
     if (extract (line, s))
       Prefs::setIKnow((bool) s.toInt());
 
-#define QCT(x)  Prefs::EnumCompType::type(x)
+#define TQCT(x)  Prefs::EnumCompType::type(x)
 
     line = profiles[profile].thresh_set;
 
@@ -187,7 +187,7 @@ void ProfilesDialog::selectProfile(int profile)
     { // new style: multiple lessons
       int pos;
       line.remove(0, 1);
-      if ((pos = line.find(')')) > 0)
+      if ((pos = line.tqfind(')')) > 0)
       {
         s = line.left (pos);
         line.remove (0, pos+1);
@@ -203,29 +203,29 @@ void ProfilesDialog::selectProfile(int profile)
       m_queryManager->setLessonItemStr(s);
 
     if (extract (line, s))
-      Prefs::setCompType(Prefs::EnumType::Lesson, QCT(s.toInt()));
+      Prefs::setCompType(Prefs::EnumType::Lesson, TQCT(s.toInt()));
     if (extract (line, s))
       Prefs::setTypeItem(s);   // s.toInt()
     if (extract (line, s))
-      Prefs::setCompType(Prefs::EnumType::WordType, QCT(s.toInt())) /*manager.setTypeComp(QCT(s.toInt()))*/;
+      Prefs::setCompType(Prefs::EnumType::WordType, TQCT(s.toInt())) /*manager.setTypeComp(TQCT(s.toInt()))*/;
     if (extract (line, s))
       Prefs::setGradeItem(s.toInt());
     if (extract (line, s))
-      Prefs::setCompType(Prefs::EnumType::Grade, QCT(s.toInt()));
+      Prefs::setCompType(Prefs::EnumType::Grade, TQCT(s.toInt()));
     if (extract (line, s))
       Prefs::setQueryItem(s.toInt());
     if (extract (line, s))
-      Prefs::setCompType(Prefs::EnumType::Query, QCT(s.toInt()));
+      Prefs::setCompType(Prefs::EnumType::Query, TQCT(s.toInt()));
     if (extract (line, s))
       Prefs::setBadItem(s.toInt());
     if (extract (line, s))
-      Prefs::setCompType(Prefs::EnumType::Bad, QCT(s.toInt()));
+      Prefs::setCompType(Prefs::EnumType::Bad, TQCT(s.toInt()));
     if (extract (line, s))
       Prefs::setDateItem(s.toInt());
     if (extract (line, s))
-      Prefs::setCompType(Prefs::EnumType::Date, QCT(s.toInt()));
+      Prefs::setCompType(Prefs::EnumType::Date, TQCT(s.toInt()));
 
-#undef QCT
+#undef TQCT
 
     line = profiles[profile].block_set;
     Prefs::setBlock(false);
diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h
index 165eb534..057acaa5 100644
--- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h
+++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h
@@ -46,9 +46,10 @@ public:
 class ProfilesDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  ProfilesDialog(QueryManager * m, TQWidget *parent = 0, const char *name = 0, bool modal = true);
+  ProfilesDialog(QueryManager * m, TQWidget *tqparent = 0, const char *name = 0, bool modal = true);
 
 signals:
   void profileActivated();
diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp
index 2b4e6c5a..94c6c6da 100644
--- a/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp
@@ -34,8 +34,8 @@
 #include "queryoptions.h"
 #include "prefs.h"
 
-QueryOptions::QueryOptions(TQWidget* parent, const char* name, WFlags fl)
-: QueryOptionsBase(parent,name,fl)
+QueryOptions::QueryOptions(TQWidget* tqparent, const char* name, WFlags fl)
+: QueryOptionsBase(tqparent,name,fl)
 {
   kcfg_MaxTimePer->setDisabled(r_no_limit->isChecked());
   kcfg_ShowCounter->setDisabled(r_no_limit->isChecked());
diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h
index 409a597e..4aa6b1a5 100644
--- a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h
@@ -23,17 +23,18 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QUERYOPTIONS_H
-#define QUERYOPTIONS_H
+#ifndef TQUERYOPTIONS_H
+#define TQUERYOPTIONS_H
 
 #include "queryoptionsbase.h"
 
 class QueryOptions : public QueryOptionsBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  QueryOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  QueryOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateWidgets();
 };
diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
index 24e70c58..c7895160 100644
--- a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>QueryOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>QueryOptionsBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QCheckBox" row="2" column="0">
+        <widget class="TQCheckBox" row="2" column="0">
             <property name="name">
                 <cstring>kcfg_AltLearn</cstring>
             </property>
@@ -36,7 +36,7 @@
                 <string>By checking this, you will use the Leitner method of learning which requires you to answer correctly to each question 4 times in a row. </string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="1" column="0">
+        <widget class="TQCheckBox" row="1" column="0">
             <property name="name">
                 <cstring>kcfg_SwapDirection</cstring>
             </property>
@@ -44,7 +44,7 @@
                 <string>S&amp;wap direction randomly</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="3" column="0">
+        <widget class="TQGroupBox" row="3" column="0">
             <property name="name">
                 <cstring>unnamed</cstring>
             </property>
@@ -55,7 +55,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="7">
+                <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="7">
                     <property name="name">
                         <cstring>kcfg_Suggestions</cstring>
                     </property>
@@ -72,7 +72,7 @@
                         <string>When this options is enabled, you can enter part of an answer, then press F5 or F6 to get a list of translations starting with or containing the text you typed.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="7">
+                <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="7">
                     <property name="name">
                         <cstring>kcfg_Split</cstring>
                     </property>
@@ -89,7 +89,7 @@
                         <string>When this options is enabled, the program will split translations into several parts, show multiple answer fields, and you will need to answer each one of them. This is useful for example when a word has several meanings that have different translations in the other language.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="1" rowspan="1" colspan="3">
+                <widget class="TQLabel" row="3" column="1" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>label_split_max_fields</cstring>
                     </property>
@@ -106,7 +106,7 @@
                         <string>Enter the maximum number of answer fields you want to have. When splitting translations, the program will only split into this many parts, and the last part will contain the rest of the translation.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="7">
+                <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="7">
                     <property name="name">
                         <cstring>kcfg_IKnow</cstring>
                     </property>
@@ -123,7 +123,7 @@
                         <string>If this is checked, the I Know button will be available. It allows you to tell the query that you know the result without writing it or having it checked. This is available by default. If you uncheck this, the I Know button will not be available.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="1">
+                <widget class="TQLabel" row="2" column="1">
                     <property name="name">
                         <cstring>label_at</cstring>
                     </property>
@@ -139,7 +139,7 @@
                         <string>at</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="2">
+                <widget class="TQCheckBox" row="2" column="2">
                     <property name="name">
                         <cstring>kcfg_Periods</cstring>
                     </property>
@@ -156,7 +156,7 @@
                         <string>When this options is enabled, translations will be split at periods if they have any (except any trailing periods that will be removed).</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="4">
+                <widget class="TQCheckBox" row="2" column="4">
                     <property name="name">
                         <cstring>kcfg_Semicolons</cstring>
                     </property>
@@ -173,7 +173,7 @@
                         <string>When this options is enabled, translations that have not been split at periods or colons will be split at semicolons if they have any.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="5" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="2" column="5" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_Commas</cstring>
                     </property>
@@ -198,7 +198,7 @@
                         <string>When this options is enabled, translations that have not been split at periods, colons or semicolons will be split at commas if they have any.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="3">
+                <widget class="TQCheckBox" row="2" column="3">
                     <property name="name">
                         <cstring>kcfg_Colons</cstring>
                     </property>
@@ -215,7 +215,7 @@
                         <string>When this options is enabled, translations that have not been split at periods will be split at colons if they have any.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="7">
+                <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="7">
                     <property name="name">
                         <cstring>kcfg_ShowMore</cstring>
                     </property>
@@ -242,7 +242,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>48</height>
@@ -261,7 +261,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
@@ -290,7 +290,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>111</width>
                             <height>20</height>
@@ -309,14 +309,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>290</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>QueryTimeout</cstring>
             </property>
@@ -333,7 +333,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QButtonGroup" row="0" column="0" rowspan="2" colspan="1">
+                <widget class="TQButtonGroup" row="0" column="0" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>kcfg_QueryTimeout</cstring>
                     </property>
@@ -350,7 +350,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QRadioButton" row="1" column="0">
+                        <widget class="TQRadioButton" row="1" column="0">
                             <property name="name">
                                 <cstring>r_show_to</cstring>
                             </property>
@@ -361,7 +361,7 @@
                                 <number>1</number>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="0" column="0">
+                        <widget class="TQRadioButton" row="0" column="0">
                             <property name="name">
                                 <cstring>r_no_limit</cstring>
                             </property>
@@ -378,7 +378,7 @@
                                 <string>When this is checked, there is no time limitation for each query</string>
                             </property>
                         </widget>
-                        <widget class="QRadioButton" row="2" column="0">
+                        <widget class="TQRadioButton" row="2" column="0">
                             <property name="name">
                                 <cstring>r_cont_to</cstring>
                             </property>
@@ -388,15 +388,15 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="1">
+                <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>label_mqtime</cstring>
                             </property>
@@ -407,7 +407,7 @@
                                 <cstring>kcfg_MaxTimePer</cstring>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="1" column="1">
+                        <widget class="TQCheckBox" row="1" column="1">
                             <property name="name">
                                 <cstring>kcfg_ShowCounter</cstring>
                             </property>
@@ -439,7 +439,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>83</width>
                                     <height>20</height>
@@ -475,7 +475,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>200</width>
                             <height>16</height>
@@ -563,7 +563,7 @@
     <tabstop>kcfg_ShowMore</tabstop>
     <tabstop>kcfg_IKnow</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
index b54d60f6..f7a3cac6 100644
--- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
@@ -101,8 +101,8 @@ static ThreshListRef Threshdate_itemlist [] =
       };
 
 
-ThresholdOptions::ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* parent, const char* name, WFlags fl)
-: ThresholdOptionsBase(parent, name, fl), m_lessons(lessons)
+ThresholdOptions::ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* tqparent, const char* name, WFlags fl)
+: ThresholdOptionsBase(tqparent, name, fl), m_lessons(lessons)
 {
   connect(lessoncomp,  TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetLessonComp(int)));
   connect(lessonlist,  TQT_SIGNAL(selectionChanged()), TQT_SIGNAL(widgetModified()));
diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h
index e3d5b9da..c34beed0 100644
--- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h
@@ -34,9 +34,10 @@ class KComboBox;
 class ThresholdOptions : public ThresholdOptionsBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateWidgets();
   bool hasChanged();
diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui
index 4cf771c2..fa569c1c 100644
--- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ThresholdOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ThresholdOptionsBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QComboBox" row="1" column="1">
+        <widget class="TQComboBox" row="1" column="1">
             <property name="name">
                 <cstring>typecomp</cstring>
             </property>
@@ -35,17 +35,17 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QComboBox" row="3" column="1">
+        <widget class="TQComboBox" row="3" column="1">
             <property name="name">
                 <cstring>querycomp</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="4" column="1">
+        <widget class="TQComboBox" row="4" column="1">
             <property name="name">
                 <cstring>badcomp</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>label_grade</cstring>
             </property>
@@ -56,7 +56,7 @@
                 <cstring>gradecomp</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>label_bcount</cstring>
             </property>
@@ -67,7 +67,7 @@
                 <cstring>badcomp</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>label_qdate</cstring>
             </property>
@@ -78,27 +78,27 @@
                 <cstring>datecomp</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="5" column="1">
+        <widget class="TQComboBox" row="5" column="1">
             <property name="name">
                 <cstring>datecomp</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="4" column="2">
+        <widget class="TQComboBox" row="4" column="2">
             <property name="name">
                 <cstring>badlist</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="3" column="2">
+        <widget class="TQComboBox" row="3" column="2">
             <property name="name">
                 <cstring>querylist</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="5" column="2">
+        <widget class="TQComboBox" row="5" column="2">
             <property name="name">
                 <cstring>datelist</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="1" column="2">
+        <widget class="TQComboBox" row="1" column="2">
             <property name="name">
                 <cstring>typelist</cstring>
             </property>
@@ -111,7 +111,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>label_type</cstring>
             </property>
@@ -122,17 +122,17 @@
                 <cstring>typecomp</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="2" column="2">
+        <widget class="TQComboBox" row="2" column="2">
             <property name="name">
                 <cstring>gradelist</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="2" column="1">
+        <widget class="TQComboBox" row="2" column="1">
             <property name="name">
                 <cstring>gradecomp</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>label_qcount</cstring>
             </property>
@@ -143,15 +143,15 @@
                 <cstring>querycomp</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton" row="2" column="1">
+                <widget class="TQPushButton" row="2" column="1">
                     <property name="name">
                         <cstring>b_all_less</cstring>
                     </property>
@@ -167,7 +167,7 @@
                         <string>&amp;All</string>
                     </property>
                 </widget>
-                <widget class="QListBox" row="1" column="3" rowspan="3" colspan="2">
+                <widget class="TQListBox" row="1" column="3" rowspan="3" colspan="2">
                     <property name="name">
                         <cstring>lessonlist</cstring>
                     </property>
@@ -183,7 +183,7 @@
                         <enum>Multi</enum>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="2">
+                <widget class="TQPushButton" row="2" column="2">
                     <property name="name">
                         <cstring>b_none_less</cstring>
                     </property>
@@ -191,7 +191,7 @@
                         <string>&amp;None</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="3">
+                <widget class="TQLabel" row="0" column="3">
                     <property name="name">
                         <cstring>l_lesson</cstring>
                     </property>
@@ -209,7 +209,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>50</height>
@@ -226,14 +226,14 @@
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>80</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="0" column="4">
+                <widget class="TQLabel" row="0" column="4">
                     <property name="name">
                         <cstring>l_count</cstring>
                     </property>
@@ -249,7 +249,7 @@
                         <string>-</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>label_lesson</cstring>
                     </property>
@@ -260,7 +260,7 @@
                         <cstring>lessoncomp</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1" rowspan="1" colspan="2">
+                <widget class="TQComboBox" row="1" column="1" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>lessoncomp</cstring>
                     </property>
@@ -285,7 +285,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>290</width>
                     <height>16</height>
@@ -294,5 +294,5 @@
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp
index 773f263f..9be23a47 100644
--- a/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp
@@ -27,8 +27,8 @@
 
 #include "viewoptions.h"
 
-ViewOptions::ViewOptions(TQWidget* parent, const char* name, WFlags fl)
-: ViewOptionsBase(parent,name,fl)
+ViewOptions::ViewOptions(TQWidget* tqparent, const char* name, WFlags fl)
+: ViewOptionsBase(tqparent,name,fl)
 {
   kcfg_GradeCol0->setEnabled(kcfg_UseGradeCol->isChecked());
   kcfg_GradeCol1->setEnabled(kcfg_UseGradeCol->isChecked());
diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptions.h b/kvoctrain/kvoctrain/common-dialogs/viewoptions.h
index db3eb409..5ee876db 100644
--- a/kvoctrain/kvoctrain/common-dialogs/viewoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/viewoptions.h
@@ -31,9 +31,10 @@
 class ViewOptions : public ViewOptionsBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  ViewOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  ViewOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
 
 };
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
index 3bb2af24..37f152fe 100644
--- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ViewOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ViewOptionsBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -27,7 +27,7 @@
                 <cstring>kcfg_TableFont</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TableFontLabel</cstring>
             </property>
@@ -43,7 +43,7 @@
                 <cstring>kcfg_IPAFont</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>IPAFontLabel</cstring>
             </property>
@@ -54,7 +54,7 @@
                 <cstring>kcfg_IPAFont</cstring>
             </property>
         </widget>
-        <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>gradegroup</cstring>
             </property>
@@ -79,7 +79,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>l_lev4</cstring>
                     </property>
@@ -98,7 +98,7 @@
                         <cstring>kcfg_GradeCol4</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>l_lev5</cstring>
                     </property>
@@ -117,7 +117,7 @@
                         <cstring>kcfg_GradeCol5</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>l_lev7</cstring>
                     </property>
@@ -136,7 +136,7 @@
                         <cstring>kcfg_GradeCol7</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>l_lev6</cstring>
                     </property>
@@ -171,7 +171,7 @@
                         <string>&amp;N</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="8" column="0">
+                <widget class="TQLabel" row="8" column="0">
                     <property name="name">
                         <cstring>l_lev0</cstring>
                     </property>
@@ -215,7 +215,7 @@
                         <string>Click here to change the color for grade 1.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="7" column="0">
+                <widget class="TQLabel" row="7" column="0">
                     <property name="name">
                         <cstring>l_lev1</cstring>
                     </property>
@@ -234,7 +234,7 @@
                         <cstring>kcfg_GradeCol1</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="6" column="0">
+                <widget class="TQLabel" row="6" column="0">
                     <property name="name">
                         <cstring>l_lev2</cstring>
                     </property>
@@ -278,7 +278,7 @@
                         <string>Click here to change the color for grade 2.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="5" column="0">
+                <widget class="TQLabel" row="5" column="0">
                     <property name="name">
                         <cstring>l_lev3</cstring>
                     </property>
@@ -422,7 +422,7 @@
                         <string>Click here to change the color for grade 7.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_UseGradeCol</cstring>
                     </property>
@@ -448,7 +448,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>61</width>
                     <height>20</height>
@@ -520,7 +520,7 @@
 <includes>
     <include location="global" impldecl="in declaration">kcolorbutton.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kfontrequester.h</includehint>
     <includehint>kfontrequester.h</includehint>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp
index f1c8d62d..73ceab50 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp
@@ -28,7 +28,7 @@
 
 #include <tqcheckbox.h>
 
-DocOptionsPage::DocOptionsPage(bool sort, TQWidget *parent, const char *name):DocOptionsPageForm(parent, name)
+DocOptionsPage::DocOptionsPage(bool sort, TQWidget *tqparent, const char *name):DocOptionsPageForm(tqparent, name)
 {
   sorter = sort;
   docsort->setChecked(sort);
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h
index 948a37af..b2ee07e6 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h
@@ -32,10 +32,11 @@
 class DocOptionsPage : public DocOptionsPageForm
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-  DocOptionsPage(bool sort, TQWidget *parent, const char *name);
+  DocOptionsPage(bool sort, TQWidget *tqparent, const char *name);
 
   bool getSorting () const { return sorter; }
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui
index 137d3df5..d1b3d34d 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>DocOptionsPageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Document_options</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -42,7 +42,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox" row="0" column="0">
+                <widget class="TQCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>docsort</cstring>
                     </property>
@@ -54,5 +54,5 @@
         </widget>
     </hbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
index a49fd65e..34979fc1 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
@@ -47,12 +47,12 @@ DocPropsDlg::DocPropsDlg
   vector<TQString>  types,
   vector<TQString>  tenses,
   vector<TQString>  usages,
-  TQWidget         *parent,
+  TQWidget         *tqparent,
   const char      *name,
   bool             modal
 )
   :
-  KDialogBase(Tabbed, i18n("Document Properties"), Ok|Cancel, Ok, parent, name, modal)
+  KDialogBase(Tabbed, i18n("Document Properties"), Ok|Cancel, Ok, tqparent, name, modal)
 {
   TQFrame *page = addPage( i18n("&General") );
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h
index 9e6080d7..0ed586ed 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h
@@ -44,6 +44,7 @@ class LangPropPage;
 class DocPropsDlg : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -59,7 +60,7 @@ public:
     vector<TQString>  types,
     vector<TQString>  tenses,
     vector<TQString>  usages,
-    TQWidget         *parent = NULL,
+    TQWidget         *tqparent = NULL,
     const char      *name = NULL,
     bool             modal = true
   );
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
index 76013ebf..c359f65f 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
@@ -42,9 +42,9 @@
 
 class kvoctraindoc;
 
-DocPropsLangDlg::DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *parent, const char *name, bool modal)
+DocPropsLangDlg::DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *tqparent, const char *name, bool modal)
   :
-  KDialogBase(Tabbed, i18n("Language Properties"), Ok|Cancel, Ok, parent, name, modal)
+  KDialogBase(Tabbed, i18n("Language Properties"), Ok|Cancel, Ok, tqparent, name, modal)
 {
   TQFrame * page;
   TQVBoxLayout * topLayout;
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h
index a6b7c14f..6b1a6170 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h
@@ -39,10 +39,11 @@ class LangSet;
 class DocPropsLangDlg : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-  DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *parent = NULL, const char *name = NULL, bool modal = true);
+  DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *tqparent = NULL, const char *name = NULL, bool modal = true);
 
   Conjugation getConjugation(int idx) const;
   Article     getArticle(int idx) const;
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
index a9d255e6..3ec0a6f5 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
@@ -40,11 +40,11 @@ LangPropPage::LangPropPage
   TQString            curr_lang,
   const Conjugation &conjug,
   const Article     &art,
-  TQWidget           *parent,
+  TQWidget           *tqparent,
   const char        *name
 )
   :
-  LangPropPageForm( parent, name ),
+  LangPropPageForm( tqparent, name ),
   doc(_doc),
   conjugations(conjug),
   articles(art)
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h
index d7ab00f5..4748e7b3 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h
@@ -36,6 +36,7 @@ class kvoctrainDoc;
 class LangPropPage : public LangPropPageForm
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -45,7 +46,7 @@ public:
     TQString            curr_lang,
     const Conjugation &conjugations,
     const Article     &article,
-    TQWidget           *parent = NULL,
+    TQWidget           *tqparent = NULL,
     const char        *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui
index cce69a3f..42446585 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>LangPropPageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>LangPropPage</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -42,7 +42,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
@@ -58,7 +58,7 @@
                         <string>Language code (ISO 639):</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>l_langcode</cstring>
                     </property>
@@ -70,7 +70,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>70</width>
                             <height>0</height>
@@ -93,14 +93,14 @@
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3">
+                <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>GroupBox3</cstring>
                     </property>
@@ -125,7 +125,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>female_label</cstring>
                             </property>
@@ -136,7 +136,7 @@
                                 <cstring>def_female</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>male_label</cstring>
                             </property>
@@ -147,7 +147,7 @@
                                 <cstring>def_male</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="2" column="2">
+                        <widget class="TQLineEdit" row="2" column="2">
                             <property name="name">
                                 <cstring>indef_male</cstring>
                             </property>
@@ -160,7 +160,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="1">
+                        <widget class="TQLabel" row="0" column="1">
                             <property name="name">
                                 <cstring>TextLabel3</cstring>
                             </property>
@@ -176,7 +176,7 @@
                                 <string>Definite</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="2" column="1">
+                        <widget class="TQLineEdit" row="2" column="1">
                             <property name="name">
                                 <cstring>def_male</cstring>
                             </property>
@@ -189,7 +189,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="2">
+                        <widget class="TQLineEdit" row="1" column="2">
                             <property name="name">
                                 <cstring>indef_female</cstring>
                             </property>
@@ -202,7 +202,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="1">
+                        <widget class="TQLineEdit" row="1" column="1">
                             <property name="name">
                                 <cstring>def_female</cstring>
                             </property>
@@ -225,14 +225,14 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLineEdit" row="3" column="1">
+                        <widget class="TQLineEdit" row="3" column="1">
                             <property name="name">
                                 <cstring>def_natural</cstring>
                             </property>
@@ -245,7 +245,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="3" column="2">
+                        <widget class="TQLineEdit" row="3" column="2">
                             <property name="name">
                                 <cstring>indef_natural</cstring>
                             </property>
@@ -258,7 +258,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class="TQLabel" row="3" column="0">
                             <property name="name">
                                 <cstring>natural_label</cstring>
                             </property>
@@ -269,7 +269,7 @@
                                 <cstring>def_natural</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="2">
+                        <widget class="TQLabel" row="0" column="2">
                             <property name="name">
                                 <cstring>TextLabel4</cstring>
                             </property>
@@ -279,7 +279,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="3">
+                <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>GroupBox4</cstring>
                     </property>
@@ -304,7 +304,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>pers1_label</cstring>
                             </property>
@@ -315,7 +315,7 @@
                                 <cstring>first_singular</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>pers2_label</cstring>
                             </property>
@@ -326,7 +326,7 @@
                                 <cstring>second_singular</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class="TQLabel" row="3" column="0">
                             <property name="name">
                                 <cstring>pers3_label</cstring>
                             </property>
@@ -334,7 +334,7 @@
                                 <string>3. Person:</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="4" column="2">
+                        <widget class="TQLineEdit" row="4" column="2">
                             <property name="name">
                                 <cstring>thirdF_plural</cstring>
                             </property>
@@ -347,7 +347,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="6" column="2">
+                        <widget class="TQLineEdit" row="6" column="2">
                             <property name="name">
                                 <cstring>thirdN_plural</cstring>
                             </property>
@@ -360,7 +360,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="5" column="2">
+                        <widget class="TQLineEdit" row="5" column="2">
                             <property name="name">
                                 <cstring>thirdM_plural</cstring>
                             </property>
@@ -373,7 +373,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="3" column="2">
+                        <widget class="TQCheckBox" row="3" column="2">
                             <property name="name">
                                 <cstring>thirdP_common</cstring>
                             </property>
@@ -389,7 +389,7 @@
                                 <string>C&amp;ommon</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="4" column="0">
+                        <widget class="TQLabel" row="4" column="0">
                             <property name="name">
                                 <cstring>female_c_label</cstring>
                             </property>
@@ -400,7 +400,7 @@
                                 <cstring>thirdF_singular</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="5" column="0">
+                        <widget class="TQLabel" row="5" column="0">
                             <property name="name">
                                 <cstring>male_c_label</cstring>
                             </property>
@@ -411,7 +411,7 @@
                                 <cstring>thirdM_singular</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="6" column="0">
+                        <widget class="TQLabel" row="6" column="0">
                             <property name="name">
                                 <cstring>natural_c_label</cstring>
                             </property>
@@ -422,7 +422,7 @@
                                 <cstring>thirdN_singular</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="2">
+                        <widget class="TQLabel" row="0" column="2">
                             <property name="name">
                                 <cstring>TextLabel4_2</cstring>
                             </property>
@@ -430,7 +430,7 @@
                                 <string>Plural</string>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="3" column="1">
+                        <widget class="TQCheckBox" row="3" column="1">
                             <property name="name">
                                 <cstring>thirdS_common</cstring>
                             </property>
@@ -446,7 +446,7 @@
                                 <string>&amp;Common</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="1">
+                        <widget class="TQLabel" row="0" column="1">
                             <property name="name">
                                 <cstring>TextLabel4_2</cstring>
                             </property>
@@ -464,14 +464,14 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLineEdit" row="2" column="1">
+                        <widget class="TQLineEdit" row="2" column="1">
                             <property name="name">
                                 <cstring>second_singular</cstring>
                             </property>
@@ -484,7 +484,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="4" column="1">
+                        <widget class="TQLineEdit" row="4" column="1">
                             <property name="name">
                                 <cstring>thirdF_singular</cstring>
                             </property>
@@ -497,7 +497,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="5" column="1">
+                        <widget class="TQLineEdit" row="5" column="1">
                             <property name="name">
                                 <cstring>thirdM_singular</cstring>
                             </property>
@@ -510,7 +510,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="6" column="1">
+                        <widget class="TQLineEdit" row="6" column="1">
                             <property name="name">
                                 <cstring>thirdN_singular</cstring>
                             </property>
@@ -523,7 +523,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="1">
+                        <widget class="TQLineEdit" row="1" column="1">
                             <property name="name">
                                 <cstring>first_singular</cstring>
                             </property>
@@ -536,7 +536,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="2">
+                        <widget class="TQLineEdit" row="1" column="2">
                             <property name="name">
                                 <cstring>first_plural</cstring>
                             </property>
@@ -549,7 +549,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="2" column="2">
+                        <widget class="TQLineEdit" row="2" column="2">
                             <property name="name">
                                 <cstring>second_plural</cstring>
                             </property>
@@ -588,5 +588,5 @@
     <tabstop>thirdM_plural</tabstop>
     <tabstop>thirdN_plural</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
index d7015435..4b0c1155 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
@@ -42,11 +42,11 @@ LessOptPage::LessOptPage
 (
   TQComboBox     *lessons,
   kvoctrainDoc  *_doc,
-  TQWidget       *parent,
+  TQWidget       *tqparent,
   const char    *name
 )
   :
-  LessOptPageForm( parent, name )
+  LessOptPageForm( tqparent, name )
 {
   connect( lessonList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotLessonChosen(int)) );
   connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewLesson()) );
@@ -85,7 +85,7 @@ void LessOptPage::slotNewLesson()
 {
   bool ok;
   TQString getLesson = KInputDialog::getText(
-              i18n( "Lesson Description" ), i18n( "Enter lesson description:" ), TQString::null, &ok );
+              i18n( "Lesson Description" ), i18n( "Enter lesson description:" ), TQString(), &ok );
   if( !ok )
     return;
   TQString str;
@@ -107,7 +107,7 @@ void LessOptPage::slotModifyLesson()
   if (lessonList->count() != 0 && (int) lessonList->count() > act_lesson)
   {
     TQString str = lessonList->text (act_lesson);
-    int pos = str.find (LESS_TAG);
+    int pos = str.tqfind (LESS_TAG);
     str.remove (0, pos+strlen (LESS_TAG));
     bool ok;
     TQString getLesson = KInputDialog::getText(
@@ -129,7 +129,7 @@ void LessOptPage::updateListBox(int start)
   for (int i = start; i < (int) lessonList->count(); i++)
   {
     str = lessonList->text (i);
-    int pos = str.find (LESS_TAG);
+    int pos = str.tqfind (LESS_TAG);
     str.remove (0, pos+strlen (LESS_TAG));
     str2.setNum (i+1);
     if (i <= 9)
@@ -179,7 +179,7 @@ void LessOptPage::getLesson (TQComboBox *ret_lesson, vector<int> &ret_Index)
   TQString str;
   for (int i = 0; i < (int) lessonList->count(); i++) {
     str = lessonList->text(i);
-    int pos = str.find (LESS_TAG);
+    int pos = str.tqfind (LESS_TAG);
     str.remove (0, pos+strlen (LESS_TAG));
     ret_lesson->insertItem (str);
   }
@@ -228,7 +228,7 @@ void LessOptPage::cleanUnused (kvoctrainDoc *doc,
   /////////////////////////////////////////////////////
   // translate_index contains new index number for each
   // old index
-  for (int i = 0; i <= QMAX (old_lessons, (int) lessonIndex.size()); i++)
+  for (int i = 0; i <= TQMAX (old_lessons, (int) lessonIndex.size()); i++)
     translate_index.push_back(0);
 
   // now adjust lesson descriptions to new index
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h
index b5a54e06..9531eed6 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h
@@ -37,6 +37,7 @@ class TQComboBox;
 class LessOptPage : public LessOptPageForm
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -44,7 +45,7 @@ public:
   (
     TQComboBox     *lessons,
     kvoctrainDoc  *doc,
-    TQWidget       *parent = NULL,
+    TQWidget       *tqparent = NULL,
     const char    *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui
index 311ab3bc..a37885ff 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>LessOptPageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Lesson_Descriptions</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>lesson_group</cstring>
             </property>
@@ -52,14 +52,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton" row="2" column="0">
+                <widget class="TQPushButton" row="2" column="0">
                     <property name="name">
                         <cstring>b_new</cstring>
                     </property>
@@ -75,7 +75,7 @@
                         <string>&amp;New...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="1">
+                <widget class="TQPushButton" row="2" column="1">
                     <property name="name">
                         <cstring>b_modify</cstring>
                     </property>
@@ -91,7 +91,7 @@
                         <string>&amp;Modify...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="2">
+                <widget class="TQPushButton" row="2" column="2">
                     <property name="name">
                         <cstring>b_delete</cstring>
                     </property>
@@ -107,7 +107,7 @@
                         <string>&amp;Delete</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="4">
+                <widget class="TQPushButton" row="2" column="4">
                     <property name="name">
                         <cstring>b_cleanup</cstring>
                     </property>
@@ -123,7 +123,7 @@
                         <string>&amp;Clean Up</string>
                     </property>
                 </widget>
-                <widget class="QListBox" row="1" column="0" rowspan="1" colspan="5">
+                <widget class="TQListBox" row="1" column="0" rowspan="1" colspan="5">
                     <property name="name">
                         <cstring>lessonList</cstring>
                     </property>
@@ -139,5 +139,5 @@
     <tabstop>b_delete</tabstop>
     <tabstop>b_cleanup</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
index 00325b7b..30ed7369 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
@@ -40,11 +40,11 @@ TenseOptPage::TenseOptPage
 (
   const vector<TQString> &tenses,
   kvoctrainDoc    *_doc,
-  TQWidget         *parent,
+  TQWidget         *tqparent,
   const char      *name
 )
   :
-  TenseOptPageForm( parent, name )
+  TenseOptPageForm( tqparent, name )
 {
   connect( tenseList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTenseChosen(int)) );
   connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );
@@ -83,7 +83,7 @@ void TenseOptPage::slotNewTense()
 {
   bool ok;
   TQString getTense = KInputDialog::getText(
-              i18n( "Tense Description" ), i18n( "Enter tense description:" ), TQString::null, &ok );
+              i18n( "Tense Description" ), i18n( "Enter tense description:" ), TQString(), &ok );
   if( !ok )
     return;
 
@@ -106,7 +106,7 @@ void TenseOptPage::slotModifyTense()
   if (tenseList->count() != 0 && (int) tenseList->count() > act_tense) 
   {
     TQString str = tenseList->text (act_tense);
-    int pos = str.find (TENSE_TAG);
+    int pos = str.tqfind (TENSE_TAG);
     str.remove (0, pos+strlen (TENSE_TAG));
     bool ok;
     TQString getTense = KInputDialog::getText(
@@ -128,7 +128,7 @@ void TenseOptPage::updateListBox(int start)
   for (int i = start; i < (int) tenseList->count(); i++) 
   {
     str = tenseList->text (i);
-    int pos = str.find (TENSE_TAG);
+    int pos = str.tqfind (TENSE_TAG);
     str.remove (0, pos+strlen (TENSE_TAG));
     str2.setNum (i+1);
     if (i <= 9)
@@ -146,7 +146,7 @@ void TenseOptPage::slotDeleteTense()
 
     TQString t;
     t.setNum(tenseIndex[act_tense]+1);
-    t.insert (0, QM_USER_TYPE);
+    t.insert (0, TQM_USER_TYPE);
     for (int ent = 0; ent < doc->numEntries(); ent++) {
       // FIXME: ProgressDlg here?
       kvoctrainExpr *exp = doc->getEntry(ent);
@@ -185,7 +185,7 @@ void TenseOptPage::getTenseNames (vector<TQString> &ret_tense, vector<int> &ret_
   for (int i = 0; i < (int) tenseList->count(); i++) 
   {
     str = tenseList->text(i);
-    int pos = str.find (TENSE_TAG);
+    int pos = str.tqfind (TENSE_TAG);
     str.remove (0, pos+strlen (TENSE_TAG));
     ret_tense.push_back (str);
   }
@@ -239,7 +239,7 @@ void TenseOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &tenseIndex,
   /////////////////////////////////////////////////////
   // translate_index contains new index number for each
   // old index
-  for (int i = 0; i <= QMAX (old_tenses, (int) tenseIndex.size()); i++)
+  for (int i = 0; i <= TQMAX (old_tenses, (int) tenseIndex.size()); i++)
     translate_index.push_back(0);
 
   // now adjust lesson descriptions to new index
@@ -260,7 +260,7 @@ void TenseOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &tenseIndex,
       bool dirty = false;
       for (int ci = 0; ci < conj.numEntries(); ci++) {
         TQString old = conj.getType(ci);
-        if (!old.isEmpty() && old.left(strlen(QM_USER_TYPE)) == QM_USER_TYPE) {
+        if (!old.isEmpty() && old.left(strlen(TQM_USER_TYPE)) == TQM_USER_TYPE) {
           old.remove (0, 1);
           int o = old.toInt();
 
@@ -268,7 +268,7 @@ void TenseOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &tenseIndex,
           TQString newtense;
           if (translate_index[o] != 0) {
             newtense.setNum (translate_index[o]);
-            newtense.insert (0, QM_USER_TYPE);
+            newtense.insert (0, TQM_USER_TYPE);
             conj.setType(ci, newtense);
           }
           else
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h
index 1cc3913b..e2430173 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h
@@ -38,6 +38,7 @@ class TQStrList;
 class TenseOptPage : public TenseOptPageForm
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -45,7 +46,7 @@ public:
   (
     const vector<TQString> &tenses,
     kvoctrainDoc    *doc,
-    TQWidget         *parent = NULL,
+    TQWidget         *tqparent = NULL,
     const char      *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui
index b0471df8..7a1df330 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>TenseOptPageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Tense_Descriptions</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>tense_group</cstring>
             </property>
@@ -52,14 +52,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton" row="1" column="0">
+                <widget class="TQPushButton" row="1" column="0">
                     <property name="name">
                         <cstring>b_new</cstring>
                     </property>
@@ -75,7 +75,7 @@
                         <string>&amp;New...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="1">
+                <widget class="TQPushButton" row="1" column="1">
                     <property name="name">
                         <cstring>b_modify</cstring>
                     </property>
@@ -91,7 +91,7 @@
                         <string>&amp;Modify...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="2">
+                <widget class="TQPushButton" row="1" column="2">
                     <property name="name">
                         <cstring>b_delete</cstring>
                     </property>
@@ -107,7 +107,7 @@
                         <string>&amp;Delete</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="4">
+                <widget class="TQPushButton" row="1" column="4">
                     <property name="name">
                         <cstring>b_cleanup</cstring>
                     </property>
@@ -123,7 +123,7 @@
                         <string>&amp;Clean Up</string>
                     </property>
                 </widget>
-                <widget class="QListBox" row="0" column="0" rowspan="1" colspan="5">
+                <widget class="TQListBox" row="0" column="0" rowspan="1" colspan="5">
                     <property name="name">
                         <cstring>tenseList</cstring>
                     </property>
@@ -139,5 +139,5 @@
     <tabstop>b_delete</tabstop>
     <tabstop>b_cleanup</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
index 96f71bd4..57dd5f2d 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
@@ -39,11 +39,11 @@ TitlePage::TitlePage
   TQString  _author,
   TQString  _license,
   TQString  _doc_remark,
-  TQWidget* parent,
+  TQWidget* tqparent,
   const char* name
 )
   :
-  TitlePageForm( parent, name )
+  TitlePageForm( tqparent, name )
 {
   title = _title;
   author = _author;
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h
index d656342a..52954e1e 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h
@@ -32,6 +32,7 @@
 class TitlePage : public TitlePageForm
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -41,7 +42,7 @@ public:
     TQString      author,
     TQString      license,
     TQString      doc_remark,
-    TQWidget     *parent = NULL,
+    TQWidget     *tqparent = NULL,
     const char  *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui
index b2a49e51..aa2bcb03 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>TitlePageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>TitlePage</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>tiltle_group</cstring>
             </property>
@@ -42,7 +42,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>label_title</cstring>
                     </property>
@@ -53,7 +53,7 @@
                         <cstring>e_title</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1">
+                <widget class="TQLineEdit" row="0" column="1">
                     <property name="name">
                         <cstring>e_title</cstring>
                     </property>
@@ -66,7 +66,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>label_author</cstring>
                     </property>
@@ -77,7 +77,7 @@
                         <cstring>e_author</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>label_remark</cstring>
                     </property>
@@ -88,7 +88,7 @@
                         <cstring>e_remark</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>label_license</cstring>
                     </property>
@@ -109,7 +109,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -126,14 +126,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QMultiLineEdit" row="3" column="1">
+                <widget class="TQMultiLineEdit" row="3" column="1">
                     <property name="name">
                         <cstring>e_remark</cstring>
                     </property>
@@ -146,7 +146,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QMultiLineEdit" row="1" column="1">
+                <widget class="TQMultiLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>e_author</cstring>
                     </property>
@@ -159,7 +159,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="2" column="1">
+                <widget class="TQLineEdit" row="2" column="1">
                     <property name="name">
                         <cstring>e_license</cstring>
                     </property>
@@ -182,5 +182,5 @@
     <tabstop>e_license</tabstop>
     <tabstop>e_remark</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
index c89129b8..48fc09e1 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
@@ -40,11 +40,11 @@ TypeOptPage::TypeOptPage
 (
   const vector<TQString> &types,
   kvoctrainDoc    *_doc,
-  TQWidget         *parent,
+  TQWidget         *tqparent,
   const char      *name
 )
   :
-  TypeOptPageForm( parent, name ),
+  TypeOptPageForm( tqparent, name ),
   doc(_doc)
 {
   connect( typeList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTypeChosen(int)) );
@@ -83,7 +83,7 @@ void TypeOptPage::slotNewType()
 {
   bool ok;
   TQString getType = KInputDialog::getText(
-              i18n( "Type Description" ), i18n( "Enter type description:" ), TQString::null, &ok );
+              i18n( "Type Description" ), i18n( "Enter type description:" ), TQString(), &ok );
   if( !ok )
     return;
   TQString str;
@@ -105,7 +105,7 @@ void TypeOptPage::slotModifyType()
   if (typeList->count() != 0
       && (int) typeList->count() > act_type) {
     TQString str = typeList->text (act_type);
-    int pos = str.find (TYPE_TAG);
+    int pos = str.tqfind (TYPE_TAG);
     str.remove (0, pos+strlen (TYPE_TAG));
     bool ok;
     TQString getType = KInputDialog::getText(
@@ -126,7 +126,7 @@ void TypeOptPage::updateListBox(int start)
   TQString str, str2;
   for (int i = start; i < (int) typeList->count(); i++) {
     str = typeList->text (i);
-    int pos = str.find (TYPE_TAG);
+    int pos = str.tqfind (TYPE_TAG);
     str.remove (0, pos+strlen (TYPE_TAG));
     str2.setNum (i+1);
     if (i <= 9)
@@ -144,7 +144,7 @@ void TypeOptPage::slotDeleteType()
 
     TQString t;
     t.setNum(typeIndex[act_type]+1);
-    t.insert (0, QM_USER_TYPE);
+    t.insert (0, TQM_USER_TYPE);
     for (int ent = 0; ent < doc->numEntries(); ent++) {
       // FIXME: ProgressDlg here?
       kvoctrainExpr *exp = doc->getEntry(ent);
@@ -179,7 +179,7 @@ void TypeOptPage::getTypeNames (vector<TQString> &ret_type, vector<int> &ret_Ind
   TQString str;    ret_type.clear();
   for (int i = 0; i < (int) typeList->count(); i++) {
     str = typeList->text(i);
-    int pos = str.find (TYPE_TAG);
+    int pos = str.tqfind (TYPE_TAG);
     str.remove (0, pos+strlen (TYPE_TAG));
     ret_type.push_back (str);
   }
@@ -196,7 +196,7 @@ void TypeOptPage::slotCleanup()
   for (int col = 0; col < doc->numLangs(); col++)
     for (int i = 0; i < (int) doc->numEntries(); i++) {
       TQString t = doc->getEntry(i)->getType(col);
-      if (t.left(strlen(QM_USER_TYPE)) == QM_USER_TYPE) {
+      if (t.left(strlen(TQM_USER_TYPE)) == TQM_USER_TYPE) {
         t.remove (0, 1);
         int idx = t.toInt();
         if ((int) used_type.size() < idx)
@@ -230,7 +230,7 @@ void TypeOptPage::cleanUnused(kvoctrainDoc *doc, const vector<int> &typeIndex, i
   /////////////////////////////////////////////////////
   // translate_index contains new index number for each
   // old index
-  for (int i = 0; i <= QMAX (old_types, (int) typeIndex.size()); i++)
+  for (int i = 0; i <= TQMAX (old_types, (int) typeIndex.size()); i++)
     translate_index.push_back(0);
 
   // now adjust lesson descriptions to new index
@@ -248,14 +248,14 @@ 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++) {
       TQString old = doc->getEntry(i)->getType (col);
-      if (!old.isEmpty() && old.left(strlen(QM_USER_TYPE)) == QM_USER_TYPE) {
+      if (!old.isEmpty() && old.left(strlen(TQM_USER_TYPE)) == TQM_USER_TYPE) {
         old.remove (0, 1);
         int o = old.toInt();
 
         TQString newtype;
         if (translate_index[o] != 0) {
           newtype.setNum (translate_index[o]);
-          newtype.insert (0, QM_USER_TYPE);
+          newtype.insert (0, TQM_USER_TYPE);
           doc->getEntry(i)->setType (col, newtype);
         }
         else
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h
index 68e50b26..7b550b6d 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h
@@ -37,6 +37,7 @@ class TQStrList;
 class TypeOptPage : public TypeOptPageForm
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -44,7 +45,7 @@ public:
   (
     const vector<TQString> &types,
     kvoctrainDoc    *doc,
-    TQWidget         *parent = NULL,
+    TQWidget         *tqparent = NULL,
     const char      *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui
index f1735015..48141b18 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>TypeOptPageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Type_Descriptions</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>type_group</cstring>
             </property>
@@ -52,14 +52,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton" row="1" column="0">
+                <widget class="TQPushButton" row="1" column="0">
                     <property name="name">
                         <cstring>b_new</cstring>
                     </property>
@@ -75,7 +75,7 @@
                         <string>&amp;New...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="1">
+                <widget class="TQPushButton" row="1" column="1">
                     <property name="name">
                         <cstring>b_modify</cstring>
                     </property>
@@ -91,7 +91,7 @@
                         <string>&amp;Modify...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="2">
+                <widget class="TQPushButton" row="1" column="2">
                     <property name="name">
                         <cstring>b_delete</cstring>
                     </property>
@@ -107,7 +107,7 @@
                         <string>&amp;Delete</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="4">
+                <widget class="TQPushButton" row="1" column="4">
                     <property name="name">
                         <cstring>b_cleanup</cstring>
                     </property>
@@ -123,7 +123,7 @@
                         <string>&amp;Clean Up</string>
                     </property>
                 </widget>
-                <widget class="QListBox" row="0" column="0" rowspan="1" colspan="5">
+                <widget class="TQListBox" row="0" column="0" rowspan="1" colspan="5">
                     <property name="name">
                         <cstring>typeList</cstring>
                     </property>
@@ -139,5 +139,5 @@
     <tabstop>b_delete</tabstop>
     <tabstop>b_cleanup</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
index 96c4a093..76452f4b 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
@@ -41,11 +41,11 @@ UsageOptPage::UsageOptPage
 (
   const vector<TQString> &usages,
   kvoctrainDoc    *_doc,
-  TQWidget         *parent,
+  TQWidget         *tqparent,
   const char      *name
 )
   :
-  UsageOptPageForm( parent, name ),
+  UsageOptPageForm( tqparent, name ),
   doc(_doc)
 {
   connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );
@@ -84,7 +84,7 @@ void UsageOptPage::slotNewUsage()
 {
   bool ok;
   TQString getUsage = KInputDialog::getText(
-              i18n( "usage (area) of an expression", "Usage Description" ), i18n( "Enter usage description:" ), TQString::null, &ok );
+              i18n( "usage (area) of an expression", "Usage Description" ), i18n( "Enter usage description:" ), TQString(), &ok );
   if( !ok )
     return;
   TQString str;
@@ -106,7 +106,7 @@ void UsageOptPage::slotModifyUsage()
   if (usageList->count() != 0
       && (int) usageList->count() > act_usage) {
     TQString str = usageList->text (act_usage);
-    int pos = str.find (USAGE_TAG);
+    int pos = str.tqfind (USAGE_TAG);
     str.remove (0, pos+strlen (USAGE_TAG));
 
     bool ok;
@@ -129,7 +129,7 @@ void UsageOptPage::updateListBox(int start)
   for (int i = start; i < (int) usageList->count(); i++) 
   {
     str = usageList->text (i);
-    int pos = str.find (USAGE_TAG);
+    int pos = str.tqfind (USAGE_TAG);
     str.remove (0, pos+strlen (USAGE_TAG));
     str2.setNum (i+1);
     if (i <= 9)
@@ -153,7 +153,7 @@ void UsageOptPage::slotDeleteUsage()
       kvoctrainExpr *exp = doc->getEntry(ent);
       for (int lang = 0; lang < doc->numLangs(); lang++) {
         TQString ul = exp->getUsageLabel(lang) + UL_USAGE_DIV;
-        if (ul.find(t) >= 0 ) {
+        if (ul.tqfind(t) >= 0 ) {
           KMessageBox::information(this,
                     i18n("usage (area) of an expression",
                         "This user-defined usage label could not be deleted "
@@ -187,7 +187,7 @@ void UsageOptPage::getUsageLabels (vector<TQString> &ret_usage,
   TQString str;    ret_usage.clear();
   for (int i = 0; i < (int) usageList->count(); i++) {
     str = usageList->text(i);
-    int pos = str.find (USAGE_TAG);
+    int pos = str.tqfind (USAGE_TAG);
     str.remove (0, pos+strlen (USAGE_TAG));
     ret_usage.push_back (str);
   }
@@ -209,7 +209,7 @@ void UsageOptPage::slotCleanup()
         t.remove (0, 1);
 
         int next;
-        if ((next = t.find(UL_USAGE_DIV)) >= 0) {
+        if ((next = t.tqfind(UL_USAGE_DIV)) >= 0) {
           n = t.left(next);
           t.remove (0, next+1);
         }
@@ -253,7 +253,7 @@ void UsageOptPage::cleanUnused(kvoctrainDoc *doc,
   /////////////////////////////////////////////////////
   // translate_index contains new index number for each
   // old index
-  for (int i = 0; i <= QMAX (old_usages, (int) usageIndex.size()); i++)
+  for (int i = 0; i <= TQMAX (old_usages, (int) usageIndex.size()); i++)
     translate_index.push_back(0);
 
   // now adjust lesson descriptions to new index
@@ -277,7 +277,7 @@ void UsageOptPage::cleanUnused(kvoctrainDoc *doc,
           TQString n;
           t.remove (0, 1);
           int next;
-          if ((next = t.find(UL_USAGE_DIV)) >= 0) {
+          if ((next = t.tqfind(UL_USAGE_DIV)) >= 0) {
             n = t.left(next);
             t.remove (0, next+1);
           }
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h
index 8d669571..4a30b2d5 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h
@@ -39,6 +39,7 @@ class TQStrList;
 class UsageOptPage : public UsageOptPageForm
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -46,7 +47,7 @@ public:
   (
     const vector<TQString> &usages,
     kvoctrainDoc    *doc,
-    TQWidget         *parent = NULL,
+    TQWidget         *tqparent = NULL,
     const char      *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui
index dbdf58fe..0d106b58 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>UsageOptPageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Usage_Labels</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>usage_group</cstring>
             </property>
@@ -52,14 +52,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton" row="1" column="0">
+                <widget class="TQPushButton" row="1" column="0">
                     <property name="name">
                         <cstring>b_new</cstring>
                     </property>
@@ -75,7 +75,7 @@
                         <string>&amp;New...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="1">
+                <widget class="TQPushButton" row="1" column="1">
                     <property name="name">
                         <cstring>b_modify</cstring>
                     </property>
@@ -91,7 +91,7 @@
                         <string>&amp;Modify...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="2">
+                <widget class="TQPushButton" row="1" column="2">
                     <property name="name">
                         <cstring>b_delete</cstring>
                     </property>
@@ -107,7 +107,7 @@
                         <string>&amp;Delete</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="4">
+                <widget class="TQPushButton" row="1" column="4">
                     <property name="name">
                         <cstring>b_cleanup</cstring>
                     </property>
@@ -123,7 +123,7 @@
                         <string>&amp;Clean Up</string>
                     </property>
                 </widget>
-                <widget class="QListBox" row="0" column="0" rowspan="1" colspan="5">
+                <widget class="TQListBox" row="0" column="0" rowspan="1" colspan="5">
                     <property name="name">
                         <cstring>usageList</cstring>
                     </property>
@@ -139,5 +139,5 @@
     <tabstop>b_delete</tabstop>
     <tabstop>b_cleanup</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp
index 0bdae252..29380370 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp
@@ -32,8 +32,8 @@
 #include <tqlineedit.h>
 
 
-AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *parent, const char *name)
-  : AdjEntryPageForm( parent, name ), dlgbook(_dlgbook)
+AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *tqparent, const char *name)
+  : AdjEntryPageForm( tqparent, name ), dlgbook(_dlgbook)
 {
   comparisons = comp;
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h
index efbae74f..3750fb3c 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h
@@ -35,9 +35,10 @@ class EntryDlg;
 class AdjEntryPage : public AdjEntryPageForm
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *parent = NULL, const char *name = NULL);
+  AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *tqparent = NULL, const char *name = NULL);
 
   void setData (bool multi_sel, const Comparison  &comp);
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui
index a2213edb..4005b0c6 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AdjEntryPageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AdjEntryPageForm</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -42,7 +42,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>lev1Label</cstring>
                     </property>
@@ -61,7 +61,7 @@
                         <cstring>lev1Field</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>lev2Label</cstring>
                     </property>
@@ -80,7 +80,7 @@
                         <cstring>lev2Field</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>lev3Label</cstring>
                     </property>
@@ -99,7 +99,7 @@
                         <cstring>lev3Field</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1">
+                <widget class="TQLineEdit" row="0" column="1">
                     <property name="name">
                         <cstring>lev1Field</cstring>
                     </property>
@@ -112,7 +112,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="1">
+                <widget class="TQLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>lev2Field</cstring>
                     </property>
@@ -125,7 +125,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="2" column="1">
+                <widget class="TQLineEdit" row="2" column="1">
                     <property name="name">
                         <cstring>lev3Field</cstring>
                     </property>
@@ -142,5 +142,5 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp
index 87e0fe59..a42e5d01 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp
@@ -41,10 +41,10 @@ AuxInfoEntryPage::AuxInfoEntryPage
   TQString     exam,
   TQString     rem,
   TQString     para,
-  TQWidget    *parent,
+  TQWidget    *tqparent,
   const char *name
 )
- : AuxInfoEntryPageForm( parent, name ), dlgbook(_dlgbook)
+ : AuxInfoEntryPageForm( tqparent, name ), dlgbook(_dlgbook)
 
 {
   TQFontMetrics fm (synonym_line->font());
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h
index e8e88535..59a62c28 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h
@@ -33,6 +33,7 @@ class EntryDlg;
 class AuxInfoEntryPage : public AuxInfoEntryPageForm
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   AuxInfoEntryPage
@@ -44,7 +45,7 @@ public:
     TQString     example,
     TQString     remark,
     TQString     para,
-    TQWidget    *parent = 0,
+    TQWidget    *tqparent = 0,
     const char *name = 0
   );
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui
index 632973bc..c936e8ce 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AuxInfoEntryPageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AuxInfoEntryPageForm</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -33,7 +33,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -58,7 +58,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QMultiLineEdit" row="2" column="1">
+                <widget class="TQMultiLineEdit" row="2" column="1">
                     <property name="name">
                         <cstring>examp_line</cstring>
                     </property>
@@ -70,14 +70,14 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>80</height>
                         </size>
                     </property>
                 </widget>
-                <widget class="QMultiLineEdit" row="3" column="1">
+                <widget class="TQMultiLineEdit" row="3" column="1">
                     <property name="name">
                         <cstring>remark_line</cstring>
                     </property>
@@ -89,14 +89,14 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>80</height>
                         </size>
                     </property>
                 </widget>
-                <widget class="QMultiLineEdit" row="4" column="1">
+                <widget class="TQMultiLineEdit" row="4" column="1">
                     <property name="name">
                         <cstring>para_line</cstring>
                     </property>
@@ -108,14 +108,14 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>80</height>
                         </size>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>synonym_label</cstring>
                     </property>
@@ -126,7 +126,7 @@
                         <cstring>synonym_line</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>antonym_label</cstring>
                     </property>
@@ -137,7 +137,7 @@
                         <cstring>antonym_line</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>examp_label</cstring>
                     </property>
@@ -148,7 +148,7 @@
                         <cstring>examp_line</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>remark_label</cstring>
                     </property>
@@ -159,7 +159,7 @@
                         <cstring>remark_line</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>para_label</cstring>
                     </property>
@@ -170,7 +170,7 @@
                         <cstring>para_line</cstring>
                     </property>
                 </widget>
-                <widget class="QMultiLineEdit" row="0" column="1">
+                <widget class="TQMultiLineEdit" row="0" column="1">
                     <property name="name">
                         <cstring>synonym_line</cstring>
                     </property>
@@ -182,7 +182,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>80</height>
@@ -195,7 +195,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QMultiLineEdit" row="1" column="1">
+                <widget class="TQMultiLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>antonym_line</cstring>
                     </property>
@@ -207,7 +207,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>80</height>
@@ -225,5 +225,5 @@
     <tabstop>remark_line</tabstop>
     <tabstop>para_line</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
index 9a7d44fb..6b4e8ea6 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
@@ -63,11 +63,11 @@ CommonEntryPage::CommonEntryPage
   QueryManager &_querymanager,
   bool          active,
   const TQFont&  _ipafont,
-  TQWidget      *parent,
+  TQWidget      *tqparent,
   const char   *name
 )
   :
-  CommonEntryPageForm( parent, name ),
+  CommonEntryPageForm( tqparent, name ),
   pronunce(pron),
   expression(expr),
   usageCollection (act_usage),
@@ -177,13 +177,13 @@ void CommonEntryPage::setTypeBox(const TQString &act_type)
   all_types = QueryManager::getRelation(false);
   all_maintypes = QueryManager::getRelation(true);
 
-  TQString s = QueryManager::getMainType(act_type)+QM_TYPE_DIV;
+  TQString s = QueryManager::getMainType(act_type)+TQM_TYPE_DIV;
   int curr_type = 0;
   type_box->clear();
   type_box->insertItem (i18n("<none>"));
   for (int i = 0; i < (int) all_maintypes.size(); i++) {
     type_box->insertItem (all_maintypes[i].longStr());
-    if (s == all_maintypes[i].shortStr()+QM_TYPE_DIV)
+    if (s == all_maintypes[i].shortStr()+TQM_TYPE_DIV)
       curr_type = i+1;
   }
   type_box->setCurrentItem(curr_type);
@@ -208,7 +208,7 @@ void CommonEntryPage::setUsageBox(const TQString & act_usage)
   usage_box->clear();
   for (int i = 0; i < (int) usages.size(); i++) {
     usage_box->insertItem (usages[i].longStr());
-    if (UsageManager::contains(TQString(usages[i].identStr()), act_usage)) {
+    if (UsageManager::tqcontains(TQString(usages[i].identStr()), act_usage)) {
       usage_box->setSelected (i, true);
     }
   }
@@ -293,7 +293,7 @@ void CommonEntryPage::slotTypeSelected(int idx)
   else {
     type = all_maintypes[idx-1].shortStr();
     emit typeSelected(type);
-    TQString main_patt = all_maintypes[idx-1].shortStr()+QM_TYPE_DIV;
+    TQString main_patt = all_maintypes[idx-1].shortStr()+TQM_TYPE_DIV;
     int sub_idx;
     if ( idx-1 < (int) all_types.size() ){
       for (sub_idx = 0; sub_idx < (int) all_types.size(); sub_idx++) {
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h
index 9d3652d2..b20d59ce 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h
@@ -37,6 +37,7 @@ class EntryDlg;
 class CommonEntryPage : public CommonEntryPageForm
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   CommonEntryPage
@@ -55,7 +56,7 @@ public:
     QueryManager &querymanager,
     bool          active,
     const TQFont&  ipafont,
-    TQWidget* parent = NULL,
+    TQWidget* tqparent = NULL,
     const char* name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
index 5e67f8a4..11c06fe1 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CommonEntryPageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>CommonEntryPageForm</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -36,7 +36,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>asdf</cstring>
             </property>
@@ -61,7 +61,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>Frame4</cstring>
                     </property>
@@ -81,7 +81,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLineEdit" row="0" column="1">
+                        <widget class="TQLineEdit" row="0" column="1">
                             <property name="name">
                                 <cstring>expr_line</cstring>
                             </property>
@@ -94,7 +94,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="2" column="1">
+                        <widget class="TQLineEdit" row="2" column="1">
                             <property name="name">
                                 <cstring>pronunce_line</cstring>
                             </property>
@@ -107,7 +107,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QComboBox" row="1" column="1">
+                        <widget class="TQComboBox" row="1" column="1">
                             <property name="name">
                                 <cstring>lesson_box</cstring>
                             </property>
@@ -120,7 +120,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>expr_label</cstring>
                             </property>
@@ -131,7 +131,7 @@
                                 <cstring>expr_line</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>pronunce_label</cstring>
                             </property>
@@ -142,7 +142,7 @@
                                 <cstring>pronunce_line</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>lesson_label</cstring>
                             </property>
@@ -153,7 +153,7 @@
                                 <cstring>lesson_box</cstring>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="1" column="2">
+                        <widget class="TQPushButton" row="1" column="2">
                             <property name="name">
                                 <cstring>b_LessDlg</cstring>
                             </property>
@@ -165,13 +165,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>30</width>
                                     <height>30</height>
@@ -184,7 +184,7 @@
                                 <string>Invokes input dialog for lessons</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="2" column="2">
+                        <widget class="TQPushButton" row="2" column="2">
                             <property name="name">
                                 <cstring>b_pronDlg</cstring>
                             </property>
@@ -196,13 +196,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>30</width>
                                     <height>30</height>
@@ -217,7 +217,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QGroupBox">
+                <widget class="TQGroupBox">
                     <property name="name">
                         <cstring>type_label</cstring>
                     </property>
@@ -234,7 +234,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <property name="name">
                                 <cstring>type_box</cstring>
                             </property>
@@ -257,14 +257,14 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>subtype_label</cstring>
                             </property>
@@ -275,7 +275,7 @@
                                 <cstring>subtype_box</cstring>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <property name="name">
                                 <cstring>subtype_box</cstring>
                             </property>
@@ -288,7 +288,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>b_TypeDlg</cstring>
                             </property>
@@ -300,13 +300,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>30</width>
                                     <height>30</height>
@@ -321,7 +321,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QGroupBox">
+                <widget class="TQGroupBox">
                     <property name="name">
                         <cstring>usage_label</cstring>
                     </property>
@@ -346,7 +346,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QPushButton" row="0" column="2">
+                        <widget class="TQPushButton" row="0" column="2">
                             <property name="name">
                                 <cstring>b_usageDlg</cstring>
                             </property>
@@ -358,13 +358,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>30</width>
                                     <height>24</height>
@@ -387,14 +387,14 @@
                             <property name="sizeType">
                                 <enum>Preferred</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QListBox" row="0" column="0" rowspan="2" colspan="1">
+                        <widget class="TQListBox" row="0" column="0" rowspan="2" colspan="1">
                             <property name="name">
                                 <cstring>usage_box</cstring>
                             </property>
@@ -406,7 +406,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>90</height>
@@ -416,7 +416,7 @@
                                 <enum>Multi</enum>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="1" rowspan="2" colspan="1">
+                        <widget class="TQLabel" row="0" column="1" rowspan="2" colspan="1">
                             <property name="name">
                                 <cstring>usage_line</cstring>
                             </property>
@@ -428,7 +428,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>80</height>
@@ -440,7 +440,7 @@
                             <property name="frameShadow">
                                 <enum>Sunken</enum>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>WordBreak|AlignTop|AlignLeft</set>
                             </property>
                             <property name="vAlign" stdset="0">
@@ -450,7 +450,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>c_active</cstring>
                     </property>
@@ -475,5 +475,5 @@
     <tabstop>b_usageDlg</tabstop>
     <tabstop>c_active</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index c0b249aa..4de1b843 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -73,14 +73,14 @@ EntryDlg::EntryDlg(
   const TQString &title,
   bool           active,
   const TQFont&   ipafont,
-  TQWidget       *parent,
+  TQWidget       *tqparent,
   const char    *name,
   bool           modal)
   :
-  KDialogBase(Tabbed, title, User1|User2|User3|Apply|Close, Apply, parent, name, modal, false,
+  KDialogBase(Tabbed, title, User1|User2|User3|Apply|Close, Apply, tqparent, name, modal, false,
     KGuiItem(i18n("&Reset")),
-    KGuiItem(TQString::null, "view_left_right"),
-    KGuiItem(TQString::null, "view_top_bottom"))
+    KGuiItem(TQString(), "view_left_right"),
+    KGuiItem(TQString(), "view_top_bottom"))
 
 {
   mainwin = main;
@@ -105,7 +105,7 @@ EntryDlg::EntryDlg(
     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,
+                                      i18n("Original &expression in %1:").tqarg(s), querymanager, active,
                                       ipafont, page, name);
     topLayout->addWidget(comm_page);
 
@@ -135,7 +135,7 @@ EntryDlg::EntryDlg(
     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,
+                                      i18n("Translated &expression in %1:").tqarg(s), querymanager, active,
                                       ipafont, page, name);
     topLayout->addWidget(comm_page);
 
@@ -246,10 +246,10 @@ void EntryDlg::setData(
 
   if (origin)
     comm_page->setData(multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel,
-      i18n("Original &expression in %1:").arg(s), querymanager, active);
+      i18n("Original &expression in %1:").tqarg(s), querymanager, active);
   else
     comm_page->setData(multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel,
-      i18n("Translated &expression in %1:").arg(s), querymanager, active);
+      i18n("Translated &expression in %1:").tqarg(s), querymanager, active);
 
   adj_page->setData(multi_sel, comp);
   aux_page->setData(multi_sel, synonym, antonym, example, rem, paraphrase);
@@ -269,16 +269,16 @@ void EntryDlg::updatePages(const TQString &type)
 {
   TQString main;
   int pos;
-  if ((pos = type.find (QM_TYPE_DIV)) < 0)  // only use main type
+  if ((pos = type.tqfind (TQM_TYPE_DIV)) < 0)  // only use main type
     main = type;
   else
     main = type.left(pos);
 
-  if (main == QM_VERB) {
+  if (main == TQM_VERB) {
     tense_page->setEnabled(EntryDlg::EnableAll);
     adj_page->setEnabled(EntryDlg::EnableNone);
   }
-  else if (main == QM_ADJ) {
+  else if (main == TQM_ADJ) {
     tense_page->setEnabled(EntryDlg::EnableNone);
     adj_page->setEnabled(EntryDlg::EnableAll);
   }
@@ -311,7 +311,7 @@ void EntryDlg::setEnabled(int enable)
   TQString type = comm_page->getType();
   TQString main;
   int pos;
-  if ((pos = type.find (QM_TYPE_DIV)) < 0)  // only use main type
+  if ((pos = type.tqfind (TQM_TYPE_DIV)) < 0)  // only use main type
     main = type;
   else
     main = type.left(pos);
@@ -321,9 +321,9 @@ void EntryDlg::setEnabled(int enable)
     comm_page->setEnabled(EnableAll);
     aux_page->setEnabled(EnableAll);
     mc_page->setEnabled(EnableAll);
-    tense_page->setEnabled(main == QM_VERB ? EnableAll : EnableNone);
+    tense_page->setEnabled(main == TQM_VERB ? EnableAll : EnableNone);
     mc_page->setEnabled(EnableAll);
-    adj_page->setEnabled(main == QM_ADJ ? EnableAll : EnableNone);
+    adj_page->setEnabled(main == TQM_ADJ ? EnableAll : EnableNone);
     if (from_page != 0)
       from_page->setEnabled(EnableNone);
     if (to_page != 0)
@@ -334,9 +334,9 @@ void EntryDlg::setEnabled(int enable)
     comm_page->setEnabled(enable);
     aux_page->setEnabled(enable);
     mc_page->setEnabled(enable);
-    tense_page->setEnabled(main == QM_VERB ? enable : EnableNone);
+    tense_page->setEnabled(main == TQM_VERB ? enable : EnableNone);
     mc_page->setEnabled(enable);
-    adj_page->setEnabled(main == QM_ADJ ? enable : EnableNone);
+    adj_page->setEnabled(main == TQM_ADJ ? enable : EnableNone);
     if (from_page != 0)
       from_page->setEnabled(enable);
     if (to_page != 0)
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
index 9850e107..04af7e7a 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
@@ -45,6 +45,7 @@ class kvoctrainDoc;
 class EntryDlg : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -89,7 +90,7 @@ public:
     const TQString &title,
     bool           active,
     const TQFont&   ipafont,
-    TQWidget       *parent = 0,
+    TQWidget       *tqparent = 0,
     const char    *name = 0,
     bool           modal = false
   );
@@ -135,24 +136,24 @@ public:
   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; }
+  bool  fromTQCountDirty () const { return from_page ? from_page->tqCountDirty() : false; }
   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; }
   count_t getFromBCount () const { return from_page ? from_page->getBCount() : 0; }
-  count_t getFromQCount () const { return from_page ? from_page->getQCount() : 0; }
+  count_t getFromTQCount () const { return from_page ? from_page->getTQCount() : 0; }
 
   bool  toDateDirty     () const { return to_page ? to_page->dateDirty() : false; }
   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; }
+  bool  toTQCountDirty   () const { return to_page ? to_page->tqCountDirty() : false; }
   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; }
   count_t getToBCount   () const { return to_page ? to_page->getBCount() : 0; }
-  count_t getToQCount   () const { return to_page ? to_page->getQCount() : 0; }
+  count_t getToTQCount   () const { return to_page ? to_page->getTQCount() : 0; }
 
   bool    lessonDirty  () const { return comm_page->lessonDirty(); }
   bool    usageDirty   () const { return comm_page->usageDirty(); }
diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
index 0a8bd0cb..75018f70 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
@@ -54,11 +54,11 @@ FromToEntryPage::FromToEntryPage
   count_t     _bcount,
   TQString     faux,
   TQString     label,
-  TQWidget    *parent,
+  TQWidget    *tqparent,
   const char *name
 )
   :
-  FromToEntryPageForm( parent, name ), fauxami(faux), dlgbook(_dlgbook)
+  FromToEntryPageForm( tqparent, name ), fauxami(faux), dlgbook(_dlgbook)
 {
   monthnames.clear();
   monthnames.append ("");
@@ -76,7 +76,7 @@ FromToEntryPage::FromToEntryPage
   monthnames.append (i18n("December"));
 
   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( qcount_line, TQT_SIGNAL(textChanged(const TQString&)),  TQT_SLOT(slotTQCount(const TQString&)) );
   connect( fauxami_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotFauxAmiSelected(const TQString&)) );
 
   connect( never, TQT_SIGNAL(clicked()), TQT_SLOT(slotNever()) );
@@ -137,9 +137,9 @@ void FromToEntryPage::setData(
     day_spin->setValue(day);
     month_spin->setValue(month);
     year_spin->setValue(year);
-    year_spin->setSpecial(TQString::null);
-    month_spin->setSpecial(TQString::null);
-    day_spin->setSpecial(TQString::null);
+    year_spin->setSpecial(TQString());
+    month_spin->setSpecial(TQString());
+    day_spin->setSpecial(TQString());
   }
   else {
     dt.setTime_t (time(0L));
@@ -200,7 +200,7 @@ void FromToEntryPage::slotGradeSelected (int g)
 }
 
 
-void FromToEntryPage::slotQCount(const TQString& s)
+void FromToEntryPage::slotTQCount(const TQString& s)
 {
   setModified(true);
   qcount_dirty = true;
@@ -249,7 +249,7 @@ void FromToEntryPage::slotYearChanged(int new_year)
     new_year = year;
   }
 
-  year_spin->setSpecial(TQString::null);
+  year_spin->setSpecial(TQString());
 
   year = new_year;
   validate();
@@ -278,7 +278,7 @@ void FromToEntryPage::slotMonthChanged(int new_month)
     new_month = month;
   }
 
-  month_spin->setSpecial(TQString::null);
+  month_spin->setSpecial(TQString());
 
   month = new_month;
   validate();
@@ -306,7 +306,7 @@ void FromToEntryPage::slotDayChanged(int new_day)
     new_day = day;
   }
 
-  day_spin->setSpecial(TQString::null);
+  day_spin->setSpecial(TQString());
 
   day = new_day;
   validate();
@@ -339,9 +339,9 @@ void FromToEntryPage::slotToday()
   day_spin->setValue(day);
   month_spin->setValue(month);
   year_spin->setValue(year);
-  year_spin->setSpecial(TQString::null);
-  month_spin->setSpecial(TQString::null);
-  day_spin->setSpecial(TQString::null);
+  year_spin->setSpecial(TQString());
+  month_spin->setSpecial(TQString());
+  day_spin->setSpecial(TQString());
   validate();
 }
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h
index 238f4462..16a1980c 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h
@@ -38,6 +38,7 @@ class EntryDlg;
 class FromToEntryPage : public FromToEntryPageForm
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -51,7 +52,7 @@ public:
       count_t     _bcount,
       TQString     faux,
       TQString     label,
-      TQWidget    *parent = NULL,
+      TQWidget    *tqparent = NULL,
       const char *name = NULL
   );
 
@@ -66,12 +67,12 @@ public:
 
   time_t  dateDirty   () const { return date_dirty; }
   grade_t gradeDirty  () const { return grade_dirty; }
-  count_t qCountDirty () const { return qcount_dirty; }
+  count_t tqCountDirty () const { return qcount_dirty; }
   count_t bCountDirty () const { return bcount_dirty; }
 
   time_t  getDate   () const;
   grade_t getGrade  () const { return grade; }
-  count_t getQCount () const { return qcount; }
+  count_t getTQCount () const { return qcount; }
   count_t getBCount () const { return bcount; }
 
   TQString getFauxAmi () const { return fauxami; }
@@ -85,7 +86,7 @@ signals:
 
 protected slots:
     void slotGradeSelected(int);
-    void slotQCount(const TQString&);
+    void slotTQCount(const TQString&);
     void slotBCount(const TQString&);
 
     void slotIncYear();
diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui
index 9fea8f70..48e4db86 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>FromToEntryPageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>FromToEntryPageForm</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>direc_label</cstring>
             </property>
@@ -42,7 +42,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QFrame">
+                <widget class="TQFrame">
                     <property name="name">
                         <cstring>Frame3</cstring>
                     </property>
@@ -72,14 +72,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QComboBox" row="0" column="1">
+                        <widget class="TQComboBox" row="0" column="1">
                             <property name="name">
                                 <cstring>gradebox</cstring>
                             </property>
@@ -92,7 +92,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2">
+                        <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>fauxami_line</cstring>
                             </property>
@@ -105,7 +105,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>fauxami_label</cstring>
                             </property>
@@ -116,7 +116,7 @@
                                 <cstring>fauxami_line</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>grade_label</cstring>
                             </property>
@@ -129,7 +129,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QGroupBox">
+                <widget class="TQGroupBox">
                     <property name="name">
                         <cstring>GroupBox2</cstring>
                     </property>
@@ -150,7 +150,7 @@
                             <property name="name">
                                 <cstring>year_spin</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>60</width>
                                     <height>0</height>
@@ -161,7 +161,7 @@
                             <property name="name">
                                 <cstring>month_spin</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>110</width>
                                     <height>0</height>
@@ -172,7 +172,7 @@
                             <property name="name">
                                 <cstring>day_spin</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>60</width>
                                     <height>0</height>
@@ -189,14 +189,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>today</cstring>
                             </property>
@@ -204,7 +204,7 @@
                                 <string>T&amp;oday</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>never</cstring>
                             </property>
@@ -214,7 +214,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QGroupBox">
+                <widget class="TQGroupBox">
                     <property name="name">
                         <cstring>GroupBox3</cstring>
                     </property>
@@ -231,7 +231,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>bcount_label</cstring>
                             </property>
@@ -242,7 +242,7 @@
                                 <cstring>bcount_line</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>qcount_label</cstring>
                             </property>
@@ -253,7 +253,7 @@
                                 <cstring>qcount_line</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="0" column="1">
+                        <widget class="TQLineEdit" row="0" column="1">
                             <property name="name">
                                 <cstring>qcount_line</cstring>
                             </property>
@@ -266,7 +266,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="1">
+                        <widget class="TQLineEdit" row="1" column="1">
                             <property name="name">
                                 <cstring>bcount_line</cstring>
                             </property>
@@ -316,5 +316,5 @@
     <tabstop>qcount_line</tabstop>
     <tabstop>bcount_line</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp
index a6967704..c58448c4 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp
@@ -32,8 +32,8 @@
 #include <tqlineedit.h>
 
 
-MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *parent, const char *name)
-  : MCEntryPageForm( parent, name ), dlgbook(_dlgbook)
+MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *tqparent, const char *name)
+  : MCEntryPageForm( tqparent, name ), dlgbook(_dlgbook)
 {
   multiplechoice = mc;
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h
index c2938814..78aa4fc8 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h
@@ -35,9 +35,10 @@ class EntryDlg;
 class MCEntryPage : public MCEntryPageForm
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  MCEntryPage(EntryDlg *dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *parent = NULL, const char *name = NULL);
+  MCEntryPage(EntryDlg *dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *tqparent = NULL, const char *name = NULL);
 
   void setData(bool multi_sel, const MultipleChoice &mc);
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui
index b03b2de6..1bb29a55 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>MCEntryPageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>MCEntryPageForm</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -42,7 +42,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>mc1Label</cstring>
                     </property>
@@ -61,7 +61,7 @@
                         <cstring>mc1Field</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>mc2Label</cstring>
                     </property>
@@ -80,7 +80,7 @@
                         <cstring>mc2Field</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>mc3Label</cstring>
                     </property>
@@ -99,7 +99,7 @@
                         <cstring>mc3Field</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="0" column="1">
+                <widget class="TQLineEdit" row="0" column="1">
                     <property name="name">
                         <cstring>mc1Field</cstring>
                     </property>
@@ -112,7 +112,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="1" column="1">
+                <widget class="TQLineEdit" row="1" column="1">
                     <property name="name">
                         <cstring>mc2Field</cstring>
                     </property>
@@ -125,7 +125,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="2" column="1">
+                <widget class="TQLineEdit" row="2" column="1">
                     <property name="name">
                         <cstring>mc3Field</cstring>
                     </property>
@@ -138,7 +138,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="4" column="1">
+                <widget class="TQLineEdit" row="4" column="1">
                     <property name="name">
                         <cstring>mc5Field</cstring>
                     </property>
@@ -151,7 +151,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLineEdit" row="3" column="1">
+                <widget class="TQLineEdit" row="3" column="1">
                     <property name="name">
                         <cstring>mc4Field</cstring>
                     </property>
@@ -164,7 +164,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>mc4Label</cstring>
                     </property>
@@ -183,7 +183,7 @@
                         <cstring>mc4Field</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>mc5Label</cstring>
                     </property>
@@ -213,5 +213,5 @@
     <tabstop>mc4Field</tabstop>
     <tabstop>mc5Field</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp
index 9e7c7450..dc91a9cc 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp
@@ -27,7 +27,7 @@
 
 #include "MySpinBox.h"
 
-MySpinBox::MySpinBox (TQWidget* parent, const char* name ): TQSpinBox(parent, name ), spin_names (0)
+MySpinBox::MySpinBox (TQWidget* tqparent, const char* name ): TQSpinBox(tqparent, name ), spin_names (0)
 {
   setWrapping(true);
 }
@@ -48,7 +48,7 @@ TQString MySpinBox::mapValueToText( int value )
   if (spin_names != 0)
     return (*spin_names)[value];
   else
-    return TQString("%1").arg(value);
+    return TQString("%1").tqarg(value);
 }
 
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h
index f17ba8ba..dedb0914 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h
@@ -28,12 +28,12 @@
 
 #include <tqspinbox.h>
 
-class QStringlist;
+class TQStringlist;
 
-class MySpinBox : public QSpinBox
+class MySpinBox : public TQSpinBox
 {
 public:
-  MySpinBox (TQWidget* parent = 0, const char* name = 0);
+  MySpinBox (TQWidget* tqparent = 0, const char* name = 0);
 
   void setSpecial(const TQString &str);
   void setData (TQStringList *names, int minValue, int maxValue);
diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
index 47487624..b2fd3be8 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
@@ -43,11 +43,11 @@
 
 struct KV_Unicode_Ref {
   wchar_t     code;
-  const char *unicodename;
+  const char *tqunicodename;
   const char *audible;
 };
 
-KV_Unicode_Ref kv_unicode_ref[] = {
+KV_Unicode_Ref kv_tqunicode_ref[] = {
 
    {0x00E6, "LATIN SMALL LETTER AE", I18N_NOOP_maybe("")},
    {0x00E7, "LATIN SMALL LETTER C WITH CEDILLA", I18N_NOOP_maybe("")},
@@ -116,7 +116,7 @@ KV_Unicode_Ref kv_unicode_ref[] = {
    {0x0282, "LATIN SMALL LETTER S WITH HOOK",     I18N_NOOP_maybe("voiceless retroflex fricative")},
    {0x0283, "LATIN SMALL LETTER ESH",     I18N_NOOP_maybe("voiceless postalveolar fricative")},
    {0x0284, "LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK",     I18N_NOOP_maybe("implosive palatal stop")},
-   {0x0285, "LATIN SMALL LETTER SQUAT REVERSED ESH",     I18N_NOOP_maybe("apical retroflex vowel")},
+   {0x0285, "LATIN SMALL LETTER STQUAT REVERSED ESH",     I18N_NOOP_maybe("apical retroflex vowel")},
    {0x0286, "LATIN SMALL LETTER ESH WITH CURL",     I18N_NOOP_maybe("palatalized voiceless postalveolar fricative")},
    {0x0287, "LATIN SMALL LETTER TURNED T",     I18N_NOOP_maybe("dental click")},
    {0x0288, "LATIN SMALL LETTER T WITH RETROFLEX HOOK",     I18N_NOOP_maybe("voiceless retroflex stop")},
@@ -171,18 +171,18 @@ KV_Unicode_Ref kv_unicode_ref[] = {
 void PhoneticButton::slotClicked()
 {
   if (text().length() != 0)
-    emit page->charSelected(text()[0].unicode());
+    emit page->charSelected(text()[0].tqunicode());
 }
 
 
-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)
+PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *tqparent, const char *name, bool modal)
+  : KDialogBase(Plain, i18n("Select Characters From Phonetic Alphabet"), Close, Close, tqparent, name, modal)
 {
-  int num = sizeof(kv_unicode_ref) / sizeof(kv_unicode_ref[0]);
+  int num = sizeof(kv_tqunicode_ref) / sizeof(kv_tqunicode_ref[0]);
   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;
+  KV_Unicode_Ref *uni_ref = kv_tqunicode_ref;
   int vert = 0;
   int horiz = 0;
   while (uni_ref->code != 0) {
@@ -191,13 +191,13 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co
     PhoneticButton *butt = new PhoneticButton(text, phoneticbox, this);
     connect (butt, TQT_SIGNAL(clicked()), butt, TQT_SLOT(slotClicked()) );
     TQString tip = i18n("Unicode name: ");
-    tip += TQString::fromLatin1(uni_ref->unicodename);
+    tip += TQString::tqfromLatin1(uni_ref->tqunicodename);
     tip += "\n";
     tip += i18n("Describing the sound of the character", "Sound: ");
     tip += i18n(uni_ref->audible);
     butt->setFont(ipafont);
-    butt->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
-    int sz = QMAX(14, int(1.7*ipafont.pointSize()));
+    butt->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+    int sz = TQMAX(14, int(1.7*ipafont.pointSize()));
     butt->setMaximumSize(TQSize (sz, sz));
     gbox->addWidget( butt, vert, horiz, AlignCenter );
     TQToolTip::add (butt, tip);
@@ -208,7 +208,7 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co
     }
     ++uni_ref;
   }
-  resize(sizeHint());
+  resize(tqsizeHint());
 }
 
 
@@ -217,7 +217,7 @@ void PhoneticEntryPage::keyPressEvent( TQKeyEvent *e )
   if ((e->state() & (ControlButton | AltButton)) == 0) {
     TQString s = e->text();
     for (unsigned i = 0; i < s.length(); ++i) {
-      emit charSelected(s[i].unicode());
+      emit charSelected(s[i].tqunicode());
     }
     e->accept();
   }
diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h
index d2747015..c422c98a 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h
@@ -34,9 +34,10 @@
 class PhoneticEntryPage : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent = 0, const char *name = 0, bool modal = false);
+  PhoneticEntryPage(const TQFont &ipafont, TQWidget *tqparent = 0, const char *name = 0, bool modal = false);
 
 signals:
   void charSelected(wchar_t);
@@ -48,13 +49,14 @@ protected:
 };
 
 
-class PhoneticButton : public QPushButton
+class PhoneticButton : public TQPushButton
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  PhoneticButton (const TQString & text, TQWidget * parent, PhoneticEntryPage *_page, const char * name = 0)
-  : TQPushButton (text, parent, name), page(_page) {}
+  PhoneticButton (const TQString & text, TQWidget * tqparent, PhoneticEntryPage *_page, const char * name = 0)
+  : TQPushButton (text, tqparent, name), page(_page) {}
 
 protected slots:
   void slotClicked();
diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp
index c8c7d41e..f4823178 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp
@@ -39,10 +39,10 @@ TenseEntryPage::TenseEntryPage
   bool               multi_sel,
   const Conjugation &con_prefix,
   const Conjugation &conjug,
-  TQWidget           *parent,
+  TQWidget           *tqparent,
   const char        *name
 )
-  : TenseEntryPageForm( parent, name ), multi_mode(multi_sel), dlgbook(_dlgbook)
+  : TenseEntryPageForm( tqparent, name ), multi_mode(multi_sel), dlgbook(_dlgbook)
 {
 
   connect( third_p_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) );
diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h
index 94e7a74c..2473d36c 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h
@@ -35,6 +35,7 @@ class EntryDlg;
 class TenseEntryPage : public TenseEntryPageForm
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   TenseEntryPage
@@ -43,7 +44,7 @@ public:
     bool               multi_sel,
     const Conjugation &con_prefix,
     const Conjugation &conjugations,
-    TQWidget           *parent = NULL,
+    TQWidget           *tqparent = NULL,
     const char        *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui
index 1c3c4ee5..d0ccdc74 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>TenseEntryPageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>TenseEntryPageForm</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>GroupBox8</cstring>
             </property>
@@ -42,15 +42,15 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget" row="1" column="0">
+                <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLineEdit" row="6" column="2">
+                        <widget class="TQLineEdit" row="6" column="2">
                             <property name="name">
                                 <cstring>thirdN_plural</cstring>
                             </property>
@@ -63,7 +63,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="3" column="2">
+                        <widget class="TQCheckBox" row="3" column="2">
                             <property name="name">
                                 <cstring>third_p_common</cstring>
                             </property>
@@ -71,7 +71,7 @@
                                 <string>C&amp;ommon</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="2" column="2">
+                        <widget class="TQLineEdit" row="2" column="2">
                             <property name="name">
                                 <cstring>second_plural</cstring>
                             </property>
@@ -84,7 +84,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="5" column="2">
+                        <widget class="TQLineEdit" row="5" column="2">
                             <property name="name">
                                 <cstring>thirdM_plural</cstring>
                             </property>
@@ -97,7 +97,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QCheckBox" row="3" column="1">
+                        <widget class="TQCheckBox" row="3" column="1">
                             <property name="name">
                                 <cstring>third_s_common</cstring>
                             </property>
@@ -105,7 +105,7 @@
                                 <string>&amp;Common</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>pers1_label</cstring>
                             </property>
@@ -124,7 +124,7 @@
                                 <cstring>first_singular</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="4" column="0">
+                        <widget class="TQLabel" row="4" column="0">
                             <property name="name">
                                 <cstring>female_label</cstring>
                             </property>
@@ -135,7 +135,7 @@
                                 <cstring>thirdF_singular</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="1">
+                        <widget class="TQLabel" row="0" column="1">
                             <property name="name">
                                 <cstring>TextLabel4_2_2</cstring>
                             </property>
@@ -143,7 +143,7 @@
                                 <string>Singular</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="4" column="2">
+                        <widget class="TQLineEdit" row="4" column="2">
                             <property name="name">
                                 <cstring>thirdF_plural</cstring>
                             </property>
@@ -156,7 +156,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="4" column="1">
+                        <widget class="TQLineEdit" row="4" column="1">
                             <property name="name">
                                 <cstring>thirdF_singular</cstring>
                             </property>
@@ -169,7 +169,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class="TQLabel" row="3" column="0">
                             <property name="name">
                                 <cstring>pers3_label</cstring>
                             </property>
@@ -180,7 +180,7 @@
                                 <cstring>third_s_common</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="2">
+                        <widget class="TQLineEdit" row="1" column="2">
                             <property name="name">
                                 <cstring>first_plural</cstring>
                             </property>
@@ -193,7 +193,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="5" column="1">
+                        <widget class="TQLineEdit" row="5" column="1">
                             <property name="name">
                                 <cstring>thirdM_singular</cstring>
                             </property>
@@ -206,7 +206,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="1">
+                        <widget class="TQLineEdit" row="1" column="1">
                             <property name="name">
                                 <cstring>first_singular</cstring>
                             </property>
@@ -229,14 +229,14 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>80</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLineEdit" row="6" column="1">
+                        <widget class="TQLineEdit" row="6" column="1">
                             <property name="name">
                                 <cstring>thirdN_singular</cstring>
                             </property>
@@ -249,7 +249,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="6" column="0">
+                        <widget class="TQLabel" row="6" column="0">
                             <property name="name">
                                 <cstring>natural_label</cstring>
                             </property>
@@ -260,7 +260,7 @@
                                 <cstring>thirdN_singular</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="5" column="0">
+                        <widget class="TQLabel" row="5" column="0">
                             <property name="name">
                                 <cstring>male_label</cstring>
                             </property>
@@ -271,7 +271,7 @@
                                 <cstring>thirdM_singular</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="2" column="1">
+                        <widget class="TQLineEdit" row="2" column="1">
                             <property name="name">
                                 <cstring>second_singular</cstring>
                             </property>
@@ -284,7 +284,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>pers2_label</cstring>
                             </property>
@@ -295,7 +295,7 @@
                                 <cstring>second_singular</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="2">
+                        <widget class="TQLabel" row="0" column="2">
                             <property name="name">
                                 <cstring>TextLabel4_2</cstring>
                             </property>
@@ -305,15 +305,15 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>tenselabel</cstring>
                             </property>
@@ -332,7 +332,7 @@
                                 <cstring>tensebox</cstring>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="0" column="2">
+                        <widget class="TQPushButton" row="0" column="2">
                             <property name="name">
                                 <cstring>b_next</cstring>
                             </property>
@@ -348,7 +348,7 @@
                                 <string>Ne&amp;xt</string>
                             </property>
                         </widget>
-                        <widget class="QComboBox" row="0" column="1">
+                        <widget class="TQComboBox" row="0" column="1">
                             <property name="name">
                                 <cstring>tensebox</cstring>
                             </property>
@@ -383,5 +383,5 @@
     <tabstop>thirdM_plural</tabstop>
     <tabstop>thirdN_plural</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/blockall.h b/kvoctrain/kvoctrain/entry-dialogs/blockall.h
index f71230f6..f7d2747d 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/blockall.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/blockall.h
@@ -28,7 +28,7 @@
 
 #include <tqvalidator.h>
 
-class BlockAllValidator : public QValidator
+class BlockAllValidator : public TQValidator
 {
 public:
   BlockAllValidator ();
diff --git a/kvoctrain/kvoctrain/kv_resource.h b/kvoctrain/kvoctrain/kv_resource.h
index 6f704913..59318424 100644
--- a/kvoctrain/kvoctrain/kv_resource.h
+++ b/kvoctrain/kvoctrain/kv_resource.h
@@ -51,7 +51,7 @@ static const char *IDS_DEFAULT =  I18N_NOOP("Ready.");
 #define IDH_NULL                        0
 #define IDH_REMOVE                      1
 #define IDH_APPEND                      2
-#define IDH_START_QUERY                 3
+#define IDH_START_TQUERY                 3
 #define IDH_RESET_GRADE                 4
 #define IDH_CREATE_LESSON               5
 #define IDH_SET_LANG                    6
@@ -65,7 +65,7 @@ static const char *IDS_DEFAULT =  I18N_NOOP("Ready.");
 #define IDH_START_ANTONYM              14
 #define IDH_START_EXAMPLE              15
 #define IDH_START_PARAPHRASE           16
-#define ID_RESUME_QUERY             13070
+#define ID_RESUME_TQUERY             13070
 #define ID_RESUME_MULTIPLE          13110
 
 
diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp
index d441cc2e..12dbc3da 100644
--- a/kvoctrain/kvoctrain/kva_clip.cpp
+++ b/kvoctrain/kvoctrain/kva_clip.cpp
@@ -38,12 +38,12 @@ using namespace std;
 void kvoctrainApp::slotSmartSearchClip()
 {
   TQString s;
-  TQString entries = TQApplication::clipboard()->text();
+  TQString entries = TQApplication::tqclipboard()->text();
 
   if (!entries.isEmpty()) {
-    int pos = entries.find ('\n'); // search for a line end
+    int pos = entries.tqfind ('\n'); // search for a line end
     if (pos < 0)
-      pos = entries.find ('\r');
+      pos = entries.tqfind ('\r');
 
     if (pos < 0)    // just first "line"
       s = entries;
@@ -148,11 +148,11 @@ void kvoctrainApp::slotEditCopy()
   }
   if (!exp.isEmpty()) {
 #if defined(_WS_X11_)
-//    disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),this,0);
+//    disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()),this,0);
 #endif
-    TQApplication::clipboard()->setText(exp);
+    TQApplication::tqclipboard()->setText(exp);
 #if defined(_WS_X11_)
-//    connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged()));
+//    connect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged()));
 #endif
   }
 
@@ -167,7 +167,7 @@ void kvoctrainApp::slotEditPaste()
 
   TQApplication::setOverrideCursor( waitCursor );
   TQString s;
-  TQString entries = TQApplication::clipboard()->text();
+  TQString entries = TQApplication::tqclipboard()->text();
 
   vector <int> csv_order = getCsvOrder(doc);
 
@@ -175,9 +175,9 @@ void kvoctrainApp::slotEditPaste()
   TQString num;
 // view->setView(0, langset, gradecols);
   while (!entries.isEmpty()) {
-    int pos = entries.find ('\n'); // search for a line end
+    int pos = entries.tqfind ('\n'); // search for a line end
     if (pos < 0) {
-      pos = entries.find ('\r');   // mac style ?
+      pos = entries.tqfind ('\r');   // mac style ?
     }
 
     if (pos < 0) {
diff --git a/kvoctrain/kvoctrain/kva_config.cpp b/kvoctrain/kvoctrain/kva_config.cpp
index 875ecd04..c5ebcfc3 100644
--- a/kvoctrain/kvoctrain/kva_config.cpp
+++ b/kvoctrain/kvoctrain/kva_config.cpp
@@ -123,19 +123,19 @@ void kvoctrainApp::saveProperties(KConfig *config )
     config->writeEntry(CFG_TITLE,doc->getTitle());
     config->writeEntry(CFG_MODIFIED,doc->isModified());
 
-    config->writeEntry(CFG_QUERYMODE, querymode);
+    config->writeEntry(CFG_TQUERYMODE, querymode);
 
     TQString filename=doc->URL().path();
     TQString tempname = kapp->tempSaveName(filename);
     saveDocProps(doc);
-    doc->saveAs(this, KURL(tempname), doc->getTitle(), kvoctrainDoc::automatic);
+    doc->saveAs(TQT_TQOBJECT(this), KURL(tempname), doc->getTitle(), kvoctrainDoc::automatic);
   }
 }
 
 
 void kvoctrainApp::readProperties(KConfig *config)
 {
-  querymode = config->readBoolEntry(CFG_QUERYMODE, 0);
+  querymode = config->readBoolEntry(CFG_TQUERYMODE, 0);
 
   TQString filename = config->readEntry(CFG_FILENAME);
   TQString title = config->readEntry(CFG_TITLE);
@@ -147,7 +147,7 @@ void kvoctrainApp::readProperties(KConfig *config)
     if(b_canRecover){
       pdlg = new ProgressDlg(TQString(), TQString(), kapp->makeStdCaption(""));
       pdlg->show();
-      doc = new kvoctrainDoc(this, KURL(tempname));
+      doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL(tempname));
       removeProgressBar();
       doc->setModified();
       doc->setTitle(title);
@@ -160,7 +160,7 @@ void kvoctrainApp::readProperties(KConfig *config)
     pdlg = new ProgressDlg (TQString(), TQString(),
                             kapp->makeStdCaption(""));
     pdlg->show();
-    doc = new kvoctrainDoc(this, KURL(filename));
+    doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL(filename));
     removeProgressBar();
     setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified()));
   }
diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp
index d1572659..7faa3dad 100644
--- a/kvoctrain/kvoctrain/kva_header.cpp
+++ b/kvoctrain/kvoctrain/kva_header.cpp
@@ -53,7 +53,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
     header_m->insertItem(SmallIconSet("sort_num"), i18n(SORT_NUM), (header << 16) | IDH_SORT_COL_NUM);
 
     connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-    connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+    connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
 
     header_m->exec(TQPoint (x, y));
     return;
@@ -90,15 +90,15 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
         (header << 16) | (i << (16+8)) | IDH_SET_LANG);
   }
   connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int)));
-  connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+  connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
 
   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);
+    header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_TQUERY);
     header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), (header << 16) | IDH_START_MULTIPLE);
     header_m->setItemEnabled((header << 16) | IDH_START_MULTIPLE, doc->numLangs() > 1);
-    header_m->setItemEnabled((header << 16) | IDH_START_QUERY,  doc->numLangs() > 1);
+    header_m->setItemEnabled((header << 16) | IDH_START_TQUERY,  doc->numLangs() > 1);
     header_m->insertSeparator();
     header_m->insertItem(i18n("&Verbs"), (header << 16) | IDH_START_VERB);
     header_m->insertItem(i18n("&Articles"), (header << 16) | IDH_START_ARTICLE);
@@ -134,27 +134,27 @@ 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(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]),
-            (i << (16+8)) |  IDH_START_QUERY);  // hack: IDs => header-ids + cmd
+        query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(names[i-1]),
+            (i << (16+8)) |  IDH_START_TQUERY);  // hack: IDs => header-ids + cmd
       }
       else {
-        query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_QUERY);
+        query_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_TQUERY);
       }
     }
     header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL);
     connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-    connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+    connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(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(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]),
+        multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(names[i-1]),
             (i << (16+8)) |  IDH_START_MULTIPLE);  // hack: IDs => header-ids + cmd
       }
       else {
-        multiple_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_MULTIPLE);
+        multiple_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_MULTIPLE);
       }
     }
     header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), multiple_m, (4 << 16) | IDH_NULL);
@@ -168,7 +168,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
     header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE);
     header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE);
     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 (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
 
     header_m->insertSeparator();
     header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA);
@@ -176,7 +176,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
   }
 
   connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-  connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+  connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
   header_m->exec(TQPoint(x, y));
 }
 
@@ -226,7 +226,7 @@ void kvoctrainApp::slotSetHeaderProp (int header_and_id) /*FOLD00*/
 }
 
 
-void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
+void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/
 {
   int header1 = (header_and_cmd >> 16) & 0xFF;
   int header2 = header_and_cmd >> (16+8);
@@ -238,7 +238,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
     case IDH_NULL:
     break;
 
-    case ID_RESUME_QUERY:
+    case ID_RESUME_TQUERY:
         slotStatusHelpMsg(i18n("Resumes random query with existing selection"));
     break;
 
@@ -262,11 +262,11 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
       TQString msg;
       if (header1 == 0) {
         TQString format = i18n("Sets %1 as language for original");
-        msg = format.arg(from);
+        msg = format.tqarg(from);
       }
       else {
         TQString format = i18n("Sets %1 as language for translation %2");
-        msg = format.arg(from).arg(header1);
+        msg = format.tqarg(from).tqarg(header1);
       }
       slotStatusHelpMsg(msg);
     }
@@ -282,7 +282,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
       else if (header1 < (int) langset.size() ) {
         TQString from = langset.longId(header1);
         TQString format = i18n("Appends %1 as new language");
-        msg = format.arg(from);
+        msg = format.tqarg(from);
         slotStatusHelpMsg(msg);
       }
     }
@@ -294,12 +294,12 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
         from = langset.findLongId(from);
       TQString msg;
       TQString format = i18n("Removes %1 irrevocably from dictionary");
-      msg = format.arg(from);
+      msg = format.tqarg(from);
       slotStatusHelpMsg(msg);
     }
     break;
 
-    case IDH_START_QUERY:
+    case IDH_START_TQUERY:
     case IDH_START_MULTIPLE: {
       TQString to = header1 ? doc->getIdent(header1) : doc->getOriginalIdent();
       if (!langset.findLongId(to).isEmpty())
@@ -313,18 +313,18 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
       TQString format;
 
       if (doc->numLangs() == 1) {
-        if (cmd == IDH_START_QUERY)
+        if (cmd == IDH_START_TQUERY)
           format = i18n("Creates and starts query to %1");
         else
           format = i18n("Creates and starts multiple choice to %1");
-        msg = format.arg(to);
+        msg = format.tqarg(to);
       }
       else {
-        if (cmd == IDH_START_QUERY)
+        if (cmd == IDH_START_TQUERY)
           format = i18n("Creates and starts query from %1 to %2");
         else
           format = i18n("Creates and starts multiple choice from %1 to %2");
-        msg = format.arg(from).arg(to);
+        msg = format.tqarg(from).tqarg(to);
       }
 
       slotStatusHelpMsg(msg);
@@ -376,13 +376,13 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
       if (!langset.findLongId(from).isEmpty())
         from = langset.findLongId(from);
       TQString format = i18n("Resets all properties for %1");
-      TQString msg = format.arg(from);
+      TQString msg = format.tqarg(from);
       slotStatusHelpMsg(msg);
     }
     break;
 
     default:
-      kdError() << "kvoctrainApp::slotHeaderStatus: got unknown command :" << cmd << endl;
+      kdError() << "kvoctrainApp::slotHeadertqStatus: got unknown command :" << cmd << endl;
   }
 }
 
@@ -421,13 +421,13 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
     case IDH_NULL:
     break;
 
-    case ID_RESUME_QUERY:
-      queryType = QT_Random;
+    case ID_RESUME_TQUERY:
+      queryType = TQT_Random;
       slotRestartQuery();
     break;
 
     case ID_RESUME_MULTIPLE:
-      queryType = QT_Multiple;
+      queryType = TQT_Multiple;
       slotRestartQuery();
     break;
 
@@ -443,7 +443,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
 
       TQString format = i18n("You are about to delete a language completely.\n"
                             "Do you really want to delete \"%1\"?");
-      msg = format.arg(name);
+      msg = format.tqarg(name);
 
       int exit = KMessageBox::warningContinueCancel(this, msg,
                     kapp->makeStdCaption(""),KStdGuiItem::del());
@@ -455,10 +455,10 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
     }
     break;
 
-    case IDH_START_QUERY:
+    case IDH_START_TQUERY:
       delete randomQueryDlg;
       randomQueryDlg = 0;
-      queryType = QT_Random;
+      queryType = TQT_Random;
       slotStartQuery(header1 ? doc->getIdent(header1) : doc->getOriginalIdent(),
                      header2 ? doc->getIdent(header2) : doc->getOriginalIdent(), true);
     break;
@@ -466,7 +466,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
     case IDH_START_MULTIPLE:
       delete mcQueryDlg;
       mcQueryDlg = 0;
-      queryType = QT_Multiple;
+      queryType = TQT_Multiple;
       slotStartQuery(header1 ? doc->getIdent(header1) : doc->getOriginalIdent(),
                      header2 ? doc->getIdent(header2) : doc->getOriginalIdent(), true);
     break;
@@ -474,52 +474,52 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
     case IDH_START_VERB: {
       delete verbQueryDlg;
       verbQueryDlg = 0;
-      queryType = QT_Conjugation;
-      slotStartTypeQuery (header1, QM_VERB);
+      queryType = TQT_Conjugation;
+      slotStartTypeQuery (header1, TQM_VERB);
     }
     break;
 
     case IDH_START_ARTICLE: {
       delete artQueryDlg;
       artQueryDlg = 0;
-      queryType = QT_Articles;
-      slotStartTypeQuery (header1, QM_NOUN);
+      queryType = TQT_Articles;
+      slotStartTypeQuery (header1, TQM_NOUN);
     }
     break;
 
     case IDH_START_ADJECTIVE: {
       delete adjQueryDlg;
       adjQueryDlg = 0;
-      queryType = QT_Comparison;
-      slotStartTypeQuery (header1, QM_ADJ);
+      queryType = TQT_Comparison;
+      slotStartTypeQuery (header1, TQM_ADJ);
     }
     break;
 
     case IDH_START_SYNONYM: {
       delete simpleQueryDlg;
       simpleQueryDlg = 0;
-      slotStartPropertyQuery (header1, QT_Synonym);
+      slotStartPropertyQuery (header1, TQT_Synonym);
     }
     break;
 
     case IDH_START_ANTONYM: {
       delete simpleQueryDlg;
       simpleQueryDlg = 0;
-      slotStartPropertyQuery (header1, QT_Antonym);
+      slotStartPropertyQuery (header1, TQT_Antonym);
     }
     break;
 
     case IDH_START_EXAMPLE: {
       delete simpleQueryDlg;
       simpleQueryDlg = 0;
-      slotStartPropertyQuery (header1, QT_Example);
+      slotStartPropertyQuery (header1, TQT_Example);
     }
     break;
 
     case IDH_START_PARAPHRASE: {
       delete simpleQueryDlg;
       simpleQueryDlg = 0;
-      slotStartPropertyQuery (header1, QT_Paraphrase);
+      slotStartPropertyQuery (header1, TQT_Paraphrase);
     }
     break;
 
@@ -548,7 +548,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
                       "lesson.\n\nDo you really want to reset \"%1\"?");
       }
 
-      msg = format.arg(name);
+      msg = format.tqarg(name);
 
       int exit = KMessageBox::warningContinueCancel(this, msg,
                     kapp->makeStdCaption(""),i18n("Reset"));
diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp
index c1b3ebe8..bf9d1d9e 100644
--- a/kvoctrain/kvoctrain/kva_init.cpp
+++ b/kvoctrain/kvoctrain/kva_init.cpp
@@ -40,8 +40,8 @@
 
 #include "prefs.h"
 
-kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name)
-: KMainWindow(parent, name)
+kvoctrainApp::kvoctrainApp(TQWidget *tqparent, const char *name)
+: KMainWindow(tqparent, name)
 {
   doc = 0;
   view = 0;
@@ -98,128 +98,128 @@ kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name)
 
 void kvoctrainApp::initActions()
 {
-  fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection());
+  fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection());
   fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document"));
   fileNew->setToolTip(fileNew->whatsThis());
 
-  fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection());
+  fileOpen = KStdAction::open(TQT_TQOBJECT(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, TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example");
+  fileOpenExample = new KAction(i18n("Open &Example..."), "fileopen", 0, TQT_TQOBJECT(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, TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns");
+  fileGHNS = new KAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns");
   fileGHNS->setWhatsThis(i18n("Downloads new vocabularies"));
   fileGHNS->setToolTip(fileGHNS->whatsThis());
 
-  fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
+  fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
 
-  fileMerge = new KAction(i18n("&Merge..."), 0, 0, this, TQT_SLOT(slotFileMerge()), actionCollection(), "file_merge");
+  fileMerge = new KAction(i18n("&Merge..."), 0, 0, TQT_TQOBJECT(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, TQT_SLOT(slotFileSave()), actionCollection());
+  fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
   fileSave->setWhatsThis(i18n("Save the active vocabulary document"));
   fileSave->setToolTip(fileSave->whatsThis());
 
-  fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection());
+  fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(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, TQT_SLOT(slotFilePrint()), actionCollection());
+  filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection());
   filePrint->setWhatsThis(i18n("Print the active vocabulary document"));
   filePrint->setToolTip(filePrint->whatsThis());
 
-  fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection());
+  fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection());
   fileQuit->setWhatsThis(i18n("Quit KVocTrain"));
   fileQuit->setToolTip(fileQuit->whatsThis());
 
-  editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection());
+  editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection());
   editCopy->setWhatsThis(i18n("Copy"));
   editCopy->setToolTip(editCopy->whatsThis());
 
-  editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection());
+  editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection());
   editPaste->setWhatsThis(i18n("Paste"));
   editPaste->setToolTip(editPaste->whatsThis());
 
-  editSelectAll = KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection());
+  editSelectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection());
   editSelectAll->setWhatsThis(i18n("Select all rows"));
   editSelectAll->setToolTip(editSelectAll->whatsThis());
 
-  editClearSelection = KStdAction::deselect(this, TQT_SLOT(slotCancelSelection()), actionCollection());
+  editClearSelection = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(slotCancelSelection()), actionCollection());
   editClearSelection->setWhatsThis(i18n("Deselect all rows"));
   editClearSelection->setToolTip(editClearSelection->whatsThis());
 
-  editSearchFromClipboard =  KStdAction::find(this, TQT_SLOT(slotSmartSearchClip()), actionCollection());
+  editSearchFromClipboard =  KStdAction::find(TQT_TQOBJECT(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, TQT_SLOT(slotAppendRow()), actionCollection(),"edit_append");
+  editAppend = new KAction(i18n("&Append New Entry"), "insert_table_row", "Insert", TQT_TQOBJECT(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, TQT_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area");
+  editEditSelectedArea = new KAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", TQT_TQOBJECT(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, TQT_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area");
+  editRemoveSelectedArea = new KAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", TQT_TQOBJECT(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, TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area");
+  editSaveSelectedArea = new KAction(i18n("Save E&ntries in Query As..."), KGlobal::iconLoader()->loadIcon("filesaveas", KIcon::Small), 0, TQT_TQOBJECT(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, TQT_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics");
+  vocabShowStatistics = new KAction(i18n("Show &Statistics"), "statistics", 0, TQT_TQOBJECT(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, TQT_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons");
+  vocabAssignLessons = new KAction(i18n("Assign L&essons..."), "rand_less", 0, TQT_TQOBJECT(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, TQT_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up");
+  vocabCleanUp = new KAction(i18n("&Clean Up"), "cleanup", 0, TQT_TQOBJECT(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(), 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)));
+  connect(vocabAppendLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabAppendLanguage()));
+  connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotAppendLang(int)));
+  connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeadertqStatus(int)));
 
   vocabSetLanguage = new KSelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language");
-  connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabSetLanguage()));
+  connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabSetLanguage()));
 
   vocabRemoveLanguage = new KSelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language");
-  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)));
+  connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabRemoveLanguage()));
+  connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderCallBack(int)));
+  connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeadertqStatus(int)));
 
-  vocabDocumentProperties = new KAction(i18n("Document &Properties"), 0, 0, this, TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties");
+  vocabDocumentProperties = new KAction(i18n("Document &Properties"), 0, 0, TQT_TQOBJECT(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, TQT_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties");
+  vocabLanguageProperties = new KAction(i18n("Lan&guage Properties"), 0, 0, TQT_TQOBJECT(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, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotChooseLesson(int)));
-  lessons->setFocusPolicy(TQWidget::NoFocus);
+  lessons->setFocusPolicy(TQ_NoFocus);
 
-  vocabLessons = new KWidgetAction(lessons, i18n("Lessons"), 0, this, 0, actionCollection(), "vocab_lessons");
+  vocabLessons = new KWidgetAction(lessons, i18n("Lessons"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "vocab_lessons");
   vocabLessons->setWhatsThis(i18n("Choose current lesson"));
   vocabLessons->setToolTip(vocabLessons->whatsThis());
 
   searchLine = new KLineEdit(this);
-  searchLine->setFocusPolicy(TQWidget::ClickFocus);
+  searchLine->setFocusPolicy(TQ_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 = new KWidgetAction(searchLine, i18n("Smart Search"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "vocab_search");
   vocabSearch->setAutoSized(true);
   vocabSearch->setWhatsThis(i18n("Search vocabulary for specified text "));
   vocabSearch->setToolTip(vocabSearch->whatsThis());
@@ -232,7 +232,7 @@ void kvoctrainApp::initActions()
   //learningResumeMultipleChoice->setWhatsThis(i18n(""));
   learningResumeMultipleChoice->setToolTip(learningResumeMultipleChoice->whatsThis());
   */
-  configApp = KStdAction::preferences(this, TQT_SLOT( slotGeneralOptions()), actionCollection());
+  configApp = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotGeneralOptions()), actionCollection());
   configApp->setWhatsThis(i18n("Show the configuration dialog"));
   configApp->setToolTip(configApp->whatsThis());
 
@@ -245,7 +245,7 @@ void kvoctrainApp::initActions()
   //connect(actionCollection(), TQT_SIGNAL(actionHighlighted(KAction *, bool)), this, TQT_SLOT(slotActionHighlighted(KAction *, bool)));
 
   if (!initialGeometrySet())
-      resize( TQSize(550, 400).expandedTo(minimumSizeHint()));
+      resize( TQSize(550, 400).expandedTo(tqminimumSizeHint()));
   setupGUI(ToolBar | Keys | StatusBar | Create);
   setAutoSaveSettings();
 
@@ -255,7 +255,7 @@ void kvoctrainApp::initActions()
 
   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(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
   connect(learn_menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowLearn()));
 }
 
@@ -280,9 +280,9 @@ void kvoctrainApp::initStatusBar()
 void kvoctrainApp::initDoc( )
 {
   if (fileOpenRecent->items().count() > 0)
-    doc = new kvoctrainDoc(this, fileOpenRecent->items()[0]);
+    doc = new kvoctrainDoc(TQT_TQOBJECT(this), fileOpenRecent->items()[0]);
   else
-    doc = new kvoctrainDoc(this, KURL(""));
+    doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL(""));
 
   loadDocProps(doc);
   if (doc->numLangs() == 0)
diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp
index c809cc3a..22c75a4e 100644
--- a/kvoctrain/kvoctrain/kva_io.cpp
+++ b/kvoctrain/kvoctrain/kva_io.cpp
@@ -46,7 +46,7 @@ static const char *PATTERN_ALL =  I18N_NOOP("*|All Files (*)\n");
 static const char *PATTERN_ML  =  I18N_NOOP("*.kvtml|KVocTrain Markup (*.kvtml)\n");
 static const char *PATTERN_LEX =  I18N_NOOP("*.lex|Vocabulary Trainer 5.0 (*.lex)\n");
 static const char *PATTERN_VL  =  I18N_NOOP("*.vl|KVoclearn (*.vl)\n");
-static const char *PATTERN_QVO =  I18N_NOOP("*.qvo|QVocab (*.qvo)\n");
+static const char *PATTERN_TQVO =  I18N_NOOP("*.qvo|TQVocab (*.qvo)\n");
 static const char *PATTERN_VOC =  I18N_NOOP("*.voc|Vokabeltrainer (*.voc)\n");
 static const char *PATTERN_CSV =  I18N_NOOP("*.csv|Text (*.csv)\n");
 static const char *PATTERN_VCB =  I18N_NOOP("*.vocab|Vocabbox (*.vocab)\n");
@@ -160,7 +160,7 @@ void kvoctrainApp::slotFileNew()
     view->setView (0, langset);
     delete doc;
     TQString name = "";
-    doc = new kvoctrainDoc (this, 0 /*KURL(name)*/);
+    doc = new kvoctrainDoc (TQT_TQOBJECT(this), 0 /*KURL(name)*/);
     loadDocProps(doc);
     if (doc->numLangs() == 0) {
       TQString l = "en";
@@ -182,7 +182,7 @@ void kvoctrainApp::slotFileOpen()
 
   if (queryExit() ) {
     TQString s;
-    KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, parentWidget(), i18n("Open Vocabulary File"));
+    KURL url = KFileDialog::getOpenURL(TQString(), FILTER_RPATTERN, tqparentWidget(), i18n("Open Vocabulary File"));
     loadfileFromPath(url, true);
   }
   slotStatusMsg(IDS_DEFAULT);
@@ -198,11 +198,11 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent)
       doc = 0;
 
       TQString format = i18n("Loading %1");
-      TQString msg = format.arg(url.path());
+      TQString msg = format.tqarg(url.path());
 
       slotStatusMsg(msg);
       prepareProgressBar();
-      doc = new kvoctrainDoc (this, url);
+      doc = new kvoctrainDoc (TQT_TQOBJECT(this), url);
       removeProgressBar();
       loadDocProps(doc);
       view->setView(doc, langset);
@@ -222,10 +222,10 @@ void kvoctrainApp::slotFileOpenExample()
   if (queryExit() ) {
     TQString s;
     s = locate("data",  "kvoctrain/examples/");
-    KURL url = KFileDialog::getOpenURL(s, FILTER_RPATTERN, parentWidget(), i18n("Open Example Vocabulary File"));
+    KURL url = KFileDialog::getOpenURL(s, FILTER_RPATTERN, tqparentWidget(), i18n("Open Example Vocabulary File"));
     loadfileFromPath(url, false);
     if (doc)
-       doc->URL().setFileName(TQString::null);
+       doc->URL().setFileName(TQString());
   }
   slotStatusMsg(IDS_DEFAULT);
 }
@@ -244,16 +244,16 @@ void kvoctrainApp::slotFileMerge()
   slotStatusMsg(i18n("Merging file..."));
 
   TQString s;
-  KURL url = KFileDialog::getOpenURL(TQString::null, FILTER_RPATTERN, parentWidget(), i18n("Merge Vocabulary File"));
+  KURL url = KFileDialog::getOpenURL(TQString(), FILTER_RPATTERN, tqparentWidget(), i18n("Merge Vocabulary File"));
 
   if (!url.isEmpty() ) {
 
     TQString format = i18n("Loading %1");
-    TQString msg = format.arg(url.path());
+    TQString msg = format.tqarg(url.path());
 
     slotStatusMsg(msg);
     prepareProgressBar();
-    kvoctrainDoc *new_doc = new kvoctrainDoc (this, url);
+    kvoctrainDoc *new_doc = new kvoctrainDoc (TQT_TQOBJECT(this), url);
     connect (new_doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool)));
     doc->setModified(false);
     removeProgressBar();
@@ -274,7 +274,7 @@ void kvoctrainApp::slotFileMerge()
     vector<TQString> new_usages = new_doc->getUsageDescr();
 
     format = i18n("Merging %1");
-    msg = format.arg(url.path());
+    msg = format.tqarg(url.path());
     slotStatusMsg(msg);
 
     TQApplication::setOverrideCursor( waitCursor );
@@ -332,11 +332,11 @@ void kvoctrainApp::slotFileMerge()
         for (int lang = 0; lang <= (int) expr->numTranslations(); lang++) {
           TQString t = expr->getType (lang);
           // adjust type offset
-          if (!t.isEmpty() && t.left(1) == QM_USER_TYPE) {
+          if (!t.isEmpty() && t.left(1) == TQM_USER_TYPE) {
             TQString t2;
             t.remove (0, 1);
             t2.setNum (t.toInt()+types_offset);
-            t2.insert (0, QM_USER_TYPE);
+            t2.insert (0, TQM_USER_TYPE);
             expr->setType (lang, t2);
           }
 
@@ -349,7 +349,7 @@ void kvoctrainApp::slotFileMerge()
               TQString n;
               t.remove (0, 1);
               int next;
-              if ((next = t.find(UL_USAGE_DIV)) >= 0) {
+              if ((next = t.tqfind(UL_USAGE_DIV)) >= 0) {
                 n = t.left(next);
                 t.remove (0, next+1);
               }
@@ -399,7 +399,7 @@ void kvoctrainApp::slotFileMerge()
       vector<int> move_matrix;
 
       vector <bool> cs_equal;
-      for (int i = 0; i < QMAX (doc->numLangs(), new_doc->numLangs()); i++)
+      for (int i = 0; i < TQMAX (doc->numLangs(), new_doc->numLangs()); i++)
         cs_equal.push_back (false);
 
       move_matrix.push_back(new_doc->findIdent(doc->getOriginalIdent()));
@@ -434,31 +434,31 @@ void kvoctrainApp::slotFileMerge()
             new_expr.setRemark (i, r);
 
             TQString t = expr->getType(lpos);
-            if (!t.isEmpty() && t.left(1) == QM_USER_TYPE) {
+            if (!t.isEmpty() && t.left(1) == TQM_USER_TYPE) {
               TQString t2;
               t.remove (0, 1);
               t2.setNum (t.toInt()+types_offset);
-              t2.insert (0, QM_USER_TYPE);
+              t2.insert (0, TQM_USER_TYPE);
               new_expr.setType (i, t2);
             }
 
             t = expr->getUsageLabel(lpos);
-            if (!t.isEmpty() && t.left(1) == QM_USER_TYPE) {
+            if (!t.isEmpty() && t.left(1) == TQM_USER_TYPE) {
               TQString t2;
               t.remove (0, 1);
               t2.setNum (t.toInt()+usages_offset);
-              t2.insert (0, QM_USER_TYPE);
+              t2.insert (0, TQM_USER_TYPE);
               new_expr.setUsageLabel (i, t2);
             }
 
             Conjugation conj = expr->getConjugation(lpos);
             for (int ci = 0; ci < conj.numEntries(); ci++) {
               t = conj.getType(ci);
-              if (!t.isEmpty() && t.left(1) == QM_USER_TYPE) {
-                t.remove (0, strlen(QM_USER_TYPE));
+              if (!t.isEmpty() && t.left(1) == TQM_USER_TYPE) {
+                t.remove (0, strlen(TQM_USER_TYPE));
                 TQString t2;
                 t2.setNum (t.toInt()+tenses_offset);
-                t2.insert (0, QM_USER_TYPE);
+                t2.insert (0, TQM_USER_TYPE);
                 conj.setType(ci, t2);
               }
             }
@@ -500,7 +500,7 @@ void kvoctrainApp::slotFileSave()
   }
 
   TQString format = i18n("Saving %1");
-  TQString msg = format.arg(doc->URL().path());
+  TQString msg = format.tqarg(doc->URL().path());
   slotStatusMsg(msg);
 
   // remove previous backup
@@ -510,7 +510,7 @@ void kvoctrainApp::slotFileSave()
 
   prepareProgressBar();
   saveDocProps(doc);
-  doc->saveAs(this, doc->URL(), doc->getTitle(), kvoctrainDoc::automatic);
+  doc->saveAs(TQT_TQOBJECT(this), doc->URL(), doc->getTitle(), kvoctrainDoc::automatic);
   fileOpenRecent->addURL(doc->URL());
   removeProgressBar();
 
@@ -592,13 +592,13 @@ void kvoctrainApp::slotFileSaveAs()
   if (entryDlg != 0)
     commitEntryDlg(false);
 
-  KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As"));
+  KURL url = KFileDialog::getSaveURL(TQString(), FILTER_WPATTERN, tqparentWidget(), i18n("Save Vocabulary As"));
 
   if (!url.isEmpty() ) {
     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()),TQString::null,i18n("Overwrite")) == KMessageBox::Cancel)
+       .tqarg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel)
     {
     // do nothing
     }
@@ -606,7 +606,7 @@ void kvoctrainApp::slotFileSaveAs()
 
     if (doc) {
       TQString format = i18n("Saving %1");
-      TQString msg = format.arg(url.path());
+      TQString msg = format.tqarg(url.path());
       slotStatusMsg(msg);
 
       TQFile::remove(TQFile::encodeName(url.path()+"~"));         // remove previous backup
@@ -614,7 +614,7 @@ void kvoctrainApp::slotFileSaveAs()
       saveDocProps(doc);
 
       prepareProgressBar();
-      doc->saveAs(this, url, doc->getTitle(), kvoctrainDoc::automatic);
+      doc->saveAs(TQT_TQOBJECT(this), url, doc->getTitle(), kvoctrainDoc::automatic);
       fileOpenRecent->addURL(doc->URL());
       removeProgressBar();
     }
@@ -631,7 +631,7 @@ void kvoctrainApp::slotSaveSelection ()
   slotStatusMsg(i18n("Saving selected area under new filename..."));
   TQString save_separator = Prefs::separator();
   Prefs::setSeparator("\t");
-  kvoctrainDoc seldoc(this, "");
+  kvoctrainDoc seldoc(TQT_TQOBJECT(this), "");
   // transfer most important parts
   seldoc.appendLang(doc->getOriginalIdent());
   for (int i = 1; i < doc->numLangs(); i++)
@@ -644,21 +644,21 @@ void kvoctrainApp::slotSaveSelection ()
     if (doc->getEntry(i)->isInQuery() )
       seldoc.appendEntry(doc->getEntry(i));
 
-  KURL url = KFileDialog::getSaveURL(TQString::null, FILTER_WPATTERN, parentWidget(), i18n("Save Vocabulary As"));
+  KURL url = KFileDialog::getSaveURL(TQString(), FILTER_WPATTERN, tqparentWidget(), i18n("Save Vocabulary As"));
 
   if (!url.isEmpty() )
   {
     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()),TQString::null,i18n("Overwrite")) == KMessageBox::Cancel)
+       .tqarg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel)
     {
     // do nothing
     }
     else
     {
       TQString format = i18n("Saving %1");
-      TQString msg = format.arg(url.path());
+      TQString msg = format.tqarg(url.path());
       slotStatusMsg(msg);
 
       TQFile::remove(url.path()+"~");         // remove previous backup
@@ -667,7 +667,7 @@ void kvoctrainApp::slotSaveSelection ()
       saveDocProps(&seldoc);
 
       prepareProgressBar();
-      seldoc.saveAs(this, url, i18n ("Part of: ") + doc->getTitle(), kvoctrainDoc::automatic);
+      seldoc.saveAs(TQT_TQOBJECT(this), url, i18n ("Part of: ") + doc->getTitle(), kvoctrainDoc::automatic);
       removeProgressBar();
     }
   }
diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp
index 0f2ca08d..564566c9 100644
--- a/kvoctrain/kvoctrain/kva_query.cpp
+++ b/kvoctrain/kvoctrain/kva_query.cpp
@@ -36,7 +36,7 @@
 #include "query-dialogs/SimpleQueryDlg.h"
 #include "prefs.h"
 
-#define MAX_QUERY_TIMEOUT 3
+#define MAX_TQUERY_TIMEOUT 3
 
 
 static const char not_answered[] = I18N_NOOP(
@@ -205,7 +205,7 @@ void kvoctrainApp::slotTimeOutProperty(QueryDlgBase::Result res)
   doc->setModified();
   switch (res) {
     case QueryDlgBase::Timeout:
-      if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) {
+      if (++num_queryTimeout >= MAX_TQUERY_TIMEOUT) {
         slotStopQuery(true);
         KMessageBox::information(this, i18n(not_answered),
                                  kapp->makeStdCaption(i18n("Stopping Query")));
@@ -339,7 +339,7 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type)
 
   hide();
   querymode = true;
-  if (queryType == QT_Conjugation) {
+  if (queryType == TQT_Conjugation) {
     verbQueryDlg = new VerbQueryDlg (exp->getType(act_query_col),
                             random_expr1[random_query_nr].nr,
                             act_query_col,
@@ -359,7 +359,7 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type)
                    this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result)));
     verbQueryDlg->show();
   }
-  else if (queryType == QT_Articles) {
+  else if (queryType == TQT_Articles) {
     artQueryDlg = new ArtQueryDlg(exp->getType(act_query_col),
                           random_expr1[random_query_nr].nr,
                           act_query_col,
@@ -376,7 +376,7 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type)
                       this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result)));
     artQueryDlg->show();
   }
-  else if (queryType == QT_Comparison) {
+  else if (queryType == TQT_Comparison) {
     adjQueryDlg = new AdjQueryDlg(exp->getType(act_query_col),
                           random_expr1[random_query_nr].nr,
                           act_query_col,
@@ -411,7 +411,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res)
   doc->setModified();
   switch (res) {
     case QueryDlgBase::Timeout:
-      if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) {
+      if (++num_queryTimeout >= MAX_TQUERY_TIMEOUT) {
         slotStopQuery(true);
         KMessageBox::information(this, i18n(not_answered),
                                  kapp->makeStdCaption(i18n("Stopping Query")));
@@ -486,7 +486,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res)
   random_query_nr = random.getLong(random_expr1.size());
   kvoctrainExpr *exp = random_expr1[random_query_nr].exp;
 
-  if (queryType == QT_Conjugation) {
+  if (queryType == TQT_Conjugation) {
     if (verbQueryDlg == 0) {
       kdError() << "verbQueryDlg == 0\n";
       slotStopQuery(true);
@@ -505,7 +505,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res)
 
     verbQueryDlg->initFocus();
   }
-  else if (queryType == QT_Articles) {
+  else if (queryType == TQT_Articles) {
     if (artQueryDlg == 0) {
       kdError() << "artQueryDlg == 0\n";
       slotStopQuery(true);
@@ -522,7 +522,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res)
                           doc->getArticle(act_query_col));
     artQueryDlg->initFocus();
   }
-  else if (queryType == QT_Comparison) {
+  else if (queryType == TQT_Comparison) {
     if (adjQueryDlg == 0) {
       kdError() << "adjQueryDlg == 0\n";
       slotStopQuery(true);
@@ -629,7 +629,7 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o
     q_trans = exp->getOriginal();
   }
 
-  if (queryType == QT_Random) {
+  if (queryType == TQT_Random) {
     randomQueryDlg = new RandomQueryDlg (
                              q_org,
                              q_trans,
@@ -648,7 +648,7 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o
                this, TQT_SLOT(slotTimeOutRandomQuery(QueryDlgBase::Result)));
       randomQueryDlg->show();
   }
-  else if (queryType == QT_Multiple) {
+  else if (queryType == TQT_Multiple) {
     mcQueryDlg = new MCQueryDlg(
                              q_org,
                              q_trans,
@@ -678,14 +678,14 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o
 
 void kvoctrainApp::slotTimeOutRandomQuery(QueryDlgBase::Result res)
 {
-  queryType = QT_Random;
+  queryType = TQT_Random;
   slotTimeOutQuery(res);
 }
 
 
 void kvoctrainApp::slotTimeOutMultipleChoice(QueryDlgBase::Result res)
 {
-  queryType = QT_Multiple;
+  queryType = TQT_Multiple;
   slotTimeOutQuery(res);
 }
 
@@ -715,7 +715,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res)
 
   switch (res) {
     case QueryDlgBase::Timeout:
-      if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) {
+      if (++num_queryTimeout >= MAX_TQUERY_TIMEOUT) {
         slotStopQuery(true);
         KMessageBox::information(this, i18n(not_answered),
                                  kapp->makeStdCaption(i18n("Stopping Query")));
@@ -957,7 +957,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res)
     q_trans = exp->getOriginal();
   }
 
-  if (queryType == QT_Random) {
+  if (queryType == TQT_Random) {
     if (randomQueryDlg == 0) {
       kdError() << "randomQueryDlg == 0\n";
       slotStopQuery(true);
@@ -975,7 +975,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res)
                              doc);
       randomQueryDlg->initFocus();
   }
-  else if (queryType == QT_Multiple) {
+  else if (queryType == TQT_Multiple) {
     if (mcQueryDlg == 0) {
       kdError() << "mcQueryDlg == 0\n";
       slotStopQuery(true);
diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp
index 62d2e901..1469c354 100644
--- a/kvoctrain/kvoctrain/kvoctrain.cpp
+++ b/kvoctrain/kvoctrain/kvoctrain.cpp
@@ -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 ? TQString::null : expr->getRemark(col)));
+                       .tqarg(noData ? TQString() : expr->getRemark(col)));
   if (pron_label != 0)
     pron_label->setText(i18n("Abbreviation for P)ronouncation","P: %1")
-                        .arg(noData ? TQString::null : expr->getPronunce(col)));
+                        .tqarg(noData ? TQString() : expr->getPronunce(col)));
   if (type_label != 0)
     type_label->setText(i18n("Abbreviation for T)ype of word", "T: %1")
-                        .arg(noData ? TQString::null : QueryManager::typeStr(expr->getType(col))));
+                        .tqarg(noData ? TQString() : QueryManager::typeStr(expr->getType(col))));
 
   if (entryDlg != 0) {
     if (noData)
@@ -144,7 +144,7 @@ void kvoctrainApp::slotEditCallBack(int res)
           {
             int lesson = doc->getEntry(row)->getLesson();
             if (lesson >= lessons->count())
-              lesson = QMAX (0, lessons->count()-1);
+              lesson = TQMAX (0, lessons->count()-1);
             slotChooseLesson(lesson);
 
             TQString exp;
@@ -219,8 +219,8 @@ void kvoctrainApp::commitEntryDlg(bool force)
        expr->setFauxAmi (col, entryDlg->getToFauxAmi(), true);
        expr->setGrade(col, entryDlg->getFromGrade(), false);
        expr->setGrade(col, entryDlg->getToGrade(), true);
-       expr->setQueryCount(col, entryDlg->getFromQCount(), false);
-       expr->setQueryCount(col, entryDlg->getToQCount(), true);
+       expr->setQueryCount(col, entryDlg->getFromTQCount(), false);
+       expr->setQueryCount(col, entryDlg->getToTQCount(), true);
        expr->setBadCount(col, entryDlg->getFromBCount(), false);
        expr->setBadCount(col, entryDlg->getToBCount(), true);
        expr->setQueryDate(col, entryDlg->getFromDate(), false);
@@ -258,10 +258,10 @@ void kvoctrainApp::commitEntryDlg(bool force)
            if (entryDlg->toGradeDirty() )
              expr->setGrade(col, entryDlg->getToGrade(), true);
 
-           if (entryDlg->fromQCountDirty() )
-             expr->setQueryCount(col, entryDlg->getFromQCount(), false);
-           if (entryDlg->toQCountDirty() )
-              expr->setQueryCount(col, entryDlg->getToQCount(), true);
+           if (entryDlg->fromTQCountDirty() )
+             expr->setQueryCount(col, entryDlg->getFromTQCount(), false);
+           if (entryDlg->toTQCountDirty() )
+              expr->setQueryCount(col, entryDlg->getToTQCount(), true);
 
            if (entryDlg->fromBCountDirty() )
              expr->setBadCount(col, entryDlg->getFromBCount(), false);
@@ -315,7 +315,7 @@ void kvoctrainApp::createEntryDlg(int row, int col)
 
    int lesson = doc->getEntry(row)->getLesson();
    if (lesson >= lessons->count())
-     lesson = QMAX (0, lessons->count()-1);
+     lesson = TQMAX (0, lessons->count()-1);
 
    if (col < KV_EXTRA_COLS) {
      title = i18n("Edit General Properties");
@@ -333,21 +333,21 @@ void kvoctrainApp::createEntryDlg(int row, int col)
                     0,
                     0,
                     0,
-                    TQString::null,
-                    TQString::null,
-                    TQString::null,
+                    TQString(),
+                    TQString(),
+                    TQString(),
                     lesson,
                     lessons,
                     doc->getOriginalIdent(),
                     langset,
-                    TQString::null,
+                    TQString(),
                     doc->getEntry(row)->getType(col),
-                    TQString::null,
-                    TQString::null,
-                    TQString::null,
-                    TQString::null,
-                    TQString::null,
-                    TQString::null,
+                    TQString(),
+                    TQString(),
+                    TQString(),
+                    TQString(),
+                    TQString(),
+                    TQString(),
                     doc->getConjugation(0),
                     Conjugation(),
                     doc->getArticle(0),
@@ -474,7 +474,7 @@ void kvoctrainApp::setDataEntryDlg (int row, int col)
 
    int lesson = expr->getLesson();
    if (lesson >= lessons->count())
-     lesson = QMAX (0, lessons->count()-1);
+     lesson = TQMAX (0, lessons->count()-1);
 
    bool hasSel = hasSelection();
 
@@ -492,21 +492,21 @@ void kvoctrainApp::setDataEntryDlg (int row, int col)
                        0,
                        0,
                        0,
-                       TQString::null,
-                       TQString::null,
-                       TQString::null,
+                       TQString(),
+                       TQString(),
+                       TQString(),
                        lesson,
                        lessons,
                        doc->getOriginalIdent(),
                        langset,
-                       TQString::null,
+                       TQString(),
                        doc->getEntry(row)->getType(0),
-                       TQString::null,
-                       TQString::null,
-                       TQString::null,
-                       TQString::null,
-                       TQString::null,
-                       TQString::null,
+                       TQString(),
+                       TQString(),
+                       TQString(),
+                       TQString(),
+                       TQString(),
+                       TQString(),
                        doc->getConjugation(0),
                        Conjugation(),
                        doc->getArticle(0),
@@ -1114,11 +1114,11 @@ void kvoctrainApp::aboutToShowLearn()
     int j;
     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_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_TQUERY);
       header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), (header << 16) | IDH_START_MULTIPLE);
 
       header_m->setItemEnabled((header << 16) | IDH_START_MULTIPLE, doc->numLangs() > 1);
-      header_m->setItemEnabled((header << 16) | IDH_START_QUERY,  doc->numLangs() > 1);
+      header_m->setItemEnabled((header << 16) | IDH_START_TQUERY,  doc->numLangs() > 1);
       header_m->insertSeparator();
 
       header_m->insertItem(i18n("&Verbs"), (header << 16) | IDH_START_VERB);
@@ -1140,17 +1140,17 @@ void kvoctrainApp::aboutToShowLearn()
         if((j = langset.indexShortId(doc->getIdent(i))) >= 0
            && !langset.PixMapFile(j).isEmpty()
            && !langset.longId(j).isEmpty() ) {
-          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
+          query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(main_names[i]),
+              (i << (16+8)) |  IDH_START_TQUERY);  // hack: IDs => header-ids + cmd
         }
         else {
-          query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_QUERY);
+          query_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_TQUERY);
         }
       }
 
       header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL);
       connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-      connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+      connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
 
       for (int i = 1; i < (int) doc->numLangs(); i++) {
         // show pixmap and long name if available
@@ -1158,11 +1158,11 @@ void kvoctrainApp::aboutToShowLearn()
         if((j = langset.indexShortId(doc->getIdent(i))) >= 0
            && !langset.PixMapFile(j).isEmpty()
            && !langset.longId(j).isEmpty() ) {
-          multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(main_names[i]),
+          multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(main_names[i]),
               (i << (16+8)) |  IDH_START_MULTIPLE);  // hack: IDs => header-ids + cmd
         }
         else {
-          multiple_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_MULTIPLE);
+          multiple_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_MULTIPLE);
         }
       }
       header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), multiple_m, (4 << 16) | IDH_NULL);
@@ -1178,11 +1178,11 @@ void kvoctrainApp::aboutToShowLearn()
       header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE);
 
       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 (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(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)));
+    connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
 
     TQString id = header == 0 ? doc->getOriginalIdent()
                              : doc->getIdent(header);
@@ -1197,10 +1197,10 @@ void kvoctrainApp::aboutToShowLearn()
   }
 
   learn_menu->insertSeparator();
-  learn_menu->insertItem(SmallIconSet("run_query"), i18n("Resume &Query"), ID_RESUME_QUERY );
+  learn_menu->insertItem(SmallIconSet("run_query"), i18n("Resume &Query"), ID_RESUME_TQUERY );
   learn_menu->insertItem(SmallIconSet("run_multi"), i18n("Resume &Multiple Choice"), ID_RESUME_MULTIPLE );
 
-  learn_menu->setItemEnabled(ID_RESUME_QUERY,  query_num != 0);
+  learn_menu->setItemEnabled(ID_RESUME_TQUERY,  query_num != 0);
   learn_menu->setItemEnabled(ID_RESUME_MULTIPLE,  query_num != 0);
 
 }
@@ -1264,7 +1264,7 @@ void kvoctrainApp::aboutToShowVocabSetLanguage()
       }
 
       connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int)));
-      connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+      connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
 
       if (header == 0)
         set_m->insertItem(i18n("&Original"), langs_m, (2 << 16) | IDH_NULL);
@@ -1272,7 +1272,7 @@ void kvoctrainApp::aboutToShowVocabSetLanguage()
         if (doc->numLangs() <= 2)
           set_m->insertItem(i18n("&Translation"), langs_m, (2 << 16) | IDH_NULL);
         else
-          set_m->insertItem(i18n("&%1. Translation").arg(header), langs_m, (2 << 16) | IDH_NULL);
+          set_m->insertItem(i18n("&%1. Translation").tqarg(header), langs_m, (2 << 16) | IDH_NULL);
       }
     }
   }
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index a1be3c54..5e3e56c7 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -76,10 +76,11 @@ class KVTNewStuff;
 class kvoctrainApp : public KMainWindow
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   /** construtor */
-  kvoctrainApp(TQWidget *parent = NULL, const char *name = NULL);
+  kvoctrainApp(TQWidget *tqparent = NULL, const char *name = NULL);
   /** destructor */
   ~kvoctrainApp();
   void initActions();
@@ -145,7 +146,7 @@ public:
 //  void slotSearchClip();
   void slotSetHeaderProp (int header_and_id);
   void slotHeaderCallBack (int cmd_and_id);
-  void slotHeaderStatus (int cmd_and_id);
+  void slotHeadertqStatus (int cmd_and_id);
   void slotHeaderMenu(int header, int x, int y);
   /** append language to table */
   void slotAppendLang(int header);
diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp
index 7dc54b45..1dbfacc2 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -39,8 +39,8 @@
 #include "kv_resource.h"
 #include "prefs.h"
 
-KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, TQWidget *parent, const char *name)
-  : TQTable(parent, name), langs(ls)
+KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, TQWidget *tqparent, const char *name)
+  : TQTable(tqparent, name), langs(ls)
 {
   m_doc = doc;
   defaultItem = 0;
@@ -76,7 +76,7 @@ void KVocTrainTable::setCurrentItem(int row)
   setCurrentRow(row, currentColumn());
 }
 /*
-TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace)
+TQWidget* KVocTrainTable::beginEdit(int row, int col, bool tqreplace)
 {
   if (KApplication::dcopClient()->isApplicationRegistered("kxkb"))
   {
@@ -103,12 +103,12 @@ TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace)
       }
     }
   }
-  return TQTable::beginEdit(row, col, replace);
+  return TQTable::beginEdit(row, col, tqreplace);
 }
 
-void KVocTrainTable::endEdit(int row, int col, bool accept, bool replace)
+void KVocTrainTable::endEdit(int row, int col, bool accept, bool tqreplace)
 {
-  TQTable::endEdit(row, col, accept, replace);
+  TQTable::endEdit(row, col, accept, tqreplace);
 }
 */
 void KVocTrainTable::sortByColumn(int header, bool alpha) {
@@ -141,7 +141,7 @@ void KVocTrainTable::sortByColumn(int header, bool alpha) {
       sortdir = m_doc->sortByLesson_index();
   }
   horizontalHeader()->setSortIndicator(header, sortdir);
-  repaintContents();
+  tqrepaintContents();
   m_doc->setModified();
   emit currentChanged(currentRow(), currentColumn());
   TQApplication::restoreOverrideCursor();
@@ -180,7 +180,7 @@ void KVocTrainTable::updateContents(int row, int col)
   int ncols, nrows;
   if (m_doc) {
     nrows = m_doc->numEntries();
-    ncols = QMAX(1, m_doc->numLangs())+KV_EXTRA_COLS;
+    ncols = TQMAX(1, m_doc->numLangs())+KV_EXTRA_COLS;
   }
   else {
     nrows = 0;
@@ -188,7 +188,7 @@ void KVocTrainTable::updateContents(int row, int col)
   }
   if (nrows != numRows()) {
     // remember number of new rows (typically one)
-    unsigned int new_rows = QMAX(0, nrows - numRows());
+    unsigned int new_rows = TQMAX(0, nrows - numRows());
     // adjust number of rows
     setNumRows(nrows);
     // adjust row heights for added rows
@@ -197,8 +197,8 @@ void KVocTrainTable::updateContents(int row, int col)
   }
   if (ncols != numCols())
     setNumCols(ncols);
-  current_row = QMIN(current_row, QMAX(0, numRows()-1));
-  current_col = QMIN(current_col, QMAX(0, numCols()-1));
+  current_row = TQMIN(current_row, TQMAX(0, numRows()-1));
+  current_col = TQMIN(current_col, TQMAX(0, numCols()-1));
   bool b = signalsBlocked();
   blockSignals(true);
   setCurrentRow(current_row, current_col);
@@ -226,7 +226,7 @@ void KVocTrainTable::setDoc(kvoctrainDoc * rows)
   if (rows) {
     m_doc = rows;
     setNumRows(rows->numEntries());
-    setNumCols(QMAX(1+KV_EXTRA_COLS, m_doc->numLangs()+KV_EXTRA_COLS));
+    setNumCols(TQMAX(1+KV_EXTRA_COLS, m_doc->numLangs()+KV_EXTRA_COLS));
     setCurrentRow(0, 0);
   }
   else {
@@ -263,7 +263,7 @@ void KVocTrainTable::menuTriggerTimeout()
   if (mt != KV_COL_MARK)
     emit rightButtonClicked(mt, mpos.x(), mpos.y());
 
-  TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0, 0), TQMouseEvent::LeftButton, TQMouseEvent::LeftButton);
+  TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0, 0), Qt::LeftButton, Qt::LeftButton);
   TQApplication::sendEvent(header, &me);
 }
 
@@ -303,7 +303,7 @@ int cellAlignment(const TQString & text)
     text.toDouble(&ok2);
   num = ok1 || ok2;
 
-  return ( num ? Qt::AlignRight : Qt::AlignAuto ) | Qt::AlignVCenter;
+  return ( num ? TQt::AlignRight : TQt::AlignAuto ) | TQt::AlignVCenter;
 }
 
 
@@ -389,7 +389,7 @@ void KVocTrainTable::paintCell(TQPainter * p, int row, int col, const TQRect & c
         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);
+        p->drawText( 3, fontpos, w, p->fontMetrics().lineSpacing(), TQt::AlignLeft, less_str);
       }
       break;
 
@@ -424,15 +424,15 @@ void KVocTrainTable::paintCell(TQPainter * p, int row, int col, const TQRect & c
   }
 
   TQPen pen( p->pen() );
-  int gridColor = style().styleHint( TQStyle::SH_Table_GridLineColor, this );
+  int gridColor = tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, this );
   if (gridColor != -1) {
     const TQPalette &pal = palette();
-    if (cg != colorGroup()
+    if (cg != tqcolorGroup()
         && cg != pal.disabled()
         && cg != pal.inactive())
       p->setPen(cg.mid());
     else
-      p->setPen((QRgb)gridColor);
+      p->setPen((TQRgb)gridColor);
   } else {
     p->setPen(cg.mid());
   }
@@ -461,7 +461,7 @@ void KVocTrainTable::keyPressEvent(TQKeyEvent * e)
   {
     case Key_Right: {
       int topCell = rowAt(0);
-      int lastRowVisible = QMIN(numRows(), rowAt(contentsHeight()));
+      int lastRowVisible = TQMIN(numRows(), rowAt(contentsHeight()));
       if (numCols() > 2)
         for (int i = topCell; i <= lastRowVisible; i++)
           updateCell(i, KV_COL_ORG);
@@ -476,7 +476,7 @@ void KVocTrainTable::keyPressEvent(TQKeyEvent * e)
       case Key_Left: {
         TQTable::keyPressEvent(e);
         int topCell = rowAt(0);
-        int lastRowVisible = QMIN(numRows(), rowAt(contentsHeight()));
+        int lastRowVisible = TQMIN(numRows(), rowAt(contentsHeight()));
         if (numCols() > 2)
           for (int i = topCell; i <= lastRowVisible; i++)
             updateCell(i, KV_COL_ORG);
@@ -533,12 +533,12 @@ void KVocTrainTable::contentsMousePressEvent(TQMouseEvent * e)
       update_org = true;
 
     int topCell = rowAt(0);
-    int lastRowVisible = QMIN(numRows(), rowAt(contentsHeight()));
+    int lastRowVisible = TQMIN(numRows(), rowAt(contentsHeight()));
     if (update_org)
       for (int i = topCell; i <= lastRowVisible; i++)
         updateCell(i, KV_COL_ORG);
   }
-  if(e->button() == LeftButton)
+  if(e->button() == Qt::LeftButton)
     setCurrentCell(cr, cc);
 }
 
diff --git a/kvoctrain/kvoctrain/kvoctraintable.h b/kvoctrain/kvoctrain/kvoctraintable.h
index 77fffa77..5bd84d06 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.h
+++ b/kvoctrain/kvoctrain/kvoctraintable.h
@@ -37,12 +37,13 @@
 /**
 @author Peter Hedlund
 */
-class KVocTrainTable : public QTable
+class KVocTrainTable : public TQTable
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   public:
-    KVocTrainTable( kvoctrainDoc *_doc, const LangSet *ls, TQWidget *parent = NULL, const char *name = NULL );
+    KVocTrainTable( kvoctrainDoc *_doc, const LangSet *ls, TQWidget *tqparent = NULL, const char *name = NULL );
 
     friend class kvoctrainView;
 
@@ -80,8 +81,8 @@ public:
 
   protected:
     int current;
-    //TQWidget* beginEdit(int row, int col, bool replace);
-    //void endEdit(int row, int col, bool accept, bool replace);
+    //TQWidget* beginEdit(int row, int col, bool tqreplace);
+    //void endEdit(int row, int col, bool accept, bool tqreplace);
     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;
diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.cpp b/kvoctrain/kvoctrain/kvoctraintableitem.cpp
index 80a2dd53..d4bc0343 100644
--- a/kvoctrain/kvoctrain/kvoctraintableitem.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintableitem.cpp
@@ -33,7 +33,7 @@
 
 
 KVocTrainTableItem::KVocTrainTableItem( TQTable *t, EditType et, kvoctrainDoc *doc)
-  : TQTableItem( t, et, TQString::null )
+  : TQTableItem( t, et, TQString() )
 {
   m_doc = doc;
   // we do not want that this item can be replaced
@@ -75,7 +75,7 @@ TQWidget *KVocTrainTableItem::createEditor() const
         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"));
-        TQSize sz = statebox->sizeHint();
+        TQSize sz = statebox->tqsizeHint();
         sz.setHeight(table()->rowHeight(row()));
         statebox->setMinimumSize(sz);
         if (!m_doc->getEntry(row())->isActive() )
diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.h b/kvoctrain/kvoctrain/kvoctraintableitem.h
index aa3b7cdd..1495b7e3 100644
--- a/kvoctrain/kvoctrain/kvoctraintableitem.h
+++ b/kvoctrain/kvoctrain/kvoctraintableitem.h
@@ -34,7 +34,7 @@
 /**
 @author Peter Hedlund
  */
-class KVocTrainTableItem : public QTableItem
+class KVocTrainTableItem : public TQTableItem
 {
   public:
     KVocTrainTableItem( TQTable *t, EditType et, kvoctrainDoc *doc );
diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp
index ebad99ee..9017525d 100644
--- a/kvoctrain/kvoctrain/kvoctrainview.cpp
+++ b/kvoctrain/kvoctrain/kvoctrainview.cpp
@@ -50,7 +50,7 @@
 kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp *_parent) : TQWidget(_parent)
 {
   m_doc = doc;
-  parent = _parent;
+  tqparent = _parent;
 
   m_table = new KVocTrainTable(m_doc, &ls, this, "ListBox_1");
   m_table->setFont(Prefs::tableFont());
@@ -60,12 +60,12 @@ kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp
     m_doc->appendLang(i18n("Original"));
 
   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(rightButtonClicked(int, int, int)), tqparent, TQT_SLOT(slotHeaderMenu(int, int, int)));
+  connect(m_table, TQT_SIGNAL(edited(int, int)), tqparent, TQT_SLOT(slotEditEntry(int, int)));
+  connect(m_table, TQT_SIGNAL(currentChanged(int, int)), tqparent, 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 *)));
+  connect(m_table, TQT_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), tqparent, TQT_SLOT(keyPressEvent(TQKeyEvent *)));
+  connect(m_table, TQT_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), tqparent, TQT_SLOT(keyReleaseEvent(TQKeyEvent *)));
 
   list_layout = new TQGridLayout( this, 2, 1/*, 4 */);
   list_layout->addWidget(m_table, 1, 0);
@@ -136,20 +136,20 @@ void kvoctrainView::resizeEvent (TQResizeEvent *r_ev)
       header->resizeSection(KV_COL_MARK, KV_COLWIDTH_MARK);
       m_table->setColumnWidth(KV_COL_MARK, KV_COLWIDTH_MARK);
       int remain = newwidth - KV_COLWIDTH_MARK;
-      int x = QMAX(20, (int)((header->sectionSize(KV_COL_LESS) * grow) + 0.5));
+      int x = TQMAX(20, (int)((header->sectionSize(KV_COL_LESS) * grow) + 0.5));
       header->resizeSection(KV_COL_LESS, x);
       m_table->setColumnWidth(KV_COL_LESS, x);
       remain -= x;
 
       for (int i = KV_COL_ORG; i < m_table->numCols() - 1; i++)
       {
-        x = QMAX(20, (int)((header->sectionSize(i) * grow) + 0.5));
+        x = TQMAX(20, (int)((header->sectionSize(i) * grow) + 0.5));
         remain -= x;
         header->resizeSection(i, x);
         m_table->setColumnWidth(i, x);
       }
-      header->resizeSection(m_table->numCols() - 1, QMAX(20, remain));
-      m_table->setColumnWidth(m_table->numCols() - 1, QMAX(20, remain));
+      header->resizeSection(m_table->numCols() - 1, TQMAX(20, remain));
+      m_table->setColumnWidth(m_table->numCols() - 1, TQMAX(20, remain));
     }
     break;
 
@@ -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"),  TQString::null);
-    setHeaderProp(KV_COL_MARK, "",  TQString::null);
+    setHeaderProp(KV_COL_LESS, i18n("Lesson"),  TQString());
+    setHeaderProp(KV_COL_MARK, "",  TQString());
     m_table->setColumnWidth(KV_COL_MARK, KV_COLWIDTH_MARK);
 
     if (id < 0)
@@ -225,7 +225,7 @@ void kvoctrainView::setHeaderProp (int id, const TQString &name, const TQString
       //this is the code used by kxkb when a flag image can't be found
       //see kdebase/kxkb/pixmap.cpp/LayoutIcon::findPixmap()
       pix.resize(21, 14);
-      pix.fill(Qt::white);
+      pix.fill(TQt::white);
 
       TQPainter p(&pix);
 
@@ -233,31 +233,31 @@ void kvoctrainView::setHeaderProp (int id, const TQString &name, const TQString
       font.setPixelSize(10);
       font.setWeight(TQFont::Bold);
       p.setFont(font);
-      p.setPen(Qt::red);
-      p.drawText(2, 1, pix.width(), pix.height()-2, Qt::AlignCenter, "err");
-      p.setPen(Qt::blue);
-      p.drawText(1, 0, pix.width(), pix.height()-2, Qt::AlignCenter, "err");
+      p.setPen(TQt::red);
+      p.drawText(2, 1, pix.width(), pix.height()-2, TQt::AlignCenter, "err");
+      p.setPen(TQt::blue);
+      p.drawText(1, 0, pix.width(), pix.height()-2, TQt::AlignCenter, "err");
     }
 
     int w = pix.width();
     int h = pix.height();
 
     TQPixmap arrow(w + 14, h);
-    TQBitmap mask(arrow.width(), arrow.height());
-    arrow.fill(Qt::white);
-    mask.fill(Qt::black);
+    TQBitmap tqmask(arrow.width(), arrow.height());
+    arrow.fill(TQt::white);
+    tqmask.fill(TQt::black);
 
     bitBlt(&arrow, 0, 0, &pix, 0, 0);
-    if (pix.mask() != 0)
-      bitBlt(&mask, 0, 0, pix.mask(), 0, 0);
+    if (pix.tqmask() != 0)
+      bitBlt(&tqmask, 0, 0, pix.tqmask(), 0, 0);
     else {
       TQBitmap bmp(pix.createHeuristicMask());
-      bitBlt(&mask, 0, 0, &bmp, 0, 0);
+      bitBlt(&tqmask, 0, 0, &bmp, 0, 0);
     }
 
     TQPainter p, pm;
     p.begin(&arrow);
-    pm.begin(&mask);
+    pm.begin(&tqmask);
 
     p.setPen(TQColor(0, 0, 0));
     p.drawLine(w + 5, h - 2, w + 5 + 1, h - 2);
@@ -275,7 +275,7 @@ void kvoctrainView::setHeaderProp (int id, const TQString &name, const TQString
 
     pm.end();
     p.end();
-    arrow.setMask(mask);
+    arrow.setMask(tqmask);
 
     TQIconSet set(arrow, TQIconSet::Small);
     header->setLabel(id, set, name);
@@ -369,7 +369,7 @@ void kvoctrainView::newPage(TQPainter & painter, int res, int startCol, int endC
   TQRect w = painter.window();
   painter.resetXForm();
   painter.setFont(KGlobalSettings::generalFont());
-  painter.drawText(marg, marg - 20, i18n("KVocTrain - %1").arg(m_doc->getTitle()));
+  painter.drawText(marg, marg - 20, i18n("KVocTrain - %1").tqarg(m_doc->getTitle()));
   painter.translate(marg, marg);
   painter.drawLine(-1 , 0, -1, hh - 1);
   for (int i = startCol; i <= endCol && i < m_table->numCols(); ++i)
diff --git a/kvoctrain/kvoctrain/kvoctrainview.h b/kvoctrain/kvoctrain/kvoctrainview.h
index f76e240e..d0e3f6b9 100644
--- a/kvoctrain/kvoctrain/kvoctrainview.h
+++ b/kvoctrain/kvoctrain/kvoctrainview.h
@@ -48,13 +48,14 @@ class LangSet;
   * This class provides an incomplete base for your application view.
   */
 
-class kvoctrainView : public QWidget
+class kvoctrainView : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
  public:
   /** Constructor for the main view */
-  kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp *parent = 0);
+  kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp *tqparent = 0);
 
   /** Destructor for the main view */
   ~kvoctrainView();
@@ -63,7 +64,7 @@ class kvoctrainView : public QWidget
   void setView(kvoctrainDoc *doc, const LangSet &ls);
 
   KVocTrainTable* getTable() { return m_table; }
-  void setHeaderProp(int id, const TQString &name, const TQString &pixfile=TQString::null);
+  void setHeaderProp(int id, const TQString &name, const TQString &pixfile=TQString());
 
   void adjustContent();
   void print(KPrinter *pPrinter);
@@ -77,7 +78,7 @@ protected:
   bool              autoResize;
   kvoctrainDoc    * m_doc;
   TQGridLayout     * list_layout;
-  kvoctrainApp    * parent;
+  kvoctrainApp    * tqparent;
 
   /** resizes table when frame is resized */
   virtual void resizeEvent(TQResizeEvent *);
diff --git a/kvoctrain/kvoctrain/kvt-core/LineList.cpp b/kvoctrain/kvoctrain/kvt-core/LineList.cpp
index 4c38d530..f439278c 100644
--- a/kvoctrain/kvoctrain/kvt-core/LineList.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/LineList.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 
-                 maintain list of lines from QMultiLineEdit
+                 maintain list of lines from TQMultiLineEdit
 
     -----------------------------------------------------------------------
 
@@ -39,11 +39,11 @@ void LineList::setLines(const TQString &the_lines )
   multilines.clear();
   TQString lines = the_lines;
   int pos;
-  if ((pos = lines.find ('\n')) >= 0) {
+  if ((pos = lines.tqfind ('\n')) >= 0) {
     while (pos >= 0) {
       multilines.push_back(lines.left(pos));
       lines.remove (0, pos+1);
-      pos = lines.find ('\n');
+      pos = lines.tqfind ('\n');
     }
   }
 
diff --git a/kvoctrain/kvoctrain/kvt-core/LineList.h b/kvoctrain/kvoctrain/kvt-core/LineList.h
index 15309c48..028c9e64 100644
--- a/kvoctrain/kvoctrain/kvt-core/LineList.h
+++ b/kvoctrain/kvoctrain/kvt-core/LineList.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 
-              maintain list of lines from QMultiLineEdit
+              maintain list of lines from TQMultiLineEdit
 
     -----------------------------------------------------------------------
 
diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
index 7eb65e1a..f08246a5 100644
--- a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
@@ -50,40 +50,40 @@ struct t_type_rel
 
 static t_type_rel InternalTypeRelations [] =
 {
-  { QM_ADJ,                           I18N_NOOP("Adjective") },
+  { TQM_ADJ,                           I18N_NOOP("Adjective") },
 
-  { QM_ADV,                           I18N_NOOP("Adverb") },
+  { TQM_ADV,                           I18N_NOOP("Adverb") },
 
-  { QM_ART,                           I18N_NOOP("Article") },
-  { QM_ART QM_TYPE_DIV QM_ART_DEF,    I18N_NOOP("Article Definite") },
-  { QM_ART QM_TYPE_DIV QM_ART_IND,    I18N_NOOP("Article Indefinite") },
+  { TQM_ART,                           I18N_NOOP("Article") },
+  { TQM_ART TQM_TYPE_DIV TQM_ART_DEF,    I18N_NOOP("Article Definite") },
+  { TQM_ART TQM_TYPE_DIV TQM_ART_IND,    I18N_NOOP("Article Indefinite") },
 
-  { QM_CON,                           I18N_NOOP("Conjunction") },
+  { TQM_CON,                           I18N_NOOP("Conjunction") },
 
-  { QM_NAME,                          I18N_NOOP("Name") },   // old type "3"
+  { TQM_NAME,                          I18N_NOOP("Name") },   // old type "3"
 
-  { QM_NOUN,                          I18N_NOOP("Noun") },   // old type "2"
-  { QM_NOUN QM_TYPE_DIV QM_NOUN_M,    I18N_NOOP("Noun Male") },
-  { QM_NOUN QM_TYPE_DIV QM_NOUN_F,    I18N_NOOP("Noun Female") },
-  { QM_NOUN QM_TYPE_DIV QM_NOUN_S,    I18N_NOOP("Noun Neutral") },
+  { TQM_NOUN,                          I18N_NOOP("Noun") },   // old type "2"
+  { TQM_NOUN TQM_TYPE_DIV TQM_NOUN_M,    I18N_NOOP("Noun Male") },
+  { TQM_NOUN TQM_TYPE_DIV TQM_NOUN_F,    I18N_NOOP("Noun Female") },
+  { TQM_NOUN TQM_TYPE_DIV TQM_NOUN_S,    I18N_NOOP("Noun Neutral") },
 
-  { QM_NUM,                           I18N_NOOP("Numeral") },
-  { QM_NUM QM_TYPE_DIV QM_NUM_ORD,    I18N_NOOP("Numeral Ordinal") },
-  { QM_NUM QM_TYPE_DIV QM_NUM_CARD,   I18N_NOOP("Numeral Cardinal") },
+  { TQM_NUM,                           I18N_NOOP("Numeral") },
+  { TQM_NUM TQM_TYPE_DIV TQM_NUM_ORD,    I18N_NOOP("Numeral Ordinal") },
+  { TQM_NUM TQM_TYPE_DIV TQM_NUM_CARD,   I18N_NOOP("Numeral Cardinal") },
 
-  { QM_PHRASE,                        I18N_NOOP("Phrase") },
+  { TQM_PHRASE,                        I18N_NOOP("Phrase") },
 
-  { QM_PREP,                          I18N_NOOP("Preposition") },
+  { TQM_PREP,                          I18N_NOOP("Preposition") },
 
-  { QM_PRON,                          I18N_NOOP("Pronoun") },
-  { QM_PRON QM_TYPE_DIV QM_PRON_POS,  I18N_NOOP("Pronoun Possessive") },
-  { QM_PRON QM_TYPE_DIV QM_PRON_PER,  I18N_NOOP("Pronoun Personal") },
+  { TQM_PRON,                          I18N_NOOP("Pronoun") },
+  { TQM_PRON TQM_TYPE_DIV TQM_PRON_POS,  I18N_NOOP("Pronoun Possessive") },
+  { TQM_PRON TQM_TYPE_DIV TQM_PRON_PER,  I18N_NOOP("Pronoun Personal") },
 
-  { QM_QUEST,                         I18N_NOOP("Question") },
+  { TQM_QUEST,                         I18N_NOOP("Question") },
 
-  { QM_VERB,                          I18N_NOOP("Verb") },   // old type "1"
-  { QM_VERB  QM_TYPE_DIV QM_VERB_IRR, I18N_NOOP("Verb Irregular") },
-  { QM_VERB  QM_TYPE_DIV QM_VERB_REG, I18N_NOOP("Verb Regular") },
+  { TQM_VERB,                          I18N_NOOP("Verb") },   // old type "1"
+  { TQM_VERB  TQM_TYPE_DIV TQM_VERB_IRR, I18N_NOOP("Verb Irregular") },
+  { TQM_VERB  TQM_TYPE_DIV TQM_VERB_REG, I18N_NOOP("Verb Regular") },
 
   { 0, 0 }  // the end
 };
@@ -93,19 +93,19 @@ TQString QueryManager::getSubType (const TQString & type)
 {
   int i;
   TQString t = type;
-  if ((i = t.find(QM_TYPE_DIV)) >= 0) {
+  if ((i = t.tqfind(TQM_TYPE_DIV)) >= 0) {
     t.remove(0, i+1);
     return t;
   }
   else
-    return TQString::null;
+    return TQString();
 }
 
 
 TQString QueryManager::getMainType (const TQString & type)
 {
   int i;
-  if ((i = type.find(QM_TYPE_DIV)) >= 0)
+  if ((i = type.tqfind(TQM_TYPE_DIV)) >= 0)
     return type.left(i);
   else
     return type;
@@ -238,7 +238,7 @@ QuerySelection QueryManager::select(kvoctrainDoc *doc, int act_lesson, int idx,
 bool QueryManager::validate(kvoctrainExpr *expr, int act_lesson, int idx, TQString query_type)
 {
    TQString qtype;
-   int pos = query_type.find (QM_TYPE_DIV);
+   int pos = query_type.tqfind (TQM_TYPE_DIV);
    if (pos >= 0)
      qtype = query_type.left (pos);
    else
@@ -246,22 +246,22 @@ bool QueryManager::validate(kvoctrainExpr *expr, int act_lesson, int idx, TQStri
 
    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
-               || expr_type == QM_NOUN  QM_TYPE_DIV  QM_NOUN_M
-               || expr_type == QM_NOUN  QM_TYPE_DIV  QM_NOUN_F;
+   if (qtype == TQM_NOUN) {
+     type_ok =    expr_type == TQM_NOUN  TQM_TYPE_DIV  TQM_NOUN_S
+               || expr_type == TQM_NOUN  TQM_TYPE_DIV  TQM_NOUN_M
+               || expr_type == TQM_NOUN  TQM_TYPE_DIV  TQM_NOUN_F;
 
    }
-   else if (qtype == QM_VERB) {
-     type_ok = (   expr_type == QM_VERB
-                || expr_type == QM_VERB  QM_TYPE_DIV  QM_VERB_IRR
-                || expr_type == QM_VERB  QM_TYPE_DIV  QM_VERB_REG
+   else if (qtype == TQM_VERB) {
+     type_ok = (   expr_type == TQM_VERB
+                || expr_type == TQM_VERB  TQM_TYPE_DIV  TQM_VERB_IRR
+                || expr_type == TQM_VERB  TQM_TYPE_DIV  TQM_VERB_REG
                )
                && expr->getConjugation(idx).numEntries() > 0;
 
    }
-   else if (qtype == QM_ADJ) {
-     type_ok =    expr_type == QM_ADJ
+   else if (qtype == TQM_ADJ) {
+     type_ok =    expr_type == TQM_ADJ
                && !expr->getComparison(idx).isEmpty();
    }
    else
@@ -315,16 +315,16 @@ QuerySelection QueryManager::select(kvoctrainDoc *doc, int act_lesson, int idx,
 bool QueryManager::validate(kvoctrainExpr *expr, int act_lesson, int idx, QueryType query_type)
 {
    bool type_ok = false;
-   if (query_type == QT_Synonym) {
+   if (query_type == TQT_Synonym) {
      type_ok = !expr->getSynonym(idx).stripWhiteSpace().isEmpty();
    }
-   else if (query_type == QT_Antonym) {
+   else if (query_type == TQT_Antonym) {
      type_ok = !expr->getAntonym(idx).stripWhiteSpace().isEmpty();
    }
-   else if (query_type == QT_Paraphrase) {
+   else if (query_type == TQT_Paraphrase) {
      type_ok = !expr->getParaphrase(idx).stripWhiteSpace().isEmpty();
    }
-   else if (query_type == QT_Example) {
+   else if (query_type == TQT_Example) {
      type_ok = !expr->getExample(idx).stripWhiteSpace().isEmpty();
    }
 
@@ -393,14 +393,14 @@ vector<TypeRelation> QueryManager::getRelation (bool only_maintypes)
   for (int i = 0; i < (int) userTypes.size(); i++) {
     TQString s;
     s.setNum(i+1);
-    s.insert(0, QM_USER_TYPE);
+    s.insert(0, TQM_USER_TYPE);
     vec.push_back(TypeRelation(s, userTypes[i]));
   }
 
 
   t_type_rel *type = InternalTypeRelations;
   while (type->short_ref != 0) {
-    if (!only_maintypes || strstr (type->short_ref, QM_TYPE_DIV) == 0)
+    if (!only_maintypes || strstr (type->short_ref, TQM_TYPE_DIV) == 0)
       vec.push_back(TypeRelation(type->short_ref, i18n(type->long_ref)));
     type++;
   }
@@ -411,14 +411,14 @@ vector<TypeRelation> QueryManager::getRelation (bool only_maintypes)
 
 TQString QueryManager::typeStr (const TQString id)
 {
-  if (id.left(1) == QM_USER_TYPE) {
+  if (id.left(1) == TQM_USER_TYPE) {
     TQString num = id;
     num.remove (0, 1);
     int i = num.toInt()-1;
     if (i >= 0 && i < (int) userTypes.size() )
       return userTypes[i];
     else
-      return TQString::null;
+      return TQString();
   }
   else {
     t_type_rel *type = InternalTypeRelations;
@@ -428,7 +428,7 @@ TQString QueryManager::typeStr (const TQString id)
       type++;
     }
   }
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -648,7 +648,7 @@ void QueryManager::setLessonItemStr (const TQString & indices)
   int pos;
   TQString indices_copy = indices;
   lessonitems.clear();
-  while ((pos = indices_copy.find(' ')) >= 0) {
+  while ((pos = indices_copy.tqfind(' ')) >= 0) {
      TQString s = indices_copy.left(pos);
      indices_copy.remove(0, pos+1);
      lessonitems.push_back(s.toInt());
diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.h b/kvoctrain/kvoctrain/kvt-core/QueryManager.h
index bdd7d815..3277bd1b 100644
--- a/kvoctrain/kvoctrain/kvt-core/QueryManager.h
+++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.h
@@ -39,42 +39,42 @@ class Prefs;
 
 // internal types, indented are subtypes
 
-#define QM_VERB           "v"    // go
-#define   QM_VERB_IRR     "ir"
-#define   QM_VERB_REG     "re"
-#define QM_NOUN           "n"    // table, coffee
-#define   QM_NOUN_F       "f"
-#define   QM_NOUN_M       "m"
-#define   QM_NOUN_S       "s"
-#define QM_NAME           "nm"
-#define QM_ART            "ar"   // article
-#define   QM_ART_DEF      "def"  // definite    a/an
-#define   QM_ART_IND      "ind"  // indefinite  the
-#define QM_ADJ            "aj"   // adjective   expensive, good
-#define QM_ADV            "av"   // adverb      today, strongly
-#define QM_PRON           "pr"   // pronoun     you, she
-#define   QM_PRON_POS     "pos"  // possessive  my, your
-#define   QM_PRON_PER     "per"  // personal
-#define QM_PHRASE         "ph"
-#define QM_NUM            "num"  // numeral
-#define   QM_NUM_ORD      "ord"  // ordinal     first, second
-#define   QM_NUM_CARD     "crd"  // cardinal    one, two
-#define QM_INFORMAL       "ifm"
-#define QM_FIG            "fig"
-#define QM_CON            "con"  // conjuncton  and, but
-#define QM_PREP           "pre"  // preposition behind, between
-#define QM_QUEST          "qu"   // question    who, what
+#define TQM_VERB           "v"    // go
+#define   TQM_VERB_IRR     "ir"
+#define   TQM_VERB_REG     "re"
+#define TQM_NOUN           "n"    // table, coffee
+#define   TQM_NOUN_F       "f"
+#define   TQM_NOUN_M       "m"
+#define   TQM_NOUN_S       "s"
+#define TQM_NAME           "nm"
+#define TQM_ART            "ar"   // article
+#define   TQM_ART_DEF      "def"  // definite    a/an
+#define   TQM_ART_IND      "ind"  // indefinite  the
+#define TQM_ADJ            "aj"   // adjective   expensive, good
+#define TQM_ADV            "av"   // adverb      today, strongly
+#define TQM_PRON           "pr"   // pronoun     you, she
+#define   TQM_PRON_POS     "pos"  // possessive  my, your
+#define   TQM_PRON_PER     "per"  // personal
+#define TQM_PHRASE         "ph"
+#define TQM_NUM            "num"  // numeral
+#define   TQM_NUM_ORD      "ord"  // ordinal     first, second
+#define   TQM_NUM_CARD     "crd"  // cardinal    one, two
+#define TQM_INFORMAL       "ifm"
+#define TQM_FIG            "fig"
+#define TQM_CON            "con"  // conjuncton  and, but
+#define TQM_PREP           "pre"  // preposition behind, between
+#define TQM_QUEST          "qu"   // question    who, what
 
 // type delimiters
 
-#define QM_USER_TYPE  "#"   // designates number of user type
-#define QM_TYPE_DIV   ":"   // divide main from subtype
+#define TQM_USER_TYPE  "#"   // designates number of user type
+#define TQM_TYPE_DIV   ":"   // divide main from subtype
 
 //enum kvq_timeout_t { kvq_notimeout, kvq_show, kvq_cont };
 
-enum QueryType  { QT_Random, QT_Multiple,
-                  QT_Articles, QT_Conjugation, QT_Comparison,
-                  QT_Synonym, QT_Antonym, QT_Example, QT_Paraphrase };
+enum QueryType  { TQT_Random, TQT_Multiple,
+                  TQT_Articles, TQT_Conjugation, TQT_Comparison,
+                  TQT_Synonym, TQT_Antonym, TQT_Example, TQT_Paraphrase };
 
 
 class TypeRelation
diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
index 9180d6e4..ece91275 100644
--- a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
@@ -135,11 +135,11 @@ vector<UsageRelation> UsageManager::getRelation ()
 }
 
 
-bool UsageManager::contains (const TQString& label, const TQString& collection)
+bool UsageManager::tqcontains (const TQString& label, const TQString& collection)
 {
    TQString s = collection;
    int pos;
-   while ((pos = s.find(UL_USAGE_DIV)) >= 0) {
+   while ((pos = s.tqfind(UL_USAGE_DIV)) >= 0) {
      if (s.left(pos) == label)
        return true;
      s.remove (0, pos+1);
diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.h b/kvoctrain/kvoctrain/kvt-core/UsageManager.h
index 647de685..dcbb2ae5 100644
--- a/kvoctrain/kvoctrain/kvt-core/UsageManager.h
+++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.h
@@ -114,7 +114,7 @@ class UsageManager
 
   UsageManager ();
 
-  static bool contains (const TQString& label, const TQString& collection);
+  static bool tqcontains (const TQString& label, const TQString& collection);
   static vector<UsageRelation> getRelation ();
   static void setUsageNames (vector<TQString> names);
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
index e4906935..f177fa14 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
@@ -106,7 +106,7 @@ bool kvoctrainDoc::saveToCsv (TQTextStream& os, TQString &)
   }
 
   setModified (false);
-  return os.device()->status() == IO_Ok;
+  return os.tqdevice()->status() == IO_Ok;
 }
 
 
@@ -125,7 +125,7 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is)
   is.setCodec(TQTextCodec::codecForName("ISO 8859-1"));
   is.setEncoding(TQTextStream::Latin1);
 
-  int size = is.device()->size ();
+  int size = is.tqdevice()->size ();
   int ln = size / 20 / 100;  // assume each line about 20 chars
   float f_ent_percent = size / 100.0;
   emit progressChanged (this, 0);
@@ -138,42 +138,42 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is)
     // autodetect utf8
     if (!utf8_mode) {
       for (int i = 0; !utf8_mode && i < (int) s.length(); ++i) {
-        ushort trigger = s[i].unicode();
+        ushort trigger = s[i].tqunicode();
         if (trigger >= 0x80) {
           int remain = s.length() - i;
           if ((trigger & 0xE0) == 0xC0){         // 110x xxxx
             if (   (remain > 1)
-                && (s[i+1].unicode() & 0xC0) == 0x80)
+                && (s[i+1].tqunicode() & 0xC0) == 0x80)
               utf8_mode = true;
           }
           else if ((trigger & 0xF0) == 0xE0) {  // 1110 xxxx
             if (   remain > 2
-                && s[i+1].unicode() & 0xC0 == 0x80
-                && s[i+2].unicode() & 0xC0 == 0x80)
+                && s[i+1].tqunicode() & 0xC0 == 0x80
+                && s[i+2].tqunicode() & 0xC0 == 0x80)
               utf8_mode = true;
           }
           else if ((trigger & 0xF8) == 0xF0) {   // 1111 0xxx
             if (   remain > 3
-                && s[i+1].unicode() & 0xC0 == 0x80
-                && s[i+2].unicode() & 0xC0 == 0x80
-                && s[i+3].unicode() & 0xC0 == 0x80)
+                && s[i+1].tqunicode() & 0xC0 == 0x80
+                && s[i+2].tqunicode() & 0xC0 == 0x80
+                && s[i+3].tqunicode() & 0xC0 == 0x80)
               utf8_mode = true;
           }
           else if ((trigger & 0xFC) == 0xF8) {   // 1111 10xx
             if (   remain > 4
-                && s[i+1].unicode() & 0xC0 == 0x80
-                && s[i+2].unicode() & 0xC0 == 0x80
-                && s[i+3].unicode() & 0xC0 == 0x80
-                && s[i+4].unicode() & 0xC0 == 0x80)
+                && s[i+1].tqunicode() & 0xC0 == 0x80
+                && s[i+2].tqunicode() & 0xC0 == 0x80
+                && s[i+3].tqunicode() & 0xC0 == 0x80
+                && s[i+4].tqunicode() & 0xC0 == 0x80)
               utf8_mode = true;
           }
           else if ((trigger & 0xFE) == 0xFC) {   // 1111 110x
             if (   remain > 5
-                && s[i+1].unicode() & 0xC0 == 0x80
-                && s[i+2].unicode() & 0xC0 == 0x80
-                && s[i+3].unicode() & 0xC0 == 0x80
-                && s[i+4].unicode() & 0xC0 == 0x80
-                && s[i+5].unicode() & 0xC0 == 0x80)
+                && s[i+1].tqunicode() & 0xC0 == 0x80
+                && s[i+2].tqunicode() & 0xC0 == 0x80
+                && s[i+3].tqunicode() & 0xC0 == 0x80
+                && s[i+4].tqunicode() & 0xC0 == 0x80
+                && s[i+5].tqunicode() & 0xC0 == 0x80)
               utf8_mode = true;
           }
         }
@@ -190,7 +190,7 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is)
     ln--;
     if (ln <= 0) {
       ln = size / 20 / 100;  // assume each line about 20 chars
-      emit progressChanged(this, is.device()->at() / (int) f_ent_percent);
+      emit progressChanged(this, is.tqdevice()->at() / (int) f_ent_percent);
     }
 
     // similar in kva_clip.cpp::slotEditPaste()
@@ -200,7 +200,7 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is)
       kvoctrainExpr expr;
       // now move columns according to paste-order
       for (int i = 0; i < bucket.numTranslations()+1; i++) {
-        lang_num = QMAX (lang_num, bucket.numTranslations()+1);
+        lang_num = TQMAX (lang_num, bucket.numTranslations()+1);
         if (i == 0)
           expr.setOriginal(bucket.getOriginal());
         else {
@@ -228,7 +228,7 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is)
     }
   }
   setModified (false);
-  return is.device()->status() == IO_Ok;
+  return is.tqdevice()->status() == IO_Ok;
 }
 
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
index 7212f456..ae713937 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
@@ -93,7 +93,7 @@ Sachgebiete|
 static TQString extract (TQString &line)
 {
    TQString ret;
-   int lim = line.find ("|");
+   int lim = line.tqfind ("|");
    if (lim < 0) {
      ret = line;
      line = "";
@@ -116,7 +116,7 @@ bool kvoctrainDoc::saveTypeNameLex (TQTextStream &os)
   while (i++ < LEX_MAX_ATTR)
     os << "|\n";
 
-  return os.device()->status() == IO_Ok;
+  return os.tqdevice()->status() == IO_Ok;
 }
 
 
@@ -139,7 +139,7 @@ bool kvoctrainDoc::loadTypeNameLex (TQTextStream &is)
     type_descr.push_back (attr);
   }
 
-  return is.device()->status() == IO_Ok;
+  return is.tqdevice()->status() == IO_Ok;
 }
 
 
@@ -152,7 +152,7 @@ bool kvoctrainDoc::saveLessonLex (TQTextStream &os)
   while (i++ < LEX_MAX_LESSON)
     os << "|\n";
 
-  return os.device()->status() == IO_Ok;
+  return os.tqdevice()->status() == IO_Ok;
 }
 
 
@@ -172,7 +172,7 @@ bool kvoctrainDoc::loadLessonLex (TQTextStream &is)
     lesson_descr.push_back (lesson);
   }
 
-  return is.device()->status() == IO_Ok;
+  return is.tqdevice()->status() == IO_Ok;
 }
 
 
@@ -220,8 +220,8 @@ bool kvoctrainDoc::saveToLex (TQTextStream& os, TQString & /*title*/)
 
     os << "0" // type
        <<  " " << "255 255 255 255 255 255 255"
-       <<  " " << QMIN (2, (*first).getGrade(false))
-       <<  " " << QMIN (2, (*first).getGrade(true))
+       <<  " " << TQMIN (2, (*first).getGrade(false))
+       <<  " " << TQMIN (2, (*first).getGrade(true))
        <<  " " << (*first).getLesson()
        <<  " " << (*first).getOriginal()
        <<  " " << "||||"  // synonyms
@@ -234,7 +234,7 @@ bool kvoctrainDoc::saveToLex (TQTextStream& os, TQString & /*title*/)
   }
 
   setModified (false);
-  return os.device()->status() == IO_Ok;
+  return os.tqdevice()->status() == IO_Ok;
 }
 
 
@@ -380,7 +380,7 @@ bool kvoctrainDoc::loadFromLex (TQTextStream& is)
   }
 
   setModified (false);
-  return is.device()->status() == IO_Ok;
+  return is.tqdevice()->status() == IO_Ok;
 }
 
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
index f07e906d..e268ce0f 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
@@ -83,7 +83,7 @@ bool kvoctrainDoc::loadTypeNameKvtMl (XmlElement elem, XmlReader& xml)
     if (elem.tag () == KV_TYPE_GRP) {
       if (! elem.isEndTag ()) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("expected ending tag <%1>").arg(KV_TYPE_GRP));
+                    i18n("expected ending tag <%1>").tqarg(KV_TYPE_GRP));
         return false;
       }
       else
@@ -109,14 +109,14 @@ bool kvoctrainDoc::loadTypeNameKvtMl (XmlElement elem, XmlReader& xml)
         }
         else if (elem.tag() != KV_TYPE_DESC || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").arg(KV_TYPE_DESC));
+                      i18n("expected ending tag <%1>").tqarg(KV_TYPE_DESC));
           return false;
         }
       }
       else {
         if (elem.tag() != KV_TYPE_DESC || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").arg(KV_TYPE_DESC));
+                      i18n("expected ending tag <%1>").tqarg(KV_TYPE_DESC));
           return false;
         }
 
@@ -127,7 +127,7 @@ bool kvoctrainDoc::loadTypeNameKvtMl (XmlElement elem, XmlReader& xml)
     else {
       if (elem.isEndTag() ) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
         return false;
       }
       else {
@@ -157,7 +157,7 @@ bool kvoctrainDoc::loadTenseNameKvtMl (XmlElement elem, XmlReader& xml)
     if (elem.tag () == KV_TENSE_GRP) {
       if (! elem.isEndTag ()) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("expected ending tag <%1>").arg(KV_TENSE_GRP));
+                    i18n("expected ending tag <%1>").tqarg(KV_TENSE_GRP));
         return false;
       }
       else
@@ -183,14 +183,14 @@ bool kvoctrainDoc::loadTenseNameKvtMl (XmlElement elem, XmlReader& xml)
         }
         else if (elem.tag() != KV_TENSE_DESC || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").arg(KV_TENSE_DESC));
+                      i18n("expected ending tag <%1>").tqarg(KV_TENSE_DESC));
           return false;
         }
       }
       else {
         if (elem.tag() != KV_TENSE_DESC || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").arg(KV_TENSE_DESC));
+                      i18n("expected ending tag <%1>").tqarg(KV_TENSE_DESC));
           return false;
         }
 
@@ -201,7 +201,7 @@ bool kvoctrainDoc::loadTenseNameKvtMl (XmlElement elem, XmlReader& xml)
     else {
       if (elem.isEndTag() ) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
         return false;
       }
       else {
@@ -231,7 +231,7 @@ bool kvoctrainDoc::loadUsageNameKvtMl (XmlElement elem, XmlReader& xml)
     if (elem.tag () == KV_USAGE_GRP) {
       if (! elem.isEndTag ()) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("expected ending tag <%1>").arg(KV_USAGE_GRP));
+                    i18n("expected ending tag <%1>").tqarg(KV_USAGE_GRP));
         return false;
       }
       else
@@ -257,14 +257,14 @@ bool kvoctrainDoc::loadUsageNameKvtMl (XmlElement elem, XmlReader& xml)
         }
         else if (elem.tag() != KV_USAGE_DESC || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").arg(KV_USAGE_DESC));
+                      i18n("expected ending tag <%1>").tqarg(KV_USAGE_DESC));
           return false;
         }
       }
       else {
         if (elem.tag() != KV_USAGE_DESC || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").arg(KV_USAGE_DESC));
+                      i18n("expected ending tag <%1>").tqarg(KV_USAGE_DESC));
           return false;
         }
 
@@ -275,7 +275,7 @@ bool kvoctrainDoc::loadUsageNameKvtMl (XmlElement elem, XmlReader& xml)
     else {
       if (elem.isEndTag() ) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
         return false;
       }
       else {
@@ -347,7 +347,7 @@ bool kvoctrainDoc::extract_O_T_attr (
     else if ((*first).name () == KV_GRADE) {
       TQString s = (*first).stringValue();
 
-      if ((pos = s.find(';')) >= 1) {
+      if ((pos = s.tqfind(';')) >= 1) {
         grade = s.left(pos).toInt();
         rev_grade = s.mid(pos+1, s.length()).toInt();
       }
@@ -357,7 +357,7 @@ bool kvoctrainDoc::extract_O_T_attr (
 
     else if ((*first).name () == KV_COUNT) {
       TQString s = (*first).stringValue();
-      if ((pos = s.find(';')) >= 1) {
+      if ((pos = s.tqfind(';')) >= 1) {
         count = s.left(pos).toInt();
         rev_count = s.mid(pos+1, s.length()).toInt();
       }
@@ -367,7 +367,7 @@ bool kvoctrainDoc::extract_O_T_attr (
 
     else if ((*first).name () == KV_BAD) {
       TQString s = (*first).stringValue();
-      if ((pos = s.find(';')) >= 1) {
+      if ((pos = s.tqfind(';')) >= 1) {
         bcount = s.left(pos).toInt();
         rev_bcount = s.mid(pos+1, s.length()).toInt();
       } else
@@ -376,7 +376,7 @@ bool kvoctrainDoc::extract_O_T_attr (
 
     else if ((*first).name () == KV_DATE) {
       TQString s = (*first).stringValue();
-      if ((pos = s.find(';')) >= 1) {
+      if ((pos = s.tqfind(';')) >= 1) {
       date = s.left(pos).toInt();
       rev_date = s.mid(pos+1, s.length()).toInt();
       }
@@ -387,7 +387,7 @@ bool kvoctrainDoc::extract_O_T_attr (
 
     else if ((*first).name () == KV_DATE2) {
       TQString s = (*first).stringValue();
-      if ((pos = s.find(';')) >= 1) {
+      if ((pos = s.tqfind(';')) >= 1) {
         date = decompressDate (s.left(pos));
         rev_date = decompressDate (s.mid(pos+1, s.length()));
       }
@@ -420,7 +420,7 @@ bool kvoctrainDoc::extract_O_T_attr (
       usage = (*first).stringValue();
 
       if (usage.length() != 0 && usage.left(1) == UL_USER_USAGE) {
-        int num = QMIN(usage.mid (1, 40).toInt(), 1000); // paranioa check
+        int num = TQMIN(usage.mid (1, 40).toInt(), 1000); // paranioa check
         if( num > (int) usage_descr.size() ) { // description missing ?
           TQString s;
           for (int i = usage_descr.size(); i < num; i++) {
@@ -443,14 +443,14 @@ bool kvoctrainDoc::extract_O_T_attr (
     else if ((*first).name () == KV_EXPRTYPE) {
       type = (*first).stringValue();
       if (type == "1")
-        type = QM_VERB;
+        type = TQM_VERB;
       else if (type == "2")  // convert from pre-0.5 versions
-        type = QM_NOUN;
+        type = TQM_NOUN;
       else if (type == "3")
-        type = QM_NAME;
+        type = TQM_NAME;
 
-      if (type.length() != 0 && type.left(1) == QM_USER_TYPE) {
-        int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
+      if (type.length() != 0 && type.left(1) == TQM_USER_TYPE) {
+        int num = TQMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
         if( num > (int) type_descr.size() ) { // description missing ?
           TQString s;
           for (int i = type_descr.size(); i < num; i++) {
@@ -466,7 +466,7 @@ bool kvoctrainDoc::extract_O_T_attr (
       pronunce = (*first).stringValue();
     }
 
-    else if ((*first).name () == KV_QUERY) {
+    else if ((*first).name () == KV_TQUERY) {
       query_id = (*first).stringValue();
     }
 
@@ -504,14 +504,14 @@ bool kvoctrainDoc::extract_KVT_E_attr (
     else if ((*first).name () == KV_EXPRTYPE) {
       type = (*first).stringValue();
       if (type == "1")
-        type = QM_VERB;
+        type = TQM_VERB;
       else if (type == "2")  // convert from pre-0.5 versions
-        type = QM_NOUN;
+        type = TQM_NOUN;
       else if (type == "3")
-        type = QM_NAME;
+        type = TQM_NAME;
 
-      if (type.length() != 0 && type.left(1) == QM_USER_TYPE) {
-        int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
+      if (type.length() != 0 && type.left(1) == TQM_USER_TYPE) {
+        int num = TQMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
         if( num > (int) type_descr.size() ) { // description missing ?
           TQString s;
           for (int i = type_descr.size(); i < num; i++) {
@@ -553,7 +553,7 @@ bool kvoctrainDoc::loadComparison (Comparison &comp, XmlElement elem,
     if (elem.tag () == KV_COMPARISON_GRP) {
       if (! elem.isEndTag ()) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("expected ending tag <%1>").arg(elem.tag()));
+                    i18n("expected ending tag <%1>").tqarg(elem.tag()));
         return false;
       }
       else
@@ -582,7 +582,7 @@ bool kvoctrainDoc::loadComparison (Comparison &comp, XmlElement elem,
     else {
       if (elem.isEndTag() ) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("unexpected ending tag <%1>").arg(elem.tag()));
+                    i18n("unexpected ending tag <%1>").tqarg(elem.tag()));
         return false;
       }
       else {
@@ -620,7 +620,7 @@ bool kvoctrainDoc::loadMultipleChoice (MultipleChoice &mc, XmlElement elem,
     if (elem.tag () == KV_MULTIPLECHOICE_GRP) {
       if (! elem.isEndTag ()) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("expected ending tag <%1>").arg(elem.tag()));
+                    i18n("expected ending tag <%1>").tqarg(elem.tag()));
         return false;
       }
       else
@@ -661,7 +661,7 @@ bool kvoctrainDoc::loadMultipleChoice (MultipleChoice &mc, XmlElement elem,
     else {
       if (elem.isEndTag() ) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("unexpected ending tag <%1>").arg(elem.tag()));
+                    i18n("unexpected ending tag <%1>").tqarg(elem.tag()));
         return false;
       }
       else {
@@ -702,7 +702,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
     if (elem.tag () == KV_DOCTYPE) {
       if (! elem.isEndTag ()) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("expected ending tag <%1>").arg(elem.tag()));
+                    i18n("expected ending tag <%1>").tqarg(elem.tag()));
         return false;
       }
       else
@@ -712,7 +712,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
     else if (elem.tag () == KV_LESS_GRP && !elem.isEndTag() ) {
       if (lessgroup) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
+                    i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
         return false;
       }
       lessgroup = true;
@@ -723,7 +723,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
     else if (elem.tag () == KV_ARTICLE_GRP && !elem.isEndTag() ) {
       if (articlegroup) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
+                    i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
         return false;
       }
       articlegroup = true;
@@ -734,7 +734,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
     else if (elem.tag () == KV_CONJUG_GRP && !elem.isEndTag() ) {
       if (conjuggroup) {
          errorKvtMl (xml.lineNumber(),
-                     i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
+                     i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
          return false;
       }
       conjuggroup = true;
@@ -745,7 +745,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
     else if (elem.tag () == KV_OPTION_GRP && !elem.isEndTag() ) {
       if (optgroup)  {
         errorKvtMl (xml.lineNumber(),
-                    i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
+                    i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
         return false;
       }
       optgroup = true;
@@ -756,7 +756,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
     else if (elem.tag () == KV_TYPE_GRP && !elem.isEndTag() ) {
       if (attrgroup) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
+                    i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
         return false;
       }
       attrgroup = true;
@@ -767,7 +767,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
     else if (elem.tag () == KV_TENSE_GRP && !elem.isEndTag() ) {
       if (tensegroup) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
+                    i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
         return false;
       }
       tensegroup = true;
@@ -779,7 +779,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
     else if (elem.tag () == KV_USAGE_GRP && !elem.isEndTag() ) {
       if (usagegroup) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
+                    i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
         return false;
       }
       usagegroup = true;
@@ -801,7 +801,7 @@ bool kvoctrainDoc::parseBody_kvtml (XmlElement elem, XmlReader& xml)
     else {
       if (elem.isEndTag() ) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
         return false;
       }
       else {
@@ -824,7 +824,7 @@ bool kvoctrainDoc::unknownAttribute (int line, const TQString &name,
 
    unknown_attr = true;
 
-   TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
+   TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line);
 
    TQString format = i18n(
       "Your document contains an unknown attribute <%1> "   // keep trailing space
@@ -834,7 +834,7 @@ bool kvoctrainDoc::unknownAttribute (int line, const TQString &name,
       "If you proceed and save afterwards you are likely to lose data;\n"
       "do you want to proceed anyway?\n"
      );
-   TQString msg = format.arg(attr).arg(name);
+   TQString msg = format.tqarg(attr).tqarg(name);
 
    TQApplication::setOverrideCursor( arrowCursor, true );
    TQString s = kapp->makeStdCaption(i18n("Unknown attribute"));
@@ -848,7 +848,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem )
 {
    unknown_elem = true;
 
-   TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line);
+   TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line);
 
    TQString format = i18n(
       "Your document contains an unknown tag <%1>.  "  // keep trailing space
@@ -857,7 +857,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem )
       "Loading is aborted because KVocTrain cannot "
       "read documents with unknown elements.\n"
      );
-   TQString msg = format.arg(elem);
+   TQString msg = format.tqarg(elem);
    TQApplication::setOverrideCursor( arrowCursor, true );
    TQString s = kapp->makeStdCaption(i18n("Unknown element"));
    KMessageBox::sorry(0, ln+msg, s);
@@ -869,7 +869,7 @@ void kvoctrainDoc::errorKvtMl (int line, const TQString &text )
 {
    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);
+   TQString ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line);
 
    TQString msg = text;
    KMessageBox::error(0, ln+msg, s);
@@ -881,7 +881,7 @@ void kvoctrainDoc::warningKvtMl (int line, const TQString &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 ln = i18n("File:\t%1\nLine:\t%2\n").tqarg(URL().path()).tqarg(line);
    TQString msg = text;
    KMessageBox::information(0, ln+msg, s);
    TQApplication::restoreOverrideCursor();
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp
index f4443ca5..de7cbd19 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp
@@ -85,7 +85,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
 
   if (elem.tag() == KV_EXPR && !elem.isEndTag() ) {
     errorKvtMl (xml.lineNumber(),
-                i18n("disallowed occurrence of tag <%1>").arg(elem.tag()));
+                i18n("disallowed occurrence of tag <%1>").tqarg(elem.tag()));
     return false;
   }
 
@@ -100,7 +100,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
     if (elem.tag() == KV_ORG && !elem.isEndTag() ) {
       if (org_found) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("repeated occurrence of tag <%1>").arg(elem.tag()));
+                    i18n("repeated occurrence of tag <%1>").tqarg(elem.tag()));
         return false;
       }
       org_found = true;
@@ -204,14 +204,14 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
 
         if (elem.tag() != KV_ORG || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").arg(KV_ORG));
+                      i18n("expected ending tag <%1>").tqarg(KV_ORG));
           return false;
         }
       }
       else {
         if (elem.tag() != KV_ORG || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").arg(KV_ORG));
+                      i18n("expected ending tag <%1>").tqarg(KV_ORG));
           return false;
         }
         textstr = "";
@@ -259,7 +259,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
     else if (elem.tag() == KV_TRANS && !elem.isEndTag() ) {
       if (!org_found) {   // must be preceded by "original"
         errorKvtMl (xml.lineNumber(),
-                    i18n("starting tag <%1> is missing").arg(KV_ORG));
+                    i18n("starting tag <%1> is missing").tqarg(KV_ORG));
         return false;
       }
 
@@ -366,7 +366,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
 
         if (elem.tag() != KV_TRANS || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").arg(KV_TRANS));
+                      i18n("expected ending tag <%1>").tqarg(KV_TRANS));
           return false;
         }
         // expr ...
@@ -374,7 +374,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
       else {
         if (elem.tag() != KV_TRANS || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").arg(KV_TRANS));
+                      i18n("expected ending tag <%1>").tqarg(KV_TRANS));
           return false;
         }
         textstr = "";
@@ -384,7 +384,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
 
       if (!org_found) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("starting tag <%1> is missing").arg(KV_ORG));
+                    i18n("starting tag <%1> is missing").tqarg(KV_ORG));
         return false;
       }
 /*
@@ -440,7 +440,7 @@ bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
     else {
       if (elem.isEndTag() ) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
         return false;
       }
       else {
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
index f952b38a..92896105 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
@@ -61,7 +61,7 @@ bool kvoctrainDoc::loadFromKvtMl (TQTextStream& is)
   if (elem.tag () != KV_DOCTYPE) {
     errorKvtMl (xml.lineNumber(),
                 i18n("Tag <%1> was expected "
-                     "but tag <%2> was read." ).arg(KV_DOCTYPE).arg(elem.tag()));
+                     "but tag <%2> was read." ).tqarg(KV_DOCTYPE).tqarg(elem.tag()));
     return false;
   }
 
@@ -84,7 +84,7 @@ bool kvoctrainDoc::loadFromKvtMl (TQTextStream& is)
         is.setEncoding(TQTextStream::Latin1);
         TQString format = i18n("Unknown document encoding \"%1\" was encountered.\n\n"
 				"It will be ignored. Encoding is now \"%2\".");
-        TQString msg =format.arg((*first).stringValue ().upper()).arg("ISO 8859-1");
+        TQString msg =format.tqarg((*first).stringValue ().upper()).tqarg("ISO 8859-1");
         warningKvtMl (xml.lineNumber(), msg);
       }
   
@@ -103,7 +103,7 @@ bool kvoctrainDoc::loadFromKvtMl (TQTextStream& is)
     }
     else if ((*first).name () == KV_GENERATOR) {
       generator = (*first).stringValue ();
-      int pos = generator.findRev (KVD_VERS_PREFIX);
+      int pos = generator.tqfindRev (KVD_VERS_PREFIX);
       if (pos >= 0) {
         doc_version = generator;
         doc_version.remove (0, pos+2);
@@ -143,7 +143,7 @@ bool kvoctrainDoc::extract_L_DESCR_attr (XmlReader &xml,
       no = (*first).intValue();
     else if ((*first).name () == KV_LESS_CURR)
       isCurr = (*first).intValue() != 0;
-    else if ((*first).name () == KV_LESS_QUERY)
+    else if ((*first).name () == KV_LESS_TQUERY)
       inQuery = (*first).intValue() != 0;
     else {
       if (!unknownAttribute(xml.lineNumber(), "descr", (*first).name ()))
@@ -190,13 +190,13 @@ bool kvoctrainDoc::extract_simple_tag (TQString tag_name,
       return false;
     }
     else if (elem.tag() != tag_name || !elem.isEndTag() ) {
-      errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").arg(tag_name));
+      errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").tqarg(tag_name));
       return false;
     }
   }
   else {
     if (elem.tag() != tag_name || !elem.isEndTag() ) {
-      errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").arg(tag_name));
+      errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").tqarg(tag_name));
       return false;
     }
     data = "";
@@ -268,12 +268,12 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
     if (elem.tag () == KV_ARTICLE_GRP) {
       if (inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_ARTICLE_GRP));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_ARTICLE_GRP));
         return false;
       }
       if (! elem.isEndTag ()) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("expected ending tag <%1>").arg(KV_ARTICLE_GRP));
+                    i18n("expected ending tag <%1>").tqarg(KV_ARTICLE_GRP));
         return false;
       }
       else
@@ -283,7 +283,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
       if (! elem.isEndTag ()) {
         if (inEntry) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("disallowed occurrence of tag <%1>").arg(KV_ART_ENTRY));
+                      i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_ENTRY));
           return false;
         }
         inEntry = true;
@@ -321,7 +321,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
     else if (elem.tag () == KV_ART_FD && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_ART_FD));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_FD));
         return false;
       }
       if (!extract_simple_tag (KV_ART_FD, xml, elem, fem_def))
@@ -330,7 +330,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
     else if (elem.tag () == KV_ART_FI && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_ART_FI));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_FI));
         return false;
       }
       if (!extract_simple_tag (KV_ART_FI, xml, elem, fem_indef))
@@ -339,7 +339,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
     else if (elem.tag () == KV_ART_MD && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_ART_MD));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_MD));
         return false;
       }
       if (!extract_simple_tag (KV_ART_MD, xml, elem, mal_def))
@@ -348,7 +348,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
     else if (elem.tag () == KV_ART_MI && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_ART_MI));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_MI));
         return false;
       }
       if (!extract_simple_tag (KV_ART_MI, xml, elem, mal_indef))
@@ -357,7 +357,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
     else if (elem.tag () == KV_ART_ND && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_ART_ND));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_ND));
         return false;
       }
       if (!extract_simple_tag (KV_ART_ND, xml, elem, nat_def))
@@ -366,7 +366,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
     else if (elem.tag () == KV_ART_NI && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_ART_NI));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_ART_NI));
         return false;
       }
       if (!extract_simple_tag (KV_ART_NI, xml, elem, nat_indef))
@@ -375,7 +375,7 @@ bool kvoctrainDoc::loadArticleKvtMl (XmlElement elem, XmlReader& xml)
     else {
       if (elem.isEndTag() ) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
         return false;
       }
       else {
@@ -502,12 +502,12 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
     if (elem.tag () == KV_CONJUG_GRP) {
       if (inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_CONJUG_GRP));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_CONJUG_GRP));
         return false;
       }
       if (! elem.isEndTag ()) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("expected ending tag <%1>").arg(elem.tag()));
+                    i18n("expected ending tag <%1>").tqarg(elem.tag()));
         return false;
       }
       else
@@ -517,7 +517,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
       if (! elem.isEndTag ()) {
         if (inEntry) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("disallowed occurrence of tag <%1>").arg(entry_tag));
+                      i18n("disallowed occurrence of tag <%1>").tqarg(entry_tag));
           return false;
         }
         inEntry = true;
@@ -544,7 +544,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
           if (!extract_T_attr (xml, elem, type))
             return false;
           if (type.length() != 0 && type.left(1) == UL_USER_TENSE) {
-            int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
+            int num = TQMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
             if( num > (int) tense_descr.size() ) { // description missing ?
               TQString s;
               for (int i = tense_descr.size(); i < num; i++) {
@@ -595,7 +595,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
     else if (elem.tag () == KV_CON_P1S && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P1S));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P1S));
         return false;
       }
       if (!extract_simple_tag (KV_CON_P1S, xml, elem, pers1_sing) )
@@ -604,7 +604,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
     else if (elem.tag () == KV_CON_P2S && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P2S));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P2S));
         return false;
       }
       if (!extract_simple_tag (KV_CON_P2S, xml, elem, pers2_sing))
@@ -613,7 +613,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
     else if (elem.tag () == KV_CON_P3SF && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3SF));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3SF));
         return false;
       }
 
@@ -627,7 +627,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
     else if (elem.tag () == KV_CON_P3SM && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3SM));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3SM));
         return false;
       }
       if (!extract_simple_tag (KV_CON_P3SM, xml, elem, pers3_m_sing))
@@ -636,7 +636,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
     else if (elem.tag () == KV_CON_P3SN && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3SN));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3SN));
         return false;
       }
       if (!extract_simple_tag (KV_CON_P3SN, xml, elem, pers3_n_sing))
@@ -645,7 +645,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
     else if (elem.tag () == KV_CON_P1P && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P1P));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P1P));
         return false;
       }
       if (!extract_simple_tag (KV_CON_P1P, xml, elem, pers1_plur) )
@@ -654,7 +654,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
     else if (elem.tag () == KV_CON_P2P && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P2P));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P2P));
         return false;
       }
       if (!extract_simple_tag (KV_CON_P2P, xml, elem, pers2_plur))
@@ -663,7 +663,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
     else if (elem.tag () == KV_CON_P3PF && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3PF));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3PF));
         return false;
       }
 
@@ -677,7 +677,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
     else if (elem.tag () == KV_CON_P3PM && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3PM));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3PM));
         return false;
       }
       if (!extract_simple_tag (KV_CON_P3PM, xml, elem, pers3_m_plur))
@@ -686,7 +686,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
     else if (elem.tag () == KV_CON_P3PN && !elem.isEndTag() ) {
       if (!inEntry) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("disallowed occurrence of tag <%1>").arg(KV_CON_P3PN));
+                    i18n("disallowed occurrence of tag <%1>").tqarg(KV_CON_P3PN));
         return false;
       }
       if (!extract_simple_tag (KV_CON_P3PN, xml, elem, pers3_n_plur))
@@ -695,7 +695,7 @@ bool kvoctrainDoc::loadConjugKvtMl (vector<Conjugation> &curr_conjug,
     else {
       if (elem.isEndTag() ) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
         return false;
       }
       else {
@@ -748,7 +748,7 @@ bool kvoctrainDoc::loadLessonKvtMl (XmlElement elem, XmlReader& xml)
     if (elem.tag () == KV_LESS_GRP) {
       if (! elem.isEndTag ()) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("expected ending tag <%1>").arg(elem.tag()));
+                    i18n("expected ending tag <%1>").tqarg(elem.tag()));
         return false;
       }
       else
@@ -780,14 +780,14 @@ bool kvoctrainDoc::loadLessonKvtMl (XmlElement elem, XmlReader& xml)
 
         if (elem.tag() != KV_LESS_DESC || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").arg(KV_LESS_DESC));
+                      i18n("expected ending tag <%1>").tqarg(KV_LESS_DESC));
           return false;
         }
       }
       else {
         if (elem.tag() != KV_LESS_DESC || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").arg(KV_LESS_DESC));
+                      i18n("expected ending tag <%1>").tqarg(KV_LESS_DESC));
           return false;
         }
         s = "";
@@ -797,7 +797,7 @@ bool kvoctrainDoc::loadLessonKvtMl (XmlElement elem, XmlReader& xml)
     else {
       if (elem.isEndTag() ) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
         return false;
       }
       else {
@@ -823,7 +823,7 @@ bool kvoctrainDoc::loadOptionsKvtMl (XmlElement elem, XmlReader& xml)
     if (elem.tag () == KV_OPTION_GRP) {
       if (! elem.isEndTag ()) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("expected ending tag <%1>").arg(elem.tag()));
+                    i18n("expected ending tag <%1>").tqarg(elem.tag()));
         return false;
       }
       else
@@ -841,7 +841,7 @@ bool kvoctrainDoc::loadOptionsKvtMl (XmlElement elem, XmlReader& xml)
     else {
       if (elem.isEndTag() ) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).tqarg(elem.tag()));
         return false;
       }
       else {
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
index 72020b94..8821a9aa 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
@@ -91,7 +91,7 @@ bool kvoctrainDoc::saveToVcb (TQTextStream& os, TQString &/*title*/)
   }
 
   setModified (false);
-  return os.device()->status() == IO_Ok;
+  return os.tqdevice()->status() == IO_Ok;
 }
 
 
@@ -103,7 +103,7 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
   loadTypeNameVcb (is);
   loadLessonVcb (is);
 
-  int size = is.device()->size ();
+  int size = is.tqdevice()->size ();
   int ln = size / 40 / 100;  // assume each line about 40 chars
   float f_ent_percent = size / 100.0;
   emit progressChanged (this, 0);
@@ -114,7 +114,7 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
     ln--;
     if (ln <= 0) {
       ln = size / 40 / 100;  // assume each line about 40 chars
-      emit progressChanged(this, int(is.device()->at() / f_ent_percent));
+      emit progressChanged(this, int(is.tqdevice()->at() / f_ent_percent));
     }
 
     if (!s.stripWhiteSpace().isEmpty()) {
@@ -124,13 +124,13 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
       size_t  odate = time(0),
               tdate = time(0);
 
-      int pos = s.find (VCB_SEPARATOR);
+      int pos = s.tqfind (VCB_SEPARATOR);
       if (pos >= 0) {
         o = s.left(pos);
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());
       }
 
-      pos = s.find (VCB_SEPARATOR);
+      pos = s.tqfind (VCB_SEPARATOR);
       if (pos >= 0) {
         t = s.left(pos);
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());
@@ -139,19 +139,19 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
         t = s;
       }
 
-      pos = s.find (VCB_SEPARATOR);
+      pos = s.tqfind (VCB_SEPARATOR);
       if (pos >= 0) {
         ograde = s.left(pos).toInt();
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());
       }
 
-      pos = s.find (VCB_SEPARATOR);
+      pos = s.tqfind (VCB_SEPARATOR);
       if (pos >= 0) {
         tgrade = s.left(pos).toInt();
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());
       }
 
-      pos = s.find (VCB_SEPARATOR);
+      pos = s.tqfind (VCB_SEPARATOR);
       if (pos >= 0) {
         odate = s.left(pos).toInt();
         s.remove (0, pos+TQString(VCB_SEPARATOR).length());
@@ -184,7 +184,7 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
   langs.push_back("en");
 
   setModified (false);
-  return is.device()->status() == IO_Ok;
+  return is.tqdevice()->status() == IO_Ok;
 }
 
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
index 7cce072b..d57f702c 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
@@ -62,7 +62,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is)
   while (keepGoing)
   {
     temp = is.readLine();
-    keepGoing = !(temp.find("\",") > 0);
+    keepGoing = !(temp.tqfind("\",") > 0);
     title.append(temp);
     if (keepGoing)
       title.append(" ");
@@ -83,7 +83,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is)
 
   keepGoing = true;
   while (keepGoing)
-    keepGoing = !(is.readLine().find("8. Lernhilfe") > 0); //DO NOT translate
+    keepGoing = !(is.readLine().tqfind("8. Lernhilfe") > 0); //DO NOT translate
 
   for (i = 0; i <= 14; i++)
     is.readLine();
@@ -96,7 +96,7 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is)
     while (c < 2)
     {
       temp = is.readLine();
-      c+= temp.contains("\",");
+      c+= temp.tqcontains("\",");
       expression.append(temp);
       if (c < 2)
         expression.append(" ");
@@ -137,5 +137,5 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is)
 
   setModified(false);
   doc_url.setFileName(i18n("Untitled"));
-  return is.device()->status() == IO_Ok;
+  return is.tqdevice()->status() == IO_Ok;
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
index c3f546c7..c89782a5 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
@@ -126,7 +126,7 @@ bool kvoctrainDoc::saveLessonKvtMl (XmlWriter &xml)
       if (getCurrentLesson() == lfn+1)
         xml.addAttribute (KV_LESS_CURR, (TQString) "1" );
       if (lfn < (int) lessons_in_query.size() && lessons_in_query[lfn])
-        xml.addAttribute (KV_LESS_QUERY, (TQString) "1" );
+        xml.addAttribute (KV_LESS_TQUERY, (TQString) "1" );
       xml.closeTag();
       xml.writeText (lesson_descr[lfn]);
       xml.endTag (KV_LESS_DESC, true);
@@ -261,7 +261,7 @@ bool kvoctrainDoc::saveConjugHeader(vector<Conjugation> &curr_conjug,
   xml.closeTag(false, true);
 
   TQString def, indef, s;
-  for (int ent = 0; ent < QMIN((int) curr_conjug.size(), numLangs()); ent++) {
+  for (int ent = 0; ent < TQMIN((int) curr_conjug.size(), numLangs()); ent++) {
     xml.writeText("  ");            // indent entry a bit
     xml.startTag (KV_CON_ENTRY, false);
 
@@ -485,7 +485,7 @@ bool kvoctrainDoc::saveArticleKvtMl (XmlWriter &xml)
   xml.closeTag(false, true);
 
   TQString def, indef, s;
-  for (int lfn = 0; lfn < QMIN((int) articles.size(), numLangs()); lfn++) {
+  for (int lfn = 0; lfn < TQMIN((int) articles.size(), numLangs()); lfn++) {
     xml.writeText("  ");            // indent entry a bit
     xml.startTag (KV_ART_ENTRY, false);
     if (lfn == 0) {
@@ -759,9 +759,9 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) {
          s = "original";
       xml.addAttribute (KV_LANG, s);
       if (s == q_org)
-        xml.addAttribute (KV_QUERY, (TQString) KV_O);
+        xml.addAttribute (KV_TQUERY, (TQString) KV_O);
       else if (s == q_trans)
-        xml.addAttribute (KV_QUERY, (TQString) KV_T);
+        xml.addAttribute (KV_TQUERY, (TQString) KV_T);
 
     }
 
@@ -804,19 +804,19 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) {
 
     TQString s;
     TQString entype = s = (*first).getType(0);
-    int pos = s.find (QM_TYPE_DIV);
+    int pos = s.tqfind (TQM_TYPE_DIV);
     if (pos >= 0)
       entype = s.left (pos);
     else
       entype = s;
 
-    if (   entype == QM_VERB
+    if (   entype == TQM_VERB
         && (*first).getConjugation(0).numEntries() > 0) {
       Conjugation conj = (*first).getConjugation(0);
       if (!saveConjugEntry(conj, xml, 1))
         return false;
     }
-    else if (entype == QM_ADJ
+    else if (entype == TQM_ADJ
         && !(*first).getComparison(0).isEmpty()) {
       Comparison comp = (*first).getComparison(0);
       if (!saveComparison (comp, xml, 1))
@@ -841,9 +841,9 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) {
         }
         xml.addAttribute (KV_LANG, s);
         if (s == q_org)
-          xml.addAttribute (KV_QUERY, (TQString) KV_O);
+          xml.addAttribute (KV_TQUERY, (TQString) KV_O);
         else if (s == q_trans)
-          xml.addAttribute (KV_QUERY, (TQString) KV_T);
+          xml.addAttribute (KV_TQUERY, (TQString) KV_T);
       }
 
       TQString s1, s2;
@@ -925,20 +925,20 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) {
 
       TQString s;
       TQString entype = s = (*first).getType(0);
-      int pos = s.find (QM_TYPE_DIV);
+      int pos = s.tqfind (TQM_TYPE_DIV);
       if (pos >= 0)
         entype = s.left (pos);
       else
         entype = s;
 
-      if (   entype == QM_VERB
+      if (   entype == TQM_VERB
           && (*first).getConjugation(trans).numEntries() > 0) {
         Conjugation conj = (*first).getConjugation(trans);
         if (!saveConjugEntry(conj, xml, 1+trans))
           return false;
       }
 
-      if (   entype == QM_ADJ
+      if (   entype == TQM_ADJ
           && !(*first).getComparison(trans).isEmpty()) {
         Comparison comp = (*first).getComparison(trans);
         if (!saveComparison (comp, xml, 1+trans))
@@ -956,5 +956,5 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) {
   xml.endTag (KV_DOCTYPE, true);
 
   setModified (false);
-  return os.device()->status() == IO_Ok;
+  return os.tqdevice()->status() == IO_Ok;
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h b/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h
index 365882c6..d2403e7a 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h
@@ -58,8 +58,8 @@
 
 #define       CFG_LESSONSIZE           "LessonSize"
 
-#define      CFG_QUERYPROP            "QueryProperties"
-#define       CFG_QUERYMODE            "QueryMode"
+#define      CFG_TQUERYPROP            "QueryProperties"
+#define       CFG_TQUERYMODE            "QueryMode"
 #define       CFG_DEFTRANS             "DefaultTranslation"
 #define       CFG_DEFORG               "DefaultOriginal"
 
@@ -72,32 +72,32 @@
 #define       CFG_L_FONT               "Font"
 #define       CFG_L_STDFONT            "SpecialFont"
 
-#define      CFG_QUERYMANAG           "QueryManager"
-#define       CFG_QM_DATE_ITEM         "DateItem"
-#define       CFG_QM_DATE_COMP         "DateComp"
-#define       CFG_QM_QUERY_ITEM        "QueryItem"
-#define       CFG_QM_QUERY_COMP        "QueryComp"
-#define       CFG_QM_BAD_ITEM          "BadItem"
-#define       CFG_QM_BAD_COMP          "BadComp"
-#define       CFG_QM_TYPE_ITEM         "TypeItem"
-#define       CFG_QM_TYPE_COMP         "TypeComp"
-#define       CFG_QM_GRADE_ITEM        "GradeItem"
-#define       CFG_QM_GRADE_COMP        "GradeComp"
-#define       CFG_QM_LESSON_ITEM       "LessonItem"
-#define       CFG_QM_LESSON_COMP       "LessonComp"
-#define       CFG_QM_BLOCK_ITEM        "BlockItem"
-#define       CFG_QM_EXPIRE_ITEM       "ExpireItem"
-
-#define      CFG_QUERY_PRESETTING     "QueryPreSettings"
-#define       CFG_QP_NUM               "NumPreSetting"
-#define       CFG_QP_NAME              "Name"
-#define       CFG_QP_THRESH            "Threshhold"
-#define       CFG_QP_BLOCK             "Blocking"
-#define       CFG_QP_QUERY             "Query"
+#define      CFG_TQUERYMANAG           "QueryManager"
+#define       CFG_TQM_DATE_ITEM         "DateItem"
+#define       CFG_TQM_DATE_COMP         "DateComp"
+#define       CFG_TQM_TQUERY_ITEM        "QueryItem"
+#define       CFG_TQM_TQUERY_COMP        "QueryComp"
+#define       CFG_TQM_BAD_ITEM          "BadItem"
+#define       CFG_TQM_BAD_COMP          "BadComp"
+#define       CFG_TQM_TYPE_ITEM         "TypeItem"
+#define       CFG_TQM_TYPE_COMP         "TypeComp"
+#define       CFG_TQM_GRADE_ITEM        "GradeItem"
+#define       CFG_TQM_GRADE_COMP        "GradeComp"
+#define       CFG_TQM_LESSON_ITEM       "LessonItem"
+#define       CFG_TQM_LESSON_COMP       "LessonComp"
+#define       CFG_TQM_BLOCK_ITEM        "BlockItem"
+#define       CFG_TQM_EXPIRE_ITEM       "ExpireItem"
+
+#define      CFG_TQUERY_PRESETTING     "QueryPreSettings"
+#define       CFG_TQP_NUM               "NumPreSetting"
+#define       CFG_TQP_NAME              "Name"
+#define       CFG_TQP_THRESH            "Threshhold"
+#define       CFG_TQP_BLOCK             "Blocking"
+#define       CFG_TQP_TQUERY             "Query"
 
 #define KVTML_EXT        "kvtml"
 #define VT5_LEX_EXT      "lex"
-#define QVOCAB_EXT       "qvo"
+#define TQVOCAB_EXT       "qvo"
 #define VCB_EXT          "vocab"
 #define KVL_EXT          "vl"
 #define CSV_EXT          "csv"
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index a10aa28a..9f2c0124 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -91,13 +91,13 @@ void kvoctrainDoc::Init ()
 }
 
 
-kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
+kvoctrainDoc::kvoctrainDoc(TQObject *tqparent, const KURL& url)
 {
   Init();
   if (!url.isEmpty())
     doc_url = url;
 
-  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
+  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), tqparent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
 
   TQString tmpfile;
   if (KIO::NetAccess::download( url, tmpfile, 0 ))
@@ -105,7 +105,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
     TQFile f(tmpfile);
     if (!f.open(IO_ReadOnly))
     {
-      KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").arg(url.path()));
+      KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").tqarg(url.path()));
       return;
     }
 
@@ -166,7 +166,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
           return;
         }
         TQString format = i18n("Could not load \"%1\"\nDo you want to try again?");
-        TQString msg = format.arg(url.path());
+        TQString msg = format.tqarg(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 (TQObject *parent, const KURL & url, TQString title, FileType ft)
+bool kvoctrainDoc::saveAs (TQObject *tqparent, const KURL & url, TQString title, FileType ft)
 {
-  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
+  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), tqparent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
 
   KURL tmp (url);
   if (title == i18n("Untitled"))
-    title = TQString::null;
+    title = TQString();
   if (title == doc_url.fileName())
-    title = TQString::null;
+    title = TQString();
 
   if (ft == automatic)
   {
@@ -222,7 +222,7 @@ bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, F
 
     if (!f.open(IO_WriteOnly))
     {
-      KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>").arg(tmp.path()));
+      KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>").tqarg(tmp.path()));
       return false;
     }
 
@@ -262,7 +262,7 @@ bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, F
 
     if (!saved) {
       TQString format = i18n("Could not save \"%1\"\nDo you want to try again?");
-      TQString msg = format.arg(tmp.path());
+      TQString msg = format.tqarg(tmp.path());
       int result = KMessageBox::warningContinueCancel(0, msg,
                                                       kapp->makeStdCaption(i18n("I/O Failure")),
                                                       i18n("&Retry"));
@@ -848,10 +848,10 @@ int kvoctrainDoc::search(TQString substr, int id,
 	{
 	 if (id == 0)
 	 {
-         	if (getEntry(i)->getOriginal().find (substr, 0, false) == 0)  // case insensitive
+         	if (getEntry(i)->getOriginal().tqfind (substr, 0, false) == 0)  // case insensitive
            	return i;
          } else {
-	 	if (getEntry(i)->getTranslation(id).find (substr, 0, false) == 0) // case insensitive
+	 	if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) == 0) // case insensitive
            	return i;
 	}
 	}	
@@ -861,10 +861,10 @@ int kvoctrainDoc::search(TQString substr, int id,
 
 	 if (id == 0)
 	 {
-         	if (getEntry(i)->getOriginal().find (substr, 0, false) > -1)  // case insensitive
+         	if (getEntry(i)->getOriginal().tqfind (substr, 0, false) > -1)  // case insensitive
            	return i;
          } else {
-	 	if (getEntry(i)->getTranslation(id).find (substr, 0, false) > -1) // case insensitive
+	 	if (getEntry(i)->getTranslation(id).tqfind (substr, 0, false) > -1) // case insensitive
            	return i;
 	}
        }
@@ -920,7 +920,7 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename)
 
    TQDataStream is( &f );
 
-   Q_INT8 c1, c2, c3, c4, c5;
+   TQ_INT8 c1, c2, c3, c4, c5;
    is >> c1
       >> c2
       >> c3
@@ -937,19 +937,19 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename)
    line.insert (0, c1);
    f.close();
 
-   bool stat = is.device()->status();
+   bool stat = is.tqdevice()->status();
    if (stat != IO_Ok)
      return kvd_none;
    if (c1 == '<' && c2 == '?' && c3 == 'x' && c4 == 'm' && c5 == 'l')
      return kvtml;
 
-   if (line.find (VCB_SEPARATOR) >= 0)
+   if (line.tqfind (VCB_SEPARATOR) >= 0)
      return vt_vcb;
 
    if (line == LEX_IDENT_50)
      return vt_lex;
 
-   if (c1 == '"' && (line.contains('"') == 1 || line.contains(TQRegExp("\",[0-9]"))))
+   if (c1 == '"' && (line.tqcontains('"') == 1 || line.tqcontains(TQRegExp("\",[0-9]"))))
      return vt_voc;
 
    return csv;
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
index c331aac0..383180a4 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
@@ -59,7 +59,7 @@
 #define KV_ORG         "o"         // original expression in specified language
 #define KV_TRANS       "t"         // translated expression in specified language
 #define KV_LANG        "l"         // language: en, de, it, fr ...
-#define KV_QUERY       "q"         // query: org or translation
+#define KV_TQUERY       "q"         // query: org or translation
 #define KV_O           "o"         // org
 #define KV_T           "t"         // translation
 #define KV_GRADE       "g"         // grade of knowledge: 0=well known, x=not known for x times
@@ -115,7 +115,7 @@
 #define KV_LESS_GRP    "lesson"    // lesson descriptor group
 #define KV_LESS_CURR   "current"   // is current lesson
 #define KV_LESS_DESC   "desc"      // lesson descriptor
-#define KV_LESS_QUERY  "query"     // lesson contained in query
+#define KV_LESS_TQUERY  "query"     // lesson contained in query
 #define KV_LESS_NO     "no"        // lesson descriptor number
 
 /*
@@ -250,9 +250,10 @@ class MultipleChoice;
   * This class contains the expressions of your vocabulary
   ************************************************************/
 
-class kvoctrainDoc : public QObject
+class kvoctrainDoc : public TQObject
 {
   Q_OBJECT
+  TQ_OBJECT
  public:
 
   enum FileType { kvd_none, automatic,
@@ -424,7 +425,7 @@ class kvoctrainDoc : public QObject
    * @param url     if url is empty (or NULL) actual name is preserved
    * @result         true if successful
    */
-  bool saveAs (TQObject *parent, const KURL & url, TQString title, FileType ft);
+  bool saveAs (TQObject *tqparent, const KURL & url, TQString title, FileType ft);
 
   /** returns count of entries
    */
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp
index 5ce499d1..6b3501ed 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.cpp
@@ -62,7 +62,7 @@ kvoctrainExpr::kvoctrainExpr (TQString &s, TQString separator, int _lesson)
   lesson = _lesson;
 
   if (separator.length() ) {
-    int pos = s.find(separator);
+    int pos = s.tqfind(separator);
 
     if (pos == -1) {
       setOriginal(s.stripWhiteSpace());
@@ -74,7 +74,7 @@ kvoctrainExpr::kvoctrainExpr (TQString &s, TQString separator, int _lesson)
 //      s.stripWhiteSpace();
 
       // gather all translations
-      while ((pos = s.find(separator)) != -1) {
+      while ((pos = s.tqfind(separator)) != -1) {
         se = s.left(pos).stripWhiteSpace();
         addTranslation(se, KV_NORM_GRADE, KV_NORM_GRADE);
         s.remove (0, pos+separator.length() );
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
index f31cd1e9..a22b06e7 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
@@ -32,7 +32,7 @@
 #define KV_MIN_GRADE       0
 
 #define KV_NORM_GRADE      0       // not queried yet
-#define KV_NORM_COLOR      Qt::black
+#define KV_NORM_COLOR      TQt::black
 static const char *KV_NORM_TEXT =  I18N_NOOP("Not Queried Yet");
 
 #define KV_LEV1_GRADE      1
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlReader.cpp b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlReader.cpp
index 819d79a6..d530ea87 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlReader.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlReader.cpp
@@ -42,7 +42,7 @@ bool XmlReader::validHeader () {
   // Check for: <? xml version="1.0" ?>
   if (tokenizer.nextToken () != XmlTokenizer::Tok_Lt)
     return false;
-  if (tokenizer.nextToken () != XmlTokenizer::Tok_QSign)
+  if (tokenizer.nextToken () != XmlTokenizer::Tok_TQSign)
     return false;
 
   if (tokenizer.nextToken () != XmlTokenizer::Tok_Symbol)
@@ -61,7 +61,7 @@ bool XmlReader::validHeader () {
   else if (tokenizer.element () != "1.0")
     return false;
 
-  if (tokenizer.nextToken () != XmlTokenizer::Tok_QSign)
+  if (tokenizer.nextToken () != XmlTokenizer::Tok_TQSign)
     return false;
   if (tokenizer.nextToken () != XmlTokenizer::Tok_Gt)
     return false;
@@ -208,31 +208,31 @@ bool XmlReader::readAttributes (std::list<XmlAttribute>& attrib_list) {
           // un-escape dangerous characters in reverted order
           KOXML_STRING val = tokenizer.element();
           int pos = 0;
-          while ((pos = val.find("&quot;", pos)) >= 0) {
+          while ((pos = val.tqfind("&quot;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos, 6);
             KOXML_STRING_INSERT( val, pos, "\"");
             pos += 1; // skip "
           }
           pos = 0;
-          while ((pos = val.find("&lf;", pos)) >= 0) {
+          while ((pos = val.tqfind("&lf;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos, 4);
             KOXML_STRING_INSERT( val, pos, "\r");
             pos += 1; // skip \r
           }
           pos = 0;
-          while ((pos = val.find("&nl;", pos)) >= 0) {
+          while ((pos = val.tqfind("&nl;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos, 4);
             KOXML_STRING_INSERT( val, pos, "\n");
             pos += 1; // skip \n
           }
           pos = 0;
-          while ((pos = val.find("&lt;", pos)) >= 0) {
+          while ((pos = val.tqfind("&lt;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos, 4);
             KOXML_STRING_INSERT( val, pos, "<");
             pos += 1; // skip <
           }
           pos = 0;
-          while ((pos = val.find ("&amp;", pos)) >= 0) {
+          while ((pos = val.tqfind ("&amp;", pos)) >= 0) {
             KOXML_STRING_REMOVE( val, pos+1, 4);
             pos += 1; // skip &
           }
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.cpp b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.cpp
index b2fde685..0a147b70 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.cpp
@@ -118,7 +118,7 @@ XmlTokenizer::Token XmlTokenizer::nextToken () {
     return last_tok = Tok_Gt;
     break;
   case '?':
-    return last_tok = Tok_QSign;
+    return last_tok = Tok_TQSign;
     break;
   case '/':
     return last_tok = Tok_Slash;
@@ -380,7 +380,7 @@ int main (int argc, char** argv) {
     case XmlTokenizer::Tok_Gt:
       cout << "> ";
       break;
-    case XmlTokenizer::Tok_QSign:
+    case XmlTokenizer::Tok_TQSign:
       cout << "? ";
       break;
     case XmlTokenizer::Tok_Slash:
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.h
index df0d4031..564e3422 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlTokenizer.h
@@ -33,7 +33,7 @@ public:
 	       Tok_Comment,  /*   5 */
 	       Tok_Lt,       /* < 6 */
 	       Tok_Gt,       /* > 7 */
-	       Tok_QSign,    /* ? 8 */
+	       Tok_TQSign,    /* ? 8 */
 	       Tok_Eq,       /* = 9 */
 	       Tok_Slash,    /* / 10 */
 	       Tok_Exclam,   /* ! 11 */
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.cpp b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.cpp
index 38dfdbf2..afeeda73 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.cpp
@@ -116,30 +116,30 @@ void XmlWriter::addAttribute (KOXML_STRING name, const KOXML_STRING& value)
   KOXML_STRING val = value;
   // escape dangerous characters in sgml-style
   int pos = 0;
-  while ((pos = val.find ('&', pos)) >= 0) {
+  while ((pos = val.tqfind ('&', pos)) >= 0) {
     KOXML_STRING_INSERT( val, pos+1, "amp;");
     pos += 5; // skip &amp;
   }
   pos = 0;
-  while ((pos = val.find ('<', pos)) >= 0) {
+  while ((pos = val.tqfind ('<', pos)) >= 0) {
     KOXML_STRING_REMOVE( val, pos, 1);
     KOXML_STRING_INSERT( val, pos, "&lt;");
     pos += 4; // skip &nl;
   }
   pos = 0;
-  while ((pos = val.find ('\n', pos)) >= 0) {
+  while ((pos = val.tqfind ('\n', pos)) >= 0) {
     KOXML_STRING_REMOVE( val, pos, 1);
     KOXML_STRING_INSERT( val, pos, "&nl;");
     pos += 4; // skip &nl;
   }
   pos = 0;
-  while ((pos = val.find ('\r', pos)) >= 0) {
+  while ((pos = val.tqfind ('\r', pos)) >= 0) {
     KOXML_STRING_REMOVE( val, pos, 1);
     KOXML_STRING_INSERT( val, pos+1, "lf;");
     pos += 4; // skip &lf;
   }
   pos = 0;
-  while ((pos = val.find ('\"', pos)) >= 0) {
+  while ((pos = val.tqfind ('\"', pos)) >= 0) {
     KOXML_STRING_REMOVE( val, pos, 1);
     KOXML_STRING_INSERT( val, pos, "&quot;");
     pos += 6; // skip &qout;
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
index 2c95a515..866e7822 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
@@ -3,7 +3,7 @@
   This file is part of KIllustrator.
   Copyright (C) 1998 Kai-Uwe Sattler (kus@iti.cs.uni-magdeburg.de)
 
-  modified for kvoctrain by Ewald Arnold kvoctrain@ewald-arnold.dein April ´99
+  modified for kvoctrain by Ewald Arnold kvoctrain@ewald-arnold.dein April �99
 
 */
 
@@ -32,8 +32,8 @@ class KOXML_OSTREAM;
  *
  *  xml.startTag ("head"); // writes &lt;head&gt;
  *
- *  // write &lt;layout format="a4" orientation="landscape"&gt;
- *  xml.startTag ("layout", false);
+ *  // write &lt;tqlayout format="a4" orientation="landscape"&gt;
+ *  xml.startTag ("tqlayout", false);
  *  xml.addAttribute ("format", "a4");
  *  xml.addAttribute ("orientation", "landscape");
  *  xml.closeTag (true);
@@ -172,7 +172,7 @@ public:
   /**
    * Get the raw output stream.
    */
-  inline TQIODevice *stream () { return strm.device(); }
+  inline TQIODevice *stream () { return strm.tqdevice(); }
 #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 4587e25d..3e031331 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h
@@ -9,14 +9,14 @@
 #ifndef KOXML_USE_STL
 
 # include <tqtextstream.h>
-# define KOXML_ISTREAM QTextStream
-# define KOXML_OSTREAM QTextStream
+# define KOXML_ISTREAM TQTextStream
+# define KOXML_OSTREAM TQTextStream
 
 # include <tqstring.h>
-# define KOXML_STRING  QString
+# define KOXML_STRING  TQString
 
 // Unicode character
-# define KOXML_CHAR QChar
+# define KOXML_CHAR TQChar
 
 # define KOXML_STRING_REMOVE( string_var, pos, count) string_var.remove (pos, count)
 # define KOXML_STRING_INSERT( string_var, pos, str)   string_var.insert(pos, str)
diff --git a/kvoctrain/kvoctrain/kvt-core/langset.cpp b/kvoctrain/kvoctrain/kvt-core/langset.cpp
index 633e6f59..a9ed5dcb 100644
--- a/kvoctrain/kvoctrain/kvt-core/langset.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/langset.cpp
@@ -82,7 +82,7 @@ TQString LangSet::shortId (int index) const
   if (index >= 0 && index < (int) langs.size() )
     return langs[index].shortId;
 
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -91,7 +91,7 @@ TQString LangSet::shortId2 (int index) const
   if (index >= 0 && index < (int) langs.size() )
     return langs[index].shortId2;
 
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -100,7 +100,7 @@ TQString LangSet::longId (int index) const
   if (index >= 0 && index < (int) langs.size() )
     return langs[index].longId;
 
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -117,7 +117,7 @@ TQString LangSet::keyboardLayout (int index) const
     return langs[index].keyboardLayout;
   }
   else {
-    return TQString::null;
+    return TQString();
   }
 }
 
@@ -131,7 +131,7 @@ TQString LangSet::findShortId (const TQString &_longId) const
     if (_longId == langs[i].longId)
       return langs[i].shortId;
 
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -145,7 +145,7 @@ TQString LangSet::findLongId (const TQString &_shortId) const
         || _shortId == langs[i].shortId2)
       return langs[i].longId;
 
-  return TQString::null;
+  return TQString();
 }
 
 
@@ -212,9 +212,9 @@ void LangSet::setPixMapFile (const TQString & s, int index)
     langs[index].PixMapFile = s;
 }
 
-void LangSet::setKeyboardLayout(const TQString& layout, int index)
+void LangSet::setKeyboardLayout(const TQString& tqlayout, int index)
 {
   if (index < (int) langs.size()) {
-    langs[index].keyboardLayout = layout;
+    langs[index].keyboardLayout = tqlayout;
   }
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h
index 526f330d..335402a9 100644
--- a/kvoctrain/kvoctrain/kvt-core/langset.h
+++ b/kvoctrain/kvoctrain/kvt-core/langset.h
@@ -42,12 +42,12 @@ class LangSet
    LangSet () {}
 
    void addSet (TQString shortId, TQString longId, TQString PixMapFile,
-		const TQString& shortId2 = TQString::null,
-		const TQString& keyboardLayout = TQString::null);
+		const TQString& shortId2 = TQString(),
+		const TQString& keyboardLayout = TQString());
 
 /*    void addSet (TQString shortId, TQString shortId2, TQString longId, */
 /* 		TQString PixMapFile,  */
-/* 		const TQString& keyboardLayout = TQString::null); */
+/* 		const TQString& keyboardLayout = TQString()); */
 
    void appendSet(const LangSet &set);
 
@@ -64,13 +64,13 @@ class LangSet
    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
+   // doesn't make sense for keyboard tqlayouts since there is no 1-to-1 relation to languages
 
    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);
+   void setKeyboardLayout(const TQString & tqlayout, int index);
 
    TQString findShortId (const TQString & longId)  const;
    TQString findLongId  (const TQString & shortId) const;
diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp
index 2714cf76..c5f01f62 100644
--- a/kvoctrain/kvoctrain/kvtnewstuff.cpp
+++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp
@@ -22,9 +22,9 @@
 #include "kvtnewstuff.h"
 #include "prefs.h"
 
-KVTNewStuff::KVTNewStuff(TQWidget *parent, const char * /*name*/) : TQObject(), KNewStuff("kdeedu/vocabulary", parent)
+KVTNewStuff::KVTNewStuff(TQWidget *tqparent, const char * /*name*/) : TQObject(), KNewStuff("kdeedu/vocabulary", tqparent)
 {
-  m_app = (kvoctrainApp*) parent;
+  m_app = (kvoctrainApp*) tqparent;
 }
 
 
@@ -63,7 +63,7 @@ TQString KVTNewStuff::destinationPath(KNS::Entry * entry)
     return file;
   }
   else
-    return TQString::null;
+    return TQString();
 }
 
 
@@ -73,17 +73,17 @@ TQString KVTNewStuff::downloadDestination(KNS::Entry * entry)
 
   if (KStandardDirs::exists(file))
   {
-    int result = KMessageBox::warningContinueCancel(parentWidget(),
+    int result = KMessageBox::warningContinueCancel(tqparentWidget(),
         i18n("The file '%1' already exists. Do you want to overwrite it?")
-        .arg(file),
-        TQString::null, i18n("Overwrite") );
+        .tqarg(file),
+        TQString(), i18n("Overwrite") );
     if (result == KMessageBox::Cancel)
-      return TQString::null;
+      return TQString();
   }
-  KMessageBox::information(parentWidget(),
+  KMessageBox::information(tqparentWidget(),
     i18n("<qt>The selected file will now be downloaded and saved as\n<b>'%1'</b>.</qt>")
-    .arg(file),
-    TQString::null,
+    .tqarg(file),
+    TQString(),
     "NewStuffDownloadLocation");
   return file;
 }
diff --git a/kvoctrain/kvoctrain/kvtnewstuff.h b/kvoctrain/kvoctrain/kvtnewstuff.h
index 1649868a..8c6fcc3a 100644
--- a/kvoctrain/kvoctrain/kvtnewstuff.h
+++ b/kvoctrain/kvoctrain/kvtnewstuff.h
@@ -22,8 +22,9 @@ class kvoctrainApp;
 class KVTNewStuff : public TQObject, public KNewStuff
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  KVTNewStuff(TQWidget *parent = 0, const char *name = 0);
+  KVTNewStuff(TQWidget *tqparent = 0, const char *name = 0);
 
   /**
     Installs a downloaded file according to the application's configuration.
diff --git a/kvoctrain/kvoctrain/main.cpp b/kvoctrain/kvoctrain/main.cpp
index 9eb124cd..efa812df 100644
--- a/kvoctrain/kvoctrain/main.cpp
+++ b/kvoctrain/kvoctrain/main.cpp
@@ -63,7 +63,7 @@ static const char version[]     = KVOCTRAIN_VERSION_STRING;
                       "http://www.ewald-arnold.de" );
 
   aboutData.addCredit("Waldo Bastian",
-                      I18N_NOOP("Help with port to Qt3/KDE3"));
+                      I18N_NOOP("Help with port to TQt3/KDE3"));
 
   aboutData.addCredit("Andrea Marconi",
                       I18N_NOOP("Initial Italian localization"));
diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h
index fd26f7bf..7643ba5c 100644
--- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h
+++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h
@@ -33,6 +33,7 @@
 class AdjQueryDlg : public QueryDlgBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   AdjQueryDlg
diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
index b8218978..9f339e9c 100644
--- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AdjQueryDlgForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AdjQueryDlgForm</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -27,7 +27,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -40,7 +40,7 @@
                 <string>Fill in the missing comparison expressions:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>lev1Label</cstring>
             </property>
@@ -51,7 +51,7 @@
                 <cstring>lev1Field</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>lev3Label</cstring>
             </property>
@@ -62,7 +62,7 @@
                 <cstring>lev3Field</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>lev2Label</cstring>
             </property>
@@ -73,7 +73,7 @@
                 <cstring>lev2Field</cstring>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="1">
+        <widget class="TQLineEdit" row="1" column="1">
             <property name="name">
                 <cstring>lev1Field</cstring>
             </property>
@@ -86,7 +86,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLineEdit" row="2" column="1">
+        <widget class="TQLineEdit" row="2" column="1">
             <property name="name">
                 <cstring>lev2Field</cstring>
             </property>
@@ -99,7 +99,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLineEdit" row="3" column="1">
+        <widget class="TQLineEdit" row="3" column="1">
             <property name="name">
                 <cstring>lev3Field</cstring>
             </property>
@@ -122,22 +122,22 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>390</width>
                     <height>60</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>status</cstring>
                     </property>
@@ -156,15 +156,15 @@
                         <enum>Plain</enum>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QPushButton" row="1" column="0">
+                        <widget class="TQPushButton" row="1" column="0">
                             <property name="name">
                                 <cstring>verify</cstring>
                             </property>
@@ -180,7 +180,7 @@
                                 <string>&amp;Verify</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="0" column="1">
+                        <widget class="TQPushButton" row="0" column="1">
                             <property name="name">
                                 <cstring>know_it</cstring>
                             </property>
@@ -196,7 +196,7 @@
                                 <string>I &amp;Know It</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="0" column="0">
+                        <widget class="TQPushButton" row="0" column="0">
                             <property name="name">
                                 <cstring>show_all</cstring>
                             </property>
@@ -212,7 +212,7 @@
                                 <string>Show &amp;All</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="1" column="1">
+                        <widget class="TQPushButton" row="1" column="1">
                             <property name="name">
                                 <cstring>dont_know</cstring>
                             </property>
@@ -230,7 +230,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1">
+                <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>progressgroup</cstring>
                     </property>
@@ -265,7 +265,7 @@
                                 <cstring>timebar</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>countlabel</cstring>
                             </property>
@@ -281,7 +281,7 @@
                                 <string>Count:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>timelabel</cstring>
                             </property>
@@ -297,7 +297,7 @@
                                 <string>Time:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>Cyclelabel</cstring>
                             </property>
@@ -308,7 +308,7 @@
                                 <string>Cycle:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="1">
+                        <widget class="TQLabel" row="2" column="1">
                             <property name="name">
                                 <cstring>progCount</cstring>
                             </property>
@@ -336,7 +336,7 @@
     <tabstop>know_it</tabstop>
     <tabstop>dont_know</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kprogress.h</includehint>
     <includehint>kprogress.h</includehint>
diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
index 244141e0..0d6c5591 100644
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
@@ -115,11 +115,11 @@ void ArtQueryDlg::setQuery(TQString,
    articles.female(def, indef);
    mw->rb_fem->setText (i18n("&female:\t")+def+" / "+indef);
    mw->rb_fem->setEnabled (!TQString(def+indef).isEmpty() );
-   if (!removed && s.find(def+" ") == 0) {
+   if (!removed && s.tqfind(def+" ") == 0) {
      s.remove (0, def.length()+1);
      removed = true;
    }
-   if (!removed && s.find(indef+" ") == 0) {
+   if (!removed && s.tqfind(indef+" ") == 0) {
      s.remove (0, indef.length()+1);
      removed = true;
    }
@@ -127,11 +127,11 @@ void ArtQueryDlg::setQuery(TQString,
    articles.male(def, indef);
    mw->male->setText (i18n("&male:\t")+def+" / "+indef);
    mw->male->setEnabled (!TQString(def+indef).isEmpty() );
-   if (!removed && s.find(def+" ") == 0) {
+   if (!removed && s.tqfind(def+" ") == 0) {
      s.remove (0, def.length()+1);
      removed = true;
    }
-   if (!removed && s.find(indef+" ") == 0) {
+   if (!removed && s.tqfind(indef+" ") == 0) {
      s.remove (0, indef.length()+1);
      removed = true;
    }
@@ -139,11 +139,11 @@ void ArtQueryDlg::setQuery(TQString,
    articles.natural(def, indef);
    mw->natural->setText (i18n("&natural:\t")+def+" / "+indef);
    mw->natural->setEnabled (!TQString(def+indef).isEmpty() );
-   if (!removed && s.find(def+" ") == 0) {
+   if (!removed && s.tqfind(def+" ") == 0) {
      s.remove (0, def.length()+1);
      removed = true;
    }
-   if (!removed && s.find(indef+" ") == 0) {
+   if (!removed && s.tqfind(indef+" ") == 0) {
      s.remove (0, indef.length()+1);
      removed = true;
    }
@@ -187,15 +187,15 @@ void ArtQueryDlg::showAllClicked()
   resetButton(mw->male);
   resetButton(mw->natural);
 
-  if (kv_exp->getType (q_ocol) == QM_NOUN  QM_TYPE_DIV  QM_NOUN_F) {
+  if (kv_exp->getType (q_ocol) == TQM_NOUN  TQM_TYPE_DIV  TQM_NOUN_F) {
     mw->rb_fem->setChecked (true);
     verifyButton(mw->rb_fem, true);
   }
-  else if (kv_exp->getType (q_ocol) == QM_NOUN  QM_TYPE_DIV  QM_NOUN_M) {
+  else if (kv_exp->getType (q_ocol) == TQM_NOUN  TQM_TYPE_DIV  TQM_NOUN_M) {
     mw->male->setChecked (true);
     verifyButton(mw->male, true);
   }
-  else if (kv_exp->getType (q_ocol) == QM_NOUN  QM_TYPE_DIV  QM_NOUN_S) {
+  else if (kv_exp->getType (q_ocol) == TQM_NOUN  TQM_TYPE_DIV  TQM_NOUN_S) {
     mw->natural->setChecked (true);
     verifyButton(mw->natural, true);
   }
@@ -211,11 +211,11 @@ void ArtQueryDlg::showMoreClicked()
 void ArtQueryDlg::verifyClicked()
 {
   bool known = false;
-  if (kv_exp->getType (q_ocol) == QM_NOUN  QM_TYPE_DIV  QM_NOUN_F)
+  if (kv_exp->getType (q_ocol) == TQM_NOUN  TQM_TYPE_DIV  TQM_NOUN_F)
     known = mw->rb_fem->isChecked ();
-  else if (kv_exp->getType (q_ocol) == QM_NOUN  QM_TYPE_DIV  QM_NOUN_M)
+  else if (kv_exp->getType (q_ocol) == TQM_NOUN  TQM_TYPE_DIV  TQM_NOUN_M)
     known = mw->male->isChecked ();
-  else if (kv_exp->getType (q_ocol) == QM_NOUN  QM_TYPE_DIV  QM_NOUN_S)
+  else if (kv_exp->getType (q_ocol) == TQM_NOUN  TQM_TYPE_DIV  TQM_NOUN_S)
     known = mw->natural->isChecked ();
 
   if (mw->rb_fem->isChecked() ) {
diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h
index a2884d05..223c3fac 100644
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h
@@ -33,6 +33,7 @@ class ArtQueryDlg : public QueryDlgBase
 {
 
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   ArtQueryDlg(
diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
index 7792ca92..31b4fa6b 100644
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ArtQueryDlgForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ArtQueryDlgForm</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -27,7 +27,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -40,7 +40,7 @@
                 <string>Select the correct article for this noun:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>orgField</cstring>
             </property>
@@ -62,7 +62,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="2" column="0">
+        <widget class="TQButtonGroup" row="2" column="0">
             <property name="name">
                 <cstring>artGroup</cstring>
             </property>
@@ -80,7 +80,7 @@
             <property name="title">
                 <string></string>
             </property>
-            <property name="layoutSpacing" stdset="0">
+            <property name="tqlayoutSpacing" stdset="0">
             </property>
             <grid>
                 <property name="name">
@@ -92,7 +92,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>rb_fem</cstring>
                     </property>
@@ -100,7 +100,7 @@
                         <string>&amp;female</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>male</cstring>
                     </property>
@@ -108,7 +108,7 @@
                         <string>&amp;male</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="2" column="0">
+                <widget class="TQRadioButton" row="2" column="0">
                     <property name="name">
                         <cstring>natural</cstring>
                     </property>
@@ -118,15 +118,15 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>layout10</cstring>
+                <cstring>tqlayout10</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1">
+                <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>progressgroup</cstring>
                     </property>
@@ -161,7 +161,7 @@
                                 <cstring>timebar</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>countlabel</cstring>
                             </property>
@@ -177,7 +177,7 @@
                                 <string>Count:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>timelabel</cstring>
                             </property>
@@ -193,7 +193,7 @@
                                 <string>Time:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>Cyclelabel</cstring>
                             </property>
@@ -212,7 +212,7 @@
                                 <string>Cycle:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="1">
+                        <widget class="TQLabel" row="2" column="1">
                             <property name="name">
                                 <cstring>progCount</cstring>
                             </property>
@@ -227,15 +227,15 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QPushButton" row="1" column="0">
+                        <widget class="TQPushButton" row="1" column="0">
                             <property name="name">
                                 <cstring>verify</cstring>
                             </property>
@@ -254,7 +254,7 @@
                                 <string>&amp;Verify</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="0" column="1">
+                        <widget class="TQPushButton" row="0" column="1">
                             <property name="name">
                                 <cstring>know_it</cstring>
                             </property>
@@ -270,7 +270,7 @@
                                 <string>I &amp;Know It</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="0" column="0">
+                        <widget class="TQPushButton" row="0" column="0">
                             <property name="name">
                                 <cstring>show_all</cstring>
                             </property>
@@ -286,7 +286,7 @@
                                 <string>Show &amp;All</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="1" column="1">
+                        <widget class="TQPushButton" row="1" column="1">
                             <property name="name">
                                 <cstring>dont_know</cstring>
                             </property>
@@ -304,7 +304,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>status</cstring>
                     </property>
@@ -339,7 +339,7 @@
     <tabstop>know_it</tabstop>
     <tabstop>dont_know</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kprogress.h</includehint>
     <includehint>kprogress.h</includehint>
diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
index ac4345a1..c3bda4e8 100644
--- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
@@ -153,7 +153,7 @@ void MCQueryDlg::setQuery(TQString org,
    solution = 0;
 
    MultipleChoice mc = exp->getMultipleChoice(q_tcol);
-   for (unsigned i = 0; i < QMIN(MAX_MULTIPLE_CHOICE, mc.size()); ++i)
+   for (unsigned i = 0; i < TQMIN(MAX_MULTIPLE_CHOICE, mc.size()); ++i)
      strings.push_back(mc.mc(i));
    std::random_shuffle(strings.begin(), strings.end());
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h
index 4fcbccf7..3284ce4c 100644
--- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h
+++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h
@@ -33,6 +33,7 @@
 class MCQueryDlg : public QueryDlgBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   MCQueryDlg(
diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
index 098bf7fa..4b8adf20 100644
--- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>MCQueryDlgForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>MCQueryDlgForm</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -32,7 +32,7 @@
                 <string>Select the correct translation:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>orgField</cstring>
             </property>
@@ -54,7 +54,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QButtonGroup" row="2" column="0">
+        <widget class="TQButtonGroup" row="2" column="0">
             <property name="name">
                 <cstring>transgroup</cstring>
             </property>
@@ -82,7 +82,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>rb_trans2</cstring>
                     </property>
@@ -90,7 +90,7 @@
                         <string>&amp;2:</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="2" column="0">
+                <widget class="TQRadioButton" row="2" column="0">
                     <property name="name">
                         <cstring>rb_trans3</cstring>
                     </property>
@@ -98,7 +98,7 @@
                         <string>&amp;3:</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>rb_trans1</cstring>
                     </property>
@@ -106,7 +106,7 @@
                         <string>&amp;1:</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="3" column="0">
+                <widget class="TQRadioButton" row="3" column="0">
                     <property name="name">
                         <cstring>rb_trans4</cstring>
                     </property>
@@ -114,7 +114,7 @@
                         <string>&amp;4:</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="4" column="0">
+                <widget class="TQRadioButton" row="4" column="0">
                     <property name="name">
                         <cstring>rb_trans5</cstring>
                     </property>
@@ -122,7 +122,7 @@
                         <string>&amp;5:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="1">
+                <widget class="TQLabel" row="2" column="1">
                     <property name="name">
                         <cstring>trans3</cstring>
                     </property>
@@ -137,11 +137,11 @@
                     <property name="text">
                         <string>-</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="1">
+                <widget class="TQLabel" row="1" column="1">
                     <property name="name">
                         <cstring>trans2</cstring>
                     </property>
@@ -156,11 +156,11 @@
                     <property name="text">
                         <string>-</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>trans1</cstring>
                     </property>
@@ -175,11 +175,11 @@
                     <property name="text">
                         <string>-</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="1">
+                <widget class="TQLabel" row="3" column="1">
                     <property name="name">
                         <cstring>trans4</cstring>
                     </property>
@@ -194,11 +194,11 @@
                     <property name="text">
                         <string>-</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="1">
+                <widget class="TQLabel" row="4" column="1">
                     <property name="name">
                         <cstring>trans5</cstring>
                     </property>
@@ -213,29 +213,29 @@
                     <property name="text">
                         <string>-</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>layout14</cstring>
+                <cstring>tqlayout14</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout12</cstring>
+                        <cstring>tqlayout12</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QPushButton" row="1" column="1">
+                        <widget class="TQPushButton" row="1" column="1">
                             <property name="name">
                                 <cstring>dont_know</cstring>
                             </property>
@@ -251,7 +251,7 @@
                                 <string>&amp;Do Not Know</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="0" column="0">
+                        <widget class="TQPushButton" row="0" column="0">
                             <property name="name">
                                 <cstring>show_all</cstring>
                             </property>
@@ -267,7 +267,7 @@
                                 <string>Show &amp;All</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="0" column="1">
+                        <widget class="TQPushButton" row="0" column="1">
                             <property name="name">
                                 <cstring>know_it</cstring>
                             </property>
@@ -283,7 +283,7 @@
                                 <string>I &amp;Know It</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="1" column="0">
+                        <widget class="TQPushButton" row="1" column="0">
                             <property name="name">
                                 <cstring>verify</cstring>
                             </property>
@@ -307,7 +307,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1">
+                <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>progressgroup</cstring>
                     </property>
@@ -342,7 +342,7 @@
                                 <cstring>timebar</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>countlabel</cstring>
                             </property>
@@ -358,7 +358,7 @@
                                 <string>Count:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>timelabel</cstring>
                             </property>
@@ -374,7 +374,7 @@
                                 <string>Time:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>Cyclelabel</cstring>
                             </property>
@@ -385,7 +385,7 @@
                                 <string>Cycle:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="1">
+                        <widget class="TQLabel" row="2" column="1">
                             <property name="name">
                                 <cstring>progCount</cstring>
                             </property>
@@ -400,7 +400,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>status</cstring>
                     </property>
@@ -436,7 +436,7 @@
     <tabstop>know_it</tabstop>
     <tabstop>dont_know</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kprogress.h</includehint>
     <includehint>kprogress.h</includehint>
diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
index d70b92ed..82a9a4f0 100644
--- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
@@ -33,8 +33,8 @@
 
 #include <klocale.h>
 
-QueryDlgBase::QueryDlgBase(const TQString & caption, TQWidget *parent, const char *name, bool modal)
-  : KDialogBase(Swallow, caption, User1|User2, NoDefault, parent, name, modal, false,
+QueryDlgBase::QueryDlgBase(const TQString & caption, TQWidget *tqparent, const char *name, bool modal)
+  : KDialogBase(Swallow, caption, User1|User2, NoDefault, tqparent, name, modal, false,
     KGuiItem(i18n("&Stop Query")), KGuiItem(i18n("&Edit Expression...")))
 {
   kv_doc = 0;
@@ -66,9 +66,9 @@ bool QueryDlgBase::verifyField(TQLineEdit *field, const TQString &really)
   if (!field->isEnabled() )
     return true;
 
-  TQColorGroup u_normal = field->colorGroup();
+  TQColorGroup u_normal = field->tqcolorGroup();
   u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00));
-  TQColorGroup k_normal = field->colorGroup();
+  TQColorGroup k_normal = field->tqcolorGroup();
   k_normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x80, 0x00));
 
   TQPalette known_pal( field->palette());
@@ -107,7 +107,7 @@ void QueryDlgBase::resetField(TQLineEdit *field)
 {
   if (!field->isEnabled() )
     return;
-  TQColorGroup normal = field->colorGroup();
+  TQColorGroup normal = field->tqcolorGroup();
   normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x00, 0x00));
 
   TQPalette pal( field->palette());
@@ -132,9 +132,9 @@ bool QueryDlgBase::verifyField(TQMultiLineEdit *field, const TQString &really, b
 {
   if (!field->isEnabled())
     return true;
-  TQColorGroup u_normal = field->colorGroup();
+  TQColorGroup u_normal = field->tqcolorGroup();
   u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00));
-  TQColorGroup k_normal = field->colorGroup();
+  TQColorGroup k_normal = field->tqcolorGroup();
   k_normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x80, 0x00));
 
   TQPalette known_pal( field->palette());
@@ -195,7 +195,7 @@ void QueryDlgBase::resetField(TQMultiLineEdit *field)
 {
   if (!field->isEnabled() )
     return;
-  TQColorGroup normal = field->colorGroup();
+  TQColorGroup normal = field->tqcolorGroup();
   normal.setColor(TQColorGroup::Text, TQColor(0x00, 0x00, 0x00));
 
   TQPalette pal( field->palette());
@@ -221,9 +221,9 @@ void QueryDlgBase::verifyButton(TQRadioButton *radio, bool is_ok, TQWidget *widg
   if (!radio->isEnabled() )
     return;
 
-  TQColorGroup u_normal = radio->colorGroup();
+  TQColorGroup u_normal = radio->tqcolorGroup();
   u_normal.setColor(TQColorGroup::Foreground, TQColor(0xff, 0x00, 0x00));
-  TQColorGroup k_normal = radio->colorGroup();
+  TQColorGroup k_normal = radio->tqcolorGroup();
   k_normal.setColor(TQColorGroup::Foreground, TQColor(0x00, 0x80, 0x00));
 
   TQPalette known_pal( radio->palette());
@@ -273,7 +273,7 @@ void QueryDlgBase::resetButton(TQRadioButton *radio, TQWidget *widget2)
 {
   if (!radio->isEnabled() )
     return;
-  TQColorGroup normal = radio->colorGroup();
+  TQColorGroup normal = radio->tqcolorGroup();
   normal.setColor(TQColorGroup::Foreground, TQColor(0x00, 0x00, 0x00));
 
   TQPalette pal(radio->palette());
@@ -305,19 +305,19 @@ void QueryDlgBase::resetButton(TQRadioButton *radio, TQWidget *widget2)
 
 TQString  QueryDlgBase::getOKComment(int percent_done)
 {
-  return i18n("Well done, you knew the correct answer. %1% done.").arg(percent_done);
+  return i18n("Well done, you knew the correct answer. %1% done.").tqarg(percent_done);
 }
 
 
 TQString  QueryDlgBase::getTimeoutComment(int percent_done)
 {
-  return i18n("You waited too long to enter the correct answer. %1% done.").arg(percent_done);
+  return i18n("You waited too long to enter the correct answer. %1% done.").tqarg(percent_done);
 }
 
 
 TQString  QueryDlgBase::getNOKComment(int percent_done)
 {
-  return i18n("Your answer was wrong. %1% done.").arg(percent_done);
+  return i18n("Your answer was wrong. %1% done.").tqarg(percent_done);
 }
 
 void QueryDlgBase::closeEvent(TQCloseEvent * /*e*/)
diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h
index 44f818c4..7036404b 100644
--- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h
+++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h
@@ -47,11 +47,12 @@ class QueryDlgBase : public KDialogBase
 {
 
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   enum Result { Unknown, Known, Timeout, StopIt };
 
-  QueryDlgBase(const TQString & caption, TQWidget *parent = 0, const char *name = 0, bool modal = false);
+  QueryDlgBase(const TQString & caption, TQWidget *tqparent = 0, const char *name = 0, bool modal = false);
 
   virtual ~QueryDlgBase ();
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
index 2e2a857b..34588847 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
@@ -60,7 +60,7 @@ TQStringList RandomQueryDlg::extractTranslations (TQString trans)
        TQRegExp regex (regexp);
        if ( regex.search (trans) >= 0 )
        {
-         translations = regex.capturedTexts();
+         translations = regex.tqcapturedTexts();
          translations.remove (translations.at (0));
          break;
        }
@@ -77,7 +77,7 @@ TQStringList RandomQueryDlg::extractTranslations (TQString trans)
        TQRegExp regex (regexp);
        if ( regex.search (trans) >= 0 )
        {
-         translations = regex.capturedTexts();
+         translations = regex.tqcapturedTexts();
          translations.remove (translations.at (0));
          break;
        }
@@ -95,7 +95,7 @@ TQStringList RandomQueryDlg::extractTranslations (TQString trans)
        TQRegExp regex (regexp);
        if ( regex.search (trans) >= 0 )
        {
-         translations = regex.capturedTexts();
+         translations = regex.tqcapturedTexts();
          translations.remove (translations.at (0));
          break;
        }
@@ -113,7 +113,7 @@ TQStringList RandomQueryDlg::extractTranslations (TQString trans)
        TQRegExp regex (regexp);
        if ( regex.search (trans) >= 0 )
        {
-         translations = regex.capturedTexts();
+         translations = regex.tqcapturedTexts();
          translations.remove (translations.at (0));
          break;
        }
@@ -168,7 +168,7 @@ RandomQueryDlg::RandomQueryDlg(
     for ( i = 0; i < fields; i ++ )
     {
       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) -> tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transCombos.at(i) -> sizePolicy().hasHeightForWidth()));
       transCombos.at(i) -> setEditable (true);
       transCombos.at(i) -> setInsertionPolicy (TQComboBox::NoInsertion);
       transCombos.at(i) -> setDuplicatesEnabled (false);
@@ -182,7 +182,7 @@ RandomQueryDlg::RandomQueryDlg(
     for ( i = 0; i < fields; i ++ )
     {
       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()));
+      transFields.at(i) -> tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth()));
       vb->addWidget(transFields.at(i));
       connect (transFields.at(i), TQT_SIGNAL (textChanged (const TQString&)), TQT_SLOT (slotTransChanged (const TQString&)));
       connect (transFields.at(i), TQT_SIGNAL (lostFocus()), TQT_SLOT (slotTransLostFocus()));
@@ -202,7 +202,7 @@ RandomQueryDlg::RandomQueryDlg(
     if ( split && kv_doc -> numEntries() >= 500 )
     {
       pdlg = new ProgressDlg (TQString(), TQString(), kapp -> makeStdCaption (i18n("Loading Random Query")));
-      pdlg -> resize (pdlg -> width(), pdlg -> minimumSize().height());
+      pdlg -> resize (pdlg -> width(), pdlg -> tqminimumSize().height());
       pdlg -> show();
       kapp -> processEvents();
     }
@@ -486,7 +486,7 @@ void RandomQueryDlg::slotTransChanged(const TQString&)
 {
   mw->verify->setDefault(true);
   bool suggestions = Prefs::suggestions();
-  if ( suggestions && sender() && sender() -> isA (TQCOMBOBOX_OBJECT_NAME_STRING) )
+  if ( suggestions && sender() && TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())) -> isA (TQCOMBOBOX_OBJECT_NAME_STRING) )
   {
     TQLineEdit* edit = ((TQComboBox*) sender()) -> lineEdit();
     resetField (edit);
@@ -497,7 +497,7 @@ void RandomQueryDlg::slotTransChanged(const TQString&)
     else
       mw->status -> clear();
   }
-  else if ( ! suggestions && sender() && sender() -> isA (TQLINEEDIT_OBJECT_NAME_STRING) )
+  else if ( ! suggestions && sender() && TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())) -> isA (TQLINEEDIT_OBJECT_NAME_STRING) )
     resetField ((TQLineEdit*) sender());
 }
 
@@ -650,8 +650,8 @@ void RandomQueryDlg::keyPressEvent( TQKeyEvent *e )
           for ( uint i = 0; i < vocabulary.count(); i ++ )
           {
             TQString trans (vocabulary[i]);
-            if ( (e -> key() == Key_F5 && trans.startsWith (curText, false)
-                || e -> key() == Key_F6 && trans.contains (curText, false)) )
+            if ( (e -> key() == Key_F5 && trans.tqstartsWith (curText, false)
+                || e -> key() == Key_F6 && trans.tqcontains (curText, false)) )
               combo -> insertItem (trans);
           }
           combo -> setEditText (curText);
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h
index e1fd7362..2dbc38b0 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h
@@ -38,6 +38,7 @@ class kvoctrainDoc;
 class RandomQueryDlg : public QueryDlgBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   RandomQueryDlg(
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
index fc573bf6..86cb075d 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>QueryDlgForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>QueryDlgForm</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -40,7 +40,7 @@
                 <string>Enter the correct translation:</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>GroupBox12</cstring>
             </property>
@@ -65,7 +65,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="1" column="1">
+                <widget class="TQLabel" row="1" column="1">
                     <property name="name">
                         <cstring>falseFriend</cstring>
                     </property>
@@ -81,7 +81,7 @@
                         <string>-</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="2" column="1">
+                <widget class="TQLabel" row="2" column="1">
                     <property name="name">
                         <cstring>remark</cstring>
                     </property>
@@ -97,7 +97,7 @@
                         <string>-</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="1">
+                <widget class="TQLabel" row="3" column="1">
                     <property name="name">
                         <cstring>type</cstring>
                     </property>
@@ -113,7 +113,7 @@
                         <string>-</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0">
+                <widget class="TQCheckBox" row="2" column="0">
                     <property name="name">
                         <cstring>c_remark</cstring>
                     </property>
@@ -121,7 +121,7 @@
                         <string>&amp;Remark:</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="3" column="0">
+                <widget class="TQCheckBox" row="3" column="0">
                     <property name="name">
                         <cstring>c_type</cstring>
                     </property>
@@ -129,7 +129,7 @@
                         <string>T&amp;ype:</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0">
+                <widget class="TQCheckBox" row="1" column="0">
                     <property name="name">
                         <cstring>c_falsefriend</cstring>
                     </property>
@@ -137,7 +137,7 @@
                         <string>&amp;False friend:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>orgField</cstring>
                     </property>
@@ -161,7 +161,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QFrame" row="2" column="0">
+        <widget class="TQFrame" row="2" column="0">
             <property name="name">
                 <cstring>TranslationFrame</cstring>
             </property>
@@ -190,22 +190,22 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>450</width>
                     <height>40</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="4" column="0">
+        <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>status</cstring>
                     </property>
@@ -227,15 +227,15 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QPushButton" row="1" column="0" rowspan="1" colspan="2">
+                        <widget class="TQPushButton" row="1" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>verify</cstring>
                             </property>
@@ -251,7 +251,7 @@
                                 <string>&amp;Verify</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="0" column="1">
+                        <widget class="TQPushButton" row="0" column="1">
                             <property name="name">
                                 <cstring>show_more</cstring>
                             </property>
@@ -267,7 +267,7 @@
                                 <string>Show &amp;More</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="0" column="0">
+                        <widget class="TQPushButton" row="0" column="0">
                             <property name="name">
                                 <cstring>show_all</cstring>
                             </property>
@@ -283,7 +283,7 @@
                                 <string>Show &amp;All</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="1" column="2">
+                        <widget class="TQPushButton" row="1" column="2">
                             <property name="name">
                                 <cstring>dont_know</cstring>
                             </property>
@@ -299,7 +299,7 @@
                                 <string>&amp;Do Not Know</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="0" column="2">
+                        <widget class="TQPushButton" row="0" column="2">
                             <property name="name">
                                 <cstring>know_it</cstring>
                             </property>
@@ -317,7 +317,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1">
+                <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>progressgroup</cstring>
                     </property>
@@ -342,7 +342,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>timelabel</cstring>
                             </property>
@@ -350,7 +350,7 @@
                                 <string>Time:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>countlabel</cstring>
                             </property>
@@ -368,7 +368,7 @@
                                 <cstring>countbar</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="1">
+                        <widget class="TQLabel" row="2" column="1">
                             <property name="name">
                                 <cstring>progCount</cstring>
                             </property>
@@ -381,7 +381,7 @@
                                 </sizepolicy>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>Cyclelabel</cstring>
                             </property>
@@ -410,7 +410,7 @@
     <tabstop>know_it</tabstop>
     <tabstop>dont_know</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kprogress.h</includehint>
     <includehint>kprogress.h</includehint>
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
index 1c6f8469..a45d6cd6 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
@@ -103,19 +103,19 @@ void SimpleQueryDlg::setQuery(QueryType _querytype,
    TQString s;
    switch (querytype)
    {
-     case QT_Synonym:
+     case TQT_Synonym:
      {
        mw->queryLabel->setText(i18n("Expression"));
        mw->instructionLabel->setText(i18n("Enter the synonym:"));
        setCaption (i18n("Synonym Training"));
        answerstring = exp->getSynonym(column);
-       mw->queryField->setAlignment(Qt::AlignVCenter);
+       mw->queryField->tqsetAlignment(TQt::AlignVCenter);
        mw->queryField->setText(column == 0 ? exp->getOriginal() : exp->getTranslation(column));
        setQueryFieldWordwrap();
      }
      break;
 
-     case QT_Antonym:
+     case TQT_Antonym:
      {
        mw->queryLabel->setText(i18n("Expression"));
        mw->instructionLabel->setText(i18n("Enter the antonym:"));
@@ -126,7 +126,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype,
      }
      break;
 
-     case QT_Paraphrase:
+     case TQT_Paraphrase:
      {
        mw->queryLabel->setText(i18n("Paraphrase"));
        mw->instructionLabel->setText(i18n("Enter the word:"));
@@ -137,7 +137,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype,
      }
      break;
 
-     case QT_Example:
+     case TQT_Example:
      {
        mw->queryLabel->setText(i18n("Example sentence"));
        mw->instructionLabel->setText(i18n("Fill in the missing word:"));
@@ -145,7 +145,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype,
        s = exp->getExample(column);
        answerstring = column == 0 ? exp->getOriginal().stripWhiteSpace() : exp->getTranslation(column).stripWhiteSpace();
        int pos = -1;
-       while ((pos = s.find(answerstring)) > 0)
+       while ((pos = s.tqfind(answerstring)) > 0)
        {
          s.remove(pos, answerstring.length());
          s.insert (pos, "..");
@@ -228,14 +228,14 @@ void SimpleQueryDlg::showMoreClicked()
 void SimpleQueryDlg::showAllClicked()
 {
   mw->answerField->setText (answerstring);
-  verifyField (mw->answerField, answerstring, querytype == QT_Synonym || querytype == QT_Antonym);
+  verifyField (mw->answerField, answerstring, querytype == TQT_Synonym || querytype == TQT_Antonym);
   mw->dont_know->setDefault(true);
 }
 
 
 void SimpleQueryDlg::verifyClicked()
 {
-  if (verifyField (mw->answerField, answerstring, querytype == QT_Synonym || querytype == QT_Antonym))
+  if (verifyField (mw->answerField, answerstring, querytype == TQT_Synonym || querytype == TQT_Antonym))
     knowItClicked();
   else
     mw->dont_know->setDefault(true);
@@ -265,25 +265,25 @@ void SimpleQueryDlg::slotUser2()
 //   queryField->setText (exp->getTranslation(q_ocol));
 
    switch (querytype) {
-     case QT_Synonym: {
+     case TQT_Synonym: {
        answerstring = exp->getSynonym(q_ocol);
        mw->queryField->setText(q_ocol == 0 ? exp->getOriginal() : exp->getTranslation(q_ocol));
      }
      break;
 
-     case QT_Antonym: {
+     case TQT_Antonym: {
        answerstring = exp->getAntonym(q_ocol);
        mw->queryField->setText(q_ocol == 0 ? exp->getOriginal() : exp->getTranslation(q_ocol));
      }
      break;
 
-     case QT_Paraphrase: {
+     case TQT_Paraphrase: {
        mw->queryField->setText(exp->getParaphrase(q_ocol));
        answerstring = q_ocol == 0 ? exp->getOriginal() : exp->getTranslation(q_ocol);
      }
      break;
 
-     case QT_Example: {
+     case TQT_Example: {
        mw->queryField->setText(exp->getExample(q_ocol));
        answerstring = q_ocol == 0 ? exp->getOriginal() : exp->getTranslation(q_ocol);
      }
@@ -327,9 +327,9 @@ void SimpleQueryDlg::setQueryFieldWordwrap()
   int w = fm.width(mw->queryField->text());
   int w2 = mw->width();
   if (w > w2)
-    mw->queryField->setAlignment(Qt::AlignVCenter | Qt::WordBreak);
+    mw->queryField->tqsetAlignment(TQt::AlignVCenter | TQt::WordBreak);
   else
-    mw->queryField->setAlignment(Qt::AlignVCenter);
+    mw->queryField->tqsetAlignment(TQt::AlignVCenter);
 }
 
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h
index 9d88cf4a..d1747864 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h
@@ -33,6 +33,7 @@
 class SimpleQueryDlg : public QueryDlgBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
   SimpleQueryDlg (QueryType querytpe,
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
index 3ff31b5f..ed6a51d3 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>SimpleQueryDlgForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>SimpleQueryDlgForm</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -27,15 +27,15 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <vbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>queryLabel</cstring>
                     </property>
@@ -43,7 +43,7 @@
                         <string>-</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>queryField</cstring>
                     </property>
@@ -64,11 +64,11 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>instructionLabel</cstring>
                     </property>
@@ -81,7 +81,7 @@
                         <string>-</string>
                     </property>
                 </widget>
-                <widget class="QMultiLineEdit">
+                <widget class="TQMultiLineEdit">
                     <property name="name">
                         <cstring>answerField</cstring>
                     </property>
@@ -106,22 +106,22 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>300</width>
                     <height>16</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout17</cstring>
+                <cstring>tqlayout17</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>status</cstring>
                     </property>
@@ -143,7 +143,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1">
+                <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>progressgroup</cstring>
                     </property>
@@ -180,7 +180,7 @@
                                 <cstring>timebar</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>countlabel</cstring>
                             </property>
@@ -196,7 +196,7 @@
                                 <string>Count:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>timelabel</cstring>
                             </property>
@@ -212,7 +212,7 @@
                                 <string>Time:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>Cyclelabel</cstring>
                             </property>
@@ -223,7 +223,7 @@
                                 <string>Cycle:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="1">
+                        <widget class="TQLabel" row="2" column="1">
                             <property name="name">
                                 <cstring>progCount</cstring>
                             </property>
@@ -238,15 +238,15 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout16</cstring>
+                        <cstring>tqlayout16</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QPushButton" row="0" column="2">
+                        <widget class="TQPushButton" row="0" column="2">
                             <property name="name">
                                 <cstring>know_it</cstring>
                             </property>
@@ -262,7 +262,7 @@
                                 <string>I &amp;Know It</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="1" column="2">
+                        <widget class="TQPushButton" row="1" column="2">
                             <property name="name">
                                 <cstring>dont_know</cstring>
                             </property>
@@ -278,7 +278,7 @@
                                 <string>Do &amp;Not Know</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="0" column="0">
+                        <widget class="TQPushButton" row="0" column="0">
                             <property name="name">
                                 <cstring>show_all</cstring>
                             </property>
@@ -294,7 +294,7 @@
                                 <string>Show &amp;All</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="0" column="1">
+                        <widget class="TQPushButton" row="0" column="1">
                             <property name="name">
                                 <cstring>show_more</cstring>
                             </property>
@@ -310,7 +310,7 @@
                                 <string>Show &amp;More</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="1" column="0" rowspan="1" colspan="2">
+                        <widget class="TQPushButton" row="1" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>verify</cstring>
                             </property>
@@ -340,7 +340,7 @@
     <tabstop>know_it</tabstop>
     <tabstop>dont_know</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kprogress.h</includehint>
     <includehint>kprogress.h</includehint>
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
index 72d749a2..644c60bf 100644
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
@@ -180,7 +180,7 @@ bool VerbQueryDlg::next()
 
   type = conjugations.getType(current);
   TQString format = i18n("Current tense is: %1.");
-  TQString msg = format.arg(conjugations.getName(type));
+  TQString msg = format.tqarg(conjugations.getName(type));
 
   mw->instructionLabel->setText (msg);
   mw->baseLabel->setText (s);
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h
index 910cd89a..2b22444e 100644
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h
@@ -33,6 +33,7 @@
 class VerbQueryDlg : public QueryDlgBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
index 0c7a5cb7..ed72fe45 100644
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>VerbQueryDlgForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>VerbQueryDlgForm</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -19,15 +19,15 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout20</cstring>
+                <cstring>tqlayout20</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>lab1</cstring>
                     </property>
@@ -40,7 +40,7 @@
                         <string>Enter the correct conjugation forms.</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>instructionLabel</cstring>
                     </property>
@@ -63,23 +63,23 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout30</cstring>
+                <cstring>tqlayout30</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout29</cstring>
+                        <cstring>tqlayout29</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class="TQLabel" row="3" column="0">
                             <property name="name">
                                 <cstring>p3smLabel</cstring>
                             </property>
@@ -90,17 +90,17 @@
                                 <cstring>p3smField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="1" column="1">
+                        <widget class="TQLineEdit" row="1" column="1">
                             <property name="name">
                                 <cstring>p2sField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="3" column="1">
+                        <widget class="TQLineEdit" row="3" column="1">
                             <property name="name">
                                 <cstring>p3smField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="4" column="0">
+                        <widget class="TQLabel" row="4" column="0">
                             <property name="name">
                                 <cstring>p3snLabel</cstring>
                             </property>
@@ -111,7 +111,7 @@
                                 <cstring>p3snField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>p1sLabel</cstring>
                             </property>
@@ -122,7 +122,7 @@
                                 <cstring>p1sField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>p3sfLabel</cstring>
                             </property>
@@ -133,17 +133,17 @@
                                 <cstring>p3sfField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="4" column="1">
+                        <widget class="TQLineEdit" row="4" column="1">
                             <property name="name">
                                 <cstring>p3snField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="2" column="1">
+                        <widget class="TQLineEdit" row="2" column="1">
                             <property name="name">
                                 <cstring>p3sfField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>p2sLabel</cstring>
                             </property>
@@ -154,32 +154,32 @@
                                 <cstring>p2sField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="0" column="1">
+                        <widget class="TQLineEdit" row="0" column="1">
                             <property name="name">
                                 <cstring>p1sField</cstring>
                             </property>
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout27</cstring>
+                        <cstring>tqlayout27</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLineEdit" row="1" column="1">
+                        <widget class="TQLineEdit" row="1" column="1">
                             <property name="name">
                                 <cstring>p2pField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="4" column="1">
+                        <widget class="TQLineEdit" row="4" column="1">
                             <property name="name">
                                 <cstring>p3pnField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>p1pLabel</cstring>
                             </property>
@@ -190,7 +190,7 @@
                                 <cstring>p1pField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>p2pLabel</cstring>
                             </property>
@@ -215,12 +215,12 @@
                                 <cstring>p2pField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="3" column="1">
+                        <widget class="TQLineEdit" row="3" column="1">
                             <property name="name">
                                 <cstring>p3pmField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="3" column="0">
+                        <widget class="TQLabel" row="3" column="0">
                             <property name="name">
                                 <cstring>p3pmLabel</cstring>
                             </property>
@@ -231,12 +231,12 @@
                                 <cstring>p3pmField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="2" column="1">
+                        <widget class="TQLineEdit" row="2" column="1">
                             <property name="name">
                                 <cstring>p3pfField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>p3pfLabel</cstring>
                             </property>
@@ -247,12 +247,12 @@
                                 <cstring>p3pfField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="0" column="1">
+                        <widget class="TQLineEdit" row="0" column="1">
                             <property name="name">
                                 <cstring>p1pField</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="4" column="0">
+                        <widget class="TQLabel" row="4" column="0">
                             <property name="name">
                                 <cstring>p3pnLabel</cstring>
                             </property>
@@ -267,15 +267,15 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout19</cstring>
+                <cstring>tqlayout19</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -283,7 +283,7 @@
                         <string>Base form:</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>baseLabel</cstring>
                     </property>
@@ -307,23 +307,23 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="4" column="0">
+        <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
-                <cstring>layout32</cstring>
+                <cstring>tqlayout32</cstring>
             </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>layout31</cstring>
+                        <cstring>tqlayout31</cstring>
                     </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QPushButton" row="0" column="1">
+                        <widget class="TQPushButton" row="0" column="1">
                             <property name="name">
                                 <cstring>know_it</cstring>
                             </property>
@@ -339,7 +339,7 @@
                                 <string>I &amp;Know It</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="1" column="0">
+                        <widget class="TQPushButton" row="1" column="0">
                             <property name="name">
                                 <cstring>verify</cstring>
                             </property>
@@ -355,7 +355,7 @@
                                 <string>&amp;Verify</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="0" column="0">
+                        <widget class="TQPushButton" row="0" column="0">
                             <property name="name">
                                 <cstring>show_all</cstring>
                             </property>
@@ -371,7 +371,7 @@
                                 <string>Show &amp;All</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton" row="1" column="1">
+                        <widget class="TQPushButton" row="1" column="1">
                             <property name="name">
                                 <cstring>dont_know</cstring>
                             </property>
@@ -389,7 +389,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>status</cstring>
                     </property>
@@ -411,7 +411,7 @@
                         <string></string>
                     </property>
                 </widget>
-                <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1">
+                <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>progressgroup</cstring>
                     </property>
@@ -446,7 +446,7 @@
                                 <cstring>timebar</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>countlabel</cstring>
                             </property>
@@ -462,7 +462,7 @@
                                 <string>Count:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>timelabel</cstring>
                             </property>
@@ -478,7 +478,7 @@
                                 <string>Time:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="0">
+                        <widget class="TQLabel" row="2" column="0">
                             <property name="name">
                                 <cstring>Cyclelabel</cstring>
                             </property>
@@ -489,7 +489,7 @@
                                 <string>Cycle:</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="2" column="1">
+                        <widget class="TQLabel" row="2" column="1">
                             <property name="name">
                                 <cstring>progCount</cstring>
                             </property>
@@ -516,7 +516,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>390</width>
                     <height>16</height>
@@ -541,7 +541,7 @@
     <tabstop>know_it</tabstop>
     <tabstop>dont_know</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kprogress.h</includehint>
     <includehint>kprogress.h</includehint>
diff --git a/kvoctrain/kvoctrain/spotlight2kvtml.cpp b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
index c6f9c565..62533df7 100644
--- a/kvoctrain/kvoctrain/spotlight2kvtml.cpp
+++ b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
@@ -36,7 +36,7 @@ using namespace std;
 #include <kapplication.h>
 
 #define KVD_VERS_PREFIX " v"     //#include "kvoctraindoc.h"
-#define QM_VERB         "v"      //#include "QueryManager.h"
+#define TQM_VERB         "v"      //#include "QueryManager.h"
 
 #include "kvoctraincore.h"
 
@@ -92,11 +92,11 @@ void readToMem (TQTextStream &is, TQString month, TQString year)
    spotty spot;
 
    bool first_line = true;
-   while (!is.eof() && is.device()->status() == IO_Ok) {
+   while (!is.eof() && is.tqdevice()->status() == IO_Ok) {
      line = is.readLine();
 
      int pos;
-     while ((pos = line.find("  ")) >= 0)
+     while ((pos = line.tqfind("  ")) >= 0)
        line.remove (pos, 1);
 
      bool head_line = (!line.stripWhiteSpace().isEmpty() && line == line.upper() );
@@ -107,32 +107,32 @@ void readToMem (TQTextStream &is, TQString month, TQString year)
      }
      first_line = false;
 
-     if (   line.find ("see p.") >= 0
-         || line.find ("see pp.") >= 0
-         || line.find ("see also p") >= 0) {
+     if (   line.tqfind ("see p.") >= 0
+         || line.tqfind ("see pp.") >= 0
+         || line.tqfind ("see also p") >= 0) {
        line = "";
      }
 
      int c = 0x92;
-     while ((pos = line.find (c)) >= 0)
+     while ((pos = line.tqfind (c)) >= 0)
        line[pos] = '\'';
 
      c = 0x94;
-     while ((pos = line.find (c)) >= 0)
+     while ((pos = line.tqfind (c)) >= 0)
        line[pos] = ' ';
 
      pos = 0;
-     while ((pos = line.find ('&', pos)) >= 0) {
+     while ((pos = line.tqfind ('&', pos)) >= 0) {
        line.insert (pos+1, "amp;");
        pos += 5; // skip &amp;
      }
 
-     while ((pos = line.find ('<')) >= 0) {
+     while ((pos = line.tqfind ('<')) >= 0) {
        line.remove(pos, 1);
        line.insert (pos, "&lt;");
      }
 
-     while ((pos = line.find ('>')) >= 0) {
+     while ((pos = line.tqfind ('>')) >= 0) {
        line.remove(pos, 1);
        line.insert (pos, "&gt;");
      }
@@ -144,9 +144,9 @@ void readToMem (TQTextStream &is, TQString month, TQString year)
          lesson_str = line + ", "+month+" "+year;
        }
        else {
-         pos = line.find ('\t');
+         pos = line.tqfind ('\t');
          if (pos < 0)
-           pos = line.find ('|');
+           pos = line.tqfind ('|');
          if (pos >= 0) {
            if (lesson_pending) {
              lesson_pending = false;
@@ -159,54 +159,54 @@ void readToMem (TQTextStream &is, TQString month, TQString year)
            spot.de_rem = "";
 
            if (line.left (3) == "to ") {
-             spot.type = QM_VERB;
+             spot.type = TQM_VERB;
              line.remove (0, 3);
              pos -= 3;
            }
            spot.en = line.mid(0, pos);
            spot.de = line.mid(pos+1, line.length()-pos-1);
 
-           if ((pos = spot.en.find(" UK") ) >= 0) {
+           if ((pos = spot.en.tqfind(" UK") ) >= 0) {
              spot.en_rem+= i18n("UK ").local8Bit();
              spot.en.remove (pos, 3);
            }
-           if ((pos = spot.en.find("(UK)") ) >= 0) {
+           if ((pos = spot.en.tqfind("(UK)") ) >= 0) {
              spot.en_rem+= i18n("UK ").local8Bit();
              spot.en.remove (pos, 4);
            }
 
-           if ((pos = spot.en.find(" N. Am.") ) >= 0) {
+           if ((pos = spot.en.tqfind(" N. Am.") ) >= 0) {
              spot.en_rem+= i18n("N. Am. ").local8Bit();
              spot.en.remove (pos, 7);
            }
-           if ((pos = spot.en.find("(N. Am.)") ) >= 0) {
+           if ((pos = spot.en.tqfind("(N. Am.)") ) >= 0) {
              spot.en_rem+= i18n("N. Am. ").local8Bit();
              spot.en.remove (pos, 8);
            }
 
-           if ((pos = spot.en.find(" US") ) >= 0) {
+           if ((pos = spot.en.tqfind(" US") ) >= 0) {
              spot.en_rem+= i18n("US ").local8Bit();
              spot.en.remove (pos, 3);
            }
-           if ((pos = spot.en.find("(US)") ) >= 0) {
+           if ((pos = spot.en.tqfind("(US)") ) >= 0) {
              spot.en_rem+= i18n("US ").local8Bit();
              spot.en.remove (pos, 4);
            }
 
-           if ((pos = spot.en.find("ifml.") ) >= 0) {
+           if ((pos = spot.en.tqfind("ifml.") ) >= 0) {
              spot.en_rem+= i18n("ifml. ").local8Bit();
              spot.en.remove (pos, 5);
            }
-           if ((pos = spot.en.find("(ifml.)") ) >= 0) {
+           if ((pos = spot.en.tqfind("(ifml.)") ) >= 0) {
              spot.en_rem+= i18n("ifml. ").local8Bit();
              spot.en.remove (pos, 7);
            }
 
-           if ((pos = spot.en.find("vulg.") ) >= 0) {
+           if ((pos = spot.en.tqfind("vulg.") ) >= 0) {
              spot.en_rem+= i18n("vulg. ").local8Bit();
              spot.en.remove (pos, 5);
            }
-           if ((pos = spot.en.find("(vulg.)") ) >= 0) {
+           if ((pos = spot.en.tqfind("(vulg.)") ) >= 0) {
              spot.en_rem+= i18n("vulg. ").local8Bit();
              spot.en.remove (pos, 7);
            }
@@ -289,7 +289,7 @@ void writeToKvtml(TQTextStream &os, TQString month, TQString year)
      writeSpotty (os, spottys[0], true);
 
    int l = 1;
-   while (os.device()->status() == IO_Ok && l < (int) spottys.size() ) {
+   while (os.tqdevice()->status() == IO_Ok && l < (int) spottys.size() ) {
      writeSpotty (os, spottys[l], false);
      l++;
    }
@@ -304,14 +304,14 @@ int main(int argc, char **argv)
   KApplication app(argc,argv, "kvoctrain");
 
   if (argc != 4) {
-    cerr << i18n("usage: spotlight2kvtml spotfile month year\n\n").local8Bit();
+    cerr << i18n("usage: spotlight2kvtml spotfile month year\n\n").local8Bit().data();
     exit (1);
   }
 
   TQString spot (argv[1]);
   TQString kvtml;
 
-  int dot = spot.findRev('.');
+  int dot = spot.tqfindRev('.');
   if (dot < 0) {
     kvtml = spot + "." KVTML_EXT;
   }
@@ -327,8 +327,8 @@ int main(int argc, char **argv)
   readToMem (is, argv[2], argv[3]);
   fs.close();
 
-  if (is.device()->status() != IO_Ok ) {
-    cerr << i18n("Could not read ").local8Bit() << spot.local8Bit() << endl;
+  if (is.tqdevice()->status() != IO_Ok ) {
+    cerr << i18n("Could not read ").local8Bit().data() << spot.local8Bit().data() << endl;
     exit (1);
   }
 
@@ -338,8 +338,8 @@ int main(int argc, char **argv)
   writeToKvtml(os, argv[2], argv[3]);
   fk.close();
 
-  if (os.device()->status() != IO_Ok ) {
-    cerr << i18n("Could not write ").local8Bit() << kvtml.local8Bit() << endl;
+  if (os.tqdevice()->status() != IO_Ok ) {
+    cerr << i18n("Could not write ").local8Bit().data() << kvtml.local8Bit().data() << endl;
     exit (1);
   }
 
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp
index 4537b42f..17f067a1 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp
@@ -30,7 +30,7 @@
 #include <tqlabel.h>
 #include <tqvaluevector.h>
 
-GenStatPage::GenStatPage(kvoctrainDoc *doc, TQWidget* parent, const char* name): GenStatPageForm( parent, name )
+GenStatPage::GenStatPage(kvoctrainDoc *doc, TQWidget* tqparent, const char* name): GenStatPageForm( tqparent, name )
 {
   l_filename->setText(doc->URL().path());
   l_title->setText(doc->getTitle());
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h
index 38cb7854..21d4fd83 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h
+++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h
@@ -34,10 +34,11 @@ class kvoctrainDoc;
 class GenStatPage : public GenStatPageForm
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-  GenStatPage(kvoctrainDoc *doc, TQWidget* parent = NULL, const char* name = NULL);
+  GenStatPage(kvoctrainDoc *doc, TQWidget* tqparent = NULL, const char* name = NULL);
 
 };
 #endif // GenStatPage_included
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui
index 669ec746..b67cc491 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui
+++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>GenStatPageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -37,7 +37,7 @@
                 <string>Filename:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel1_2</cstring>
             </property>
@@ -49,7 +49,7 @@
                 <string>Title:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>TextLabel1_2_2_2</cstring>
             </property>
@@ -61,7 +61,7 @@
                 <string>Entries:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>TextLabel1_2_2</cstring>
             </property>
@@ -73,7 +73,7 @@
                 <string>Author:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>TextLabel1_2_2_2_2</cstring>
             </property>
@@ -85,7 +85,7 @@
                 <string>Lessons:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="1">
+        <widget class="TQLabel" row="4" column="1">
             <property name="name">
                 <cstring>l_lessons</cstring>
             </property>
@@ -107,7 +107,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="1">
+        <widget class="TQLabel" row="3" column="1">
             <property name="name">
                 <cstring>kcfg_entriesPerLesson</cstring>
             </property>
@@ -129,7 +129,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="1">
+        <widget class="TQLabel" row="2" column="1">
             <property name="name">
                 <cstring>l_author</cstring>
             </property>
@@ -151,7 +151,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="1">
+        <widget class="TQLabel" row="1" column="1">
             <property name="name">
                 <cstring>l_title</cstring>
             </property>
@@ -173,7 +173,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="1">
+        <widget class="TQLabel" row="0" column="1">
             <property name="name">
                 <cstring>l_filename</cstring>
             </property>
@@ -205,7 +205,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -214,5 +214,5 @@
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
index 7fd6bbb0..a3a65acd 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
@@ -34,8 +34,8 @@
 #include <langset.h>
 #include <kvoctraindoc.h>
 
-StatistikDlg::StatistikDlg(LangSet &langset, kvoctrainDoc *doc, TQWidget *parent, const char *name, bool modal)
-  : KDialogBase(Tabbed, i18n("Document Statistics"), Close, Close, parent, name, modal)
+StatistikDlg::StatistikDlg(LangSet &langset, kvoctrainDoc *doc, TQWidget *tqparent, const char *name, bool modal)
+  : KDialogBase(Tabbed, i18n("Document Statistics"), Close, Close, tqparent, name, modal)
 {
   TQFrame * page;
   TQVBoxLayout * topLayout;
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h
index 3199ae27..55480ef1 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h
@@ -38,9 +38,10 @@ class GradeCols;
 class StatistikDlg : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  StatistikDlg(LangSet &langset, kvoctrainDoc *doc, TQWidget *parent = NULL, const char *name = NULL, bool modal = true);
+  StatistikDlg(LangSet &langset, kvoctrainDoc *doc, TQWidget *tqparent = 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 7453b75c..f634b4dd 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
@@ -47,10 +47,10 @@
 #define TB_LESSON          3
 
 
-class GradeListItem : public QListViewItem
+class GradeListItem : public TQListViewItem
 {
 public:
-  inline GradeListItem (TQListView* parent, int _lesson): TQListViewItem(parent), lesson(_lesson) {}
+  inline GradeListItem (TQListView* tqparent, int _lesson): TQListViewItem(tqparent), lesson(_lesson) {}
   inline int getLesson() const { return lesson; }
 
 private:
@@ -58,8 +58,8 @@ private:
 };
 
 
-StatistikPage::StatistikPage(int col, kvoctrainDoc  *_doc, TQWidget *parent, const char *name)
-  : StatistikPageForm( parent, name ), doc(_doc)
+StatistikPage::StatistikPage(int col, kvoctrainDoc  *_doc, TQWidget *tqparent, const char *name)
+  : StatistikPageForm( tqparent, name ), doc(_doc)
 {
   StatListView->setColumnWidth(0, SIZE_GRADE + 10);
   StatListView->setColumnWidth(1, SIZE_GRADE + 10);
@@ -74,8 +74,8 @@ StatistikPage::StatistikPage(int col, kvoctrainDoc  *_doc, TQWidget *parent, con
   // accumulate numbers of grades per lesson
   for (int i = 0; i < (int) doc->numEntries(); i++) {
     kvoctrainExpr *expr = doc->getEntry(i);
-    int fg = QMIN(KV_MAX_GRADE, expr->getGrade(col, false));
-    int tg = QMIN(KV_MAX_GRADE, expr->getGrade(col, true));
+    int fg = TQMIN(KV_MAX_GRADE, expr->getGrade(col, false));
+    int tg = TQMIN(KV_MAX_GRADE, expr->getGrade(col, true));
     int l = expr->getLesson();
     if (l >= 0 && l <= (int) lesson.size() ) {
       fsc[l].grade[fg]++;
@@ -123,7 +123,7 @@ void StatistikPage::setupPixmaps()
           }
           else {
             --num;
-            widths[j] = QMAX(MIN_COL_WIDTH, fsc[entry].grade[j] * maxw / fsc[entry].num);
+            widths[j] = TQMAX(MIN_COL_WIDTH, fsc[entry].grade[j] * maxw / fsc[entry].num);
             w -= widths[j];
           }
         }
@@ -181,7 +181,7 @@ void StatistikPage::setupPixmaps()
           }
           else {
             --num;
-            widths[j] = QMAX(MIN_COL_WIDTH, tsc[entry].grade[j] * maxw / tsc[entry].num);
+            widths[j] = TQMAX(MIN_COL_WIDTH, tsc[entry].grade[j] * maxw / tsc[entry].num);
             w -= widths[j];
           }
         }
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h
index 0e15231e..374d1ec5 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h
@@ -38,9 +38,10 @@ class GradeCols;
 class StatistikPage : public StatistikPageForm
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
-  StatistikPage(int col, kvoctrainDoc *doc, TQWidget *parent = NULL, const char *name = NULL);
+  StatistikPage(int col, kvoctrainDoc *doc, TQWidget *tqparent = NULL, const char *name = NULL);
 
 public slots:
   void slotPopupMenu(int row, int col);
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui
index 7964f7e0..ede9c220 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>StatistikPageForm</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form2</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -22,7 +22,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QListView" row="0" column="0">
+        <widget class="TQListView" row="0" column="0">
             <column>
                 <property name="text">
                     <string>Grade FROM</string>
@@ -70,7 +70,7 @@
             <property name="name">
                 <cstring>StatListView</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>500</width>
                     <height>0</height>
@@ -82,5 +82,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kvoctrain/kvoctrain/tools/extractlang.cpp b/kvoctrain/kvoctrain/tools/extractlang.cpp
index a775274e..efb510f3 100644
--- a/kvoctrain/kvoctrain/tools/extractlang.cpp
+++ b/kvoctrain/kvoctrain/tools/extractlang.cpp
@@ -19,19 +19,19 @@ TQString threeLangs;
 
 void parseLanguage(TQString name, TQString three, TQString two)
 {
-  int star = three.find('*');
+  int star = three.tqfind('*');
   if (star > 0)
     three.remove(star, 1);
 
   TQString three_1 = three;
 
-  int slash = three_1.find('/');
+  int slash = three_1.tqfind('/');
   if (slash > 0) {
     three_1.remove(slash, 1);
     three_1.insert(slash, ", ");
   }
 
-  if (!two.contains("&nbsp;")) {
+  if (!two.tqcontains("&nbsp;")) {
       twoLangs.append("\t{{\"");
       twoLangs.append(two);
       twoLangs.append("\"}, {\"");
@@ -43,7 +43,7 @@ void parseLanguage(TQString name, TQString three, TQString two)
   else
     two = "";
 
-  slash = three.find('/');
+  slash = three.tqfind('/');
   if (slash > 0) {
     if (two.length() == 0)
       two = three.mid(slash+1);
@@ -96,7 +96,7 @@ bool parseTR(TQString& line, TQTextIStream& in)
 
 
   uint count = 0;
-  while (line.contains("<td"))
+  while (line.tqcontains("<td"))
     { 
       if (count > 3)
 	return true;
@@ -111,7 +111,7 @@ bool parseTR(TQString& line, TQTextIStream& in)
       parseLanguage(text[0], text[2], text[3]);
     }
 
-  if (line.contains("/tr"))
+  if (line.tqcontains("/tr"))
     return true;
 
   return false;
@@ -130,7 +130,7 @@ int main()
       if (readNext)
 	line = in.readLine();
 
-      if (line.contains("<tr"))
+      if (line.tqcontains("<tr"))
 	{
 	  readNext = parseTR(line, in);
 	}