rename the following methods:

tqparent parent
tqmask mask


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

76 files changed, 128 insertions, 128 deletions

diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp
index 246589da..7bdfe888 100644
--- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp
@@ -34,8 +34,8 @@
 #include <kstandarddirs.h>
 
 
-ProgressDlg::ProgressDlg(const TQString &doctitle, const TQString &filename, const TQString &title, TQWidget* tqparent, const char* name)
-  : ProgressDlgForm( tqparent, name )
+ProgressDlg::ProgressDlg(const TQString &doctitle, const TQString &filename, const TQString &title, TQWidget* parent, const char* name)
+  : ProgressDlgForm( parent, name )
 {
   doc = 0;
   setCaption (title);
diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h
index c9eba176..799dbda6 100644
--- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h
+++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h
@@ -44,7 +44,7 @@ public:
         const TQString &doctitle,
         const TQString &filename,
         const TQString &title,
-        TQWidget* tqparent = NULL,
+        TQWidget* parent = NULL,
         const char* name = NULL
     );
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
index 7f24d5ad..88df5b53 100644
--- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
@@ -74,8 +74,8 @@ static ListRef date_itemlist [] =
 };
 
 
-BlockOptions::BlockOptions(TQWidget* tqparent, const char* name, WFlags fl)
-: BlockOptionsBase(tqparent, name, fl)
+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)));
diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.h b/kvoctrain/kvoctrain/common-dialogs/blockoptions.h
index 4895e244..8ed53853 100644
--- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.h
@@ -39,7 +39,7 @@ class BlockOptions : public BlockOptionsBase
   TQ_OBJECT
 
 public:
-  BlockOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  BlockOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   void updateWidgets();
   bool hasChanged();
   bool isDefault();
diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp b/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp
index 1f9c8bd7..e69d5c99 100644
--- a/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/generaloptions.cpp
@@ -29,8 +29,8 @@
 
 #include "generaloptions.h"
 
-GeneralOptions::GeneralOptions(TQWidget* tqparent, const char* name, WFlags fl)
-: GeneralOptionsBase(tqparent,name,fl)
+GeneralOptions::GeneralOptions(TQWidget* parent, const char* name, WFlags fl)
+: GeneralOptionsBase(parent,name,fl)
 {
  kcfg_BackupTime->setEnabled(kcfg_AutoBackup->isChecked());
 }
diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptions.h b/kvoctrain/kvoctrain/common-dialogs/generaloptions.h
index 7b1a7191..6a54474a 100644
--- a/kvoctrain/kvoctrain/common-dialogs/generaloptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/generaloptions.h
@@ -34,7 +34,7 @@ class GeneralOptions : public GeneralOptionsBase
   TQ_OBJECT
 
 public:
-  GeneralOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  GeneralOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 };
 
 #endif
diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp
index 6af8cc3b..ea11654b 100644
--- a/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/groupoptions.cpp
@@ -28,8 +28,8 @@
 
 #include "groupoptions.h"
 
-GroupOptions::GroupOptions(TQWidget* tqparent, const char* name, WFlags fl)
-: GroupOptionsBase(tqparent,name,fl)
+GroupOptions::GroupOptions(TQWidget* parent, const char* name, WFlags fl)
+: GroupOptionsBase(parent,name,fl)
 {
 
 }
diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptions.h b/kvoctrain/kvoctrain/common-dialogs/groupoptions.h
index b77f10c2..966980b7 100644
--- a/kvoctrain/kvoctrain/common-dialogs/groupoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/groupoptions.h
@@ -34,7 +34,7 @@ class GroupOptions : public GroupOptionsBase
   TQ_OBJECT
 
 public:
-  GroupOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  GroupOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateButtons();
 };
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
index 005607a0..73db49ce 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
@@ -54,10 +54,10 @@ static const char unapplied[] = I18N_NOOP(
     "If you save a profile, those changes will not be included.\n"
     "Do you wish to continue?");
 
-KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *tqparent,
+KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *parent,
   const char *name,  KConfigSkeleton *config, DialogType dialogType, int /*dialogButtons*/, ButtonCode /*defaultButton*/,
   bool /*modal*/)
