Rename a number of old tq methods that are no longer tq specific

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-15 15:47:17 -0600
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-15 15:47:17 -0600
commit: 6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3 (patch)
tree: cc90a09df2d1fd6d956cc084529a62d354316ad3 /kvoctrain
parent: 174fd5e23c68598774706ea9b571d3d178e36b81 (diff)
download: tdeedu-6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.tar.gz
tdeedu-6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.zip
66 files changed, 356 insertions, 356 deletions
diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui
index 6fe8b52a..76550b4a 100644
--- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlgForm.ui
@@ -12,7 +12,7 @@
             <height>127</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>400</width>
             <height>120</height>
@@ -110,7 +110,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -129,7 +129,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>340</width>
                     <height>22</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
index 88df5b53..26834bea 100644
--- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
@@ -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").tqarg(i).tqarg(i + 1));
+        message.append(i18n("The time for level %1 should be lower than the time for level %2.\n").arg(i).arg(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").tqarg(i).tqarg(i + 1));
+        message.append(i18n("The time for level %1 should be lower than the time for level %2.\n").arg(i).arg(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").tqarg(i + 1));
+        message.append(i18n("The blocking time at level %1 should be lower than the expiration time.\n").arg(i + 1));
       }
     }
   }
diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui
index e64f19a2..2c8112e5 100644
--- a/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/blockoptionsbase.ui
@@ -190,7 +190,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -241,7 +241,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>380</width>
                     <height>30</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui
index d64fb69a..48897be5 100644
--- a/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/generaloptionsbase.ui
@@ -165,7 +165,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>51</width>
                     <height>123</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui
index 937e8a75..e19951b2 100644
--- a/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/groupoptionsbase.ui
@@ -32,7 +32,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -127,7 +127,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>150</width>
                     <height>16</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
index 73db49ce..69f2d3bc 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
@@ -17,7 +17,7 @@
  ***************************************************************************/
 
 #include <tqwidgetstack.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
 #include <tqlistview.h>
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index d0715a1d..f3568543 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -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_kbtqlayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&)));
+  connect(d_kblayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&)));
 
   // Load the languages first, then the countries and create the
   // menus for the languages last, so they will have flags
@@ -768,13 +768,13 @@ void LanguageOptions::slotDeleteClicked()
   enableLangWidgets();
 
   // doesn't work yet
-  if (d_shortName->count() != 0 && d_kbtqlayout->isEnabled())
+  if (d_shortName->count() != 0 && d_kblayout->isEnabled())
   {
-    for (int i = 0; i < d_kbtqlayout->count(); i++)
+    for (int i = 0; i < d_kblayout->count(); i++)
     {
-      if (d_kbtqlayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem()))
+      if (d_kblayout->text(i) == m_langSet.keyboardLayout(d_shortName->currentItem()))
       {
-        d_kbtqlayout->setCurrentItem(i);
+        d_kblayout->setCurrentItem(i);
         break;
       }
     }
@@ -782,9 +782,9 @@ void LanguageOptions::slotDeleteClicked()
 }
 
 
-void LanguageOptions::slotKeyboardLayoutChanged(const TQString& tqlayout)
+void LanguageOptions::slotKeyboardLayoutChanged(const TQString& layout)
 {
-  m_langSet.setKeyboardLayout(tqlayout, d_shortName->currentItem());
+  m_langSet.setKeyboardLayout(layout, d_shortName->currentItem());
   emit widgetModified();
   m_hasChanged = true;
 }
@@ -818,16 +818,16 @@ void LanguageOptions::enableLangWidgets()
         TQDataStream stream(replyData, IO_ReadOnly);
         stream >> layouts;
         layouts.prepend(TQString());
-        d_kbtqlayout->clear();
-        d_kbtqlayout->insertStringList(layouts);
+        d_kblayout->clear();
+        d_kblayout->insertStringList(layouts);
       }
     }
   }
   else
   {
     //kdDebug() << "kxkb not enabled" << endl;
-    d_kbtqlayout->clear();
-    d_kbtqlayout->setEnabled(false);
+    d_kblayout->clear();
+    d_kblayout->setEnabled(false);
   }
 }
 
@@ -898,22 +898,22 @@ void LanguageOptions::slotShortActivated(const TQString& _id)
      else
        b_langPixmap->setText (i18n("No Picture Selected"));
 
-     TQString tqlayout = m_langSet.keyboardLayout(d_shortName->currentItem());
+     TQString layout = m_langSet.keyboardLayout(d_shortName->currentItem());
 
-     //kdDebug() << "tqlayout to select " << tqlayout << endl;
+     //kdDebug() << "layout to select " << layout << endl;
 
-     for (int i = 0; i < d_kbtqlayout->count(); i++)
+     for (int i = 0; i < d_kblayout->count(); i++)
      {
-      if (d_kbtqlayout->text(i) == tqlayout)
+      if (d_kblayout->text(i) == layout)
        {
-        d_kbtqlayout->setCurrentItem(i);
+        d_kblayout->setCurrentItem(i);
         break;
        }
      }
      // not found
-     if (d_kbtqlayout->currentText() != tqlayout)
+     if (d_kblayout->currentText() != layout)
      {
-       d_kbtqlayout->setCurrentItem(0);
+       d_kblayout->setCurrentItem(0);
      }
    }
 }
@@ -1015,8 +1015,8 @@ void LanguageOptions::loadCountryData()
   locale.setLanguage(curr_lang);
   KGlobal::_locale = &locale;
 
-  TQString sub = TQString::tqfromLatin1("l10n/");
-  TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*.desktop"));
+  TQString sub = TQString::fromLatin1("l10n/");
+  TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop"));
   regionlist.sort();
 
   TQMap<TQString, Region>  regions;
@@ -1033,22 +1033,22 @@ void LanguageOptions::loadCountryData()
     if (index != -1) tag.truncate(index);
 
     KSimpleConfig entry(*it);
-    entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-    TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
+    entry.setGroup(TQString::fromLatin1("KCM Locale"));
+    TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
 
     regions.insert(tag, Region(name));
   }
 
   // add all languages to the list
-  TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::tqfromLatin1("*/entry.desktop"));
+  TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop"));
 
   int idx = 0;
   for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit)
   {
     KSimpleConfig entry(*sit);
-    entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-    TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
-    TQString submenu = entry.readEntry(TQString::tqfromLatin1("Region"));
+    entry.setGroup(TQString::fromLatin1("KCM Locale"));
+    TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+    TQString submenu = entry.readEntry(TQString::fromLatin1("Region"));
 
     TQString tag = *sit;
     int index = tag.findRev('/');
@@ -1059,7 +1059,7 @@ void LanguageOptions::loadCountryData()
     if (tag == "C")
       continue;
 
-    TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::tqfromLatin1("Languages")));
+    TQStringList all_langs = TQStringList::split(",", entry.readEntry(TQString::fromLatin1("Languages")));
     TQValueList<int> langs;
 
     TQString pixmap = *sit;
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
index 12b3b98e..23057407 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui
@@ -93,7 +93,7 @@
                 </widget>
                 <widget class="KComboBox" row="4" column="1">
                     <property name="name">
