rename the following methods:

tqparent parent
tqmask mask


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

73 files changed, 148 insertions, 148 deletions

diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp
index 5b42a36a..5f9d906a 100644
--- a/languages/cpp/app_templates/kapp/appview.cpp
+++ b/languages/cpp/app_templates/kapp/appview.cpp
@@ -13,8 +13,8 @@
 #include <krun.h>
 #include <klocale.h>
 
-%{APPNAME}View::%{APPNAME}View(TQWidget *tqparent)
-    : TQWidget(tqparent),
+%{APPNAME}View::%{APPNAME}View(TQWidget *parent)
+    : TQWidget(parent),
       DCOPObject("%{APPNAME}Iface")
 {
     // setup our tqlayout manager to automatically add our widgets
diff --git a/languages/cpp/app_templates/kapp/appview.h b/languages/cpp/app_templates/kapp/appview.h
index 2eab2322..a32c35a0 100644
--- a/languages/cpp/app_templates/kapp/appview.h
+++ b/languages/cpp/app_templates/kapp/appview.h
@@ -29,7 +29,7 @@ public:
 	/**
 	 * Default constructor
 	 */
-    %{APPNAME}View(TQWidget *tqparent);
+    %{APPNAME}View(TQWidget *parent);
 
 	/**
 	 * Destructor
diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp
index 3d720a65..673df14e 100644
--- a/languages/cpp/app_templates/kapp/pref.cpp
+++ b/languages/cpp/app_templates/kapp/pref.cpp
@@ -22,8 +22,8 @@
     m_pageTwo = new %{APPNAME}PrefPageTwo(frame);
 }
 
-%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *tqparent)
-    : TQFrame(tqparent)
+%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *parent)
+    : TQFrame(parent)
 {
     TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
     tqlayout->setAutoAdd(true);
@@ -31,8 +31,8 @@
     new TQLabel(i18n("Add something here"), this);
 }
 
-%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *tqparent)
-    : TQFrame(tqparent)
+%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *parent)
+    : TQFrame(parent)
 {
     TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
     tqlayout->setAutoAdd(true);
diff --git a/languages/cpp/app_templates/kapp/pref.h b/languages/cpp/app_templates/kapp/pref.h
index 23798000..b22ab262 100644
--- a/languages/cpp/app_templates/kapp/pref.h
+++ b/languages/cpp/app_templates/kapp/pref.h
@@ -26,7 +26,7 @@ class %{APPNAME}PrefPageOne : public TQFrame
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}PrefPageOne(TQWidget *tqparent = 0);
+    %{APPNAME}PrefPageOne(TQWidget *parent = 0);
 };
 
 class %{APPNAME}PrefPageTwo : public TQFrame
@@ -34,7 +34,7 @@ class %{APPNAME}PrefPageTwo : public TQFrame
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}PrefPageTwo(TQWidget *tqparent = 0);
+    %{APPNAME}PrefPageTwo(TQWidget *parent = 0);
 };
 
 #endif // _%{APPNAMEUC}PREF_H_
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
index 8c729f72..1a40df32 100644
--- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
@@ -33,15 +33,15 @@ KatePluginFactory::~KatePluginFactory()
   delete s_instance;
 }
 
-TQObject* KatePluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & )
+TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & )
 {
-  return new KatePlugin%{APPNAME}( tqparent, name );
+  return new KatePlugin%{APPNAME}( parent, name );
 }
 
 KInstance* KatePluginFactory::s_instance = 0L;
 
-KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* tqparent, const char* name )
-    : Kate::Plugin ( (Kate::Application*)tqparent, name )
+KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name )
+    : Kate::Plugin ( (Kate::Application*)parent, name )
 {
 }
 
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h
index 2183e88e..53e46d06 100644
--- a/languages/cpp/app_templates/kateplugin/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin/plugin_app.h
@@ -23,7 +23,7 @@ class KatePluginFactory : public KLibFactory
     KatePluginFactory();
     virtual ~KatePluginFactory();
 
-    virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+    virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
   private:
     static KInstance* s_instance;
@@ -35,7 +35,7 @@ class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface
   TQ_OBJECT
 
   public:
-    KatePlugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 );
+    KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 );
     virtual ~KatePlugin%{APPNAME}();
 
     void addView (Kate::MainWindow *win);
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index 1670f252..18595d10 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -37,15 +37,15 @@ KatePluginFactory::~KatePluginFactory()
     delete s_instance;
 }
 
-TQObject* KatePluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & )
+TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & )
 {
-    return new KatePlugin%{APPNAME}( tqparent, name );
+    return new KatePlugin%{APPNAME}( parent, name );
 }
 
 KInstance* KatePluginFactory::s_instance = 0L;
 
-KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* tqparent, const char* name )
-    : Kate::Plugin ( (Kate::Application*)tqparent, name )
+KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name )
+    : Kate::Plugin ( (Kate::Application*)parent, name )
 {
 }
 
@@ -114,7 +114,7 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p )
 /**
  * %{APPNAME}ConfigPage
  */
-%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* tqparent /*= 0L*/, TQWidget *parentWidget /*= 0L*/)
+%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* parent /*= 0L*/, TQWidget *parentWidget /*= 0L*/)
     : Kate::PluginConfigPage( parentWidget )
 {
     TQVBoxLayout* lo = new TQVBoxLayout( this, 0, 0, "config_page_layout" );
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h
index 3550a344..297c0b4c 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h
@@ -27,7 +27,7 @@ public:
     KatePluginFactory();
     virtual ~KatePluginFactory();
 
-    virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+    virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
 private:
     static KInstance* s_instance;
@@ -39,7 +39,7 @@ class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface, Kat
   TQ_OBJECT
 
 public:
-    KatePlugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 );
+    KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 );
     virtual ~KatePlugin%{APPNAME}();
 
     void addView (Kate::MainWindow *win);
@@ -71,7 +71,7 @@ class %{APPNAME}ConfigPage : public Kate::PluginConfigPage
     friend class KatePlugin%{APPNAME};
 
 public:
