Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

37 files changed, 351 insertions, 351 deletions

diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
index 5ca5de2f..1d39a821 100644
--- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
@@ -77,23 +77,23 @@ static ListRef date_itemlist [] =
 BlockOptions::BlockOptions(TQWidget* parent, const char* name, WFlags fl)
 : BlockOptionsBase(parent, name, fl)
 {
-   connect(expire1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
-   connect(block1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
-   connect(expire2, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
-   connect(block2, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
-   connect(expire3, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
-   connect(block3, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
-   connect(expire4, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
-   connect(block4, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
-   connect(expire5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
-   connect(block5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
-   connect(expire6, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
-   connect(block6, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
-   connect(expire7, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
-   connect(block7, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int)));
-
-   connect(kcfg_Block, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotBlockToggled(bool)));
-   connect(kcfg_Expire, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExpireToggled(bool)));
+   connect(expire1, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int)));
+   connect(block1, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int)));
+   connect(expire2, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int)));
+   connect(block2, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int)));
+   connect(expire3, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int)));
+   connect(block3, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int)));
+   connect(expire4, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int)));
+   connect(block4, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int)));
+   connect(expire5, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int)));
+   connect(block5, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int)));
+   connect(expire6, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int)));
+   connect(block6, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int)));
+   connect(expire7, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int)));
+   connect(block7, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int)));
+
+   connect(kcfg_Block, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotBlockToggled(bool)));
+   connect(kcfg_Expire, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotExpireToggled(bool)));
 
    fillWidgets();
    updateWidgets();
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
index 05f9e590..89c88657 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
@@ -67,26 +67,26 @@ KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * les
 
   m_languageOptions = new LanguageOptions(m_langSet, 0, "Language Settings");
   addPage(m_languageOptions, i18n("Languages"), "set_language", i18n("Language Settings"), true);
-  connect(m_languageOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons()));
+  connect(m_languageOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons()));
 
   m_viewOptions = new ViewOptions(0, "View Settings");
   addPage(m_viewOptions, i18n("View"), "view_choose", i18n("View Settings"), true);
 
   m_pasteOptions = new PasteOptions(m_langSet, doc, 0, "Copy & Paste Settings");
   addPage(m_pasteOptions, i18n("Copy & Paste"), "edit-paste", i18n("Copy & Paste Settings"), true);
-  connect(m_pasteOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons()));
+  connect(m_pasteOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons()));
 
   m_queryOptions = new QueryOptions(0, "Query Settings");
   addPage(m_queryOptions, i18n("Query"), "run_query", i18n("Query Settings"), true);
 
   m_thresholdOptions = new ThresholdOptions(lessons, m_queryManager, 0, "Threshold Settings");
   addPage(m_thresholdOptions, i18n("Thresholds"), "configure", i18n("Threshold Settings"), true);
-  connect(m_thresholdOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons()));
+  connect(m_thresholdOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons()));
 
   m_blockOptions = new BlockOptions(0, "Blocking Settings");
   addPage(m_blockOptions, i18n("Blocking"), "configure", i18n("Blocking Settings"), true);
-  connect(m_blockOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons()));
-  connect(m_blockOptions, TQT_SIGNAL(blockExpireChanged(bool, bool)), m_thresholdOptions, TQT_SLOT(slotBlockExpire(bool, bool)));
+  connect(m_blockOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons()));
+  connect(m_blockOptions, TQ_SIGNAL(blockExpireChanged(bool, bool)), m_thresholdOptions, TQ_SLOT(slotBlockExpire(bool, bool)));
 
   setButtonGuiItem(KDialogBase::User1, KGuiItem(i18n("&Profiles...")));
   setButtonTip(KDialogBase::User1, i18n("Save or load specific Query settings which consist in a profile"));
@@ -143,7 +143,7 @@ void KVocTrainPrefs::slotUser1()
   if (showDlg)
   {
     ProfilesDialog * dlg = new ProfilesDialog(m_queryManager, this, 0, true);
-    connect(dlg, TQT_SIGNAL(profileActivated()), this, TQT_SLOT(updateWidgets()));
+    connect(dlg, TQ_SIGNAL(profileActivated()), this, TQ_SLOT(updateWidgets()));
     dlg->show();
   }
 }
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index e786b534..b2cf665b 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -682,14 +682,14 @@ LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char
 {
   langset_popup = 0;
 
-  connect(b_langDel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteClicked()));
-  connect(b_langNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewClicked()));
-  connect(b_langPixmap, TQT_SIGNAL(clicked()), TQT_SLOT(slotPixmapClicked()));
-  connect(e_newName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotNewNameChanged(const TQString&)));
-  connect(d_shortName, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotShortActivated(const TQString&)));
-  connect(e_langLong, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLangChanged(const TQString&)));
-  connect(e_shortName2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotShort2Changed(const TQString&)));
-  connect(d_kblayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&)));
+  connect(b_langDel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteClicked()));
+  connect(b_langNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewClicked()));
+  connect(b_langPixmap, TQ_SIGNAL(clicked()), TQ_SLOT(slotPixmapClicked()));
+  connect(e_newName, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotNewNameChanged(const TQString&)));
+  connect(d_shortName, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotShortActivated(const TQString&)));
+  connect(e_langLong, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotLangChanged(const TQString&)));
+  connect(e_shortName2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotShort2Changed(const TQString&)));
+  connect(d_kblayout, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotKeyboardLayoutChanged(const TQString&)));
 
   // Load the languages first, then the countries and create the
   // menus for the languages last, so they will have flags
@@ -1099,11 +1099,11 @@ void LanguageOptions::loadCountryData()
   for (TQMap<TQString, Region>::Iterator it = regions.begin(); it != regions.end(); ++it)
     regmap.insert(it.data().region, it.data());
 
-  connect(langset_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromGlobalActivated(int)));
+  connect(langset_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotLangFromGlobalActivated(int)));
   for (TQMap<TQString, Region>::Iterator it = regmap.begin(); it != regmap.end(); ++it)
   {
     TQPopupMenu *regpop = new TQPopupMenu();
-    connect(regpop, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromGlobalActivated(int)));
+    connect(regpop, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotLangFromGlobalActivated(int)));
     langset_popup->insertItem(it.key(), regpop);
     Region r = it.data();
 
@@ -1201,7 +1201,7 @@ void LanguageOptions::createISO6391Menus()
     if (it.key()[0].upper() != lang[0].upper())
     {
       pop = new TQPopupMenu();
-      connect(pop, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromISO6391Activated(int)));
+      connect(pop, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotLangFromISO6391Activated(int)));
       iso6391_popup->insertItem(it.key()[0].upper(), pop, 1);
     }
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
index 31a5f768..a009e0bf 100644
--- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
@@ -58,13 +58,13 @@ PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* pare
   SkipButton->setEnabled(!kcfg_UseCurrent->isChecked());
   DownButton->setEnabled(!kcfg_UseCurrent->isChecked());
 
-  connect(OrderList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(syncButtons()));
-  connect(DownButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownButtonClicked()));
-  connect(SkipButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSkipButtonClicked()));
-  connect(UpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpButtonClicked()));
+  connect(OrderList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(syncButtons()));
+  connect(DownButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownButtonClicked()));
+  connect(SkipButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSkipButtonClicked()));
+  connect(UpButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpButtonClicked()));
 
-  connect(SeparatorCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSeparatorComboActivated(int)));
-  connect(kcfg_UseCurrent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUseCurrentDocToggled(bool)));
+  connect(SeparatorCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSeparatorComboActivated(int)));
+  connect(kcfg_UseCurrent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUseCurrentDocToggled(bool)));
 
   m_doc = doc;
   fillWidgets();
diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
index f898f754..c38a2065 100644
--- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
@@ -46,10 +46,10 @@ ProfilesDialog::ProfilesDialog(QueryManager * m, TQWidget *parent, const char *n
   mw = new GroupOptions(this);
   setMainWidget(mw);
 
-  connect(mw->ps_del, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteGroup()));
-  connect(mw->ps_new, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewGroup()));
-  connect(mw->ps_recall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRecallGroup()));
-  connect(mw->ps_store, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStoreGroup()));
+  connect(mw->ps_del, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteGroup()));
+  connect(mw->ps_new, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewGroup()));
+  connect(mw->ps_recall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRecallGroup()));
+  connect(mw->ps_store, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStoreGroup()));
 
   int ls = Prefs::numPreSetting();
   for (int i = 0 ; i < ls; i++)
diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
index 271bde65..5b81c32a 100644
--- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
@@ -104,20 +104,20 @@ static ThreshListRef Threshdate_itemlist [] =
 ThresholdOptions::ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* parent, const char* name, WFlags fl)
 : ThresholdOptionsBase(parent, name, fl), m_lessons(lessons)
 {
-  connect(lessoncomp,  TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetLessonComp(int)));
-  connect(lessonlist,  TQT_SIGNAL(selectionChanged()), TQT_SIGNAL(widgetModified()));
-  connect(b_all_less,  TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectAll()));
-  connect(b_none_less, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectNone()));
-  connect(typecomp,    TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetTypeComp(int)));
-  connect(typelist,    TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int)));
-  connect(gradecomp,   TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetGradeComp(int)));
-  connect(gradelist,   TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int)));
-  connect(querycomp,   TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetQueryComp(int)));
-  connect(querylist,   TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int)));
-  connect(badcomp,     TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetBadComp(int)));
-  connect(badlist,     TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int)));
-  connect(datecomp,    TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetDateComp(int)));
-  connect(datelist,    TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int)));
+  connect(lessoncomp,  TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetLessonComp(int)));
+  connect(lessonlist,  TQ_SIGNAL(selectionChanged()), TQ_SIGNAL(widgetModified()));
+  connect(b_all_less,  TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectAll()));
+  connect(b_none_less, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectNone()));
+  connect(typecomp,    TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetTypeComp(int)));
+  connect(typelist,    TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int)));
+  connect(gradecomp,   TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetGradeComp(int)));
+  connect(gradelist,   TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int)));
+  connect(querycomp,   TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetQueryComp(int)));
+  connect(querylist,   TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int)));
+  connect(badcomp,     TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetBadComp(int)));
+  connect(badlist,     TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int)));
+  connect(datecomp,    TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetDateComp(int)));
+  connect(datelist,    TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int)));
 
   m_queryManager = m;
   fillWidgets();
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp
index f1c8d62d..5d62f334 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp
@@ -33,7 +33,7 @@ DocOptionsPage::DocOptionsPage(bool sort, TQWidget *parent, const char *name):Do
   sorter = sort;
   docsort->setChecked(sort);
 
-  connect( docsort, TQT_SIGNAL(toggled(bool)), TQT_SLOT(docSortToggled(bool)) );
+  connect( docsort, TQ_SIGNAL(toggled(bool)), TQ_SLOT(docSortToggled(bool)) );
 }
 
 void DocOptionsPage::docSortToggled(bool state)
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
index 646358f1..f17b68bd 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
@@ -51,25 +51,25 @@ LangPropPage::LangPropPage
 {
   l_langcode->setText(curr_lang);
 
-  connect( indef_female, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefFemaleChanged(const TQString&)) );
-  connect( def_female, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defFemaleChanged(const TQString&)) );
-  connect( def_male, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defMaleChanged(const TQString&)) );
-  connect( indef_male, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefMaleChanged(const TQString&)) );
-  connect( def_natural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defNaturalChanged(const TQString&)) );
-  connect( indef_natural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefNaturalChanged(const TQString&)) );
-  connect( first_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstSingularChanged(const TQString&)) );
-  connect( first_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstPluralChanged(const TQString&)) );
-  connect( second_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondSingularChanged(const TQString&)) );
-  connect( second_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondPluralChanged(const TQString&)) );
-  connect( thirdF_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFSingularChanged(const TQString&)) );
-  connect( thirdF_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFPluralChanged(const TQString&)) );
-  connect( thirdM_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMSingularChanged(const TQString&)) );
-  connect( thirdM_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMPluralChanged(const TQString&)) );
-  connect( thirdN_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNSingularChanged(const TQString&)) );
-  connect( thirdN_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNPluralChanged(const TQString&)) );
-
-  connect( thirdS_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdSCommonToggled(bool)) );
-  connect( thirdP_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) );
+  connect( indef_female, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(indefFemaleChanged(const TQString&)) );
+  connect( def_female, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(defFemaleChanged(const TQString&)) );
+  connect( def_male, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(defMaleChanged(const TQString&)) );
+  connect( indef_male, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(indefMaleChanged(const TQString&)) );
+  connect( def_natural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(defNaturalChanged(const TQString&)) );
+  connect( indef_natural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(indefNaturalChanged(const TQString&)) );
+  connect( first_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstSingularChanged(const TQString&)) );
+  connect( first_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstPluralChanged(const TQString&)) );
+  connect( second_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondSingularChanged(const TQString&)) );
+  connect( second_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondPluralChanged(const TQString&)) );
+  connect( thirdF_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFSingularChanged(const TQString&)) );
+  connect( thirdF_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFPluralChanged(const TQString&)) );
+  connect( thirdM_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMSingularChanged(const TQString&)) );
+  connect( thirdM_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMPluralChanged(const TQString&)) );
+  connect( thirdN_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNSingularChanged(const TQString&)) );
+  connect( thirdN_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNPluralChanged(const TQString&)) );
+
+  connect( thirdS_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdSCommonToggled(bool)) );
+  connect( thirdP_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdPCommonToggled(bool)) );
 
   conjugations = conjug;
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
index 7d90f04b..1fdbd151 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
@@ -48,11 +48,11 @@ LessOptPage::LessOptPage
   :
   LessOptPageForm( parent, name )
 {
-  connect( lessonList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotLessonChosen(int)) );
-  connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewLesson()) );
-  connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyLesson()) );
-  connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteLesson()) );
-  connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );
+  connect( lessonList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotLessonChosen(int)) );
+  connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewLesson()) );
+  connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyLesson()) );
+  connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteLesson()) );
+  connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) );
 
   doc = _doc;
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
index 2e6e893c..0b5c6f73 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
@@ -46,11 +46,11 @@ TenseOptPage::TenseOptPage
   :
   TenseOptPageForm( parent, name )
 {
-  connect( tenseList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTenseChosen(int)) );
-  connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );
-  connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteTense()) );
-  connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyTense()) );
-  connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewTense()) );
+  connect( tenseList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotTenseChosen(int)) );
+  connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) );
+  connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteTense()) );
+  connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyTense()) );
+  connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewTense()) );
 
   TQString str;
   for (int i = 0; i < (int) tenses.size(); i++) {
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
index f7a30bf3..9292827a 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
@@ -64,10 +64,10 @@ TitlePage::TitlePage
   e_remark->setText (doc_remark);
   label_remark->setBuddy(e_remark);
 
-  connect( e_author, TQT_SIGNAL(textChanged()),  TQT_SLOT(slotAuthorChanged()) );
-  connect( e_title, TQT_SIGNAL(textChanged(const TQString&)),   TQT_SLOT(slotTitleChanged(const TQString&)) );
-  connect( e_license, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotLicenseChanged(const TQString&)) );
-  connect( e_remark, TQT_SIGNAL(textChanged()),  TQT_SLOT(slotDocRemarkChanged()) );
+  connect( e_author, TQ_SIGNAL(textChanged()),  TQ_SLOT(slotAuthorChanged()) );
+  connect( e_title, TQ_SIGNAL(textChanged(const TQString&)),   TQ_SLOT(slotTitleChanged(const TQString&)) );
+  connect( e_license, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotLicenseChanged(const TQString&)) );
+  connect( e_remark, TQ_SIGNAL(textChanged()),  TQ_SLOT(slotDocRemarkChanged()) );
 }
 
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
index 9b126b17..adac2c24 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
@@ -47,11 +47,11 @@ TypeOptPage::TypeOptPage
   TypeOptPageForm( parent, name ),
   doc(_doc)
 {
-  connect( typeList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTypeChosen(int)) );
-  connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );
-  connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteType()) );
-  connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyType()) );
-  connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewType()) );
+  connect( typeList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotTypeChosen(int)) );
+  connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) );
+  connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteType()) );
+  connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyType()) );
+  connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewType()) );
 
   TQString str;
   for (int i = 0; i < (int) types.size(); i++) {
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
index 7e6dad66..74b9dcab 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
@@ -48,11 +48,11 @@ UsageOptPage::UsageOptPage
   UsageOptPageForm( parent, name ),
   doc(_doc)
 {
-  connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );
-  connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteUsage()) );
-  connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyUsage()) );
-  connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewUsage()) );
-  connect( usageList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotUsageChosen(int)) );
+  connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) );
+  connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteUsage()) );
+  connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyUsage()) );
+  connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewUsage()) );
+  connect( usageList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotUsageChosen(int)) );
 
   TQString str;
   for (int i = 0; i < (int) usages.size(); i++) {
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp
index 0bdae252..8a136d73 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp
@@ -37,9 +37,9 @@ AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison
 {
   comparisons = comp;
 
-  connect( lev1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev1Changed(const TQString&)) );
-  connect( lev2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev2Changed(const TQString&)) );
-  connect( lev3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev3Changed(const TQString&)) );
+  connect( lev1Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev1Changed(const TQString&)) );
+  connect( lev2Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev2Changed(const TQString&)) );
+  connect( lev3Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev3Changed(const TQString&)) );
 
   setData(multi_sel, comp);
 }
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp
index 87e0fe59..f75f4703 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp
@@ -56,11 +56,11 @@ AuxInfoEntryPage::AuxInfoEntryPage
   remark_line->setMaximumHeight(sz*3);
   examp_line->setMaximumHeight(sz*3);
 