-                        <cstring>d_kbtqlayout</cstring>
+                        <cstring>d_kblayout</cstring>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Select a language or use the Add New Language Code to add one.</string>
@@ -205,7 +205,7 @@
                 </widget>
                 <widget class="TQLabel" row="4" column="0">
                     <property name="name">
-                        <cstring>label_kbtqlayout</cstring>
+                        <cstring>label_kblayout</cstring>
                     </property>
                     <property name="sizePolicy">
                         <sizepolicy>
@@ -216,10 +216,10 @@
                         </sizepolicy>
                     </property>
                     <property name="text">
-                        <string>Keyboard tqlayout:</string>
+                        <string>Keyboard layout:</string>
                     </property>
                     <property name="buddy" stdset="0">
-                        <cstring>d_kbtqlayout</cstring>
+                        <cstring>d_kblayout</cstring>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>You can assign a language to each column</string>
@@ -323,7 +323,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>390</width>
                     <height>20</height>
@@ -337,7 +337,7 @@
     <tabstop>e_shortName2</tabstop>
     <tabstop>e_langLong</tabstop>
     <tabstop>b_langPixmap</tabstop>
-    <tabstop>d_kbtqlayout</tabstop>
+    <tabstop>d_kblayout</tabstop>
     <tabstop>b_langDel</tabstop>
     <tabstop>e_newName</tabstop>
     <tabstop>b_langNew</tabstop>
diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui
index 142ee7f5..2524dc71 100644
--- a/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptionsbase.ui
@@ -37,7 +37,7 @@
             <property name="name">
                 <cstring>SeparatorCombo</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>140</width>
                     <height>0</height>
@@ -60,7 +60,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>310</width>
                     <height>20</height>
@@ -145,7 +145,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>21</height>
@@ -164,7 +164,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>80</width>
                     <height>31</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
index 3250b83e..73da961e 100644
--- a/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/queryoptionsbase.ui
@@ -242,7 +242,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>48</height>
@@ -261,7 +261,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
@@ -290,7 +290,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>111</width>
                             <height>20</height>
@@ -309,7 +309,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>290</width>
                     <height>20</height>
@@ -390,7 +390,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -439,7 +439,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>83</width>
                                     <height>20</height>
@@ -475,7 +475,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>200</width>
                             <height>16</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui
index 788ff271..f653d9e1 100644
--- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptionsbase.ui
@@ -145,7 +145,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -209,7 +209,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>50</height>
@@ -226,7 +226,7 @@
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>80</height>
@@ -285,7 +285,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>290</width>
                     <height>16</height>
diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
index 9c6b18e6..1729c84f 100644
--- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
+++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui
@@ -448,7 +448,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>61</width>
                     <height>20</height>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
index a49fd65e..a7bf8442 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
@@ -23,7 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
index 76013ebf..c7b58c9b 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
@@ -28,7 +28,7 @@
 #include "LangPropPage.h"
 
 #include <tqstringlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvaluelist.h>
 #include <tqtabwidget.h>
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui
index cd5b426b..eef4d0d4 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPageForm.ui
@@ -70,7 +70,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>70</width>
                             <height>0</height>
@@ -93,7 +93,7 @@
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -225,7 +225,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>20</height>
@@ -464,7 +464,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>20</height>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
index 3143007e..62012ea8 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
@@ -32,7 +32,7 @@
 
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kvoctraindoc.h>
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui
index e189b5bc..dbd8e918 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPageForm.ui
@@ -52,7 +52,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui
index 7ee368cc..910056d3 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPageForm.ui
@@ -52,7 +52,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui
index 7a4aff84..fb07ebca 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePageForm.ui
@@ -109,7 +109,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -126,7 +126,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui
index d5207579..2a9126d0 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPageForm.ui
@@ -52,7 +52,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui
index bca2b89d..14ef81ce 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPageForm.ui
@@ -52,7 +52,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui
index b5cea508..131df53c 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPageForm.ui
@@ -70,7 +70,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>80</height>
@@ -89,7 +89,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>80</height>
@@ -108,7 +108,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>80</height>
@@ -182,7 +182,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>80</height>
@@ -207,7 +207,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>80</height>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
index 428e902f..6676ea29 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
@@ -165,13 +165,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>30</width>
                                     <height>30</height>
@@ -196,13 +196,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>30</width>
                                     <height>30</height>
@@ -257,7 +257,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -300,13 +300,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>30</width>
                                     <height>30</height>
@@ -358,13 +358,13 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>30</width>
                                     <height>0</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>30</width>
                                     <height>24</height>
@@ -387,7 +387,7 @@
                             <property name="sizeType">
                                 <enum>Preferred</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -406,7 +406,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>90</height>
@@ -428,7 +428,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>80</height>
@@ -440,7 +440,7 @@
                             <property name="frameShadow">
                                 <enum>Sunken</enum>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignTop|AlignLeft</set>
                             </property>
                             <property name="vAlign" stdset="0">
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index 82a8f945..6d619b79 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -26,7 +26,7 @@
 
 #include "EntryDlg.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 
 #include <kmainwindow.h>
@@ -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:").tqarg(s), querymanager, active,
+                                      i18n("Original &expression in %1:").arg(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:").tqarg(s), querymanager, active,
+                                      i18n("Translated &expression in %1:").arg(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:").tqarg(s), querymanager, active);
+      i18n("Original &expression in %1:").arg(s), querymanager, active);
   else
     comm_page->setData(multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel,
-      i18n("Translated &expression in %1:").tqarg(s), querymanager, active);
+      i18n("Translated &expression in %1:").arg(s), querymanager, active);
 
   adj_page->setData(multi_sel, comp);
   aux_page->setData(multi_sel, synonym, antonym, example, rem, paraphrase);
diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui
index d01d74bf..20d5e373 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPageForm.ui
@@ -72,7 +72,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -150,7 +150,7 @@
                             <property name="name">
                                 <cstring>year_spin</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>60</width>
                                     <height>0</height>
@@ -161,7 +161,7 @@
                             <property name="name">
                                 <cstring>month_spin</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>110</width>
                                     <height>0</height>
@@ -172,7 +172,7 @@
                             <property name="name">
                                 <cstring>day_spin</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>60</width>
                                     <height>0</height>
@@ -189,7 +189,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp
index 5bfe2343..9e7c7450 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp
@@ -48,7 +48,7 @@ TQString MySpinBox::mapValueToText( int value )
   if (spin_names != 0)
     return (*spin_names)[value];
   else
-    return TQString("%1").tqarg(value);
+    return TQString("%1").arg(value);
 }
 
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
index 9669719c..e212c87c 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
@@ -26,7 +26,7 @@
 
 #include "PhoneticEntryPage.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqgroupbox.h>
 #include <tqtooltip.h>
@@ -43,11 +43,11 @@
 
 struct KV_Unicode_Ref {
   wchar_t     code;
-  const char *tqunicodename;
+  const char *unicodename;
   const char *audible;
 };
 