-    %{APPNAME}ConfigPage (TQObject* tqparent = 0L, TQWidget *parentWidget = 0L);
+    %{APPNAME}ConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L);
     ~%{APPNAME}ConfigPage ();
 
     /** Reimplemented from Kate::PluginConfigPage; just emits configPageApplyRequest( this ).  */
diff --git a/languages/cpp/app_templates/kcmodule/module.cpp b/languages/cpp/app_templates/kcmodule/module.cpp
index 4e9d3ca5..bb15b923 100644
--- a/languages/cpp/app_templates/kcmodule/module.cpp
+++ b/languages/cpp/app_templates/kcmodule/module.cpp
@@ -11,8 +11,8 @@
 typedef KGenericFactory<%{APPNAME}, TQWidget> %{APPNAME}Factory;
 K_EXPORT_COMPONENT_FACTORY( kcm_%{APPNAME}, %{APPNAME}Factory("kcm%{APPNAMELC}"))
 
-%{APPNAME}::%{APPNAME}(TQWidget *tqparent, const char *name, const TQStringList&)
-    : KCModule(tqparent, name), myAboutData(0)
+%{APPNAME}::%{APPNAME}(TQWidget *parent, const char *name, const TQStringList&)
+    : KCModule(parent, name), myAboutData(0)
 {
     // place widgets here
     load();
diff --git a/languages/cpp/app_templates/kcmodule/module.h b/languages/cpp/app_templates/kcmodule/module.h
index 57542aae..8be473a9 100644
--- a/languages/cpp/app_templates/kcmodule/module.h
+++ b/languages/cpp/app_templates/kcmodule/module.h
@@ -12,7 +12,7 @@ class %{APPNAME}: public KCModule
   TQ_OBJECT
 
 public:
-    %{APPNAME}( TQWidget *tqparent=0, const char *name=0, const TQStringList& = TQStringList() );
+    %{APPNAME}( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() );
     ~%{APPNAME}();
 
     virtual void load();
diff --git a/languages/cpp/app_templates/kconfig35/appview.cpp b/languages/cpp/app_templates/kconfig35/appview.cpp
index 0c82dd25..6123db0b 100644
--- a/languages/cpp/app_templates/kconfig35/appview.cpp
+++ b/languages/cpp/app_templates/kconfig35/appview.cpp
@@ -6,8 +6,8 @@
 #include <klocale.h>
 #include <tqlabel.h>
 
-%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *tqparent)
-    : %{APPNAMELC}view_base(tqparent)
+%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent)
+    : %{APPNAMELC}view_base(parent)
 {
 	settingsChanged();
 }
diff --git a/languages/cpp/app_templates/kconfig35/appview.h b/languages/cpp/app_templates/kconfig35/appview.h
index 897072a6..338cfaa9 100644
--- a/languages/cpp/app_templates/kconfig35/appview.h
+++ b/languages/cpp/app_templates/kconfig35/appview.h
@@ -27,7 +27,7 @@ public:
 	/**
 	 * Default constructor
 	 */
-    %{APPNAMELC}View(TQWidget *tqparent);
+    %{APPNAMELC}View(TQWidget *parent);
 
 	/**
 	 * Destructor
diff --git a/languages/cpp/app_templates/kde4app/kapp4view.h b/languages/cpp/app_templates/kde4app/kapp4view.h
index c4ce6517..c8851bdc 100644
--- a/languages/cpp/app_templates/kde4app/kapp4view.h
+++ b/languages/cpp/app_templates/kde4app/kapp4view.h
@@ -27,7 +27,7 @@ public:
     /**
      * Default constructor
      */
-    %{APPNAME}View(TQWidget *tqparent);
+    %{APPNAME}View(TQWidget *parent);
 
     /**
      * Destructor
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
index 1ca8f046..364ec0d7 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
@@ -21,8 +21,8 @@ typedef KGenericFactory<%{APPNAME}Part> %{APPNAME}Factory;
 K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( "kdev%{APPNAMELC}" ) );
 static const KDevPluginInfo data("kdev%{APPNAMELC}");
 
-%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList& )
-: KDevLanguageSupport(&data, tqparent, name ? name : "%{APPNAME}Part" )
+%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList& )
+: KDevLanguageSupport(&data, parent, name ? name : "%{APPNAME}Part" )
 {
 	setInstance(%{APPNAME}Factory::instance());
 	setXMLFile("kdevlang_%{APPNAMELC}.rc");
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h
index 234107bb..e8b4d15a 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.h
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h
@@ -20,7 +20,7 @@ class %{APPNAME}Part : public KDevLanguageSupport
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &);
+		%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &);
 		~%{APPNAME}Part();
 	protected:
 		virtual Features features();
diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.cpp b/languages/cpp/app_templates/kdevpart/globalconfig.cpp
index 54e56426..cddf3e7e 100644
--- a/languages/cpp/app_templates/kdevpart/globalconfig.cpp
+++ b/languages/cpp/app_templates/kdevpart/globalconfig.cpp
@@ -3,8 +3,8 @@
 
 #include "%{APPNAMELC}part.h"
 
-%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name)
-    : %{APPNAME}GlobalConfigBase(tqparent, name), m_part(part)
+%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name)
+    : %{APPNAME}GlobalConfigBase(parent, name), m_part(part)
 {
 }
 
diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.h b/languages/cpp/app_templates/kdevpart/globalconfig.h
index f08bd1bd..b7bfc732 100644
--- a/languages/cpp/app_templates/kdevpart/globalconfig.h
+++ b/languages/cpp/app_templates/kdevpart/globalconfig.h
@@ -11,7 +11,7 @@ class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0);
+    %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
index 96ddb6ca..082549c4 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
@@ -28,8 +28,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &/*args*/)
-    : KDevPlugin(&data, tqparent, name ? name : "%{APPNAME}Part")
+%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/)
+    : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
 {
     setInstance(%{APPNAME}Factory::instance());
     setXMLFile("kdev%{APPNAMELC}.rc");
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h
index ddedde17..05494c1d 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.h
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h
@@ -21,7 +21,7 @@ class %{APPNAME}Part: public KDevPlugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &args);
+    %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args);
     ~%{APPNAME}Part();
   
 private slots:
diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.cpp b/languages/cpp/app_templates/kdevpart/projectconfig.cpp
index a3bc8b8c..42a9f3e7 100644
--- a/languages/cpp/app_templates/kdevpart/projectconfig.cpp
+++ b/languages/cpp/app_templates/kdevpart/projectconfig.cpp
@@ -3,8 +3,8 @@
 
 #include "%{APPNAMELC}part.h"
 
-%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name)
-    : %{APPNAME}ProjectConfigBase(tqparent, name), m_part(part)
+%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name)
+    : %{APPNAME}ProjectConfigBase(parent, name), m_part(part)
 {
 }
 
diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.h b/languages/cpp/app_templates/kdevpart/projectconfig.h
index 2d13ce14..fe77464b 100644
--- a/languages/cpp/app_templates/kdevpart/projectconfig.h
+++ b/languages/cpp/app_templates/kdevpart/projectconfig.h
@@ -11,7 +11,7 @@ class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0);
+    %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp
index 54e56426..cddf3e7e 100644
--- a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp
+++ b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp
@@ -3,8 +3,8 @@
 
 #include "%{APPNAMELC}part.h"
 
-%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name)
-    : %{APPNAME}GlobalConfigBase(tqparent, name), m_part(part)
+%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name)
+    : %{APPNAME}GlobalConfigBase(parent, name), m_part(part)
 {
 }
 
diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.h b/languages/cpp/app_templates/kdevpart2/globalconfig.h
index f08bd1bd..b7bfc732 100644
--- a/languages/cpp/app_templates/kdevpart2/globalconfig.h
+++ b/languages/cpp/app_templates/kdevpart2/globalconfig.h
@@ -11,7 +11,7 @@ class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0);
+    %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
index 96ddb6ca..082549c4 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
@@ -28,8 +28,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) );
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &/*args*/)
-    : KDevPlugin(&data, tqparent, name ? name : "%{APPNAME}Part")
+%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/)
+    : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part")
 {
     setInstance(%{APPNAME}Factory::instance());
     setXMLFile("kdev%{APPNAMELC}.rc");
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h
index ddedde17..05494c1d 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h
@@ -21,7 +21,7 @@ class %{APPNAME}Part: public KDevPlugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &args);
+    %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args);
     ~%{APPNAME}Part();
   
 private slots:
diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp
index a3bc8b8c..42a9f3e7 100644
--- a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp
+++ b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp
@@ -3,8 +3,8 @@
 
 #include "%{APPNAMELC}part.h"
 
-%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name)
-    : %{APPNAME}ProjectConfigBase(tqparent, name), m_part(part)
+%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name)
+    : %{APPNAME}ProjectConfigBase(parent, name), m_part(part)
 {
 }
 
diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.h b/languages/cpp/app_templates/kdevpart2/projectconfig.h
index 2d13ce14..fe77464b 100644
--- a/languages/cpp/app_templates/kdevpart2/projectconfig.h
+++ b/languages/cpp/app_templates/kdevpart2/projectconfig.h
@@ -11,7 +11,7 @@ class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0);
+    %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0);
 
 public slots:
     void accept();
diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp
index 5ccbec50..db259cb3 100644
--- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp
+++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp
@@ -13,9 +13,9 @@ typedef KGenericFactory<%{APPNAME}Plugin> %{APPNAME}Factory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_%{APPNAME}, %{APPNAME}Factory( "kfile_%{APPNAMELC}" ))
 
-%{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *tqparent, const char *name,
+%{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *parent, const char *name,
                        const TQStringList &args)
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     //add the mimetype here - example:
     //KFileMimeTypeInfo* info = addMimeTypeInfo( "text/html" );
diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h
index 93303359..f2ed7408 100644
--- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h
+++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h
@@ -16,7 +16,7 @@ class %{APPNAME}Plugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    %{APPNAME}Plugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    %{APPNAME}Plugin( TQObject *parent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
diff --git a/languages/cpp/app_templates/khello2/widget.cpp b/languages/cpp/app_templates/khello2/widget.cpp
index 40e2d2bb..266e894f 100644
--- a/languages/cpp/app_templates/khello2/widget.cpp
+++ b/languages/cpp/app_templates/khello2/widget.cpp
@@ -4,8 +4,8 @@
 
 #include "%{APPNAMELC}widget.h"
 
-%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* tqparent, const char* name, WFlags fl)
-        : %{APPNAME}WidgetBase(tqparent,name,fl)
+%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* parent, const char* name, WFlags fl)
+        : %{APPNAME}WidgetBase(parent,name,fl)
 {}
 
 %{APPNAME}Widget::~%{APPNAME}Widget()
diff --git a/languages/cpp/app_templates/khello2/widget.h b/languages/cpp/app_templates/khello2/widget.h
index 3773456b..ed436a38 100644
--- a/languages/cpp/app_templates/khello2/widget.h
+++ b/languages/cpp/app_templates/khello2/widget.h
@@ -11,7 +11,7 @@ class %{APPNAME}Widget : public %{APPNAME}WidgetBase
   TQ_OBJECT
 
 public:
-    %{APPNAME}Widget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+    %{APPNAME}Widget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~%{APPNAME}Widget();
     /*$PUBLIC_FUNCTIONS$*/
 
diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp
index d609fa26..29ec3d1d 100644
--- a/languages/cpp/app_templates/kicker/applet.cpp
+++ b/languages/cpp/app_templates/kicker/applet.cpp
@@ -10,8 +10,8 @@
 #include "%{APPNAMELC}.h"
 
 