-  connect( para_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotParaSelected()) );
-  connect( remark_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotRemarkSelected()) );
-  connect( examp_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotExampSelected()) );
-  connect( antonym_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotAntonymSelected()) );
-  connect( synonym_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotSynonymSelected()) );
+  connect( para_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotParaSelected()) );
+  connect( remark_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotRemarkSelected()) );
+  connect( examp_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotExampSelected()) );
+  connect( antonym_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotAntonymSelected()) );
+  connect( synonym_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotSynonymSelected()) );
 
   setData(multi_sel, syno, anto, exam, rem, para);
 }
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
index e4ce0679..254886bc 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
@@ -80,18 +80,18 @@ CommonEntryPage::CommonEntryPage
   ipafont(_ipafont)
 {
 
-  connect( b_usageDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeUsageDlg()) );
-  connect( b_LessDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeLessDlg()) );
-  connect( b_pronDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokePronDlg()) );
-  connect( b_TypeDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeTypeDlg()) );
-  connect( usage_box, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotUsageChanged()) );
-  connect( lesson_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotLessonSelected(int)) );
-  connect( subtype_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSubTypeSelected(int)) );
-  connect( type_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeSelected(int)) );
-  connect( c_active, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotActiveChanged(bool)) );
-
-  connect( pronunce_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotPronunceSelected(const TQString&)) );
-  connect( expr_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotExprSelected(const TQString&)) );
+  connect( b_usageDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokeUsageDlg()) );
+  connect( b_LessDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokeLessDlg()) );
+  connect( b_pronDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokePronDlg()) );
+  connect( b_TypeDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokeTypeDlg()) );
+  connect( usage_box, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotUsageChanged()) );
+  connect( lesson_box, TQ_SIGNAL(activated(int)), TQ_SLOT(slotLessonSelected(int)) );
+  connect( subtype_box, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSubTypeSelected(int)) );
+  connect( type_box, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeSelected(int)) );
+  connect( c_active, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotActiveChanged(bool)) );
+
+  connect( pronunce_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotPronunceSelected(const TQString&)) );
+  connect( expr_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotExprSelected(const TQString&)) );
 
   usage_label->setTitle(i18n("Usage (area) of an Expression", "&Usage Labels"));
   pronunce_line->setFont(ipafont);
@@ -329,7 +329,7 @@ void CommonEntryPage::invokePronDlg()
 {
   //if (phoneticDlg == 0) {
     PhoneticEntryPage * phoneticDlg = new PhoneticEntryPage (ipafont, this);
-    connect (phoneticDlg, TQT_SIGNAL(charSelected(wchar_t)), TQT_SLOT(phoneticSelected(wchar_t)) );
+    connect (phoneticDlg, TQ_SIGNAL(charSelected(wchar_t)), TQ_SLOT(phoneticSelected(wchar_t)) );
     phoneticDlg->show();
   //}
   //else
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index 5fbcc71f..efe7e374 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -176,23 +176,23 @@ EntryDlg::EntryDlg(
 
   updatePages (type);
 
-  connect(comm_page, TQT_SIGNAL(typeSelected(const TQString&)), TQT_SLOT(updatePages(const TQString&)) );
+  connect(comm_page, TQ_SIGNAL(typeSelected(const TQString&)), TQ_SLOT(updatePages(const TQString&)) );
 
-  connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotUndo()) );
-  connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotApply()) );
-  connect( this, TQT_SIGNAL(user2Clicked()), this, TQT_SLOT(slotDockVertical()) );
-  connect( this, TQT_SIGNAL(user3Clicked()), this, TQT_SLOT(slotDockHorizontal()) );
+  connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotUndo()) );
+  connect( this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotApply()) );
+  connect( this, TQ_SIGNAL(user2Clicked()), this, TQ_SLOT(slotDockVertical()) );
+  connect( this, TQ_SIGNAL(user3Clicked()), this, TQ_SLOT(slotDockHorizontal()) );
 
-  connect (comm_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() ));
-  connect (aux_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() ));
-  connect (adj_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() ));
-  connect (mc_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() ));
-  connect (tense_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() ));
+  connect (comm_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() ));
+  connect (aux_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() ));
+  connect (adj_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() ));
+  connect (mc_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() ));
+  connect (tense_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() ));
 
   if (from_page != 0)
-    connect (from_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() ));
+    connect (from_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() ));
   if (to_page != 0)
-    connect (to_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() ));
+    connect (to_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() ));
 
   enableButtonApply(false);
   enableButton(User1, false);
diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
index a4bb55f1..8fc70db0 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
@@ -75,17 +75,17 @@ FromToEntryPage::FromToEntryPage
   monthnames.append (i18n("November"));
   monthnames.append (i18n("December"));
 
-  connect( bcount_line, TQT_SIGNAL(textChanged(const TQString&)),  TQT_SLOT(slotBCount(const TQString&)) );
-  connect( qcount_line, TQT_SIGNAL(textChanged(const TQString&)),  TQT_SLOT(slotQCount(const TQString&)) );
-  connect( fauxami_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotFauxAmiSelected(const TQString&)) );
+  connect( bcount_line, TQ_SIGNAL(textChanged(const TQString&)),  TQ_SLOT(slotBCount(const TQString&)) );
+  connect( qcount_line, TQ_SIGNAL(textChanged(const TQString&)),  TQ_SLOT(slotQCount(const TQString&)) );
+  connect( fauxami_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotFauxAmiSelected(const TQString&)) );
 
-  connect( never, TQT_SIGNAL(clicked()), TQT_SLOT(slotNever()) );
-  connect( today, TQT_SIGNAL(clicked()), TQT_SLOT(slotToday()) );
-  connect( gradebox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotGradeSelected(int)) );
+  connect( never, TQ_SIGNAL(clicked()), TQ_SLOT(slotNever()) );
+  connect( today, TQ_SIGNAL(clicked()), TQ_SLOT(slotToday()) );
+  connect( gradebox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotGradeSelected(int)) );
 
-  connect( year_spin,  TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotYearChanged(int)) );
-  connect( month_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotMonthChanged(int)) );
-  connect( day_spin,   TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDayChanged(int)) );
+  connect( year_spin,  TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotYearChanged(int)) );
+  connect( month_spin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotMonthChanged(int)) );
+  connect( day_spin,   TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotDayChanged(int)) );
 
   year_spin->setData ((TQStringList *) 0, 1980, 2100);
   month_spin->setData (&monthnames, 1, 12);
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp
index a6967704..1c028345 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp
@@ -37,11 +37,11 @@ MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoic
 {
   multiplechoice = mc;
 
-  connect( mc1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc1Changed(const TQString&)) );
-  connect( mc2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc2Changed(const TQString&)) );
-  connect( mc3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc3Changed(const TQString&)) );
-  connect( mc4Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc4Changed(const TQString&)) );
-  connect( mc5Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc5Changed(const TQString&)) );
+  connect( mc1Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc1Changed(const TQString&)) );
+  connect( mc2Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc2Changed(const TQString&)) );
+  connect( mc3Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc3Changed(const TQString&)) );
+  connect( mc4Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc4Changed(const TQString&)) );
+  connect( mc5Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc5Changed(const TQString&)) );
 
   setData(multi_sel, mc);
 }
diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
index a7661be0..e710d2ef 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
@@ -189,7 +189,7 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co
     TQChar qc = uni_ref->code;
     TQString text = qc;
     PhoneticButton *butt = new PhoneticButton(text, phoneticbox, this);