-KV_Unicode_Ref kv_tqunicode_ref[] = {
+KV_Unicode_Ref kv_unicode_ref[] = {
 
    {0x00E6, "LATIN SMALL LETTER AE", I18N_NOOP_maybe("")},
    {0x00E7, "LATIN SMALL LETTER C WITH CEDILLA", I18N_NOOP_maybe("")},
@@ -171,18 +171,18 @@ KV_Unicode_Ref kv_tqunicode_ref[] = {
 void PhoneticButton::slotClicked()
 {
   if (text().length() != 0)
-    emit page->charSelected(text()[0].tqunicode());
+    emit page->charSelected(text()[0].unicode());
 }
 
 
 PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, const char *name, bool modal)
   : KDialogBase(Plain, i18n("Select Characters From Phonetic Alphabet"), Close, Close, parent, name, modal)
 {
-  int num = sizeof(kv_tqunicode_ref) / sizeof(kv_tqunicode_ref[0]);
+  int num = sizeof(kv_unicode_ref) / sizeof(kv_unicode_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_tqunicode_ref;
+  KV_Unicode_Ref *uni_ref = kv_unicode_ref;
   int vert = 0;
   int horiz = 0;
   while (uni_ref->code != 0) {
@@ -191,12 +191,12 @@ 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::tqfromLatin1(uni_ref->tqunicodename);
+    tip += TQString::fromLatin1(uni_ref->unicodename);
     tip += "\n";
     tip += i18n("Describing the sound of the character", "Sound: ");
     tip += i18n(uni_ref->audible);
     butt->setFont(ipafont);
-    butt->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+    butt->setSizePolicy(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 );
@@ -208,7 +208,7 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co
     }
     ++uni_ref;
   }
-  resize(tqsizeHint());
+  resize(sizeHint());
 }
 
 
@@ -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].tqunicode());
+      emit charSelected(s[i].unicode());
     }
     e->accept();
   }
diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui
index 8c1e580b..c3ea92a6 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPageForm.ui
@@ -44,7 +44,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -229,7 +229,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>80</width>
                                     <height>20</height>
@@ -307,7 +307,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp
index 9d272a4e..3e13aaa6 100644
--- a/kvoctrain/kvoctrain/kva_clip.cpp
+++ b/kvoctrain/kvoctrain/kva_clip.cpp
@@ -26,7 +26,7 @@
 
 #include "kvoctrain.h"
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include <klineedit.h>
 #include <klocale.h>
@@ -38,7 +38,7 @@ using namespace std;
 void kvoctrainApp::slotSmartSearchClip()
 {
   TQString s;
-  TQString entries = TQApplication::tqclipboard()->text();
+  TQString entries = TQApplication::clipboard()->text();
 
   if (!entries.isEmpty()) {
     int pos = entries.find ('\n'); // search for a line end
@@ -148,11 +148,11 @@ void kvoctrainApp::slotEditCopy()
   }
   if (!exp.isEmpty()) {
 #if defined(_WS_X11_)
-//    disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()),this,0);
+//    disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),this,0);
 #endif
-    TQApplication::tqclipboard()->setText(exp);
+    TQApplication::clipboard()->setText(exp);
 #if defined(_WS_X11_)
-//    connect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged()));
+//    connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged()));
 #endif
   }
 
@@ -167,7 +167,7 @@ void kvoctrainApp::slotEditPaste()
 
   TQApplication::setOverrideCursor( waitCursor );
   TQString s;
-  TQString entries = TQApplication::tqclipboard()->text();
+  TQString entries = TQApplication::clipboard()->text();
 
   vector <int> csv_order = getCsvOrder(doc);
 
diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp
index eee43d99..54f7a7ee 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(slotHeadertqStatus(int)));
+    connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
 
     header_m->exec(TQPoint (x, y));
     return;
@@ -90,7 +90,7 @@ 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(slotHeadertqStatus(int)));
+  connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
 
   header_m = new TQPopupMenu();
 
@@ -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").tqarg(names[i-1]),
+        query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]),
             (i << (16+8)) |  IDH_START_TQUERY);  // hack: IDs => header-ids + cmd
       }
       else {
-        query_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_TQUERY);
+        query_m->insertItem(i18n("From %1").arg(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(slotHeadertqStatus(int)));
+    connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
     for (int i = 1; i < (int) doc->numLangs(); i++) {
       // show pixmap and long name if available
       int j;
       if((j = langset.indexShortId(doc->getIdent(i))) >= 0
          && !langset.PixMapFile(j).isEmpty()
          && !langset.longId(j).isEmpty() ) {
-        multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(names[i-1]),
+        multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]),
             (i << (16+8)) |  IDH_START_MULTIPLE);  // hack: IDs => header-ids + cmd
       }
       else {
-        multiple_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_MULTIPLE);
+        multiple_m->insertItem(i18n("From %1").arg(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(slotHeadertqStatus(int)));
+    connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
 
     header_m->insertSeparator();
     header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA);
@@ -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(slotHeadertqStatus(int)));
+  connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
   header_m->exec(TQPoint(x, y));
 }
 
@@ -226,7 +226,7 @@ void kvoctrainApp::slotSetHeaderProp (int header_and_id) /*FOLD00*/
 }
 
 
-void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/
+void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
 {
   int header1 = (header_and_cmd >> 16) & 0xFF;
   int header2 = header_and_cmd >> (16+8);
@@ -262,11 +262,11 @@ void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/
       TQString msg;
       if (header1 == 0) {
         TQString format = i18n("Sets %1 as language for original");
-        msg = format.tqarg(from);
+        msg = format.arg(from);
       }
       else {
         TQString format = i18n("Sets %1 as language for translation %2");
-        msg = format.tqarg(from).tqarg(header1);
+        msg = format.arg(from).arg(header1);
       }
       slotStatusHelpMsg(msg);
     }
@@ -282,7 +282,7 @@ void kvoctrainApp::slotHeadertqStatus (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.tqarg(from);
+        msg = format.arg(from);
         slotStatusHelpMsg(msg);
       }
     }
@@ -294,7 +294,7 @@ void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/
         from = langset.findLongId(from);
       TQString msg;
       TQString format = i18n("Removes %1 irrevocably from dictionary");
-      msg = format.tqarg(from);
+      msg = format.arg(from);
       slotStatusHelpMsg(msg);
     }
     break;
@@ -317,14 +317,14 @@ void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/
           format = i18n("Creates and starts query to %1");
         else
           format = i18n("Creates and starts multiple choice to %1");
-        msg = format.tqarg(to);
+        msg = format.arg(to);
       }
       else {
         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.tqarg(from).tqarg(to);
+        msg = format.arg(from).arg(to);
       }
 
       slotStatusHelpMsg(msg);
@@ -376,7 +376,7 @@ void kvoctrainApp::slotHeadertqStatus (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.tqarg(from);
+      TQString msg = format.arg(from);
       slotStatusHelpMsg(msg);
     }
     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.tqarg(name);
+      msg = format.arg(name);
 
       int exit = KMessageBox::warningContinueCancel(this, msg,
                     kapp->makeStdCaption(""),KStdGuiItem::del());
@@ -548,7 +548,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
                       "lesson.\n\nDo you really want to reset \"%1\"?");
       }
 