-  : KConfigDialog(tqparent, name, config, dialogType, Default|Ok|Apply|Cancel|Help|User1, Ok, true), m_langSet(ls)
+  : KConfigDialog(parent, name, config, dialogType, Default|Ok|Apply|Cancel|Help|User1, Ok, true), m_langSet(ls)
 {
   m_config = config;
   m_queryManager = m;
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
index 6909d0df..218155aa 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h
@@ -47,7 +47,7 @@ public:
   /**
    * Creates a configuration dialog.
    */
-  KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *tqparent=0,
+  KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * lessons, QueryManager * m, TQWidget *parent=0,
     const char *name=0, KConfigSkeleton *config=0, DialogType dialogType=IconList,
     int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index 3a87a546..d0715a1d 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -677,8 +677,8 @@ KV_ISO639_Code kv_iso639_2[] = {
 };
 */
 
-LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* tqparent, const char* name, WFlags fl)
-  : LanguageOptionsBase(tqparent, name, fl), m_langSet(langset)
+LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char* name, WFlags fl)
+  : LanguageOptionsBase(parent, name, fl), m_langSet(langset)
 {
   langset_popup = 0;
 
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.h b/kvoctrain/kvoctrain/common-dialogs/languageoptions.h
index d239f06f..40a1a04e 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.h
@@ -37,7 +37,7 @@ class LanguageOptions : public LanguageOptionsBase
   TQ_OBJECT
 
 public:
-  LanguageOptions(LangSet & langset, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  LanguageOptions(LangSet & langset, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   virtual ~LanguageOptions ();
 
   LangSet getLangSet () const;
diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
index a273088b..ca79f2d5 100644
--- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
@@ -50,8 +50,8 @@ static const char *separator_id[] =
   0
 };
 
-PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* tqparent, const char* name, WFlags fl)
-: PasteOptionsBase(tqparent,name,fl), m_langSet(langset)
+PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* parent, const char* name, WFlags fl)
+: PasteOptionsBase(parent,name,fl), m_langSet(langset)
 {
   OrderList->setEnabled(!kcfg_UseCurrent->isChecked());
   UpButton->setEnabled(!kcfg_UseCurrent->isChecked());
diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h
index f7ef34d3..cbef3b6f 100644
--- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h
@@ -37,7 +37,7 @@ class PasteOptions : public PasteOptionsBase
   TQ_OBJECT
 
 public:
-  PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateWidgets();
   bool hasChanged();
diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
index 1956976e..a782fd00 100644
--- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
@@ -39,8 +39,8 @@ SettingsProfile::SettingsProfile(TQString n, TQString q, TQString t, TQString b)
 {
 }
 
-ProfilesDialog::ProfilesDialog(QueryManager * m, TQWidget *tqparent, const char *name, bool modal)
- : KDialogBase(Swallow, i18n("Profiles"), Close, Close, tqparent, name, modal, false)
+ProfilesDialog::ProfilesDialog(QueryManager * m, TQWidget *parent, const char *name, bool modal)
+ : KDialogBase(Swallow, i18n("Profiles"), Close, Close, parent, name, modal, false)
 {
   m_queryManager = m;
   mw = new GroupOptions(this);
diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h
index 057acaa5..79df6ef6 100644
--- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h
+++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h
@@ -49,7 +49,7 @@ class ProfilesDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-  ProfilesDialog(QueryManager * m, TQWidget *tqparent = 0, const char *name = 0, bool modal = true);
+  ProfilesDialog(QueryManager * m, TQWidget *parent = 0, const char *name = 0, bool modal = true);
 
 signals:
   void profileActivated();
diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp
index 94c6c6da..2b4e6c5a 100644
--- a/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/queryoptions.cpp
@@ -34,8 +34,8 @@
 #include "queryoptions.h"
 #include "prefs.h"
 
-QueryOptions::QueryOptions(TQWidget* tqparent, const char* name, WFlags fl)
-: QueryOptionsBase(tqparent,name,fl)
+QueryOptions::QueryOptions(TQWidget* parent, const char* name, WFlags fl)
+: QueryOptionsBase(parent,name,fl)
 {
   kcfg_MaxTimePer->setDisabled(r_no_limit->isChecked());
   kcfg_ShowCounter->setDisabled(r_no_limit->isChecked());
diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h
index 4aa6b1a5..19e6e2fa 100644
--- a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h
@@ -34,7 +34,7 @@ class QueryOptions : public QueryOptionsBase
   TQ_OBJECT
 
 public:
-  QueryOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  QueryOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateWidgets();
 };
diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
index f7a3cac6..b54d60f6 100644
--- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
@@ -101,8 +101,8 @@ static ThreshListRef Threshdate_itemlist [] =
       };
 
 
-ThresholdOptions::ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* tqparent, const char* name, WFlags fl)
-: ThresholdOptionsBase(tqparent, name, fl), m_lessons(lessons)
+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()));
diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h
index c34beed0..240511af 100644
--- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h
@@ -37,7 +37,7 @@ class ThresholdOptions : public ThresholdOptionsBase
   TQ_OBJECT
 
 public:
-  ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
   void updateWidgets();
   bool hasChanged();
diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp
index 9be23a47..773f263f 100644
--- a/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/viewoptions.cpp
@@ -27,8 +27,8 @@
 
 #include "viewoptions.h"
 