-%{APPNAME}::%{APPNAME}(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name)
-    : KPanelApplet(configFile, type, actions, tqparent, name)
+%{APPNAME}::%{APPNAME}(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name)
+    : KPanelApplet(configFile, type, actions, parent, name)
 {
     // Get the current application configuration handle
     ksConfig = config();
@@ -62,11 +62,11 @@ void %{APPNAME}::resizeEvent(TQResizeEvent *e)
 
 extern "C"
 {
-    KPanelApplet* init( TQWidget *tqparent, const TQString& configFile)
+    KPanelApplet* init( TQWidget *parent, const TQString& configFile)
     {
         KGlobal::locale()->insertCatalogue("%{APPNAMELC}");
         return new %{APPNAME}(configFile, KPanelApplet::Normal,
                              KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences,
-                             tqparent, "%{APPNAMELC}");
+                             parent, "%{APPNAMELC}");
     }
 }
diff --git a/languages/cpp/app_templates/kicker/applet.h b/languages/cpp/app_templates/kicker/applet.h
index b11b1aa9..1c134399 100644
--- a/languages/cpp/app_templates/kicker/applet.h
+++ b/languages/cpp/app_templates/kicker/applet.h
@@ -24,11 +24,11 @@ public:
      * @param configFile The configFile handed over in the factory function.
      * @param Type The applet @ref type().
      * @param actions Standard RMB menu actions supported by the applet (see @ref action() ).
-     * @param tqparent The pointer to the tqparent widget handed over in the factory function.
+     * @param parent The pointer to the parent widget handed over in the factory function.
      * @param name A TQt object name for your applet.
      **/
     %{APPNAME}(const TQString& configFile, Type t = Normal, int actions = 0,
-        TQWidget *tqparent = 0, const char *name = 0);
+        TQWidget *parent = 0, const char *name = 0);
     /** destructor */
     ~%{APPNAME}();
     
diff --git a/languages/cpp/app_templates/kmake/mainviewimp.cpp b/languages/cpp/app_templates/kmake/mainviewimp.cpp
index 5e953b0d..8a0de706 100644
--- a/languages/cpp/app_templates/kmake/mainviewimp.cpp
+++ b/languages/cpp/app_templates/kmake/mainviewimp.cpp
@@ -3,8 +3,8 @@
 #include <tqlabel.h>
 #include <klocale.h>
 
-MainViewImp::MainViewImp(TQWidget* tqparent, const char* name, WFlags fl)
-: MainView(tqparent,name,fl)
+MainViewImp::MainViewImp(TQWidget* parent, const char* name, WFlags fl)
+: MainView(parent,name,fl)
 {
 }
 
diff --git a/languages/cpp/app_templates/kmake/mainviewimp.h b/languages/cpp/app_templates/kmake/mainviewimp.h
index 1a8af0b8..bcd627d0 100644
--- a/languages/cpp/app_templates/kmake/mainviewimp.h
+++ b/languages/cpp/app_templates/kmake/mainviewimp.h
@@ -9,7 +9,7 @@ class MainViewImp : public MainView
   TQ_OBJECT
 
 public:
-  MainViewImp(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  MainViewImp(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   ~MainViewImp();
 
 public slots:
diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
index d020ed5e..86287a3f 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
@@ -23,8 +23,8 @@ extern "C"
 KInstance* %{APPNAME}Factory::s_global = 0L;
 KAboutData* %{APPNAME}Factory::s_aboutData = 0L;
 
-%{APPNAME}Factory::%{APPNAME}Factory( TQObject* tqparent, const char* name )
-    : KoFactory( tqparent, name )
+%{APPNAME}Factory::%{APPNAME}Factory( TQObject* parent, const char* name )
+    : KoFactory( parent, name )
 {
     global();
 }
@@ -37,14 +37,14 @@ KAboutData* %{APPNAME}Factory::s_aboutData = 0L;
     s_global = 0L;
 }
 
-KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & )
 {
     // If classname is "KoDocument", our host is a koffice application
     // otherwise, the host wants us as a simple part, so switch to readonly and single view.
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
     // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
-    %{APPNAME}Part *part = new %{APPNAME}Part( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
+    %{APPNAME}Part *part = new %{APPNAME}Part( parentWidget, widgetName, parent, name, !bWantKoDocument );
 
     if ( !bWantKoDocument )
       part->setReadWrite( false );
diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h
index b0f934d9..9e820797 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_factory.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h
@@ -16,10 +16,10 @@ class %{APPNAME}Factory : public KoFactory
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}Factory( TQObject* tqparent = 0, const char* name = 0 );
+    %{APPNAME}Factory( TQObject* parent = 0, const char* name = 0 );
     ~%{APPNAME}Factory();
 
-    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
+    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.cpp b/languages/cpp/app_templates/kofficepart/kopart_part.cpp
index fe8c0cca..a1196404 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_part.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_part.cpp
@@ -8,8 +8,8 @@
 
 #include <tqpainter.h>
 
-%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
-    : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
+%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode )
+    : KoDocument( parentWidget, widgetName, parent, name, singleViewMode )
 {
 }
 
@@ -19,9 +19,9 @@ bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* parentWidget )
     return TRUE;
 }
 
-KoView* %{APPNAME}Part::createViewInstance( TQWidget* tqparent, const char* name )
+KoView* %{APPNAME}Part::createViewInstance( TQWidget* parent, const char* name )
 {
-    return new %{APPNAME}View( this, tqparent, name );
+    return new %{APPNAME}View( this, parent, name );
 }
 
 bool %{APPNAME}Part::loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store )
diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h
index fc67a523..21ad460a 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_part.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_part.h
@@ -13,7 +13,7 @@ class %{APPNAME}Part : public KoDocument
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
+    %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false );
 
     virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 );
 
@@ -25,7 +25,7 @@ public:
     virtual bool saveOasis( KoStore* store, KoXmlWriter* manifestWriter );
 
 protected:
-    virtual KoView* createViewInstance( TQWidget* tqparent, const char* name );
+    virtual KoView* createViewInstance( TQWidget* parent, const char* name );
 };
 
 #endif
diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
index 240251f9..f32707a8 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
@@ -13,8 +13,8 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* tqparent, const char* name )
-    : KoView( part, tqparent, name )
+%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent, const char* name )
+    : KoView( part, parent, name )
 {
     setInstance( %{APPNAME}Factory::global() );
     setXMLFile( "%{APPNAMELC}.rc" );
diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.h b/languages/cpp/app_templates/kofficepart/kopart_view.h
index bcaac2e1..2b97fe4f 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_view.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_view.h
@@ -18,7 +18,7 @@ class %{APPNAME}View : public KoView
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}View( %{APPNAME}Part* part, TQWidget* tqparent = 0, const char* name = 0 );
+    %{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent = 0, const char* name = 0 );
 
 protected slots:
     void cut();
diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp
index 4f0d7557..ae9a85a6 100644
--- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp
+++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp
@@ -7,8 +7,8 @@
 #include "%{APPNAMELC}.h"
 #include "%{APPNAMELC}.moc"
 
-%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name):
-                   KonqSidebarPlugin(inst,tqparent,widgetParent,desktopName,name)
+%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name):
+                   KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name)
 {
 	widget=new TQLabel("Init Value",widgetParent);
 }
diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h
index b219619b..83c5c2c4 100644
--- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h
+++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h
@@ -21,12 +21,12 @@ public:
      * Construct a @ref KonqSidebarPlugin.
      *
      * @param inst The sidebar's kinstance class.
-     * @param tqparent The sidebar internal button info class responsible for this plugin.
+     * @param parent The sidebar internal button info class responsible for this plugin.
      * @param widgetParent The container which will contain the plugins widget.
      * @param desktopName The filename of the configuration file.
      * @param name A TQt object name for your plugin.
      **/
-     %{APPNAME}(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);
+     %{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);
 
     /** destructor */
     ~%{APPNAME}();
diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index 479a6782..1f3992af 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -13,8 +13,8 @@
 #include <tqmultilineedit.h>
 
 %{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName,
-                                  TQObject *tqparent, const char *name )
-    : KParts::ReadWritePart(tqparent, name)
+                                  TQObject *parent, const char *name )
+    : KParts::ReadWritePart(parent, name)
 {
     // we need an instance
     setInstance( %{APPNAME}PartFactory::instance() );
@@ -74,7 +74,7 @@ void %{APPNAME}Part::setModified(bool modified)
     else
         save->setEnabled(false);
 
-    // in any event, we want our tqparent to do it's thing
+    // in any event, we want our parent to do it's thing
     ReadWritePart::setModified(modified);
 }
 
@@ -165,11 +165,11 @@ KAboutData* %{APPNAME}PartFactory::s_about = 0L;
 }
 
 KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