-      msg = format.tqarg(name);
+      msg = format.arg(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 9bef423d..6af8c57b 100644
--- a/kvoctrain/kvoctrain/kva_init.cpp
+++ b/kvoctrain/kvoctrain/kva_init.cpp
@@ -27,7 +27,7 @@
 
 #include "common-dialogs/ProgressDlg.h"
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqtimer.h>
 
 #include <klineedit.h>
@@ -187,7 +187,7 @@ void kvoctrainApp::initActions()
   vocabAppendLanguage = new KSelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language");
   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)));
+  connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int)));
 
   vocabSetLanguage = new KSelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language");
   connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabSetLanguage()));
@@ -195,7 +195,7 @@ void kvoctrainApp::initActions()
   vocabRemoveLanguage = new KSelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language");
   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)));
+  connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int)));
 
   vocabDocumentProperties = new KAction(i18n("Document &Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties");
   vocabDocumentProperties->setWhatsThis(i18n("Edit document properties"));
@@ -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(tqminimumSizeHint()));
+      resize( TQSize(550, 400).expandedTo(minimumSizeHint()));
   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(slotHeadertqStatus(int)));
+  connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
   connect(learn_menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowLearn()));
 }
 
diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp
index 5f0c52bc..7d4c338c 100644
--- a/kvoctrain/kvoctrain/kva_io.cpp
+++ b/kvoctrain/kvoctrain/kva_io.cpp
@@ -198,7 +198,7 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent)
       doc = 0;
 
       TQString format = i18n("Loading %1");
-      TQString msg = format.tqarg(url.path());
+      TQString msg = format.arg(url.path());
 
       slotStatusMsg(msg);
       prepareProgressBar();
@@ -249,7 +249,7 @@ void kvoctrainApp::slotFileMerge()
   if (!url.isEmpty() ) {
 
     TQString format = i18n("Loading %1");
-    TQString msg = format.tqarg(url.path());
+    TQString msg = format.arg(url.path());
 
     slotStatusMsg(msg);
     prepareProgressBar();
@@ -274,7 +274,7 @@ void kvoctrainApp::slotFileMerge()
     vector<TQString> new_usages = new_doc->getUsageDescr();
 
     format = i18n("Merging %1");
-    msg = format.tqarg(url.path());
+    msg = format.arg(url.path());
     slotStatusMsg(msg);
 
     TQApplication::setOverrideCursor( waitCursor );
@@ -500,7 +500,7 @@ void kvoctrainApp::slotFileSave()
   }
 
   TQString format = i18n("Saving %1");
-  TQString msg = format.tqarg(doc->URL().path());
+  TQString msg = format.arg(doc->URL().path());
   slotStatusMsg(msg);
 
   // remove previous backup
@@ -598,7 +598,7 @@ void kvoctrainApp::slotFileSaveAs()
     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>")
-       .tqarg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel)
+       .arg(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.tqarg(url.path());
+      TQString msg = format.arg(url.path());
       slotStatusMsg(msg);
 
       TQFile::remove(TQFile::encodeName(url.path()+"~"));         // remove previous backup
@@ -651,14 +651,14 @@ void kvoctrainApp::slotSaveSelection ()
     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>")
-       .tqarg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel)
+       .arg(url.path()),TQString(),i18n("Overwrite")) == KMessageBox::Cancel)
     {
     // do nothing
     }
     else
     {
       TQString format = i18n("Saving %1");
-      TQString msg = format.tqarg(url.path());
+      TQString msg = format.arg(url.path());
       slotStatusMsg(msg);
 
       TQFile::remove(url.path()+"~");         // remove previous backup
diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp
index 1469c354..c9be7784 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")
-                       .tqarg(noData ? TQString() : expr->getRemark(col)));
+                       .arg(noData ? TQString() : expr->getRemark(col)));
   if (pron_label != 0)
     pron_label->setText(i18n("Abbreviation for P)ronouncation","P: %1")
-                        .tqarg(noData ? TQString() : expr->getPronunce(col)));
+                        .arg(noData ? TQString() : expr->getPronunce(col)));
   if (type_label != 0)
     type_label->setText(i18n("Abbreviation for T)ype of word", "T: %1")
-                        .tqarg(noData ? TQString() : QueryManager::typeStr(expr->getType(col))));
+                        .arg(noData ? TQString() : QueryManager::typeStr(expr->getType(col))));
 
   if (entryDlg != 0) {
     if (noData)
@@ -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").tqarg(main_names[i]),
+          query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(main_names[i]),
               (i << (16+8)) |  IDH_START_TQUERY);  // hack: IDs => header-ids + cmd
         }
         else {
-          query_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_TQUERY);
+          query_m->insertItem(i18n("From %1").arg(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(slotHeadertqStatus(int)));
+      connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
 
       for (int i = 1; i < (int) doc->numLangs(); i++) {
         // show pixmap and long name if available
@@ -1158,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").tqarg(main_names[i]),
+          multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(main_names[i]),
               (i << (16+8)) |  IDH_START_MULTIPLE);  // hack: IDs => header-ids + cmd
         }
         else {
-          multiple_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_MULTIPLE);
+          multiple_m->insertItem(i18n("From %1").arg(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(slotHeadertqStatus(int)));
+      connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
     }
 
     connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-    connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
+    connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
 
     TQString id = header == 0 ? doc->getOriginalIdent()
                              : doc->getIdent(header);
@@ -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(slotHeadertqStatus(int)));
+      connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
 
       if (header == 0)
         set_m->insertItem(i18n("&Original"), langs_m, (2 << 16) | IDH_NULL);
@@ -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").tqarg(header), langs_m, (2 << 16) | IDH_NULL);
+          set_m->insertItem(i18n("&%1. Translation").arg(header), langs_m, (2 << 16) | IDH_NULL);
       }
     }
   }
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index bf1ea6ea..7fa8203d 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -146,7 +146,7 @@ public:
 //  void slotSearchClip();
   void slotSetHeaderProp (int header_and_id);
   void slotHeaderCallBack (int cmd_and_id);