-    connect (butt, TQT_SIGNAL(clicked()), butt, TQT_SLOT(slotClicked()) );
+    connect (butt, TQ_SIGNAL(clicked()), butt, TQ_SLOT(slotClicked()) );
     TQString tip = i18n("Unicode name: ");
     tip += TQString::fromLatin1(uni_ref->unicodename);
     tip += "\n";
diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp
index c8c7d41e..e9f2f7c0 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp
@@ -45,21 +45,21 @@ TenseEntryPage::TenseEntryPage
   : TenseEntryPageForm( parent, name ), multi_mode(multi_sel), dlgbook(_dlgbook)
 {
 
-  connect( third_p_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) );
-  connect( third_s_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdSCommonToggled(bool)) );
-  connect( b_next, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextConj()) );
-  connect( tensebox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTenseSelected(int)) );
-
-  connect( thirdN_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNPluralChanged(const TQString&)) );
-  connect( thirdN_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNSingularChanged(const TQString&)) );
-  connect( thirdM_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMPluralChanged(const TQString&)) );
-  connect( thirdM_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMSingularChanged(const TQString&)) );
-  connect( thirdF_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFPluralChanged(const TQString&)) );
-  connect( thirdF_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFSingularChanged(const TQString&)) );
-  connect( second_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondPluralChanged(const TQString&)) );
-  connect( second_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondSingularChanged(const TQString&)) );
-  connect( first_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstPluralChanged(const TQString&)) );
-  connect( first_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstSingularChanged(const TQString&)) );
+  connect( third_p_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdPCommonToggled(bool)) );
+  connect( third_s_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdSCommonToggled(bool)) );
+  connect( b_next, TQ_SIGNAL(clicked()), TQ_SLOT(slotNextConj()) );
+  connect( tensebox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTenseSelected(int)) );
+
+  connect( thirdN_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNPluralChanged(const TQString&)) );
+  connect( thirdN_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNSingularChanged(const TQString&)) );
+  connect( thirdM_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMPluralChanged(const TQString&)) );
+  connect( thirdM_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMSingularChanged(const TQString&)) );
+  connect( thirdF_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFPluralChanged(const TQString&)) );
+  connect( thirdF_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFSingularChanged(const TQString&)) );
+  connect( second_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondPluralChanged(const TQString&)) );
+  connect( second_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondSingularChanged(const TQString&)) );
+  connect( first_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstPluralChanged(const TQString&)) );
+  connect( first_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstSingularChanged(const TQString&)) );
 
   prefix = con_prefix;
   selection = "";
diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp
index 66e1ca9a..a3a5860e 100644
--- a/kvoctrain/kvoctrain/kva_clip.cpp
+++ b/kvoctrain/kvoctrain/kva_clip.cpp
@@ -106,11 +106,11 @@ void kvoctrainApp::slotEditCopy()
   }
   if (!exp.isEmpty()) {
 #if defined(_WS_X11_)
-//    disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),this,0);
+//    disconnect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()),this,0);
 #endif
     TQApplication::clipboard()->setText(exp);
 #if defined(_WS_X11_)
-//    connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged()));
+//    connect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()), this,TQ_SLOT(clipboardChanged()));
 #endif
   }
 
diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp
index e7e716a8..55a37717 100644
--- a/kvoctrain/kvoctrain/kva_header.cpp
+++ b/kvoctrain/kvoctrain/kva_header.cpp
@@ -52,8 +52,8 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
     header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header << 16) | IDH_SORT_COL_ALPHA);
     header_m->insertItem(SmallIconSet("sort_num"), i18n(SORT_NUM), (header << 16) | IDH_SORT_COL_NUM);
 
-    connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-    connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+    connect (header_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int)));
+    connect (header_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int)));
 
     header_m->exec(TQPoint (x, y));
     return;
@@ -89,8 +89,8 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
       langs_m->insertItem(names[i],
         (header << 16) | (i << (16+8)) | IDH_SET_LANG);
   }
-  connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int)));
-  connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+  connect (langs_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetHeaderProp(int)));
+  connect (langs_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int)));
 
   header_m = new TQPopupMenu();
 
@@ -142,8 +142,8 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
       }
     }
     header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL);
-    connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-    connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+    connect (query_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int)));
+    connect (query_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int)));
     for (int i = 1; i < (int) doc->numLangs(); i++) {
       // show pixmap and long name if available
       int j;
@@ -167,16 +167,16 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
     header_m->insertItem(i18n("&Antonyms"), (header << 16) | IDH_START_ANTONYM);
     header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE);
     header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE);
-    connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-    connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+    connect (multiple_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int)));
+    connect (multiple_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int)));
 
     header_m->insertSeparator();
     header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA);
     header_m->insertItem(SmallIconSet("set_language"), i18n("Set &Language"), langs_m, (2 << 16) | IDH_NULL);
   }
 
-  connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-  connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+  connect (header_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int)));
+  connect (header_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int)));
   header_m->exec(TQPoint(x, y));
 }
 
diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp
index 6a4d92eb..26b1599f 100644
--- a/kvoctrain/kvoctrain/kva_init.cpp
+++ b/kvoctrain/kvoctrain/kva_init.cpp
@@ -90,7 +90,7 @@ kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name)
 
   querying = false;
   btimer = new TQTimer( this );
-  connect( btimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeOutBackup()) );
+  connect( btimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeOutBackup()) );
   if (Prefs::autoBackup())
     btimer->start(Prefs::backupTime() * 60 * 1000, TRUE);
 }
@@ -98,116 +98,116 @@ kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name)
 
 void kvoctrainApp::initActions()
 {
-  fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection());
+  fileNew = KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection());
   fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document"));
   fileNew->setToolTip(fileNew->whatsThis());
 
-  fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection());
+  fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection());
   fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document"));
   fileOpen->setToolTip(fileOpen->whatsThis());
 
-  fileOpenExample = new TDEAction(i18n("Open &Example..."), "document-open", 0, this, TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example");
+  fileOpenExample = new TDEAction(i18n("Open &Example..."), "document-open", 0, this, TQ_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example");
   fileOpen->setWhatsThis(i18n("Open a vocabulary document"));
   fileOpen->setToolTip(fileOpen->whatsThis());
 
-  fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, this, TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns");
+  fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, this, TQ_SLOT(slotGHNS()), actionCollection(), "file_ghns");
   fileGHNS->setWhatsThis(i18n("Downloads new vocabularies"));
   fileGHNS->setToolTip(fileGHNS->whatsThis());
 
-  fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
+  fileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
 
-  fileMerge = new TDEAction(i18n("&Merge..."), 0, 0, this, TQT_SLOT(slotFileMerge()), actionCollection(), "file_merge");
+  fileMerge = new TDEAction(i18n("&Merge..."), 0, 0, this, TQ_SLOT(slotFileMerge()), actionCollection(), "file_merge");
   fileMerge->setWhatsThis(i18n("Merge an existing vocabulary document with the current one"));
   fileMerge->setToolTip(fileOpen->whatsThis());
 
-  fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection());
+  fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection());
   fileSave->setWhatsThis(i18n("Save the active vocabulary document"));
   fileSave->setToolTip(fileSave->whatsThis());
 
-  fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection());
+  fileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection());
   fileSaveAs->setWhatsThis(i18n("Save the active vocabulary document with a different name"));
   fileSaveAs->setToolTip(fileSaveAs->whatsThis());
 
-  filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection());
+  filePrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection());
   filePrint->setWhatsThis(i18n("Print the active vocabulary document"));
   filePrint->setToolTip(filePrint->whatsThis());
 
-  fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection());
+  fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection());
   fileQuit->setWhatsThis(i18n("Quit KVocTrain"));
   fileQuit->setToolTip(fileQuit->whatsThis());
 
-  editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection());
+  editCopy = KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection());
   editCopy->setWhatsThis(i18n("Copy"));
   editCopy->setToolTip(editCopy->whatsThis());
 
-  editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection());
+  editPaste = KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection());
   editPaste->setWhatsThis(i18n("Paste"));
   editPaste->setToolTip(editPaste->whatsThis());
 
-  editSelectAll = KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection());
+  editSelectAll = KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), actionCollection());
   editSelectAll->setWhatsThis(i18n("Select all rows"));
   editSelectAll->setToolTip(editSelectAll->whatsThis());
 
-  editClearSelection = KStdAction::deselect(this, TQT_SLOT(slotCancelSelection()), actionCollection());
+  editClearSelection = KStdAction::deselect(this, TQ_SLOT(slotCancelSelection()), actionCollection());
   editClearSelection->setWhatsThis(i18n("Deselect all rows"));
   editClearSelection->setToolTip(editClearSelection->whatsThis());
 