-ViewOptions::ViewOptions(TQWidget* tqparent, const char* name, WFlags fl)
-: ViewOptionsBase(tqparent,name,fl)
+ViewOptions::ViewOptions(TQWidget* parent, const char* name, WFlags fl)
+: ViewOptionsBase(parent,name,fl)
 {
   kcfg_GradeCol0->setEnabled(kcfg_UseGradeCol->isChecked());
   kcfg_GradeCol1->setEnabled(kcfg_UseGradeCol->isChecked());
diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptions.h b/kvoctrain/kvoctrain/common-dialogs/viewoptions.h
index 5ee876db..4897e786 100644
--- a/kvoctrain/kvoctrain/common-dialogs/viewoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/viewoptions.h
@@ -34,7 +34,7 @@ class ViewOptions : public ViewOptionsBase
   TQ_OBJECT
 
 public:
-  ViewOptions(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  ViewOptions(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 
 };
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp
index 73ceab50..f1c8d62d 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp
@@ -28,7 +28,7 @@
 
 #include <tqcheckbox.h>
 
-DocOptionsPage::DocOptionsPage(bool sort, TQWidget *tqparent, const char *name):DocOptionsPageForm(tqparent, name)
+DocOptionsPage::DocOptionsPage(bool sort, TQWidget *parent, const char *name):DocOptionsPageForm(parent, name)
 {
   sorter = sort;
   docsort->setChecked(sort);
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h
index b2ee07e6..d50b7434 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h
@@ -36,7 +36,7 @@ class DocOptionsPage : public DocOptionsPageForm
 
 public:
 
-  DocOptionsPage(bool sort, TQWidget *tqparent, const char *name);
+  DocOptionsPage(bool sort, TQWidget *parent, const char *name);
 
   bool getSorting () const { return sorter; }
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
index 34979fc1..a49fd65e 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
@@ -47,12 +47,12 @@ DocPropsDlg::DocPropsDlg
   vector<TQString>  types,
   vector<TQString>  tenses,
   vector<TQString>  usages,
-  TQWidget         *tqparent,
+  TQWidget         *parent,
   const char      *name,
   bool             modal
 )
   :
-  KDialogBase(Tabbed, i18n("Document Properties"), Ok|Cancel, Ok, tqparent, name, modal)
+  KDialogBase(Tabbed, i18n("Document Properties"), Ok|Cancel, Ok, parent, name, modal)
 {
   TQFrame *page = addPage( i18n("&General") );
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, KDialog::spacingHint() );
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h
index 0ed586ed..066e4b3a 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h
@@ -60,7 +60,7 @@ public:
     vector<TQString>  types,
     vector<TQString>  tenses,
     vector<TQString>  usages,
-    TQWidget         *tqparent = NULL,
+    TQWidget         *parent = NULL,
     const char      *name = NULL,
     bool             modal = true
   );
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
index c359f65f..76013ebf 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
@@ -42,9 +42,9 @@
 
 class kvoctraindoc;
 
-DocPropsLangDlg::DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *tqparent, const char *name, bool modal)
+DocPropsLangDlg::DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *parent, const char *name, bool modal)
   :
-  KDialogBase(Tabbed, i18n("Language Properties"), Ok|Cancel, Ok, tqparent, name, modal)
+  KDialogBase(Tabbed, i18n("Language Properties"), Ok|Cancel, Ok, parent, name, modal)
 {
   TQFrame * page;
   TQVBoxLayout * topLayout;
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h
index 6b1a6170..b5d6c7ad 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h
@@ -43,7 +43,7 @@ class DocPropsLangDlg : public KDialogBase
 
 public:
 
-  DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *tqparent = NULL, const char *name = NULL, bool modal = true);
+  DocPropsLangDlg(kvoctrainDoc *doc, LangSet *langset, TQWidget *parent = NULL, const char *name = NULL, bool modal = true);
 
   Conjugation getConjugation(int idx) const;
   Article     getArticle(int idx) const;
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
index 3ec0a6f5..a9d255e6 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
@@ -40,11 +40,11 @@ LangPropPage::LangPropPage
   TQString            curr_lang,
   const Conjugation &conjug,
   const Article     &art,
-  TQWidget           *tqparent,
+  TQWidget           *parent,
   const char        *name
 )
   :
-  LangPropPageForm( tqparent, name ),
+  LangPropPageForm( parent, name ),
   doc(_doc),
   conjugations(conjug),
   articles(art)
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h
index 4748e7b3..43478e0c 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h
@@ -46,7 +46,7 @@ public:
     TQString            curr_lang,
     const Conjugation &conjugations,
     const Article     &article,
-    TQWidget           *tqparent = NULL,
+    TQWidget           *parent = NULL,
     const char        *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
index 8cb2346a..3143007e 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
@@ -42,11 +42,11 @@ LessOptPage::LessOptPage
 (
   TQComboBox     *lessons,
   kvoctrainDoc  *_doc,
-  TQWidget       *tqparent,
+  TQWidget       *parent,
   const char    *name
 )
   :
