1 files changed, 16 insertions, 16 deletions

diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index c0b249aa..4de1b843 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -73,14 +73,14 @@ EntryDlg::EntryDlg(
   const TQString &title,
   bool           active,
   const TQFont&   ipafont,
-  TQWidget       *parent,
+  TQWidget       *tqparent,
   const char    *name,
   bool           modal)
   :
-  KDialogBase(Tabbed, title, User1|User2|User3|Apply|Close, Apply, parent, name, modal, false,
+  KDialogBase(Tabbed, title, User1|User2|User3|Apply|Close, Apply, tqparent, name, modal, false,
     KGuiItem(i18n("&Reset")),
-    KGuiItem(TQString::null, "view_left_right"),
-    KGuiItem(TQString::null, "view_top_bottom"))
+    KGuiItem(TQString(), "view_left_right"),
+    KGuiItem(TQString(), "view_top_bottom"))
 
 {
   mainwin = main;
@@ -105,7 +105,7 @@ EntryDlg::EntryDlg(
     topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
     comm_page = new CommonEntryPage (this, doc, multi_sel, expr, lesson, lessonbox,
                                       lang, type, pronunce, usagelabel,
-                                      i18n("Original &expression in %1:").arg(s), querymanager, active,
+                                      i18n("Original &expression in %1:").tqarg(s), querymanager, active,
                                       ipafont, page, name);
     topLayout->addWidget(comm_page);
 
@@ -135,7 +135,7 @@ EntryDlg::EntryDlg(
     topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
     comm_page = new CommonEntryPage (this, doc, multi_sel, expr, lesson, lessonbox,
                                       lang, type, pronunce, usagelabel,
-                                      i18n("Translated &expression in %1:").arg(s), querymanager, active,
+                                      i18n("Translated &expression in %1:").tqarg(s), querymanager, active,
                                       ipafont, page, name);
     topLayout->addWidget(comm_page);
 
@@ -246,10 +246,10 @@ void EntryDlg::setData(
 
   if (origin)
     comm_page->setData(multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel,
-      i18n("Original &expression in %1:").arg(s), querymanager, active);
+      i18n("Original &expression in %1:").tqarg(s), querymanager, active);
   else
     comm_page->setData(multi_sel, expr, lesson, lessonbox, lang, type, pronunce, usagelabel,
-      i18n("Translated &expression in %1:").arg(s), querymanager, active);
+      i18n("Translated &expression in %1:").tqarg(s), querymanager, active);
 
   adj_page->setData(multi_sel, comp);
   aux_page->setData(multi_sel, synonym, antonym, example, rem, paraphrase);
@@ -269,16 +269,16 @@ void EntryDlg::updatePages(const TQString &type)
 {
   TQString main;
   int pos;
-  if ((pos = type.find (QM_TYPE_DIV)) < 0)  // only use main type
+  if ((pos = type.tqfind (TQM_TYPE_DIV)) < 0)  // only use main type
     main = type;
   else
     main = type.left(pos);
 
-  if (main == QM_VERB) {
+  if (main == TQM_VERB) {
     tense_page->setEnabled(EntryDlg::EnableAll);
     adj_page->setEnabled(EntryDlg::EnableNone);
   }
-  else if (main == QM_ADJ) {
+  else if (main == TQM_ADJ) {
     tense_page->setEnabled(EntryDlg::EnableNone);
     adj_page->setEnabled(EntryDlg::EnableAll);
   }
@@ -311,7 +311,7 @@ void EntryDlg::setEnabled(int enable)
   TQString type = comm_page->getType();
   TQString main;
   int pos;
-  if ((pos = type.find (QM_TYPE_DIV)) < 0)  // only use main type
+  if ((pos = type.tqfind (TQM_TYPE_DIV)) < 0)  // only use main type
     main = type;
   else
     main = type.left(pos);
@@ -321,9 +321,9 @@ void EntryDlg::setEnabled(int enable)
     comm_page->setEnabled(EnableAll);
     aux_page->setEnabled(EnableAll);
     mc_page->setEnabled(EnableAll);
-    tense_page->setEnabled(main == QM_VERB ? EnableAll : EnableNone);
+    tense_page->setEnabled(main == TQM_VERB ? EnableAll : EnableNone);
     mc_page->setEnabled(EnableAll);
-    adj_page->setEnabled(main == QM_ADJ ? EnableAll : EnableNone);
+    adj_page->setEnabled(main == TQM_ADJ ? EnableAll : EnableNone);
     if (from_page != 0)
       from_page->setEnabled(EnableNone);
     if (to_page != 0)
@@ -334,9 +334,9 @@ void EntryDlg::setEnabled(int enable)
     comm_page->setEnabled(enable);
     aux_page->setEnabled(enable);
     mc_page->setEnabled(enable);
-    tense_page->setEnabled(main == QM_VERB ? enable : EnableNone);
+    tense_page->setEnabled(main == TQM_VERB ? enable : EnableNone);
     mc_page->setEnabled(enable);
-    adj_page->setEnabled(main == QM_ADJ ? enable : EnableNone);
+    adj_page->setEnabled(main == TQM_ADJ ? enable : EnableNone);
     if (from_page != 0)
       from_page->setEnabled(enable);
     if (to_page != 0)