-                                                        TQObject *tqparent, const char *name,
+                                                        TQObject *parent, const char *name,
                                                         const char *classname, const TQStringList &args )
 {
     // Create an instance of our Part
-    %{APPNAME}Part* obj = new %{APPNAME}Part( parentWidget, widgetName, tqparent, name );
+    %{APPNAME}Part* obj = new %{APPNAME}Part( parentWidget, widgetName, parent, name );
 
     // See if we are to be read-write or not
     if (TQCString(classname) == "KParts::ReadOnlyPart")
diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h
index 3a481c5c..30f99b04 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.h
+++ b/languages/cpp/app_templates/kpartapp/app_part.h
@@ -27,7 +27,7 @@ public:
      * Default constructor
      */
     %{APPNAME}Part(TQWidget *parentWidget, const char *widgetName,
-                    TQObject *tqparent, const char *name);
+                    TQObject *parent, const char *name);
 
     /**
      * Destructor
@@ -76,7 +76,7 @@ public:
     %{APPNAME}PartFactory();
     virtual ~%{APPNAME}PartFactory();
     virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
-                                            TQObject *tqparent, const char *name,
+                                            TQObject *parent, const char *name,
                                             const char *classname, const TQStringList &args );
     static KInstance* instance();
  
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
index dac6dc20..61e3ca0e 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
@@ -8,8 +8,8 @@
 #include <klocale.h>
 #include <kglobal.h>
 
-Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* tqparent, const char* name )
-    : Plugin( tqparent, name )
+Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name )
+    : Plugin( parent, name )
 {
     // Instantiate all of your actions here.  These will appear in
     // Konqueror's menu and toolbars.
@@ -27,7 +27,7 @@ void Plugin%{APPNAME}::slotAction()
     // This plugin assumes KHTMLPart.  If your plugin can handle more
     // than this or a different Part than this, simply delete or
     // change the following block.
-    if ( !tqparent()->inherits("KHTMLPart") )
+    if ( !parent()->inherits("KHTMLPart") )
     {
         TQString title( i18n( "Cannot Translate Source" ) );
         TQString text( i18n( "You cannot translate anything except web pages "
@@ -37,9 +37,9 @@ void Plugin%{APPNAME}::slotAction()
         return;
     }
 
-    // Get a handle on our tqparent so we may get the necessary data for
+    // Get a handle on our parent so we may get the necessary data for
     // processing
-    KHTMLPart *part = dynamic_cast<KHTMLPart *>(tqparent());
+    KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent());
 
     // This plugin only uses the URL.  You may use whatever data you
     // need.
@@ -83,9 +83,9 @@ void Plugin%{APPNAME}::slotAction()
   s_instance = 0;
 }
 
-TQObject* %{APPNAME}Factory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & )
+TQObject* %{APPNAME}Factory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & )
 {
-  return new Plugin%{APPNAME}( tqparent, name );
+  return new Plugin%{APPNAME}( parent, name );
 }
 
 KInstance *%{APPNAME}Factory::instance()
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h
index 3d637d1b..cff0a63c 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.h
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h
@@ -10,7 +10,7 @@ class Plugin%{APPNAME} : public KParts::Plugin
   Q_OBJECT
   TQ_OBJECT
 public:
-  Plugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 );
+  Plugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 );
   virtual ~Plugin%{APPNAME}();
 
 public slots:
@@ -25,7 +25,7 @@ public:
   %{APPNAME}Factory();
   virtual ~%{APPNAME}Factory();
 
-  virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+  virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
   static KInstance* instance();
 
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
index 0818d856..06a6409c 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
@@ -18,8 +18,8 @@ typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory;
 K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory );
 
 %{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *parentWidget, const char *widgetName, 
-		TQObject *tqparent, const char *name, const TQStringList & /*args*/)
-    : KParts::ReadWritePart(tqparent)
+		TQObject *parent, const char *name, const TQStringList & /*args*/)
+    : KParts::ReadWritePart(parent)
 {
     // we need an instance
     setInstance( %{APPNAMELC}PartFactory::instance() );
@@ -88,7 +88,7 @@ void %{APPNAMELC}Part::setModified(bool modified)
     else
         save->setEnabled(false);
 
-    // in any event, we want our tqparent to do it's thing
+    // in any event, we want our parent to do it's thing
     ReadWritePart::setModified(modified);
 }
 
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h
index fabeedbc..5ab44003 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.h
+++ b/languages/cpp/app_templates/kscons_kmdi/app_part.h
@@ -29,7 +29,7 @@ public:
      * Default constructor
      */
     %{APPNAMELC}Part(TQWidget *parentWidget, const char *widgetName,
-                    TQObject *tqparent, const char *name, const TQStringList & /*args*/);
+                    TQObject *parent, const char *name, const TQStringList & /*args*/);
 
     /**
      * Destructor
diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp
index d0c856ec..5bd6b949 100644
--- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp
@@ -12,7 +12,7 @@
 
 #include "kmdikonsole.h"
 
-kmdikonsole::kmdikonsole(TQWidget *tqparent, const char *name) : TQVBox(tqparent, name)
+kmdikonsole::kmdikonsole(TQWidget *parent, const char *name) : TQVBox(parent, name)
 {
 	m_haskonsole = false;
 	respawn();
diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h
index e97175c1..727e9675 100644
--- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h
+++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h
@@ -11,7 +11,7 @@ class kmdikonsole : public TQVBox
   TQ_OBJECT
 
 	public:
-		kmdikonsole( TQWidget* tqparent, const char* name=0);
+		kmdikonsole( TQWidget* parent, const char* name=0);
 		~kmdikonsole();
 
 	public slots:
diff --git a/languages/cpp/app_templates/kscons_kxt/appview.cpp b/languages/cpp/app_templates/kscons_kxt/appview.cpp
index a474e605..f2dd28a3 100644
--- a/languages/cpp/app_templates/kscons_kxt/appview.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/appview.cpp
@@ -6,8 +6,8 @@
 #include <klocale.h>
 #include <tqlabel.h>
 
-%{APPNAME}View::%{APPNAME}View(TQWidget *tqparent)
-    : %{APPNAME}view_base(tqparent)
+%{APPNAME}View::%{APPNAME}View(TQWidget *parent)
+    : %{APPNAME}view_base(parent)
 {
 	settingsChanged();
 }
diff --git a/languages/cpp/app_templates/kscons_kxt/appview.h b/languages/cpp/app_templates/kscons_kxt/appview.h
index 8d4517bd..56a6edd3 100644
--- a/languages/cpp/app_templates/kscons_kxt/appview.h
+++ b/languages/cpp/app_templates/kscons_kxt/appview.h
@@ -27,7 +27,7 @@ public:
 	/**
 	 * Default constructor
 	 */
-    %{APPNAME}View(TQWidget *tqparent);
+    %{APPNAME}View(TQWidget *parent);
 
 	/**
 	 * Destructor
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
index 855fb657..efdbf40b 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
+++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
@@ -33,8 +33,8 @@ extern "C"
 
 //-----------------------------------------------------------------------------
 //! dialog to setup screen saver parameters
-%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *tqparent, const char *name )
-        : %{APPNAME}UI( tqparent, name, TRUE )
+%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *parent, const char *name )
+        : %{APPNAME}UI( parent, name, TRUE )
 {
     /// @todo
     //Connect your signals and slots here to configure the screen saver.
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.h b/languages/cpp/app_templates/kscreensaver/kscreensaver.h
index c8511d34..fc2fd650 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.h
+++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.h
@@ -23,7 +23,7 @@ class %{APPNAME}Setup : public %{APPNAME}UI
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}Setup( TQWidget *tqparent = NULL, const char *name = NULL );
+    %{APPNAME}Setup( TQWidget *parent = NULL, const char *name = NULL );
 
 private slots:
     void slotOkPressed();
diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp
index 0c82dd25..6123db0b 100644
--- a/languages/cpp/app_templates/kxt/appview.cpp
+++ b/languages/cpp/app_templates/kxt/appview.cpp
@@ -6,8 +6,8 @@
 #include <klocale.h>
 #include <tqlabel.h>
 
-%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *tqparent)
-    : %{APPNAMELC}view_base(tqparent)
+%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent)
+    : %{APPNAMELC}view_base(parent)
 {
 	settingsChanged();
 }
diff --git a/languages/cpp/app_templates/kxt/appview.h b/languages/cpp/app_templates/kxt/appview.h
index 897072a6..338cfaa9 100644
--- a/languages/cpp/app_templates/kxt/appview.h
+++ b/languages/cpp/app_templates/kxt/appview.h
@@ -27,7 +27,7 @@ public:
 	/**
 	 * Default constructor
 	 */