-  LessOptPageForm( tqparent, name )
+  LessOptPageForm( parent, name )
 {
   connect( lessonList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotLessonChosen(int)) );
   connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewLesson()) );
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h
index 9531eed6..f45fb809 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h
@@ -45,7 +45,7 @@ public:
   (
     TQComboBox     *lessons,
     kvoctrainDoc  *doc,
-    TQWidget       *tqparent = NULL,
+    TQWidget       *parent = NULL,
     const char    *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
index 5ec3c37a..6732540b 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
@@ -40,11 +40,11 @@ TenseOptPage::TenseOptPage
 (
   const vector<TQString> &tenses,
   kvoctrainDoc    *_doc,
-  TQWidget         *tqparent,
+  TQWidget         *parent,
   const char      *name
 )
   :
-  TenseOptPageForm( tqparent, name )
+  TenseOptPageForm( parent, name )
 {
   connect( tenseList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTenseChosen(int)) );
   connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h
index e2430173..a45cfcda 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h
@@ -46,7 +46,7 @@ public:
   (
     const vector<TQString> &tenses,
     kvoctrainDoc    *doc,
-    TQWidget         *tqparent = NULL,
+    TQWidget         *parent = NULL,
     const char      *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
index 57dd5f2d..96f71bd4 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
@@ -39,11 +39,11 @@ TitlePage::TitlePage
   TQString  _author,
   TQString  _license,
   TQString  _doc_remark,
-  TQWidget* tqparent,
+  TQWidget* parent,
   const char* name
 )
   :
-  TitlePageForm( tqparent, name )
+  TitlePageForm( parent, name )
 {
   title = _title;
   author = _author;
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h
index 52954e1e..4f00e057 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h
@@ -42,7 +42,7 @@ public:
     TQString      author,
     TQString      license,
     TQString      doc_remark,
-    TQWidget     *tqparent = NULL,
+    TQWidget     *parent = NULL,
     const char  *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
index ef16cd4e..39db6421 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
@@ -40,11 +40,11 @@ TypeOptPage::TypeOptPage
 (
   const vector<TQString> &types,
   kvoctrainDoc    *_doc,
-  TQWidget         *tqparent,
+  TQWidget         *parent,
   const char      *name
 )
   :
-  TypeOptPageForm( tqparent, name ),
+  TypeOptPageForm( parent, name ),
   doc(_doc)
 {
   connect( typeList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTypeChosen(int)) );
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h
index 7b550b6d..3a6e3b49 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h
@@ -45,7 +45,7 @@ public:
   (
     const vector<TQString> &types,
     kvoctrainDoc    *doc,
-    TQWidget         *tqparent = NULL,
+    TQWidget         *parent = NULL,
     const char      *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
index 6f55d815..accc2bc5 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
@@ -41,11 +41,11 @@ UsageOptPage::UsageOptPage
 (
   const vector<TQString> &usages,
   kvoctrainDoc    *_doc,
-  TQWidget         *tqparent,
+  TQWidget         *parent,
   const char      *name
 )
   :
-  UsageOptPageForm( tqparent, name ),
+  UsageOptPageForm( parent, name ),
   doc(_doc)
 {
   connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) );
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h
index 4a30b2d5..eb49bd46 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h
@@ -47,7 +47,7 @@ public:
   (
     const vector<TQString> &usages,
     kvoctrainDoc    *doc,
-    TQWidget         *tqparent = NULL,
+    TQWidget         *parent = NULL,
     const char      *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp
index 29380370..0bdae252 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp
@@ -32,8 +32,8 @@
 #include <tqlineedit.h>
 
 
-AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *tqparent, const char *name)
-  : AdjEntryPageForm( tqparent, name ), dlgbook(_dlgbook)
+AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *parent, const char *name)
+  : AdjEntryPageForm( parent, name ), dlgbook(_dlgbook)
 {
   comparisons = comp;
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h
index 3750fb3c..861faaa4 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h
@@ -38,7 +38,7 @@ class AdjEntryPage : public AdjEntryPageForm
   TQ_OBJECT
 
 public:
-  AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *tqparent = NULL, const char *name = NULL);
+  AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison &comp, TQWidget *parent = NULL, const char *name = NULL);
 
   void setData (bool multi_sel, const Comparison  &comp);
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp
index a42e5d01..87e0fe59 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp
@@ -41,10 +41,10 @@ AuxInfoEntryPage::AuxInfoEntryPage
   TQString     exam,
   TQString     rem,
   TQString     para,
-  TQWidget    *tqparent,
+  TQWidget    *parent,
   const char *name
 )
- : AuxInfoEntryPageForm( tqparent, name ), dlgbook(_dlgbook)
+ : AuxInfoEntryPageForm( parent, name ), dlgbook(_dlgbook)
 
 {
   TQFontMetrics fm (synonym_line->font());
diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h
index 59a62c28..eee7260b 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h
@@ -45,7 +45,7 @@ public:
     TQString     example,
     TQString     remark,
     TQString     para,
-    TQWidget    *tqparent = 0,
+    TQWidget    *parent = 0,
     const char *name = 0
   );
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
index e9803914..7e79a1ee 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
@@ -63,11 +63,11 @@ CommonEntryPage::CommonEntryPage
   QueryManager &_querymanager,
   bool          active,
   const TQFont&  _ipafont,
-  TQWidget      *tqparent,
+  TQWidget      *parent,
   const char   *name
 )
   :
-  CommonEntryPageForm( tqparent, name ),
+  CommonEntryPageForm( parent, name ),
   pronunce(pron),
   expression(expr),
   usageCollection (act_usage),
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h
index b20d59ce..f8818774 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h
@@ -56,7 +56,7 @@ public:
     QueryManager &querymanager,
     bool          active,
     const TQFont&  ipafont,