-  editSearchFromClipboard =  KStdAction::find(this, TQT_SLOT(slotSmartSearchClip()), actionCollection());
+  editSearchFromClipboard =  KStdAction::find(this, TQ_SLOT(slotSmartSearchClip()), actionCollection());
   editSearchFromClipboard->setWhatsThis(i18n("Search for the clipboard contents in the vocabulary"));
   editSearchFromClipboard->setToolTip(editSearchFromClipboard->whatsThis());
 
-  editAppend = new TDEAction(i18n("&Append New Entry"), "insert_table_row", "Insert", this, TQT_SLOT(slotAppendRow()), actionCollection(),"edit_append");
+  editAppend = new TDEAction(i18n("&Append New Entry"), "insert_table_row", "Insert", this, TQ_SLOT(slotAppendRow()), actionCollection(),"edit_append");
   editAppend->setWhatsThis(i18n("Append a new row to the vocabulary"));
   editAppend->setToolTip(editAppend->whatsThis());
 
-  editEditSelectedArea = new TDEAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", this, TQT_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area");
+  editEditSelectedArea = new TDEAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", this, TQ_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area");
   editEditSelectedArea->setWhatsThis(i18n("Edit the entries in the selected rows"));
   editEditSelectedArea->setToolTip(editEditSelectedArea->whatsThis());
 
-  editRemoveSelectedArea = new TDEAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", this, TQT_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area");
+  editRemoveSelectedArea = new TDEAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", this, TQ_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area");
   editRemoveSelectedArea->setWhatsThis(i18n("Delete the selected rows"));
   editRemoveSelectedArea->setToolTip(editRemoveSelectedArea->whatsThis());
 
-  editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("document-save-as", TDEIcon::Small), 0, this, TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area");
+  editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("document-save-as", TDEIcon::Small), 0, this, TQ_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area");
   editSaveSelectedArea->setWhatsThis(i18n("Save the entries in the query as a new vocabulary"));
   editSaveSelectedArea->setToolTip(editSaveSelectedArea->whatsThis());
 
-  vocabShowStatistics = new TDEAction(i18n("Show &Statistics"), "statistics", 0, this, TQT_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics");
+  vocabShowStatistics = new TDEAction(i18n("Show &Statistics"), "statistics", 0, this, TQ_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics");
   vocabShowStatistics->setWhatsThis(i18n("Show statistics for the current vocabulary"));
   vocabShowStatistics->setToolTip(vocabShowStatistics->whatsThis());
 
-  vocabAssignLessons = new TDEAction(i18n("Assign L&essons..."), "rand_less", 0, this, TQT_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons");
+  vocabAssignLessons = new TDEAction(i18n("Assign L&essons..."), "rand_less", 0, this, TQ_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons");
   vocabAssignLessons->setWhatsThis(i18n("Create random lessons with unassigned entries"));
   vocabAssignLessons->setToolTip(vocabAssignLessons->whatsThis());
 
-  vocabCleanUp = new TDEAction(i18n("&Clean Up"), "cleanup", 0, this, TQT_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up");
+  vocabCleanUp = new TDEAction(i18n("&Clean Up"), "cleanup", 0, this, TQ_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up");
   vocabCleanUp->setWhatsThis(i18n("Remove entries with same content from vocabulary"));
   vocabCleanUp->setToolTip(vocabCleanUp->whatsThis());
 
   vocabAppendLanguage = new TDESelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language");
-  connect(vocabAppendLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabAppendLanguage()));
-  connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAppendLang(int)));
-  connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+  connect(vocabAppendLanguage->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowVocabAppendLanguage()));
+  connect (vocabAppendLanguage->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotAppendLang(int)));
+  connect (vocabAppendLanguage->popupMenu(), TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int)));
 
   vocabSetLanguage = new TDESelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language");
-  connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabSetLanguage()));
+  connect(vocabSetLanguage->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowVocabSetLanguage()));
 
   vocabRemoveLanguage = new TDESelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language");
-  connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowVocabRemoveLanguage()));
-  connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-  connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+  connect(vocabRemoveLanguage->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowVocabRemoveLanguage()));
+  connect(vocabRemoveLanguage->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int)));
+  connect(vocabRemoveLanguage->popupMenu(), TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int)));
 
-  vocabDocumentProperties = new TDEAction(i18n("Document &Properties"), 0, 0, this, TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties");
+  vocabDocumentProperties = new TDEAction(i18n("Document &Properties"), 0, 0, this, TQ_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties");
   vocabDocumentProperties->setWhatsThis(i18n("Edit document properties"));
   vocabDocumentProperties->setToolTip(vocabAppendLanguage->whatsThis());
 
-  vocabLanguageProperties = new TDEAction(i18n("Lan&guage Properties"), 0, 0, this, TQT_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties");
+  vocabLanguageProperties = new TDEAction(i18n("Lan&guage Properties"), 0, 0, this, TQ_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties");
   vocabLanguageProperties->setWhatsThis(i18n("Edit language properties in current document"));
   vocabLanguageProperties->setToolTip(vocabSetLanguage->whatsThis());
 
   lessons = new KComboBox(this);
   lessons->setMinimumWidth(160);
-  connect(lessons, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotChooseLesson(int)));
+  connect(lessons, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotChooseLesson(int)));
   lessons->setFocusPolicy(TQWidget::NoFocus);
 
   vocabLessons = new KWidgetAction(lessons, i18n("Lessons"), 0, this, 0, actionCollection(), "vocab_lessons");
@@ -216,33 +216,33 @@ void kvoctrainApp::initActions()
 
   searchLine = new KLineEdit(this);
   searchLine->setFocusPolicy(TQWidget::ClickFocus);
-  connect (searchLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchNext()));
-  connect (searchLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotResumeSearch(const TQString&)));
+  connect (searchLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotSearchNext()));
+  connect (searchLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotResumeSearch(const TQString&)));
 
   vocabSearch = new KWidgetAction(searchLine, i18n("Smart Search"), 0, this, 0, actionCollection(), "vocab_search");
   vocabSearch->setAutoSized(true);
   vocabSearch->setWhatsThis(i18n("Search vocabulary for specified text "));
   vocabSearch->setToolTip(vocabSearch->whatsThis());
   /*
-  learningResumeQuery = new TDEAction(i18n("Resume &Query..."), "run_query", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_query");
+  learningResumeQuery = new TDEAction(i18n("Resume &Query..."), "run_query", 0, this, TQ_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_query");
   //learningResumeQuery->setWhatsThis(i18n(""));
   learningResumeQuery->setToolTip(learningResumeQuery->whatsThis());
 
-  learningResumeMultipleChoice = new TDEAction(i18n("&Resume Multiple Choice..."), "run_multi", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_multiple_choice");
+  learningResumeMultipleChoice = new TDEAction(i18n("&Resume Multiple Choice..."), "run_multi", 0, this, TQ_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_multiple_choice");
   //learningResumeMultipleChoice->setWhatsThis(i18n(""));
   learningResumeMultipleChoice->setToolTip(learningResumeMultipleChoice->whatsThis());
   */
-  configApp = KStdAction::preferences(this, TQT_SLOT( slotGeneralOptions()), actionCollection());
+  configApp = KStdAction::preferences(this, TQ_SLOT( slotGeneralOptions()), actionCollection());
   configApp->setWhatsThis(i18n("Show the configuration dialog"));
   configApp->setToolTip(configApp->whatsThis());
 
-  /*configQueryOptions = new TDEAction(i18n("Configure &Query..."), "configure_query", 0, this, TQT_SLOT(slotQueryOptions()), actionCollection(),"config_query_options");
+  /*configQueryOptions = new TDEAction(i18n("Configure &Query..."), "configure_query", 0, this, TQ_SLOT(slotQueryOptions()), actionCollection(),"config_query_options");
   configQueryOptions->setWhatsThis(i18n("Show the query configuration dialog"));
   configQueryOptions->setToolTip(configQueryOptions->whatsThis());*/
 
   actionCollection()->setHighlightingEnabled(true);
-  connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusHelpMsg(const TQString &)));
-  //connect(actionCollection(), TQT_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQT_SLOT(slotActionHighlighted(TDEAction *, bool)));
+  connect(actionCollection(), TQ_SIGNAL(actionStatusText(const TQString &)), this, TQ_SLOT(slotStatusHelpMsg(const TQString &)));
+  //connect(actionCollection(), TQ_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQ_SLOT(slotActionHighlighted(TDEAction *, bool)));
 
   if (!initialGeometrySet())
       resize( TQSize(550, 400).expandedTo(minimumSizeHint()));