-  void slotHeadertqStatus (int cmd_and_id);
+  void slotHeaderStatus (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 c41de57b..e5259f31 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -424,10 +424,10 @@ void KVocTrainTable::paintCell(TQPainter * p, int row, int col, const TQRect & c
   }
 
   TQPen pen( p->pen() );
-  int gridColor = tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, this );
+  int gridColor = tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, this );
   if (gridColor != -1) {
     const TQPalette &pal = palette();
-    if (cg != tqcolorGroup()
+    if (cg != colorGroup()
         && cg != pal.disabled()
         && cg != pal.inactive())
       p->setPen(cg.mid());
diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.cpp b/kvoctrain/kvoctrain/kvoctraintableitem.cpp
index d4bc0343..34b00912 100644
--- a/kvoctrain/kvoctrain/kvoctraintableitem.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintableitem.cpp
@@ -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->tqsizeHint();
+        TQSize sz = statebox->sizeHint();
         sz.setHeight(table()->rowHeight(row()));
         statebox->setMinimumSize(sz);
         if (!m_doc->getEntry(row())->isActive() )
diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp
index 61cc55bb..17515e5e 100644
--- a/kvoctrain/kvoctrain/kvoctrainview.cpp
+++ b/kvoctrain/kvoctrain/kvoctrainview.cpp
@@ -38,7 +38,7 @@
 #include <kapplication.h>
 #include <kprinter.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqbitmap.h>
 #include <tqfile.h>
 
@@ -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").tqarg(m_doc->getTitle()));
+  painter.drawText(marg, marg - 20, i18n("KVocTrain - %1").arg(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/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
index f177fa14..06f8f972 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
@@ -27,7 +27,7 @@
 
 #include "kvoctrain.h"
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <vector>
 using namespace std;
@@ -106,7 +106,7 @@ bool kvoctrainDoc::saveToCsv (TQTextStream& os, TQString &)
   }
 
   setModified (false);
-  return os.tqdevice()->status() == IO_Ok;
+  return os.device()->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.tqdevice()->size ();
+  int size = is.device()->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].tqunicode();
+        ushort trigger = s[i].unicode();
         if (trigger >= 0x80) {
           int remain = s.length() - i;
           if ((trigger & 0xE0) == 0xC0){         // 110x xxxx
             if (   (remain > 1)
-                && (s[i+1].tqunicode() & 0xC0) == 0x80)
+                && (s[i+1].unicode() & 0xC0) == 0x80)
               utf8_mode = true;
           }
           else if ((trigger & 0xF0) == 0xE0) {  // 1110 xxxx
             if (   remain > 2
-                && s[i+1].tqunicode() & 0xC0 == 0x80
-                && s[i+2].tqunicode() & 0xC0 == 0x80)
+                && s[i+1].unicode() & 0xC0 == 0x80
+                && s[i+2].unicode() & 0xC0 == 0x80)
               utf8_mode = true;
           }
           else if ((trigger & 0xF8) == 0xF0) {   // 1111 0xxx
             if (   remain > 3
-                && s[i+1].tqunicode() & 0xC0 == 0x80
-                && s[i+2].tqunicode() & 0xC0 == 0x80
-                && s[i+3].tqunicode() & 0xC0 == 0x80)
+                && s[i+1].unicode() & 0xC0 == 0x80
+                && s[i+2].unicode() & 0xC0 == 0x80
+                && s[i+3].unicode() & 0xC0 == 0x80)
               utf8_mode = true;
           }
           else if ((trigger & 0xFC) == 0xF8) {   // 1111 10xx
             if (   remain > 4
-                && 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+1].unicode() & 0xC0 == 0x80
+                && s[i+2].unicode() & 0xC0 == 0x80
+                && s[i+3].unicode() & 0xC0 == 0x80
+                && s[i+4].unicode() & 0xC0 == 0x80)
               utf8_mode = true;
           }
           else if ((trigger & 0xFE) == 0xFC) {   // 1111 110x
             if (   remain > 5
-                && 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)
+                && 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)
               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.tqdevice()->at() / (int) f_ent_percent);
+      emit progressChanged(this, is.device()->at() / (int) f_ent_percent);
     }
 
     // similar in kva_clip.cpp::slotEditPaste()
@@ -228,7 +228,7 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is)
     }
   }
   setModified (false);
-  return is.tqdevice()->status() == IO_Ok;
+  return is.device()->status() == IO_Ok;
 }
 
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
index 0bd03361..649825d4 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
@@ -116,7 +116,7 @@ bool kvoctrainDoc::saveTypeNameLex (TQTextStream &os)
   while (i++ < LEX_MAX_ATTR)
     os << "|\n";
 
-  return os.tqdevice()->status() == IO_Ok;
+  return os.device()->status() == IO_Ok;
 }
 
 
@@ -139,7 +139,7 @@ bool kvoctrainDoc::loadTypeNameLex (TQTextStream &is)
     type_descr.push_back (attr);
   }
 
-  return is.tqdevice()->status() == IO_Ok;
+  return is.device()->status() == IO_Ok;
 }
 
 
@@ -152,7 +152,7 @@ bool kvoctrainDoc::saveLessonLex (TQTextStream &os)
   while (i++ < LEX_MAX_LESSON)
     os << "|\n";
 
-  return os.tqdevice()->status() == IO_Ok;
+  return os.device()->status() == IO_Ok;
 }
 
 
@@ -172,7 +172,7 @@ bool kvoctrainDoc::loadLessonLex (TQTextStream &is)
     lesson_descr.push_back (lesson);
   }
 
-  return is.tqdevice()->status() == IO_Ok;
+  return is.device()->status() == IO_Ok;
 }
 
 
@@ -234,7 +234,7 @@ bool kvoctrainDoc::saveToLex (TQTextStream& os, TQString & /*title*/)
   }
 
   setModified (false);
-  return os.tqdevice()->status() == IO_Ok;
+  return os.device()->status() == IO_Ok;
 }
 
 
@@ -380,7 +380,7 @@ bool kvoctrainDoc::loadFromLex (TQTextStream& is)
   }
 
   setModified (false);