-    TQWidget* tqparent = NULL,
+    TQWidget* parent = NULL,
     const char* name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index e5cb5504..514d92e1 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -73,11 +73,11 @@ EntryDlg::EntryDlg(
   const TQString &title,
   bool           active,
   const TQFont&   ipafont,
-  TQWidget       *tqparent,
+  TQWidget       *parent,
   const char    *name,
   bool           modal)
   :
-  KDialogBase(Tabbed, title, User1|User2|User3|Apply|Close, Apply, tqparent, name, modal, false,
+  KDialogBase(Tabbed, title, User1|User2|User3|Apply|Close, Apply, parent, name, modal, false,
     KGuiItem(i18n("&Reset")),
     KGuiItem(TQString(), "view_left_right"),
     KGuiItem(TQString(), "view_top_bottom"))
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
index 04af7e7a..5fd3a376 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h
@@ -90,7 +90,7 @@ public:
     const TQString &title,
     bool           active,
     const TQFont&   ipafont,
-    TQWidget       *tqparent = 0,
+    TQWidget       *parent = 0,
     const char    *name = 0,
     bool           modal = false
   );
diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
index 6650eee3..5f751d17 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
@@ -54,11 +54,11 @@ FromToEntryPage::FromToEntryPage
   count_t     _bcount,
   TQString     faux,
   TQString     label,
-  TQWidget    *tqparent,
+  TQWidget    *parent,
   const char *name
 )
   :
-  FromToEntryPageForm( tqparent, name ), fauxami(faux), dlgbook(_dlgbook)
+  FromToEntryPageForm( parent, name ), fauxami(faux), dlgbook(_dlgbook)
 {
   monthnames.clear();
   monthnames.append ("");
diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h
index 16198fe0..6efd4f07 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h
@@ -52,7 +52,7 @@ public:
       count_t     _bcount,
       TQString     faux,
       TQString     label,
-      TQWidget    *tqparent = NULL,
+      TQWidget    *parent = NULL,
       const char *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp
index c58448c4..a6967704 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp
@@ -32,8 +32,8 @@
 #include <tqlineedit.h>
 
 
-MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *tqparent, const char *name)
-  : MCEntryPageForm( tqparent, name ), dlgbook(_dlgbook)
+MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *parent, const char *name)
+  : MCEntryPageForm( parent, name ), dlgbook(_dlgbook)
 {
   multiplechoice = mc;
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h
index 78aa4fc8..f5a277cc 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h
@@ -38,7 +38,7 @@ class MCEntryPage : public MCEntryPageForm
   TQ_OBJECT
 
 public:
-  MCEntryPage(EntryDlg *dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *tqparent = NULL, const char *name = NULL);
+  MCEntryPage(EntryDlg *dlgbook, bool multi_sel, const MultipleChoice &mc, TQWidget *parent = NULL, const char *name = NULL);
 
   void setData(bool multi_sel, const MultipleChoice &mc);
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp
index dc91a9cc..5bfe2343 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.cpp
@@ -27,7 +27,7 @@
 
 #include "MySpinBox.h"
 
-MySpinBox::MySpinBox (TQWidget* tqparent, const char* name ): TQSpinBox(tqparent, name ), spin_names (0)
+MySpinBox::MySpinBox (TQWidget* parent, const char* name ): TQSpinBox(parent, name ), spin_names (0)
 {
   setWrapping(true);
 }
diff --git a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h
index dedb0914..4e9ae0f3 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/MySpinBox.h
@@ -33,7 +33,7 @@ class TQStringlist;
 class MySpinBox : public TQSpinBox
 {
 public:
-  MySpinBox (TQWidget* tqparent = 0, const char* name = 0);
+  MySpinBox (TQWidget* parent = 0, const char* name = 0);
 
   void setSpecial(const TQString &str);
   void setData (TQStringList *names, int minValue, int maxValue);
diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
index b2fd3be8..9669719c 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
@@ -175,8 +175,8 @@ void PhoneticButton::slotClicked()
 }
 
 
-PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *tqparent, const char *name, bool modal)
-  : KDialogBase(Plain, i18n("Select Characters From Phonetic Alphabet"), Close, Close, tqparent, name, modal)
+PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, const char *name, bool modal)
+  : KDialogBase(Plain, i18n("Select Characters From Phonetic Alphabet"), Close, Close, parent, name, modal)
 {
   int num = sizeof(kv_tqunicode_ref) / sizeof(kv_tqunicode_ref[0]);
   TQFrame * phoneticbox = plainPage();
diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h
index c422c98a..69b555a8 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h
@@ -37,7 +37,7 @@ class PhoneticEntryPage : public KDialogBase
   TQ_OBJECT
 
 public:
-  PhoneticEntryPage(const TQFont &ipafont, TQWidget *tqparent = 0, const char *name = 0, bool modal = false);
+  PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent = 0, const char *name = 0, bool modal = false);
 
 signals:
   void charSelected(wchar_t);
@@ -55,8 +55,8 @@ class PhoneticButton : public TQPushButton
   TQ_OBJECT
 
 public:
-  PhoneticButton (const TQString & text, TQWidget * tqparent, PhoneticEntryPage *_page, const char * name = 0)
-  : TQPushButton (text, tqparent, name), page(_page) {}
+  PhoneticButton (const TQString & text, TQWidget * parent, PhoneticEntryPage *_page, const char * name = 0)
+  : TQPushButton (text, parent, name), page(_page) {}
 
 protected slots:
   void slotClicked();
diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp
index f4823178..c8c7d41e 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp
@@ -39,10 +39,10 @@ TenseEntryPage::TenseEntryPage
   bool               multi_sel,
   const Conjugation &con_prefix,
   const Conjugation &conjug,
-  TQWidget           *tqparent,
+  TQWidget           *parent,
   const char        *name
 )
-  : TenseEntryPageForm( tqparent, name ), multi_mode(multi_sel), dlgbook(_dlgbook)
+  : TenseEntryPageForm( parent, name ), multi_mode(multi_sel), dlgbook(_dlgbook)
 {
 
   connect( third_p_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) );
diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h
index 2473d36c..29dd39b7 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h
+++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h
@@ -44,7 +44,7 @@ public:
     bool               multi_sel,
     const Conjugation &con_prefix,
     const Conjugation &conjugations,
-    TQWidget           *tqparent = NULL,
+    TQWidget           *parent = NULL,
     const char        *name = NULL
   );
 
diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp
index bf9d1d9e..9bef423d 100644
--- a/kvoctrain/kvoctrain/kva_init.cpp
+++ b/kvoctrain/kvoctrain/kva_init.cpp
@@ -40,8 +40,8 @@
 
 #include "prefs.h"
 
-kvoctrainApp::kvoctrainApp(TQWidget *tqparent, const char *name)
-: KMainWindow(tqparent, name)
+kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name)
+: KMainWindow(parent, name)
 {
   doc = 0;
   view = 0;
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index 5e3e56c7..bf1ea6ea 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -80,7 +80,7 @@ class kvoctrainApp : public KMainWindow
 
 public:
   /** construtor */
-  kvoctrainApp(TQWidget *tqparent = NULL, const char *name = NULL);
+  kvoctrainApp(TQWidget *parent = NULL, const char *name = NULL);
   /** destructor */
   ~kvoctrainApp();
   void initActions();
diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp
index e4f4180b..c41de57b 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -39,8 +39,8 @@
 #include "kv_resource.h"
 #include "prefs.h"
 
-KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, TQWidget *tqparent, const char *name)
-  : TQTable(tqparent, name), langs(ls)
+KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, TQWidget *parent, const char *name)
+  : TQTable(parent, name), langs(ls)
 {
   m_doc = doc;
   defaultItem = 0;
diff --git a/kvoctrain/kvoctrain/kvoctraintable.h b/kvoctrain/kvoctrain/kvoctraintable.h
index 4e39288a..5644e61e 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.h
+++ b/kvoctrain/kvoctrain/kvoctraintable.h
@@ -43,7 +43,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
   public:
-    KVocTrainTable( kvoctrainDoc *_doc, const LangSet *ls, TQWidget *tqparent = NULL, const char *name = NULL );
+    KVocTrainTable( kvoctrainDoc *_doc, const LangSet *ls, TQWidget *parent = NULL, const char *name = NULL );
 
     friend class kvoctrainView;
 
diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp
index 9017525d..bedb8647 100644
--- a/kvoctrain/kvoctrain/kvoctrainview.cpp
+++ b/kvoctrain/kvoctrain/kvoctrainview.cpp
@@ -50,7 +50,7 @@
 kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp *_parent) : TQWidget(_parent)
 {
   m_doc = doc;
-  tqparent = _parent;
+  parent = _parent;
 
   m_table = new KVocTrainTable(m_doc, &ls, this, "ListBox_1");
   m_table->setFont(Prefs::tableFont());
@@ -60,12 +60,12 @@ kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp
     m_doc->appendLang(i18n("Original"));
 
   connect(m_table, TQT_SIGNAL(selected(int)), m_table, TQT_SLOT(sortByColumn_alpha(int)));
-  connect(m_table, TQT_SIGNAL(rightButtonClicked(int, int, int)), tqparent, TQT_SLOT(slotHeaderMenu(int, int, int)));
-  connect(m_table, TQT_SIGNAL(edited(int, int)), tqparent, TQT_SLOT(slotEditEntry(int, int)));
-  connect(m_table, TQT_SIGNAL(currentChanged(int, int)), tqparent, TQT_SLOT(slotCurrentCellChanged(int, int)));
+  connect(m_table, TQT_SIGNAL(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*)), tqparent, TQT_SLOT(keyPressEvent(TQKeyEvent *)));
-  connect(m_table, TQT_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), tqparent, TQT_SLOT(keyReleaseEvent(TQKeyEvent *)));
+  connect(m_table, TQT_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), parent, TQT_SLOT(keyPressEvent(TQKeyEvent *)));
+  connect(m_table, TQT_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), parent, TQT_SLOT(keyReleaseEvent(TQKeyEvent *)));
 
   list_layout = new TQGridLayout( this, 2, 1/*, 4 */);
   list_layout->addWidget(m_table, 1, 0);
