Remove additional unneeded tq method conversions

24 files changed, 151 insertions, 151 deletions

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/entry-dialogs/CommonEntryPageForm.ui b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
index 4f1b4a96..6676ea29 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPageForm.ui
@@ -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..1230f507 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -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/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/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp
index 9b76f721..54f7a7ee 100644
--- a/kvoctrain/kvoctrain/kva_header.cpp
+++ b/kvoctrain/kvoctrain/kva_header.cpp
@@ -134,11 +134,11 @@ 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);
@@ -150,11 +150,11 @@ 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() ) {
-        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);
@@ -262,11 +262,11 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
       TQString msg;
       if (header1 == 0) {
         TQString format = i18n("Sets %1 as language for original");
-        msg = format.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::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
       else if (header1 < (int) langset.size() ) {
         TQString from = langset.longId(header1);
         TQString format = i18n("Appends %1 as new language");
-        msg = format.tqarg(from);
+        msg = format.arg(from);
         slotStatusHelpMsg(msg);
       }
     }
@@ -294,7 +294,7 @@ void kvoctrainApp::slotHeaderStatus (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::slotHeaderStatus (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::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
       if (!langset.findLongId(from).isEmpty())
         from = langset.findLongId(from);
       TQString format = i18n("Resets all properties for %1");
-      TQString msg = format.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_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 2a106dd8..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,11 +1140,11 @@ 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);
         }
       }
 
@@ -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);
@@ -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/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp
index 61cc55bb..30f19f6d 100644
--- a/kvoctrain/kvoctrain/kvoctrainview.cpp
+++ b/kvoctrain/kvoctrain/kvoctrainview.cpp
@@ -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..0db70701 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
@@ -106,7 +106,7 @@ bool kvoctrainDoc::saveToCsv (TQTextStream& os, TQString &)
   }
 
   setModified (false);
-  return os.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);
@@ -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..edaa945f 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
@@ -61,7 +61,7 @@ bool kvoctrainDoc::loadFromKvtMl (TQTextStream& is)
   if (elem.tag () != KV_DOCTYPE) {
     errorKvtMl (xml.lineNumber(),
                 i18n("Tag <%1> was expected "
-                     "but tag <%2> was read." ).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..55e4491f 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
@@ -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..c427b4f2 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvt-xml/XmlWriter.h
@@ -172,7 +172,7 @@ public:
   /**
    * Get the raw output stream.
    */
-  inline TQIODevice *stream () { return strm.tqdevice(); }
+  inline TQIODevice *stream () { return strm.device(); }
 #endif
 
 private:
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/MCQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlgForm.ui
index edcb7c2e..0398580c 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>
diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
index 7e67c425..d70b92ed 100644
--- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
@@ -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/SimpleQueryDlgForm.ui b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
index b03c17ab..6185f2ba 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlgForm.ui
@@ -64,7 +64,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
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/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);
   }