-  return is.tqdevice()->status() == IO_Ok;
+  return is.device()->status() == IO_Ok;
 }
 
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
index 1bb67f28..f1c4bbc3 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>").tqarg(KV_TYPE_GRP));
+                    i18n("expected ending tag <%1>").arg(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>").tqarg(KV_TYPE_DESC));
+                      i18n("expected ending tag <%1>").arg(KV_TYPE_DESC));
           return false;
         }
       }
       else {
         if (elem.tag() != KV_TYPE_DESC || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").tqarg(KV_TYPE_DESC));
+                      i18n("expected ending tag <%1>").arg(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>" ).tqarg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).arg(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>").tqarg(KV_TENSE_GRP));
+                    i18n("expected ending tag <%1>").arg(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>").tqarg(KV_TENSE_DESC));
+                      i18n("expected ending tag <%1>").arg(KV_TENSE_DESC));
           return false;
         }
       }
       else {
         if (elem.tag() != KV_TENSE_DESC || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").tqarg(KV_TENSE_DESC));
+                      i18n("expected ending tag <%1>").arg(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>" ).tqarg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).arg(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>").tqarg(KV_USAGE_GRP));
+                    i18n("expected ending tag <%1>").arg(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>").tqarg(KV_USAGE_DESC));
+                      i18n("expected ending tag <%1>").arg(KV_USAGE_DESC));
           return false;
         }
       }
       else {
         if (elem.tag() != KV_USAGE_DESC || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").tqarg(KV_USAGE_DESC));
+                      i18n("expected ending tag <%1>").arg(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>" ).tqarg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
         return false;
       }
       else {
@@ -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>").tqarg(elem.tag()));
+                    i18n("expected ending tag <%1>").arg(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>").tqarg(elem.tag()));
+                    i18n("unexpected ending tag <%1>").arg(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>").tqarg(elem.tag()));
+                    i18n("expected ending tag <%1>").arg(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>").tqarg(elem.tag()));
+                    i18n("unexpected ending tag <%1>").arg(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>").tqarg(elem.tag()));
+                    i18n("expected ending tag <%1>").arg(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>").tqarg(elem.tag()));
+                    i18n("repeated occurrence of tag <%1>").arg(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>").tqarg(elem.tag()));
+                    i18n("repeated occurrence of tag <%1>").arg(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>").tqarg(elem.tag()));
+                     i18n("repeated occurrence of tag <%1>").arg(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>").tqarg(elem.tag()));
+                    i18n("repeated occurrence of tag <%1>").arg(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>").tqarg(elem.tag()));
+                    i18n("repeated occurrence of tag <%1>").arg(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>").tqarg(elem.tag()));
+                    i18n("repeated occurrence of tag <%1>").arg(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>").tqarg(elem.tag()));
+                    i18n("repeated occurrence of tag <%1>").arg(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>" ).tqarg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).arg(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").tqarg(URL().path()).tqarg(line);
+   TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(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.tqarg(attr).tqarg(name);
+   TQString msg = format.arg(attr).arg(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").tqarg(URL().path()).tqarg(line);
+   TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(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.tqarg(elem);
+   TQString msg = format.arg(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").tqarg(URL().path()).tqarg(line);
+   TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(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").tqarg(URL().path()).tqarg(line);
+   TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(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 de7cbd19..f4443ca5 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>").tqarg(elem.tag()));
+                i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(elem.tag()));
+                    i18n("repeated occurrence of tag <%1>").arg(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>").tqarg(KV_ORG));
+                      i18n("expected ending tag <%1>").arg(KV_ORG));
           return false;
         }
       }
       else {
         if (elem.tag() != KV_ORG || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").tqarg(KV_ORG));
+                      i18n("expected ending tag <%1>").arg(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").tqarg(KV_ORG));
+                    i18n("starting tag <%1> is missing").arg(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>").tqarg(KV_TRANS));
+                      i18n("expected ending tag <%1>").arg(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>").tqarg(KV_TRANS));
+                      i18n("expected ending tag <%1>").arg(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").tqarg(KV_ORG));
+                    i18n("starting tag <%1> is missing").arg(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>" ).tqarg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).arg(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 5bc10f3f..7bef3ff7 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
@@ -27,7 +27,7 @@
 
 #include <klocale.h>
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 bool kvoctrainDoc::loadFromKvtMl (TQTextStream& is)
 {
@@ -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." ).tqarg(KV_DOCTYPE).tqarg(elem.tag()));
+                     "but tag <%2> was read." ).arg(KV_DOCTYPE).arg(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.tqarg((*first).stringValue ().upper()).tqarg("ISO 8859-1");
+        TQString msg =format.arg((*first).stringValue ().upper()).arg("ISO 8859-1");
         warningKvtMl (xml.lineNumber(), msg);
       }
   
@@ -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>").tqarg(tag_name));
+      errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").arg(tag_name));
       return false;
     }
   }
   else {
     if (elem.tag() != tag_name || !elem.isEndTag() ) {
-      errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").tqarg(tag_name));
+      errorKvtMl (xml.lineNumber(), i18n("expected ending tag <%1>").arg(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>").tqarg(KV_ARTICLE_GRP));
+                    i18n("disallowed occurrence of tag <%1>").arg(KV_ARTICLE_GRP));
         return false;
       }
       if (! elem.isEndTag ()) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("expected ending tag <%1>").tqarg(KV_ARTICLE_GRP));
+                    i18n("expected ending tag <%1>").arg(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>").tqarg(KV_ART_ENTRY));
+                      i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_ART_FD));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_ART_FI));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_ART_MD));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_ART_MI));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_ART_ND));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_ART_NI));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>" ).tqarg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).arg(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>").tqarg(KV_CONJUG_GRP));
+                    i18n("disallowed occurrence of tag <%1>").arg(KV_CONJUG_GRP));
         return false;
       }
       if (! elem.isEndTag ()) {
         errorKvtMl (xml.lineNumber(),
-                    i18n("expected ending tag <%1>").tqarg(elem.tag()));
+                    i18n("expected ending tag <%1>").arg(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>").tqarg(entry_tag));
+                      i18n("disallowed occurrence of tag <%1>").arg(entry_tag));
           return false;
         }
         inEntry = true;
@@ -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>").tqarg(KV_CON_P1S));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_CON_P2S));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_CON_P3SF));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_CON_P3SM));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_CON_P3SN));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_CON_P1P));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_CON_P2P));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_CON_P3PF));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_CON_P3PM));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>").tqarg(KV_CON_P3PN));
+                    i18n("disallowed occurrence of tag <%1>").arg(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>" ).tqarg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).arg(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>").tqarg(elem.tag()));
+                    i18n("expected ending tag <%1>").arg(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>").tqarg(KV_LESS_DESC));
+                      i18n("expected ending tag <%1>").arg(KV_LESS_DESC));
           return false;
         }
       }
       else {
         if (elem.tag() != KV_LESS_DESC || !elem.isEndTag() ) {
           errorKvtMl (xml.lineNumber(),
-                      i18n("expected ending tag <%1>").tqarg(KV_LESS_DESC));
+                      i18n("expected ending tag <%1>").arg(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>" ).tqarg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).arg(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>").tqarg(elem.tag()));
+                    i18n("expected ending tag <%1>").arg(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>" ).tqarg(elem.tag()));
+                    i18n("unexpected ending tag <%1>" ).arg(elem.tag()));
         return false;
       }
       else {
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
index 748fe81d..72020b94 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.tqdevice()->status() == IO_Ok;
+  return os.device()->status() == IO_Ok;
 }
 
 
@@ -103,7 +103,7 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
   loadTypeNameVcb (is);
   loadLessonVcb (is);
 
-  int size = is.tqdevice()->size ();
+  int size = is.device()->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.tqdevice()->at() / f_ent_percent));
+      emit progressChanged(this, int(is.device()->at() / f_ent_percent));
     }
 
     if (!s.stripWhiteSpace().isEmpty()) {
@@ -184,7 +184,7 @@ bool kvoctrainDoc::loadFromVcb (TQTextStream& is)
   langs.push_back("en");
 
   setModified (false);
-  return is.tqdevice()->status() == IO_Ok;
+  return is.device()->status() == IO_Ok;
 }
 
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
index c280d6ed..7cce072b 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
@@ -137,5 +137,5 @@ bool kvoctrainDoc::loadFromVoc(TQTextStream& is)
 
   setModified(false);
   doc_url.setFileName(i18n("Untitled"));