@@ -243,21 +243,21 @@ void kvoctrainView::setHeaderProp (int id, const TQString &name, const TQString
     int h = pix.height();
 
     TQPixmap arrow(w + 14, h);
-    TQBitmap tqmask(arrow.width(), arrow.height());
+    TQBitmap mask(arrow.width(), arrow.height());
     arrow.fill(TQt::white);
-    tqmask.fill(TQt::black);
+    mask.fill(TQt::black);
 
     bitBlt(&arrow, 0, 0, &pix, 0, 0);
-    if (pix.tqmask() != 0)
-      bitBlt(&tqmask, 0, 0, pix.tqmask(), 0, 0);
+    if (pix.mask() != 0)
+      bitBlt(&mask, 0, 0, pix.mask(), 0, 0);
     else {
       TQBitmap bmp(pix.createHeuristicMask());
-      bitBlt(&tqmask, 0, 0, &bmp, 0, 0);
+      bitBlt(&mask, 0, 0, &bmp, 0, 0);
     }
 
     TQPainter p, pm;
     p.begin(&arrow);
-    pm.begin(&tqmask);
+    pm.begin(&mask);
 
     p.setPen(TQColor(0, 0, 0));
     p.drawLine(w + 5, h - 2, w + 5 + 1, h - 2);
@@ -275,7 +275,7 @@ void kvoctrainView::setHeaderProp (int id, const TQString &name, const TQString
 
     pm.end();
     p.end();
-    arrow.setMask(tqmask);
+    arrow.setMask(mask);
 
     TQIconSet set(arrow, TQIconSet::Small);
     header->setLabel(id, set, name);
diff --git a/kvoctrain/kvoctrain/kvoctrainview.h b/kvoctrain/kvoctrain/kvoctrainview.h
index d0e3f6b9..30a5df8f 100644
--- a/kvoctrain/kvoctrain/kvoctrainview.h
+++ b/kvoctrain/kvoctrain/kvoctrainview.h
@@ -55,7 +55,7 @@ class kvoctrainView : public TQWidget
 
  public:
   /** Constructor for the main view */
-  kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp *tqparent = 0);
+  kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp *parent = 0);
 
   /** Destructor for the main view */
   ~kvoctrainView();
@@ -78,7 +78,7 @@ protected:
   bool              autoResize;
   kvoctrainDoc    * m_doc;
   TQGridLayout     * list_layout;
-  kvoctrainApp    * tqparent;
+  kvoctrainApp    * parent;
 
   /** resizes table when frame is resized */
   virtual void resizeEvent(TQResizeEvent *);
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index 47d8db75..ba21da07 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -91,13 +91,13 @@ void kvoctrainDoc::Init ()
 }
 
 
-kvoctrainDoc::kvoctrainDoc(TQObject *tqparent, const KURL& url)
+kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url)
 {
   Init();
   if (!url.isEmpty())
     doc_url = url;
 
-  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), tqparent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
+  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
 
   TQString tmpfile;
   if (KIO::NetAccess::download( url, tmpfile, 0 ))
@@ -187,9 +187,9 @@ kvoctrainDoc::~kvoctrainDoc()
 }
 
 
-bool kvoctrainDoc::saveAs (TQObject *tqparent, const KURL & url, TQString title, FileType ft)
+bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, FileType ft)
 {
-  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), tqparent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
+  connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) );
 
   KURL tmp (url);
   if (title == i18n("Untitled"))
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
index 383180a4..40d83333 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
@@ -425,7 +425,7 @@ class kvoctrainDoc : public TQObject
    * @param url     if url is empty (or NULL) actual name is preserved
    * @result         true if successful
    */
-  bool saveAs (TQObject *tqparent, const KURL & url, TQString title, FileType ft);
+  bool saveAs (TQObject *parent, const KURL & url, TQString title, FileType ft);
 
   /** returns count of entries
    */
diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp
index 671d8899..475ecbb9 100644
--- a/kvoctrain/kvoctrain/kvtnewstuff.cpp
+++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp
@@ -22,9 +22,9 @@
 #include "kvtnewstuff.h"
 #include "prefs.h"
 
-KVTNewStuff::KVTNewStuff(TQWidget *tqparent, const char * /*name*/) : TQObject(), KNewStuff("kdeedu/vocabulary", tqparent)
+KVTNewStuff::KVTNewStuff(TQWidget *parent, const char * /*name*/) : TQObject(), KNewStuff("kdeedu/vocabulary", parent)
 {
-  m_app = (kvoctrainApp*) tqparent;
+  m_app = (kvoctrainApp*) parent;
 }
 
 
diff --git a/kvoctrain/kvoctrain/kvtnewstuff.h b/kvoctrain/kvoctrain/kvtnewstuff.h
index 8c6fcc3a..375e0466 100644
--- a/kvoctrain/kvoctrain/kvtnewstuff.h
+++ b/kvoctrain/kvoctrain/kvtnewstuff.h
@@ -24,7 +24,7 @@ class KVTNewStuff : public TQObject, public KNewStuff
 Q_OBJECT
   TQ_OBJECT
 public:
-  KVTNewStuff(TQWidget *tqparent = 0, const char *name = 0);
+  KVTNewStuff(TQWidget *parent = 0, const char *name = 0);
 
   /**
     Installs a downloaded file according to the application's configuration.
diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
index 82a9a4f0..3b108143 100644
--- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
@@ -33,8 +33,8 @@
 
 #include <klocale.h>
 
-QueryDlgBase::QueryDlgBase(const TQString & caption, TQWidget *tqparent, const char *name, bool modal)
-  : KDialogBase(Swallow, caption, User1|User2, NoDefault, tqparent, name, modal, false,
+QueryDlgBase::QueryDlgBase(const TQString & caption, TQWidget *parent, const char *name, bool modal)
+  : KDialogBase(Swallow, caption, User1|User2, NoDefault, parent, name, modal, false,
     KGuiItem(i18n("&Stop Query")), KGuiItem(i18n("&Edit Expression...")))
 {
   kv_doc = 0;
diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h
index 7036404b..984340bb 100644
--- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h
+++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h
@@ -52,7 +52,7 @@ class QueryDlgBase : public KDialogBase
 public:
   enum Result { Unknown, Known, Timeout, StopIt };
 
-  QueryDlgBase(const TQString & caption, TQWidget *tqparent = 0, const char *name = 0, bool modal = false);
+  QueryDlgBase(const TQString & caption, TQWidget *parent = 0, const char *name = 0, bool modal = false);
 
   virtual ~QueryDlgBase ();
 
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp
index 17f067a1..4537b42f 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.cpp
@@ -30,7 +30,7 @@
 #include <tqlabel.h>
 #include <tqvaluevector.h>
 
-GenStatPage::GenStatPage(kvoctrainDoc *doc, TQWidget* tqparent, const char* name): GenStatPageForm( tqparent, name )
+GenStatPage::GenStatPage(kvoctrainDoc *doc, TQWidget* parent, const char* name): GenStatPageForm( parent, name )
 {
   l_filename->setText(doc->URL().path());
   l_title->setText(doc->getTitle());
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h
index 21d4fd83..d3ae2e98 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h
+++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h
@@ -38,7 +38,7 @@ class GenStatPage : public GenStatPageForm
 
 public:
 
-  GenStatPage(kvoctrainDoc *doc, TQWidget* tqparent = NULL, const char* name = NULL);
+  GenStatPage(kvoctrainDoc *doc, TQWidget* parent = NULL, const char* name = NULL);
 
 };
 #endif // GenStatPage_included
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
index a3a65acd..7fd6bbb0 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
@@ -34,8 +34,8 @@
 #include <langset.h>
 #include <kvoctraindoc.h>
 
-StatistikDlg::StatistikDlg(LangSet &langset, kvoctrainDoc *doc, TQWidget *tqparent, const char *name, bool modal)
-  : KDialogBase(Tabbed, i18n("Document Statistics"), Close, Close, tqparent, name, modal)
+StatistikDlg::StatistikDlg(LangSet &langset, kvoctrainDoc *doc, TQWidget *parent, const char *name, bool modal)
+  : KDialogBase(Tabbed, i18n("Document Statistics"), Close, Close, parent, name, modal)
 {
   TQFrame * page;
   TQVBoxLayout * topLayout;
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h
index 55480ef1..851e6a50 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h
@@ -41,7 +41,7 @@ class StatistikDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-  StatistikDlg(LangSet &langset, kvoctrainDoc *doc, TQWidget *tqparent = NULL, const char *name = NULL, bool modal = true);
+  StatistikDlg(LangSet &langset, kvoctrainDoc *doc, TQWidget *parent = NULL, const char *name = NULL, bool modal = true);
 
 };
 
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
index f634b4dd..02d40854 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
@@ -50,7 +50,7 @@
 class GradeListItem : public TQListViewItem
 {
 public:
-  inline GradeListItem (TQListView* tqparent, int _lesson): TQListViewItem(tqparent), lesson(_lesson) {}
+  inline GradeListItem (TQListView* parent, int _lesson): TQListViewItem(parent), lesson(_lesson) {}
   inline int getLesson() const { return lesson; }
 
 private:
@@ -58,8 +58,8 @@ private:
 };
 
 
-StatistikPage::StatistikPage(int col, kvoctrainDoc  *_doc, TQWidget *tqparent, const char *name)
-  : StatistikPageForm( tqparent, name ), doc(_doc)
+StatistikPage::StatistikPage(int col, kvoctrainDoc  *_doc, TQWidget *parent, const char *name)
+  : StatistikPageForm( parent, name ), doc(_doc)
 {
   StatListView->setColumnWidth(0, SIZE_GRADE + 10);
   StatListView->setColumnWidth(1, SIZE_GRADE + 10);
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h
index 374d1ec5..e697dbcd 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h
@@ -41,7 +41,7 @@ class StatistikPage : public StatistikPageForm
   TQ_OBJECT
 
 public:
-  StatistikPage(int col, kvoctrainDoc *doc, TQWidget *tqparent = NULL, const char *name = NULL);
+  StatistikPage(int col, kvoctrainDoc *doc, TQWidget *parent = NULL, const char *name = NULL);
 
 public slots:
   void slotPopupMenu(int row, int col);