@@ -254,9 +254,9 @@ void kvoctrainApp::initActions()
   configToolbar->setToolTip(configToolbar->whatsThis());
 
   learn_menu = (TQPopupMenu*) child( "learning", "TDEPopupMenu" );
-  connect(learn_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-  connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
-  connect(learn_menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowLearn()));
+  connect(learn_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int)));
+  connect(learn_menu, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int)));
+  connect(learn_menu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowLearn()));
 }
 
 
@@ -287,7 +287,7 @@ void kvoctrainApp::initDoc( )
   loadDocProps(doc);
   if (doc->numLangs() == 0)
     doc->appendLang("en");
-  connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool)));
+  connect (doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool)));
   doc->setModified(false);
 }
 
diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp
index fbe94dc1..7261bd5d 100644
--- a/kvoctrain/kvoctrain/kva_io.cpp
+++ b/kvoctrain/kvoctrain/kva_io.cpp
@@ -169,7 +169,7 @@ void kvoctrainApp::slotFileNew()
     view->setView(doc, langset);
     view->getTable()->setFont(Prefs::tableFont());
     view->adjustContent();
-    connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool)));
+    connect (doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool)));
     doc->setModified(false);
   }
   slotStatusMsg(IDS_DEFAULT);
@@ -210,7 +210,7 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent)
       view->adjustContent();
       if (addRecent)
         fileOpenRecent->addURL(url) /*addRecentFile (url.path())*/;
-      connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool)));
+      connect (doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool)));
       doc->setModified(false);
     }
 }
@@ -254,7 +254,7 @@ void kvoctrainApp::slotFileMerge()
     slotStatusMsg(msg);
     prepareProgressBar();
     kvoctrainDoc *new_doc = new kvoctrainDoc (this, url);
-    connect (new_doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool)));
+    connect (new_doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool)));
     doc->setModified(false);
     removeProgressBar();
 
diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp
index 48c024f0..fce1db59 100644
--- a/kvoctrain/kvoctrain/kva_query.cpp
+++ b/kvoctrain/kvoctrain/kva_query.cpp
@@ -179,11 +179,11 @@ void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property)
                            exp,
                            doc);
 
-  connect( simpleQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)),
-           this, TQT_SLOT(slotEditEntry(int,int)));
+  connect( simpleQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)),
+           this, TQ_SLOT(slotEditEntry(int,int)));
 
-  connect( simpleQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
-           this, TQT_SLOT(slotTimeOutProperty(QueryDlgBase::Result)));
+  connect( simpleQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
+           this, TQ_SLOT(slotTimeOutProperty(QueryDlgBase::Result)));
 
   simpleQueryDlg->initFocus();
   simpleQueryDlg->show();
@@ -352,11 +352,11 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type)
                             exp->getConjugation(act_query_col));
 
     verbQueryDlg->initFocus();
-    connect( verbQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)),
-             this, TQT_SLOT(slotEditEntry(int,int)));
+    connect( verbQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)),
+             this, TQ_SLOT(slotEditEntry(int,int)));
 
-    connect(verbQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
-                   this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result)));
+    connect(verbQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
+                   this, TQ_SLOT(slotTimeOutType(QueryDlgBase::Result)));
     verbQueryDlg->show();
   }
   else if (queryType == TQT_Articles) {
@@ -370,10 +370,10 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type)
                           doc,
                           doc->getArticle(act_query_col));
     artQueryDlg->initFocus();
-    connect( artQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)),
-             this, TQT_SLOT(slotEditEntry(int,int)));
-    connect(artQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
-                      this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result)));
+    connect( artQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)),
+             this, TQ_SLOT(slotEditEntry(int,int)));
+    connect(artQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
+                      this, TQ_SLOT(slotTimeOutType(QueryDlgBase::Result)));
     artQueryDlg->show();
   }
   else if (queryType == TQT_Comparison) {
@@ -387,11 +387,11 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type)
                           doc,
                           exp->getComparison(act_query_col));
     adjQueryDlg->initFocus();
-    connect( adjQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)),
-              this, TQT_SLOT(slotEditEntry(int,int)));
+    connect( adjQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)),
+              this, TQ_SLOT(slotEditEntry(int,int)));
 
-    connect(adjQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
-                    this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result)));
+    connect(adjQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
+                    this, TQ_SLOT(slotTimeOutType(QueryDlgBase::Result)));
     adjQueryDlg->show();
   }
   else {
@@ -642,10 +642,10 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o
                              exp,
                              doc);
       randomQueryDlg->initFocus();
-      connect( randomQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)),
-               this, TQT_SLOT(slotEditEntry(int,int)));
-      connect(randomQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
-               this, TQT_SLOT(slotTimeOutRandomQuery(QueryDlgBase::Result)));
+      connect( randomQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)),
+               this, TQ_SLOT(slotEditEntry(int,int)));
+      connect(randomQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
+               this, TQ_SLOT(slotTimeOutRandomQuery(QueryDlgBase::Result)));
       randomQueryDlg->show();
   }
   else if (queryType == TQT_Multiple) {
@@ -661,10 +661,10 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o
                              exp,
                              doc);
       mcQueryDlg->initFocus();
-      connect( mcQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)),
-               this, TQT_SLOT(slotEditEntry(int,int)));
-      connect(mcQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
-               this, TQT_SLOT(slotTimeOutMultipleChoice(QueryDlgBase::Result)));
+      connect( mcQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)),
+               this, TQ_SLOT(slotEditEntry(int,int)));
+      connect(mcQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)),
+               this, TQ_SLOT(slotTimeOutMultipleChoice(QueryDlgBase::Result)));
       mcQueryDlg->show();
   }
   else {
diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp
index 5bcd011f..b75c2050 100644
--- a/kvoctrain/kvoctrain/kvoctrain.cpp
+++ b/kvoctrain/kvoctrain/kvoctrain.cpp
@@ -410,8 +410,8 @@ void kvoctrainApp::createEntryDlg(int row, int col)
                     doc->getEntry(row)->isActive(),
                     Prefs::iPAFont());
    }
-   connect( entryDlg, TQT_SIGNAL(sigEditChoice(int)),
-             this, TQT_SLOT(slotEditCallBack(int)));
+   connect( entryDlg, TQ_SIGNAL(sigEditChoice(int)),
+             this, TQ_SLOT(slotEditCallBack(int)));
 
    view->getTable()->setReadOnly(true);
 
@@ -961,7 +961,7 @@ void kvoctrainApp::slotGeneralOptions()
 void kvoctrainApp::slotGeneralOptionsPage(int index)
 {
   KVocTrainPrefs* dialog = new KVocTrainPrefs(langset, doc, lessons, &querymanager, this, "settings",  Prefs::self() );
-  connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplyPreferences()));
+  connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplyPreferences()));
   if (index >= 0)
     dialog->selectPage(index);
   dialog->show();
@@ -1149,8 +1149,8 @@ void kvoctrainApp::aboutToShowLearn()
       }
 
       header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL);
-      connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-      connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+      connect (query_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int)));
+      connect (query_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int)));
 
       for (int i = 1; i < (int) doc->numLangs(); i++) {
         // show pixmap and long name if available
@@ -1177,12 +1177,12 @@ void kvoctrainApp::aboutToShowLearn()
       header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE);
       header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE);
 
-      connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-      connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+      connect (multiple_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int)));
+      connect (multiple_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int)));
     }
 
-    connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-    connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+    connect (header_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int)));
+    connect (header_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int)));
 
     TQString id = header == 0 ? doc->getOriginalIdent()
                              : doc->getIdent(header);
@@ -1263,8 +1263,8 @@ void kvoctrainApp::aboutToShowVocabSetLanguage()
           langs_m->insertItem(names[i], (header << 16) | (i << (16+8)) | IDH_SET_LANG);
       }
 
-      connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int)));
-      connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+      connect (langs_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetHeaderProp(int)));
+      connect (langs_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int)));
 
       if (header == 0)
         set_m->insertItem(i18n("&Original"), langs_m, (2 << 16) | IDH_NULL);
diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp
index e524e033..ff3382df 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -61,13 +61,13 @@ KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, TQWidget *p
   m_pixInactive = TQPixmap(TDEGlobal::iconLoader()->loadIcon("no", TDEIcon::Small));
 
   delayTimer = new TQTimer(this);