-  return is.tqdevice()->status() == IO_Ok;
+  return is.device()->status() == IO_Ok;
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
index c01c82c9..39a4bf8a 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
@@ -28,7 +28,7 @@
 
 #include <kdebug.h>
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 bool kvoctrainDoc::saveTypeNameKvtMl (XmlWriter &xml)
 {
@@ -956,5 +956,5 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) {
   xml.endTag (KV_DOCTYPE, true);
 
   setModified (false);
-  return os.tqdevice()->status() == IO_Ok;
+  return os.device()->status() == IO_Ok;
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index ba21da07..24beec1f 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -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>").tqarg(url.path()));
+      KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").arg(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.tqarg(url.path());
+        TQString msg = format.arg(url.path());
         int result = KMessageBox::warningContinueCancel(0, msg,
                                                         kapp->makeStdCaption(i18n("I/O Failure")),
                                                         i18n("&Retry"));
@@ -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>").tqarg(tmp.path()));
+      KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>").arg(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.tqarg(tmp.path());
+      TQString msg = format.arg(tmp.path());
       int result = KMessageBox::warningContinueCancel(0, msg,
                                                       kapp->makeStdCaption(i18n("I/O Failure")),
                                                       i18n("&Retry"));
@@ -937,7 +937,7 @@ kvoctrainDoc::FileType kvoctrainDoc::detectFT(const TQString &filename)
    line.insert (0, c1);
    f.close();
 
-   bool stat = is.tqdevice()->status();
+   bool stat = is.device()->status();
    if (stat != IO_Ok)
      return kvd_none;
    if (c1 == '<' && c2 == '?' && c3 == 'x' && c4 == 'm' && c5 == 'l')
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
index 866e7822..d5ab8f91 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
@@ -32,8 +32,8 @@ class KOXML_OSTREAM;
  *
  *  xml.startTag ("head"); // writes &lt;head&gt;
  *
- *  // write &lt;tqlayout format="a4" orientation="landscape"&gt;
- *  xml.startTag ("tqlayout", false);
+ *  // write &lt;layout format="a4" orientation="landscape"&gt;
+ *  xml.startTag ("layout", 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.tqdevice(); }
+  inline TQIODevice *stream () { return strm.device(); }
 #endif
 
 private:
diff --git a/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h b/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h
index 3e031331..fd411e23 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/koxml_config.h
@@ -8,7 +8,7 @@
 
 #ifndef KOXML_USE_STL
 
-# include <tqtextstream.h>
+# include <textstream.h>
 # define KOXML_ISTREAM TQTextStream
 # define KOXML_OSTREAM TQTextStream
 
diff --git a/kvoctrain/kvoctrain/kvt-core/langset.cpp b/kvoctrain/kvoctrain/kvt-core/langset.cpp
index a9ed5dcb..77d03fb0 100644
--- a/kvoctrain/kvoctrain/kvt-core/langset.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/langset.cpp
@@ -212,9 +212,9 @@ void LangSet::setPixMapFile (const TQString & s, int index)
     langs[index].PixMapFile = s;
 }
 
-void LangSet::setKeyboardLayout(const TQString& tqlayout, int index)
+void LangSet::setKeyboardLayout(const TQString& layout, int index)
 {
   if (index < (int) langs.size()) {
-    langs[index].keyboardLayout = tqlayout;
+    langs[index].keyboardLayout = layout;
   }
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h
index cfcc7f3b..ac4e8ace 100644
--- a/kvoctrain/kvoctrain/kvt-core/langset.h
+++ b/kvoctrain/kvoctrain/kvt-core/langset.h
@@ -70,7 +70,7 @@ class LangSet
    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 & tqlayout, int index);
+   void setKeyboardLayout(const TQString & layout, 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 659c6f82..792ca63c 100644
--- a/kvoctrain/kvoctrain/kvtnewstuff.cpp
+++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp
@@ -75,14 +75,14 @@ TQString KVTNewStuff::downloadDestination(KNS::Entry * entry)
   {
     int result = KMessageBox::warningContinueCancel(parentWidget(),
         i18n("The file '%1' already exists. Do you want to overwrite it?")
-        .tqarg(file),
+        .arg(file),
         TQString(), i18n("Overwrite") );
     if (result == KMessageBox::Cancel)
       return TQString();
   }
   KMessageBox::information(parentWidget(),
     i18n("<qt>The selected file will now be downloaded and saved as\n<b>'%1'</b>.</qt>")
-    .tqarg(file),
+    .arg(file),
     TQString(),
     "NewStuffDownloadLocation");
   return file;
diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
index 6aaf00a9..d6197ea0 100644
--- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlgForm.ui
@@ -122,7 +122,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>390</width>
                     <height>60</height>
@@ -131,7 +131,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -158,7 +158,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
index 42653ef9..def5f384 100644
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlgForm.ui
@@ -120,7 +120,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout10</cstring>
+                <cstring>layout10</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -229,7 +229,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
index edcb7c2e..4a46ac77 100644
--- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
@@ -137,7 +137,7 @@
                     <property name="text">
                         <string>-</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -156,7 +156,7 @@
                     <property name="text">
                         <string>-</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -175,7 +175,7 @@
                     <property name="text">
                         <string>-</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -194,7 +194,7 @@
                     <property name="text">
                         <string>-</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -213,7 +213,7 @@
                     <property name="text">
                         <string>-</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -221,7 +221,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout14</cstring>
+                <cstring>layout14</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -229,7 +229,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout12</cstring>
+                        <cstring>layout12</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
index 3b108143..d70b92ed 100644
--- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
@@ -66,9 +66,9 @@ bool QueryDlgBase::verifyField(TQLineEdit *field, const TQString &really)
   if (!field->isEnabled() )
     return true;
 
-  TQColorGroup u_normal = field->tqcolorGroup();
+  TQColorGroup u_normal = field->colorGroup();
   u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00));
-  TQColorGroup k_normal = field->tqcolorGroup();
+  TQColorGroup k_normal = field->colorGroup();
   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->tqcolorGroup();
+  TQColorGroup normal = field->colorGroup();
   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->tqcolorGroup();
+  TQColorGroup u_normal = field->colorGroup();
   u_normal.setColor(TQColorGroup::Text, TQColor(0xff, 0x00, 0x00));
-  TQColorGroup k_normal = field->tqcolorGroup();
+  TQColorGroup k_normal = field->colorGroup();
   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->tqcolorGroup();
+  TQColorGroup normal = field->colorGroup();
   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->tqcolorGroup();
+  TQColorGroup u_normal = radio->colorGroup();
   u_normal.setColor(TQColorGroup::Foreground, TQColor(0xff, 0x00, 0x00));
-  TQColorGroup k_normal = radio->tqcolorGroup();
+  TQColorGroup k_normal = radio->colorGroup();
   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->tqcolorGroup();
+  TQColorGroup normal = radio->colorGroup();
   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.").tqarg(percent_done);
+  return i18n("Well done, you knew the correct answer. %1% done.").arg(percent_done);
 }
 
 
 TQString  QueryDlgBase::getTimeoutComment(int percent_done)
 {
-  return i18n("You waited too long to enter the correct answer. %1% done.").tqarg(percent_done);
+  return i18n("You waited too long to enter the correct answer. %1% done.").arg(percent_done);
 }
 
 
 TQString  QueryDlgBase::getNOKComment(int percent_done)
 {
-  return i18n("Your answer was wrong. %1% done.").tqarg(percent_done);
+  return i18n("Your answer was wrong. %1% done.").arg(percent_done);
 }
 
 void QueryDlgBase::closeEvent(TQCloseEvent * /*e*/)
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
index e767775c..57c5b802 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
@@ -36,7 +36,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqregexp.h>
@@ -60,7 +60,7 @@ TQStringList RandomQueryDlg::extractTranslations (TQString trans)
        TQRegExp regex (regexp);
        if ( regex.search (trans) >= 0 )
        {
-         translations = regex.tqcapturedTexts();
+         translations = regex.capturedTexts();
          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.tqcapturedTexts();
+         translations = regex.capturedTexts();
          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.tqcapturedTexts();
+         translations = regex.capturedTexts();
          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.tqcapturedTexts();
+         translations = regex.capturedTexts();
          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) -> tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transCombos.at(i) -> sizePolicy().hasHeightForWidth()));