-    %{APPNAMELC}View(TQWidget *tqparent);
+    %{APPNAMELC}View(TQWidget *parent);
 
 	/**
 	 * Destructor
diff --git a/languages/cpp/app_templates/opieapp/example.cpp b/languages/cpp/app_templates/opieapp/example.cpp
index 6636116e..6a0d616e 100644
--- a/languages/cpp/app_templates/opieapp/example.cpp
+++ b/languages/cpp/app_templates/opieapp/example.cpp
@@ -6,11 +6,11 @@ typedef OApplicationFactory<%{APPNAME}> %{APPNAME}Factory;
 OPIE_EXPORT_APP( %{APPNAME}Factory )
 
 /*
- *  Constructs a %{APPNAME} which is a child of 'tqparent', with the
+ *  Constructs a %{APPNAME} which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  */
-%{APPNAME}::%{APPNAME}( TQWidget* tqparent,  const char* name, WFlags fl )
-    : %{APPNAME}Base( tqparent, name, fl )
+%{APPNAME}::%{APPNAME}( TQWidget* parent,  const char* name, WFlags fl )
+    : %{APPNAME}Base( parent, name, fl )
 {
     connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye()));
 }
diff --git a/languages/cpp/app_templates/opieapp/example.h b/languages/cpp/app_templates/opieapp/example.h
index 0a8320c9..7da09f5a 100644
--- a/languages/cpp/app_templates/opieapp/example.h
+++ b/languages/cpp/app_templates/opieapp/example.h
@@ -11,7 +11,7 @@ public:
     static TQString appName() {
         return TQString::tqfromLatin1("%{APPNAMELC}" );
     }