-  connect(delayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(menuTriggerTimeout()));
+  connect(delayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(menuTriggerTimeout()));
 
   TQHeader *header = horizontalHeader();
-  connect(header, TQT_SIGNAL(pressed(int)), this, TQT_SLOT(headerPressEvent(int)));
-  connect(header, TQT_SIGNAL(released(int)), this, TQT_SLOT(headerReleaseEvent(int)));
+  connect(header, TQ_SIGNAL(pressed(int)), this, TQ_SLOT(headerPressEvent(int)));
+  connect(header, TQ_SIGNAL(released(int)), this, TQ_SLOT(headerReleaseEvent(int)));
 
-  connect(this, TQT_SIGNAL(currentChanged(int, int)), this, TQT_SLOT(slotCurrentChanged(int, int)));
+  connect(this, TQ_SIGNAL(currentChanged(int, int)), this, TQ_SLOT(slotCurrentChanged(int, int)));
 }
 
 
diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp
index 600f27a7..9eb0f449 100644
--- a/kvoctrain/kvoctrain/kvoctrainview.cpp
+++ b/kvoctrain/kvoctrain/kvoctrainview.cpp
@@ -59,13 +59,13 @@ kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp
   if (m_doc->numLangs() == 0)
     m_doc->appendLang(i18n("Original"));
 
-  connect(m_table, TQT_SIGNAL(selected(int)), m_table, TQT_SLOT(sortByColumn_alpha(int)));
-  connect(m_table, TQT_SIGNAL(rightButtonClicked(int, int, int)), parent, TQT_SLOT(slotHeaderMenu(int, int, int)));
-  connect(m_table, TQT_SIGNAL(edited(int, int)), parent, TQT_SLOT(slotEditEntry(int, int)));
-  connect(m_table, TQT_SIGNAL(currentChanged(int, int)), parent, TQT_SLOT(slotCurrentCellChanged(int, int)));
-  connect(m_table, TQT_SIGNAL(selectionChanged()), m_table, TQT_SLOT(slotSelectionChanged()));
-  connect(m_table, TQT_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), parent, TQT_SLOT(keyPressEvent(TQKeyEvent *)));
-  connect(m_table, TQT_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), parent, TQT_SLOT(keyReleaseEvent(TQKeyEvent *)));
+  connect(m_table, TQ_SIGNAL(selected(int)), m_table, TQ_SLOT(sortByColumn_alpha(int)));
+  connect(m_table, TQ_SIGNAL(rightButtonClicked(int, int, int)), parent, TQ_SLOT(slotHeaderMenu(int, int, int)));
+  connect(m_table, TQ_SIGNAL(edited(int, int)), parent, TQ_SLOT(slotEditEntry(int, int)));
+  connect(m_table, TQ_SIGNAL(currentChanged(int, int)), parent, TQ_SLOT(slotCurrentCellChanged(int, int)));
+  connect(m_table, TQ_SIGNAL(selectionChanged()), m_table, TQ_SLOT(slotSelectionChanged()));
+  connect(m_table, TQ_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), parent, TQ_SLOT(keyPressEvent(TQKeyEvent *)));
+  connect(m_table, TQ_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), parent, TQ_SLOT(keyReleaseEvent(TQKeyEvent *)));
 
   list_layout = new TQGridLayout( this, 2, 1/*, 4 */);
   list_layout->addWidget(m_table, 1, 0);
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index 5d0ec824..906c3753 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -97,7 +97,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
   if (!url.isEmpty())
     doc_url = url;
 
-  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
+  connect( this, TQ_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQ_SLOT(slotProgress(kvoctrainDoc*,int)) );
 
   TQString tmpfile;
   if (TDEIO::NetAccess::download( url, tmpfile, 0 ))
@@ -189,7 +189,7 @@ kvoctrainDoc::~kvoctrainDoc()
 
 bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, FileType ft)
 {
-  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
+  connect( this, TQ_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQ_SLOT(slotProgress(kvoctrainDoc*,int)) );
 
   KURL tmp (url);
   if (title == i18n("Untitled"))
diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
index 0fb0ec89..09710019 100644
--- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
@@ -55,18 +55,18 @@ AdjQueryDlg::AdjQueryDlg
   mw = new AdjQueryDlgForm(this);
   setMainWidget(mw);
 
-  connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) );
-  connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) );
-  connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) );
-  connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) );
+  connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) );
+  connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) );
+  connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) );
+  connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) );
 
-  connect(mw->lev1Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) );
-  connect(mw->lev2Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) );
-  connect(mw->lev3Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) );
+  connect(mw->lev1Field, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) );
+  connect(mw->lev2Field, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) );
+  connect(mw->lev3Field, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) );
 
-  connect(mw->lev1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev1Changed(const TQString&)) );
-  connect(mw->lev2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev2Changed(const TQString&)) );
-  connect(mw->lev3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev3Changed(const TQString&)) );
+  connect(mw->lev1Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev1Changed(const TQString&)) );
+  connect(mw->lev2Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev2Changed(const TQString&)) );
+  connect(mw->lev3Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev3Changed(const TQString&)) );
 
   qtimer = 0;
 
@@ -137,7 +137,7 @@ void AdjQueryDlg::setQuery(TQString,
    if (mqtime > 0) {
      if (qtimer == 0) {
        qtimer = new TQTimer( this );
-       connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) );
+       connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) );
      }
 
      if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) {
diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
index 1912d7b3..9e8e9ce2 100644
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
@@ -61,14 +61,14 @@ ArtQueryDlg::ArtQueryDlg
   mw->artGroup->insert (mw->male);
   mw->artGroup->insert (mw->rb_fem);
 
-  connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) );
-  connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) );
-  connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) );
-  connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) );
+  connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) );
+  connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) );
+  connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) );
+  connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) );
 
-  connect(mw->natural, TQT_SIGNAL(clicked()), TQT_SLOT(slotNaturalClicked()) );
-  connect(mw->male, TQT_SIGNAL(clicked()), TQT_SLOT(slotMaleClicked()) );
-  connect(mw->rb_fem, TQT_SIGNAL(clicked()), TQT_SLOT(slotFemClicked()) );
+  connect(mw->natural, TQ_SIGNAL(clicked()), TQ_SLOT(slotNaturalClicked()) );
+  connect(mw->male, TQ_SIGNAL(clicked()), TQ_SLOT(slotMaleClicked()) );
+  connect(mw->rb_fem, TQ_SIGNAL(clicked()), TQ_SLOT(slotFemClicked()) );
 
   setQuery (type, entry, col, query_cycle, query_num, query_startnum, exp, doc, articles);
   mw->countbar->setFormat("%v/%m");
@@ -158,7 +158,7 @@ void ArtQueryDlg::setQuery(TQString,
    if (mqtime > 0) {
      if (qtimer == 0) {
        qtimer = new TQTimer( this );
-       connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) );
+       connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) );
      }
 
      if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) {
diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
index 42a578f0..19b977c1 100644
--- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
@@ -64,15 +64,15 @@ MCQueryDlg::MCQueryDlg(
   mw->transgroup->insert(mw->rb_trans4);
   mw->transgroup->insert(mw->rb_trans5);
 
-  connect( mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) );
-  connect( mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) );
-// connect( verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) );
-  connect( mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showItClicked()) );
-  connect( mw->rb_trans5, TQT_SIGNAL(clicked()), TQT_SLOT(trans5clicked()) );
-  connect( mw->rb_trans4, TQT_SIGNAL(clicked()), TQT_SLOT(trans4clicked()) );
-  connect( mw->rb_trans3, TQT_SIGNAL(clicked()), TQT_SLOT(trans3clicked()) );
-  connect( mw->rb_trans2, TQT_SIGNAL(clicked()), TQT_SLOT(trans2clicked()) );
-  connect( mw->rb_trans1, TQT_SIGNAL(clicked()), TQT_SLOT(trans1clicked()) );
+  connect( mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) );
+  connect( mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) );
+// connect( verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) );
+  connect( mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showItClicked()) );
+  connect( mw->rb_trans5, TQ_SIGNAL(clicked()), TQ_SLOT(trans5clicked()) );
+  connect( mw->rb_trans4, TQ_SIGNAL(clicked()), TQ_SLOT(trans4clicked()) );
+  connect( mw->rb_trans3, TQ_SIGNAL(clicked()), TQ_SLOT(trans3clicked()) );
+  connect( mw->rb_trans2, TQ_SIGNAL(clicked()), TQ_SLOT(trans2clicked()) );
+  connect( mw->rb_trans1, TQ_SIGNAL(clicked()), TQ_SLOT(trans1clicked()) );
 
   qtimer = 0;
 
@@ -121,7 +121,7 @@ void MCQueryDlg::setQuery(TQString org,
    if (mqtime > 0) {
      if (qtimer == 0) {
        qtimer = new TQTimer( this );
-       connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) );
+       connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) );
      }
 
      if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) {
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
index 819ed2a2..f9725434 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
@@ -140,14 +140,14 @@ RandomQueryDlg::RandomQueryDlg(
   mw = new QueryDlgForm(this);
   setMainWidget(mw);
 
-  connect( mw->c_type, TQT_SIGNAL(clicked()), TQT_SLOT(slotTypeClicked()) );
-  connect( mw->c_remark, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemClicked()) );
-  connect( mw->c_falsefriend, TQT_SIGNAL(clicked()), TQT_SLOT(slotFFClicked()) );
-  connect( mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) );
-  connect( mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) );
-  connect( mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) );
-  connect( mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) );
-  connect( mw->show_more, TQT_SIGNAL(clicked()), TQT_SLOT(showMoreClicked()) );
+  connect( mw->c_type, TQ_SIGNAL(clicked()), TQ_SLOT(slotTypeClicked()) );
+  connect( mw->c_remark, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemClicked()) );
+  connect( mw->c_falsefriend, TQ_SIGNAL(clicked()), TQ_SLOT(slotFFClicked()) );
+  connect( mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) );
+  connect( mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) );
+  connect( mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) );
+  connect( mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) );
+  connect( mw->show_more, TQ_SIGNAL(clicked()), TQ_SLOT(showMoreClicked()) );
 
   mw->show_more -> setEnabled (Prefs::showMore());
   mw->know_it -> setEnabled (Prefs::iKnow());
@@ -173,8 +173,8 @@ RandomQueryDlg::RandomQueryDlg(
       transCombos.at(i) -> setInsertionPolicy (TQComboBox::NoInsertion);
       transCombos.at(i) -> setDuplicatesEnabled (false);
       vb->addWidget(transCombos.at(i));
-      connect (transCombos.at(i), TQT_SIGNAL (textChanged (const TQString&)), TQT_SLOT (slotTransChanged (const TQString&)));
-      connect (transCombos.at(i) -> lineEdit(), TQT_SIGNAL (lostFocus()), TQT_SLOT (slotTransLostFocus()));
+      connect (transCombos.at(i), TQ_SIGNAL (textChanged (const TQString&)), TQ_SLOT (slotTransChanged (const TQString&)));
+      connect (transCombos.at(i) -> lineEdit(), TQ_SIGNAL (lostFocus()), TQ_SLOT (slotTransLostFocus()));
     }
   }
   else
@@ -184,8 +184,8 @@ RandomQueryDlg::RandomQueryDlg(
       transFields.append (new TQLineEdit (mw->TranslationFrame, TQCString ("transField") + TQCString().setNum (i)));
       transFields.at(i) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth()));
       vb->addWidget(transFields.at(i));
-      connect (transFields.at(i), TQT_SIGNAL (textChanged (const TQString&)), TQT_SLOT (slotTransChanged (const TQString&)));
-      connect (transFields.at(i), TQT_SIGNAL (lostFocus()), TQT_SLOT (slotTransLostFocus()));
+      connect (transFields.at(i), TQ_SIGNAL (textChanged (const TQString&)), TQ_SLOT (slotTransChanged (const TQString&)));
+      connect (transFields.at(i), TQ_SIGNAL (lostFocus()), TQ_SLOT (slotTransLostFocus()));
     }
   }
 
@@ -316,7 +316,7 @@ void RandomQueryDlg::setQuery(TQString org,
    if (mqtime > 0) {
      if (qtimer == 0) {
        qtimer = new TQTimer( this );
-       connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) );
+       connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) );
      }
 
      if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) {
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
index c5b40d09..e0737d32 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
@@ -51,12 +51,12 @@ SimpleQueryDlg::SimpleQueryDlg(
   mw = new SimpleQueryDlgForm(this);
   setMainWidget(mw);
 
-  connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) );
-  connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) );
-  connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) );
-  connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) );
-  connect(mw->show_more, TQT_SIGNAL(clicked()), TQT_SLOT(showMoreClicked()) );
-  connect(mw->answerField, TQT_SIGNAL(textChanged()), TQT_SLOT(slotAnswerChanged()) );
+  connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) );
+  connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) );
+  connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) );
+  connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) );
+  connect(mw->show_more, TQ_SIGNAL(clicked()), TQ_SLOT(showMoreClicked()) );
+  connect(mw->answerField, TQ_SIGNAL(textChanged()), TQ_SLOT(slotAnswerChanged()) );
 
   kv_doc = 0;
   qtimer = 0;
@@ -170,7 +170,7 @@ void SimpleQueryDlg::setQuery(QueryType _querytype,
    if (mqtime > 0) {
      if (qtimer == 0) {
        qtimer = new TQTimer( this );
-       connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) );
+       connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) );
      }
 
      if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) {
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
index e7868a9e..03e29d64 100644
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
@@ -54,32 +54,32 @@ VerbQueryDlg::VerbQueryDlg
   mw = new VerbQueryDlgForm(this);
   setMainWidget(mw);
 
-  connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) );
-  connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) );
-  connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) );
-  connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) );
-
-  connect(mw->p3pmField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
-  connect(mw->p3pnField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
-  connect(mw->p3snField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
-  connect(mw->p3smField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
-  connect(mw->p3pfField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
-  connect(mw->p3sfField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
-  connect(mw->p2pField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
-  connect(mw->p2sField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
-  connect(mw->p1pField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
-  connect(mw->p1sField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
-
-  connect(mw->p3pmField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pmChanged(const TQString&)) );
-  connect(mw->p3snField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3snChanged(const TQString&)) );
-  connect(mw->p3pnField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pnChanged(const TQString&)) );
-  connect(mw->p3smField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3smChanged(const TQString&)) );
-  connect(mw->p3pfField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pfChanged(const TQString&)) );
-  connect(mw->p3sfField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3sfChanged(const TQString&)) );
-  connect(mw->p2pField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP2pChanged(const TQString&)) );
-  connect(mw->p2sField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP2sChanged(const TQString&)) );
-  connect(mw->p1pField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP1pChanged(const TQString&)) );
-  connect(mw->p1sField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP1sChanged(const TQString&)) );
+  connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) );
+  connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) );
+  connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) );
+  connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) );
+
+  connect(mw->p3pmField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) );
+  connect(mw->p3pnField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) );
+  connect(mw->p3snField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) );
+  connect(mw->p3smField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) );
+  connect(mw->p3pfField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) );
+  connect(mw->p3sfField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) );
+  connect(mw->p2pField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) );
+  connect(mw->p2sField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) );
+  connect(mw->p1pField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) );
+  connect(mw->p1sField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) );
+
+  connect(mw->p3pmField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3pmChanged(const TQString&)) );
+  connect(mw->p3snField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3snChanged(const TQString&)) );
+  connect(mw->p3pnField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3pnChanged(const TQString&)) );
+  connect(mw->p3smField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3smChanged(const TQString&)) );
+  connect(mw->p3pfField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3pfChanged(const TQString&)) );
+  connect(mw->p3sfField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3sfChanged(const TQString&)) );
+  connect(mw->p2pField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP2pChanged(const TQString&)) );
+  connect(mw->p2sField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP2sChanged(const TQString&)) );
+  connect(mw->p1pField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP1pChanged(const TQString&)) );
+  connect(mw->p1sField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP1sChanged(const TQString&)) );
 
   qtimer = 0;
 
@@ -146,7 +146,7 @@ void VerbQueryDlg::setQuery(TQString,
    if (mqtime > 0) { // more than 1000 milli-seconds
      if (qtimer == 0) {
        qtimer = new TQTimer( this );
-       connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) );
+       connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) );
      }
 
      if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) {
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
index ae34d191..f6aa5a31 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
@@ -85,8 +85,8 @@ StatistikPage::StatistikPage(int col, kvoctrainDoc  *_doc, TQWidget *parent, con
     }
   }
   setupPixmaps();
-  connect(StatListView, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint& , int ) ),
-          this, TQT_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) );
+  connect(StatListView, TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint& , int ) ),
+          this, TQ_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) );
 }