+      transCombos.at(i) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transCombos.at(i) -> sizePolicy().hasHeightForWidth()));
       transCombos.at(i) -> setEditable (true);
       transCombos.at(i) -> setInsertionPolicy (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) -> tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth()));
+      transFields.at(i) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth()));
       vb->addWidget(transFields.at(i));
       connect (transFields.at(i), 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 -> tqminimumSize().height());
+      pdlg -> resize (pdlg -> width(), pdlg -> minimumSize().height());
       pdlg -> show();
       kapp -> processEvents();
     }
@@ -650,7 +650,7 @@ void RandomQueryDlg::keyPressEvent( TQKeyEvent *e )
           for ( uint i = 0; i < vocabulary.count(); i ++ )
           {
             TQString trans (vocabulary[i]);
-            if ( (e -> key() == Key_F5 && trans.tqstartsWith (curText, false)
+            if ( (e -> key() == Key_F5 && trans.startsWith (curText, false)
                 || e -> key() == Key_F6 && trans.contains (curText, false)) )
               combo -> insertItem (trans);
           }
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
index 8b84c852..7b35a6c2 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlgForm.ui
@@ -190,7 +190,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>450</width>
                     <height>40</height>
@@ -199,7 +199,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -229,7 +229,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
index eb88a5f2..d23be59d 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
@@ -109,7 +109,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype,
        mw->instructionLabel->setText(i18n("Enter the synonym:"));
        setCaption (i18n("Synonym Training"));
        answerstring = exp->getSynonym(column);
-       mw->queryField->tqsetAlignment(TQt::AlignVCenter);
+       mw->queryField->setAlignment(TQt::AlignVCenter);
        mw->queryField->setText(column == 0 ? exp->getOriginal() : exp->getTranslation(column));
        setQueryFieldWordwrap();
      }
@@ -327,9 +327,9 @@ void SimpleQueryDlg::setQueryFieldWordwrap()
   int w = fm.width(mw->queryField->text());
   int w2 = mw->width();
   if (w > w2)
-    mw->queryField->tqsetAlignment(TQt::AlignVCenter | TQt::WordBreak);
+    mw->queryField->setAlignment(TQt::AlignVCenter | TQt::WordBreak);
   else
-    mw->queryField->tqsetAlignment(TQt::AlignVCenter);
+    mw->queryField->setAlignment(TQt::AlignVCenter);
 }
 
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
index c39377c7..c20cd142 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -64,7 +64,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -106,7 +106,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>300</width>
                     <height>16</height>
@@ -115,7 +115,7 @@
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout17</cstring>
+                <cstring>layout17</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -240,7 +240,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout16</cstring>
+                        <cstring>layout16</cstring>
                     </property>
                     <grid>
                         <property name="name">
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
index 644c60bf..72d749a2 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.tqarg(conjugations.getName(type));
+  TQString msg = format.arg(conjugations.getName(type));
 
   mw->instructionLabel->setText (msg);
   mw->baseLabel->setText (s);
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
index 0ca0d685..7e28115d 100644
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlgForm.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout20</cstring>
+                <cstring>layout20</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -65,7 +65,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout30</cstring>
+                <cstring>layout30</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -73,7 +73,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout29</cstring>
+                        <cstring>layout29</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -163,7 +163,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout27</cstring>
+                        <cstring>layout27</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -269,7 +269,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout19</cstring>
+                <cstring>layout19</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -309,7 +309,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
-                <cstring>tqlayout32</cstring>
+                <cstring>layout32</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -317,7 +317,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout31</cstring>
+                        <cstring>layout31</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -516,7 +516,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>390</width>
                     <height>16</height>
diff --git a/kvoctrain/kvoctrain/spotlight2kvtml.cpp b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
index fa407605..1f722230 100644
--- a/kvoctrain/kvoctrain/spotlight2kvtml.cpp
+++ b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
@@ -92,7 +92,7 @@ void readToMem (TQTextStream &is, TQString month, TQString year)
    spotty spot;
 
    bool first_line = true;
-   while (!is.eof() && is.tqdevice()->status() == IO_Ok) {
+   while (!is.eof() && is.device()->status() == IO_Ok) {
      line = is.readLine();
 
      int pos;
@@ -289,7 +289,7 @@ void writeToKvtml(TQTextStream &os, TQString month, TQString year)
      writeSpotty (os, spottys[0], true);
 
    int l = 1;
-   while (os.tqdevice()->status() == IO_Ok && l < (int) spottys.size() ) {
+   while (os.device()->status() == IO_Ok && l < (int) spottys.size() ) {
      writeSpotty (os, spottys[l], false);
      l++;
    }
@@ -327,7 +327,7 @@ int main(int argc, char **argv)
   readToMem (is, argv[2], argv[3]);
   fs.close();
 
-  if (is.tqdevice()->status() != IO_Ok ) {
+  if (is.device()->status() != IO_Ok ) {
     cerr << i18n("Could not read ").local8Bit().data() << spot.local8Bit().data() << endl;
     exit (1);
   }
@@ -338,7 +338,7 @@ int main(int argc, char **argv)
   writeToKvtml(os, argv[2], argv[3]);
   fk.close();
 
-  if (os.tqdevice()->status() != IO_Ok ) {
+  if (os.device()->status() != IO_Ok ) {
     cerr << i18n("Could not write ").local8Bit().data() << kvtml.local8Bit().data() << endl;
     exit (1);
   }
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui
index db44fed9..8e797879 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui
+++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPageForm.ui
@@ -205,7 +205,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
index 7fd6bbb0..10cc4a45 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
@@ -23,7 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include "StatistikDlg.h"
 #include "StatistikPage.h"
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui
index e1fcff46..a9e4130e 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPageForm.ui
@@ -70,7 +70,7 @@
             <property name="name">
                 <cstring>StatListView</cstring>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>500</width>
                     <height>0</height>
diff --git a/kvoctrain/kvoctrain/tools/extractlang.cpp b/kvoctrain/kvoctrain/tools/extractlang.cpp
index a775274e..3d968bc6 100644
--- a/kvoctrain/kvoctrain/tools/extractlang.cpp
+++ b/kvoctrain/kvoctrain/tools/extractlang.cpp
@@ -1,4 +1,4 @@
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstring.h>
 
 ///////////////////////////////////////////////////////////
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-15 15:47:17 -0600
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-15 15:47:17 -0600
commit	6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3 (patch)
tree	cc90a09df2d1fd6d956cc084529a62d354316ad3 /kvoctrain
parent	174fd5e23c68598774706ea9b571d3d178e36b81 (diff)
download	tdeedu-6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.tar.gz tdeedu-6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.zip