-    %{APPNAME}( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+    %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~%{APPNAME}();
 
 private slots:
diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp
index cc2a6a17..9a181745 100644
--- a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp
+++ b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp
@@ -8,8 +8,8 @@
 #include "%{APPNAMELC}.h"
 
 
-%{APPNAME}::%{APPNAME}(TQWidget *tqparent)
-    : TQWidget( tqparent,  "%{APPNAME} Applet" ) {
+%{APPNAME}::%{APPNAME}(TQWidget *parent)
+    : TQWidget( parent,  "%{APPNAME} Applet" ) {
 /*
  * we will load an Image, scale it for the right usage
  * remember your applet might be used by different
@@ -89,12 +89,12 @@ void %{APPNAME}::paintEvent( TQPaintEvent* ) {
 /*
  * For the taskbar interface return a Widget
  */
-TQWidget* %{APPNAME}Impl::applet( TQWidget* tqparent ) {
+TQWidget* %{APPNAME}Impl::applet( TQWidget* parent ) {
     /*
      * There are problems with ownership. So we add
      * our ownlist and clear this;
      */
-    %{APPNAME}* ap = new %{APPNAME}( tqparent );
+    %{APPNAME}* ap = new %{APPNAME}( parent );
     m_applets.append( ap );
 
     return ap;
diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.h b/languages/cpp/app_templates/opieapplet/simpleimpl.h
index 855aed57..311d7c14 100644
--- a/languages/cpp/app_templates/opieapplet/simpleimpl.h
+++ b/languages/cpp/app_templates/opieapplet/simpleimpl.h
@@ -42,7 +42,7 @@ class  %{APPNAME} : public TQWidget {
     Q_OBJECT
   TQ_OBJECT
 public:
-     %{APPNAME}(TQWidget *tqparent);
+     %{APPNAME}(TQWidget *parent);
     ~%{APPNAME}();
 private:
     void mousePressEvent( TQMouseEvent* );
@@ -58,7 +58,7 @@ public:
 
     TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** );
 
-    TQWidget *applet( TQWidget* tqparent );
+    TQWidget *applet( TQWidget* parent );
     int position()const;
 
     /*
diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp
index ea178e59..6a7bef4f 100644
--- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp
+++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp
@@ -102,10 +102,10 @@ void %{APPNAME}::slotCtrl(bool b){
     delete m_icn;
 }
 
-TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *tqparent, TQt::WFlags f )
+TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *parent, TQt::WFlags f )
 {
     if ( !m_pickboard )
-	m_pickboard = new %{APPNAME}( tqparent, f );
+	m_pickboard = new %{APPNAME}( parent, f );
     return m_pickboard;
 }
 
diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.h b/languages/cpp/app_templates/opieinput/simpleimpl.h
index 76af8138..ab41e38d 100644
--- a/languages/cpp/app_templates/opieinput/simpleimpl.h
+++ b/languages/cpp/app_templates/opieinput/simpleimpl.h
@@ -37,7 +37,7 @@ public:
     TQ_REFCOUNT
 #endif
 
-    virtual TQWidget *inputMethod( TQWidget *tqparent, TQt::WFlags f );
+    virtual TQWidget *inputMethod( TQWidget *parent, TQt::WFlags f );
     virtual void resetState();
     virtual TQPixmap *icon();
     virtual TQString name();
diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.h b/languages/cpp/app_templates/opiemenu/simpleimpl.h
index 61c3cc5b..71d7afa4 100644
--- a/languages/cpp/app_templates/opiemenu/simpleimpl.h
+++ b/languages/cpp/app_templates/opiemenu/simpleimpl.h
@@ -26,7 +26,7 @@ public:
     /* virtual TQString tr( const char* ) const;
     virtual TQString tr( const char*, const char* ) const;
     */
-    virtual TQPopupMenu *popup ( TQWidget *tqparent ) const;
+    virtual TQPopupMenu *popup ( TQWidget *parent ) const;
     virtual void activated ( );
 };
 
diff --git a/languages/cpp/app_templates/opienet/simpleiface.cpp b/languages/cpp/app_templates/opienet/simpleiface.cpp
index 9b38bc77..e98148d2 100644
--- a/languages/cpp/app_templates/opienet/simpleiface.cpp
+++ b/languages/cpp/app_templates/opienet/simpleiface.cpp
@@ -1,9 +1,9 @@
 #include "%{APPNAMELC}iface.h"
 
-%{APPNAME}Interface::%{APPNAME}Interface( TQObject* tqparent,
+%{APPNAME}Interface::%{APPNAME}Interface( TQObject* parent,
                                     const char* name,
                                     bool status )
-    : Interface(tqparent, name, status )
+    : Interface(parent, name, status )
 {
 }
 
diff --git a/languages/cpp/app_templates/opienet/simpleiface.h b/languages/cpp/app_templates/opienet/simpleiface.h
index c38d884f..d998de8f 100644
--- a/languages/cpp/app_templates/opienet/simpleiface.h
+++ b/languages/cpp/app_templates/opienet/simpleiface.h
@@ -8,7 +8,7 @@ class %{APPNAME}Interface : public Interface {
   TQ_OBJECT
 
 public:
-    %{APPNAME}Interface(TQObject* tqparent, const char* name = "vpn", bool up = false );
+    %{APPNAME}Interface(TQObject* parent, const char* name = "vpn", bool up = false );
     ~%{APPNAME}Interface();
 
 public slots:
diff --git a/languages/cpp/app_templates/opietoday/exampleplugin.cpp b/languages/cpp/app_templates/opietoday/exampleplugin.cpp
index d3dc37ab..12d702b6 100644
--- a/languages/cpp/app_templates/opietoday/exampleplugin.cpp
+++ b/languages/cpp/app_templates/opietoday/exampleplugin.cpp
@@ -36,7 +36,7 @@ TQString %{APPNAME}::pixmapNameConfig() const {
 }
 
 // No config widget yet, look at the datebook plugin for an example of that
-TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*tqparent*/ ) {
+TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*parent*/ ) {
     return 0l;
 }
 
diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp
index 98b19f9a..2f491481 100644
--- a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp
+++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp
@@ -3,8 +3,8 @@
 
 #include "%{APPNAMELC}widget.h"
 
-%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *tqparent,  const char* name)
-    : TQWidget(tqparent,  name ) {
+%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *parent,  const char* name)
+    : TQWidget(parent,  name ) {
 
     m_exampleLabel = 0l;
     m_layout = 0l;
diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.h b/languages/cpp/app_templates/opietoday/examplepluginwidget.h
index f5e35d4e..f079013e 100644
--- a/languages/cpp/app_templates/opietoday/examplepluginwidget.h
+++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.h
@@ -11,7 +11,7 @@ class %{APPNAME}Widget : public TQWidget {
   TQ_OBJECT
 
 public:
-    %{APPNAME}Widget( TQWidget *tqparent,  const char *name );
+    %{APPNAME}Widget( TQWidget *parent,  const char *name );
     ~%{APPNAME}Widget();
     
     void refresh();
diff --git a/languages/cpp/app_templates/qtopia4app/example.cpp b/languages/cpp/app_templates/qtopia4app/example.cpp
index 12c3f634..735f7e03 100644
--- a/languages/cpp/app_templates/qtopia4app/example.cpp
+++ b/languages/cpp/app_templates/qtopia4app/example.cpp
@@ -2,8 +2,8 @@
 #include "%{APPNAMELC}.h"
 #include <tqpushbutton.h>
 
-%{APPNAME}Base::%{APPNAME}Base( TQWidget *tqparent, TQt::WFlags f )
-    : TQWidget( tqparent, f )
+%{APPNAME}Base::%{APPNAME}Base( TQWidget *parent, TQt::WFlags f )
+    : TQWidget( parent, f )
 {
     setupUi( this );
 }
@@ -13,11 +13,11 @@
 }
 
 /* 
- *  Constructs a %{APPNAME} which is a child of 'tqparent', with the 
+ *  Constructs a %{APPNAME} which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
-%{APPNAME}::%{APPNAME}( TQWidget *tqparent, TQt::WFlags f )
-    : %{APPNAME}Base( tqparent, f )
+%{APPNAME}::%{APPNAME}( TQWidget *parent, TQt::WFlags f )
+    : %{APPNAME}Base( parent, f )
 {
     connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye()));
 }
diff --git a/languages/cpp/app_templates/qtopia4app/example.h b/languages/cpp/app_templates/qtopia4app/example.h
index e4c44a8f..0b174641 100644
--- a/languages/cpp/app_templates/qtopia4app/example.h
+++ b/languages/cpp/app_templates/qtopia4app/example.h
@@ -6,7 +6,7 @@
 class %{APPNAME}Base : public TQWidget, public Ui_%{APPNAME}Base
 {
 public:
-    %{APPNAME}Base( TQWidget *tqparent = 0, TQt::WFlags f = 0 );
+    %{APPNAME}Base( TQWidget *parent = 0, TQt::WFlags f = 0 );
     virtual ~%{APPNAME}Base();
 };
 
@@ -15,7 +15,7 @@ class %{APPNAME} : public %{APPNAME}Base
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}( TQWidget *tqparent = 0, TQt::WFlags f = 0 );
+    %{APPNAME}( TQWidget *parent = 0, TQt::WFlags f = 0 );
     virtual ~%{APPNAME}();
 
 private slots:
diff --git a/languages/cpp/app_templates/qtopiaapp/example.cpp b/languages/cpp/app_templates/qtopiaapp/example.cpp
index 85082508..d68f6c6d 100644
--- a/languages/cpp/app_templates/qtopiaapp/example.cpp
+++ b/languages/cpp/app_templates/qtopiaapp/example.cpp
@@ -3,11 +3,11 @@
 #include <tqpushbutton.h>
 
 /*
- *  Constructs a %{APPNAME} which is a child of 'tqparent', with the
+ *  Constructs a %{APPNAME} which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  */
-%{APPNAME}::%{APPNAME}( TQWidget* tqparent,  const char* name, WFlags fl )
-    : %{APPNAME}Base( tqparent, name, fl )
+%{APPNAME}::%{APPNAME}( TQWidget* parent,  const char* name, WFlags fl )
+    : %{APPNAME}Base( parent, name, fl )
 {
     connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye()));
 }
diff --git a/languages/cpp/app_templates/qtopiaapp/example.h b/languages/cpp/app_templates/qtopiaapp/example.h
index 64abf97c..84f90cfd 100644
--- a/languages/cpp/app_templates/qtopiaapp/example.h
+++ b/languages/cpp/app_templates/qtopiaapp/example.h
@@ -9,7 +9,7 @@ class %{APPNAME} : public %{APPNAME}Base
   TQ_OBJECT
 
 public:
-    %{APPNAME}( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+    %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~%{APPNAME}();
 
 private slots: