rename the following methods:

tqparent parent
tqmask mask


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

49 files changed, 247 insertions, 247 deletions

diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp
index 949aef0..66641a5 100644
--- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp
+++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp
@@ -36,7 +36,7 @@
 #include "../../core/kmfundoengine.h"
 
 namespace KMF {
-KMFRuleEditCustomOpt::KMFRuleEditCustomOpt( TQWidget *tqparent, const char *name ) : KMyFirewallRuleEditorCustomRule( tqparent, name ) {
+KMFRuleEditCustomOpt::KMFRuleEditCustomOpt( TQWidget *parent, const char *name ) : KMyFirewallRuleEditorCustomRule( parent, name ) {
 	c_options->setChecked( false );
 	c_target_options->setChecked( false );
 	t_target->clear();
diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.h b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.h
index e12b633..76992a7 100644
--- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.h
+++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.h
@@ -31,7 +31,7 @@ class KMFRuleEditCustomOpt : public KMyFirewallRuleEditorCustomRule  {
    Q_OBJECT
   TQ_OBJECT
 public: 
-	KMFRuleEditCustomOpt(TQWidget *tqparent=0, const char *name=0);
+	KMFRuleEditCustomOpt(TQWidget *parent=0, const char *name=0);
 	~KMFRuleEditCustomOpt();
 
 	void loadRule( IPTRule * );
diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp
index 4fdf61c..7a59e75 100644
--- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp
+++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp
@@ -39,10 +39,10 @@
 #include "kmfruleeditcustomopt.h"
 
 namespace KMF {
-KMFRuleOptionEditCustom::KMFRuleOptionEditCustom(TQObject *tqparent, const char *name,const TQStringList& )
-		: KMFRuleOptionEditInterface(tqparent, name) {
-	kdDebug() <<"KMFRuleOptionEditCustom::KMFRuleOptionEditCustom(TQObject *tqparent, const char *name)" << endl;
-	kdDebug() << "Parent has Type: " << tqparent->className()  << endl;
+KMFRuleOptionEditCustom::KMFRuleOptionEditCustom(TQObject *parent, const char *name,const TQStringList& )
+		: KMFRuleOptionEditInterface(parent, name) {
+	kdDebug() <<"KMFRuleOptionEditCustom::KMFRuleOptionEditCustom(TQObject *parent, const char *name)" << endl;
+	kdDebug() << "Parent has Type: " << parent->className()  << endl;
 	
 	m_edit = new KMFRuleEditCustomOpt( 0 , "Edit" );
 	m_edit->hide();
@@ -53,10 +53,10 @@ KMFRuleOptionEditCustom::KMFRuleOptionEditCustom(TQObject *tqparent, const char
 KMFRuleOptionEditCustom::~KMFRuleOptionEditCustom() {}
 
 void KMFRuleOptionEditCustom::slotShowOverview() {
-	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( tqparent() ) ) {
+	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( parent() ) ) {
 		ruleedit->showOverview();
 	} else {
-		kdDebug() << "KMFRuleOptionEditCustom::slotShowOverview(): tqparent() not of type KMFRuleEditInterface" << endl;
+		kdDebug() << "KMFRuleOptionEditCustom::slotShowOverview(): parent() not of type KMFRuleEditInterface" << endl;
 	}
 }
 
@@ -98,14 +98,14 @@ TQWidget* KMFRuleOptionEditCustom::editWidget() {
 // // KInstance* KMFRuleOptionEditCustomFactory::s_instance = 0L;
 // // KAboutData* KMFRuleOptionEditCustomFactory::s_about = 0L;
 
-KMFRuleOptionEditCustomFactory::KMFRuleOptionEditCustomFactory( TQObject* tqparent, const char* name )
-		: KLibFactory( tqparent, name ) {
+KMFRuleOptionEditCustomFactory::KMFRuleOptionEditCustomFactory( TQObject* parent, const char* name )
+		: KLibFactory( parent, name ) {
 // // 	s_instance = new KInstance( "KMFRuleOptionEditCustomFactory" );
 }
 
-TQObject* KMFRuleOptionEditCustomFactory::createObject( TQObject* tqparent, const char* name,
+TQObject* KMFRuleOptionEditCustomFactory::createObject( TQObject* parent, const char* name,
         const char*, const TQStringList & ) {
-	TQObject * obj = new KMFRuleOptionEditCustom( tqparent, name );
+	TQObject * obj = new KMFRuleOptionEditCustom( parent, name );
 	emit objectCreated( obj );
 	return obj;
 }
diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h
index 948c910..8ab5352 100644
--- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h
+++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h
@@ -48,7 +48,7 @@ class KMFRuleOptionEditCustom : public KMFRuleOptionEditInterface {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditCustom(TQObject *tqparent = 0, const char *name = 0, const TQStringList& = TQString());
+	KMFRuleOptionEditCustom(TQObject *parent = 0, const char *name = 0, const TQStringList& = TQString());
 
 	~KMFRuleOptionEditCustom();
 	void loadRule( IPTRule* rule );	
@@ -71,11 +71,11 @@ class KMFRuleOptionEditCustomFactory : public KLibFactory {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditCustomFactory( TQObject *tqparent = 0, const char *name = 0 );
+	KMFRuleOptionEditCustomFactory( TQObject *parent = 0, const char *name = 0 );
 	virtual ~KMFRuleOptionEditCustomFactory() {
 /* 		delete s_instance; */
 	};
-	virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0,
+	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/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
index c3242c4..27ef89d 100644
--- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
+++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
@@ -42,7 +42,7 @@
 #include "../../core/kmfundoengine.h"
 #include "../../core/xmlnames.h"
 namespace KMF {
-KMFRuleEditorInterface::KMFRuleEditorInterface( TQWidget *tqparent, const char *name, WFlags fl /*,IPTRule* cr */ ) : KMyFirewallRuleEditorInterface( tqparent, name, fl ) {
+KMFRuleEditorInterface::KMFRuleEditorInterface( TQWidget *parent, const char *name, WFlags fl /*,IPTRule* cr */ ) : KMyFirewallRuleEditorInterface( parent, name, fl ) {
 }
 KMFRuleEditorInterface::~KMFRuleEditorInterface() {}
 
diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.h b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.h
index 4616b64..5bf377a 100644
--- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.h
+++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.h
@@ -33,7 +33,7 @@ class KMFRuleEditorInterface : public KMyFirewallRuleEditorInterface {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleEditorInterface( TQWidget *tqparent = 0, const char *name = 0, WFlags fl = 0 );
+	KMFRuleEditorInterface( TQWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
 	~KMFRuleEditorInterface();
 
 	void loadRule( IPTRule* );
diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp
index 5d71f3e..a2bcb7a 100644
--- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp
+++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.cpp
@@ -25,10 +25,10 @@
 #include "kmfruleeditorinterface.h"
 
 namespace KMF {
-KMFRuleOptionEditorInterface::KMFRuleOptionEditorInterface(TQObject *tqparent, const char *name)
-		: KMFRuleOptionEditInterface(tqparent, name) {
-	kdDebug() <<"KMFRuleOptionEditorInterface::KMFRuleOptionEditorInterface(TQObject *tqparent, const char *name)" << endl;
-	kdDebug() << "Parent has Type: " << tqparent->className()  << endl;
+KMFRuleOptionEditorInterface::KMFRuleOptionEditorInterface(TQObject *parent, const char *name)
+		: KMFRuleOptionEditInterface(parent, name) {
+	kdDebug() <<"KMFRuleOptionEditorInterface::KMFRuleOptionEditorInterface(TQObject *parent, const char *name)" << endl;
+	kdDebug() << "Parent has Type: " << parent->className()  << endl;
 	
 	m_edit = new KMFRuleEditorInterface( 0 , "Edit", 0 );
 	m_edit->hide();
@@ -43,10 +43,10 @@ KMFRuleOptionEditorInterface::KMFRuleOptionEditorInterface(TQObject *tqparent, c
 KMFRuleOptionEditorInterface::~KMFRuleOptionEditorInterface() {}
 
 void KMFRuleOptionEditorInterface::slotShowOverview() {
-	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( tqparent() ) ) {
+	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( parent() ) ) {
 		ruleedit->showOverview();
 	} else {
-		kdDebug() << "KMFRuleOptionEditCustom::slotShowOverview(): tqparent() not of type KMFRuleEditInterface" << endl;
+		kdDebug() << "KMFRuleOptionEditCustom::slotShowOverview(): parent() not of type KMFRuleEditInterface" << endl;
 	}
 }
 
@@ -88,14 +88,14 @@ TQWidget* KMFRuleOptionEditorInterface::editWidget() {
 // KInstance* KMFRuleOptionEditorInterfaceFactory::s_instance = 0L;
 // KAboutData* KMFRuleOptionEditorInterfaceFactory::s_about = 0L;
 
-KMFRuleOptionEditorInterfaceFactory::KMFRuleOptionEditorInterfaceFactory( TQObject* tqparent, const char* name )
-		: KLibFactory( tqparent, name ) {
+KMFRuleOptionEditorInterfaceFactory::KMFRuleOptionEditorInterfaceFactory( TQObject* parent, const char* name )
+		: KLibFactory( parent, name ) {
 // 	s_instance = new KInstance( "KMFRuleOptionEditorInterfaceFactory" );
 }
 
-TQObject* KMFRuleOptionEditorInterfaceFactory::createObject( TQObject* tqparent, const char* name,
+TQObject* KMFRuleOptionEditorInterfaceFactory::createObject( TQObject* parent, const char* name,
         const char*, const TQStringList & ) {
-	TQObject * obj = new KMFRuleOptionEditorInterface( tqparent, name );
+	TQObject * obj = new KMFRuleOptionEditorInterface( parent, name );
 	emit objectCreated( obj );
 	return obj;
 }
diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h
index 695e9d4..c1e01fe 100644
--- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h
+++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h
@@ -32,7 +32,7 @@ class KMFRuleOptionEditorInterface : public KMFRuleOptionEditInterface {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditorInterface(TQObject *tqparent = 0, const char *name = 0);
+	KMFRuleOptionEditorInterface(TQObject *parent = 0, const char *name = 0);
 
 	~KMFRuleOptionEditorInterface();
 	void loadRule( IPTRule* rule );	
@@ -55,11 +55,11 @@ class KMFRuleOptionEditorInterfaceFactory : public KLibFactory {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditorInterfaceFactory( TQObject *tqparent = 0, const char *name = 0 );
+	KMFRuleOptionEditorInterfaceFactory( TQObject *parent = 0, const char *name = 0 );
 	virtual ~KMFRuleOptionEditorInterfaceFactory() {
 /* 		delete s_instance; */
 	};
-	virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0,
+	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/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp
index 6c8c7e4..b63ab42 100644
--- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp
+++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp
@@ -44,14 +44,14 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
 
 namespace KMF {
 /*
- *  Constructs a KMFRuleEditIP which is a child of 'tqparent', with the
+ *  Constructs a KMFRuleEditIP which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f' 
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-KMFRuleEditIP::KMFRuleEditIP( TQWidget* tqparent, const char* name, WFlags fl )
-		: KMyFirewallRuleEditorIP ( tqparent, name, fl ) {
+KMFRuleEditIP::KMFRuleEditIP( TQWidget* parent, const char* name, WFlags fl )
+		: KMyFirewallRuleEditorIP ( parent, name, fl ) {
 	m_CheckInput = new KMFCheckInput();
 	m_ErrorHandler = new KMFErrorHandler( "KMFRuleEditIP" );
 	m_err = new KMFError();
diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.h b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.h
index cb2c7ee..5e6f15e 100644
--- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.h
+++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.h
@@ -29,7 +29,7 @@ class KMFRuleEditIP : public KMyFirewallRuleEditorIP /*, virtual public KMFRuleO
   TQ_OBJECT
 
 public:
-	KMFRuleEditIP( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+	KMFRuleEditIP( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 	~KMFRuleEditIP();
 
 // 	TQPtrList<TQString>* options;
diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp
index e97cdc0..4672c98 100644
--- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp
+++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.cpp
@@ -37,10 +37,10 @@
 #include "kmfruleeditip.h"
 
 namespace KMF {
-KMFRuleOptionEditIP::KMFRuleOptionEditIP(TQObject *tqparent, const char *name)
-		: KMFRuleOptionEditInterface(tqparent, name) {
-	kdDebug() <<"KMFRuleOptionEditIP::KMFRuleOptionEditIP(TQObject *tqparent, const char *name)" << endl;
-	kdDebug() << "Parent has Type: " << tqparent->className()  << endl;
+KMFRuleOptionEditIP::KMFRuleOptionEditIP(TQObject *parent, const char *name)
+		: KMFRuleOptionEditInterface(parent, name) {
+	kdDebug() <<"KMFRuleOptionEditIP::KMFRuleOptionEditIP(TQObject *parent, const char *name)" << endl;
+	kdDebug() << "Parent has Type: " << parent->className()  << endl;
 	
 	m_edit = new KMFRuleEditIP( 0 , "Edit", 0 );
 	m_edit->hide();
@@ -51,10 +51,10 @@ KMFRuleOptionEditIP::KMFRuleOptionEditIP(TQObject *tqparent, const char *name)
 KMFRuleOptionEditIP::~KMFRuleOptionEditIP() {}
 
 void KMFRuleOptionEditIP::slotShowOverview() {
-	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( tqparent() ) ) {
+	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( parent() ) ) {
 		ruleedit->showOverview();
 	} else {
-		kdDebug() << "KMFRuleOptionEditCustom::slotShowOverview(): tqparent() not of type KMFRuleEditInterface" << endl;
+		kdDebug() << "KMFRuleOptionEditCustom::slotShowOverview(): parent() not of type KMFRuleEditInterface" << endl;
 	}
 }
 
@@ -96,14 +96,14 @@ TQWidget* KMFRuleOptionEditIP::editWidget() {
 // KInstance* KMFRuleOptionEditIPFactory::s_instance = 0L;
 // KAboutData* KMFRuleOptionEditIPFactory::s_about = 0L;
 
-KMFRuleOptionEditIPFactory::KMFRuleOptionEditIPFactory( TQObject* tqparent, const char* name )
-		: KLibFactory( tqparent, name ) {
+KMFRuleOptionEditIPFactory::KMFRuleOptionEditIPFactory( TQObject* parent, const char* name )
+		: KLibFactory( parent, name ) {
 // 	s_instance = new KInstance( "KMFRuleOptionEditIPFactory" );
 }
 
-TQObject* KMFRuleOptionEditIPFactory::createObject( TQObject* tqparent, const char* name,
+TQObject* KMFRuleOptionEditIPFactory::createObject( TQObject* parent, const char* name,
         const char*, const TQStringList & ) {
-	TQObject * obj = new KMFRuleOptionEditIP( tqparent, name );
+	TQObject * obj = new KMFRuleOptionEditIP( parent, name );
 	emit objectCreated( obj );
 	return obj;
 }
diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h
index 19ccfd5..db0a155 100644
--- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h
+++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h
@@ -42,7 +42,7 @@ class KMFRuleOptionEditIP : public KMFRuleOptionEditInterface {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditIP(TQObject *tqparent = 0, const char *name = 0);
+	KMFRuleOptionEditIP(TQObject *parent = 0, const char *name = 0);
 
 	~KMFRuleOptionEditIP();
 	void loadRule( IPTRule* rule );	
@@ -65,11 +65,11 @@ class KMFRuleOptionEditIPFactory : public KLibFactory {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditIPFactory( TQObject *tqparent = 0, const char *name = 0 );
+	KMFRuleOptionEditIPFactory( TQObject *parent = 0, const char *name = 0 );
 	virtual ~KMFRuleOptionEditIPFactory() {
 /* 		delete s_instance; */
 	};
-	virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0,
+	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/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp
index 3efd7d8..39dd5fd 100644
--- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp
+++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp
@@ -39,7 +39,7 @@
 #include "../../core/kmfundoengine.h"
 #include "../../core/xmlnames.h"
 namespace KMF {
-KMFRuleEditorLimit::KMFRuleEditorLimit( TQWidget *tqparent, const char *name, WFlags fl /*,IPTRule* cr*/ ) : KMyFirewallRuleEditorLimit( tqparent, name, fl ) {}
+KMFRuleEditorLimit::KMFRuleEditorLimit( TQWidget *parent, const char *name, WFlags fl /*,IPTRule* cr*/ ) : KMyFirewallRuleEditorLimit( parent, name, fl ) {}
 KMFRuleEditorLimit::~KMFRuleEditorLimit() {}
 void KMFRuleEditorLimit::loadRule( IPTRule * rule ) {
 	kdDebug() << "void KMFRuleEditorLimit::loadRule( IPTRule * rule )" << endl;
diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.h b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.h
index 52bc87b..cdd60f6 100644
--- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.h
+++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.h
@@ -29,7 +29,7 @@ class KMFRuleEditorLimit : public KMyFirewallRuleEditorLimit {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleEditorLimit( TQWidget *tqparent = 0, const char *name = 0, WFlags fl = 0 );
+	KMFRuleEditorLimit( TQWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
 	~KMFRuleEditorLimit();
 
 	void loadRule( IPTRule* );
diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp
index 87537b1..e0e1a71 100644
--- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp
+++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.cpp
@@ -37,10 +37,10 @@
 #include "kmfruleeditorlimit.h"
 
 namespace KMF {
-KMFRuleOptionEditLimit::KMFRuleOptionEditLimit(TQObject *tqparent, const char *name)
-		: KMFRuleOptionEditInterface(tqparent, name) {
-	kdDebug() <<"KMFRuleOptionEditLimit::KMFRuleOptionEditLimit(TQObject *tqparent, const char *name)" << endl;
-	kdDebug() << "Parent has Type: " << tqparent->className()  << endl;
+KMFRuleOptionEditLimit::KMFRuleOptionEditLimit(TQObject *parent, const char *name)
+		: KMFRuleOptionEditInterface(parent, name) {
+	kdDebug() <<"KMFRuleOptionEditLimit::KMFRuleOptionEditLimit(TQObject *parent, const char *name)" << endl;
+	kdDebug() << "Parent has Type: " << parent->className()  << endl;
 	
 	m_edit = new KMFRuleEditorLimit( 0 , "Edit", 0 );
 	m_edit->hide();
@@ -52,10 +52,10 @@ KMFRuleOptionEditLimit::~KMFRuleOptionEditLimit() {}
 
 
 void KMFRuleOptionEditLimit::slotShowOverview() {
-	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( tqparent() ) ) {
+	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( parent() ) ) {
 		ruleedit->showOverview();
 	} else {
-		kdDebug() << "KMFRuleOptionEditCustom::slotShowOverview(): tqparent() not of type KMFRuleEditInterface" << endl;
+		kdDebug() << "KMFRuleOptionEditCustom::slotShowOverview(): parent() not of type KMFRuleEditInterface" << endl;
 	}
 }
 
@@ -98,14 +98,14 @@ TQWidget* KMFRuleOptionEditLimit::editWidget() {
 // KInstance* KMFRuleOptionEditLimitFactory::s_instance = 0L;
 // KAboutData* KMFRuleOptionEditLimitFactory::s_about = 0L;
 
-KMFRuleOptionEditLimitFactory::KMFRuleOptionEditLimitFactory( TQObject* tqparent, const char* name )
-		: KLibFactory( tqparent, name ) {
+KMFRuleOptionEditLimitFactory::KMFRuleOptionEditLimitFactory( TQObject* parent, const char* name )
+		: KLibFactory( parent, name ) {
 // 	s_instance = new KInstance( "KMFRuleOptionEditLimitFactory" );
 }
 
-TQObject* KMFRuleOptionEditLimitFactory::createObject( TQObject* tqparent, const char* name,
+TQObject* KMFRuleOptionEditLimitFactory::createObject( TQObject* parent, const char* name,
         const char*, const TQStringList & ) {
-	TQObject * obj = new KMFRuleOptionEditLimit( tqparent, name );
+	TQObject * obj = new KMFRuleOptionEditLimit( parent, name );
 	emit objectCreated( obj );
 	return obj;
 }
diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h
index cc6be29..0d38801 100644
--- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h
+++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h
@@ -42,7 +42,7 @@ class KMFRuleOptionEditLimit : public KMFRuleOptionEditInterface {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditLimit(TQObject *tqparent = 0, const char *name = 0);
+	KMFRuleOptionEditLimit(TQObject *parent = 0, const char *name = 0);
 
 	~KMFRuleOptionEditLimit();
 	void loadRule( IPTRule* rule );	
@@ -65,11 +65,11 @@ class KMFRuleOptionEditLimitFactory : public KLibFactory {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditLimitFactory( TQObject *tqparent = 0, const char *name = 0 );
+	KMFRuleOptionEditLimitFactory( TQObject *parent = 0, const char *name = 0 );
 	virtual ~KMFRuleOptionEditLimitFactory() {
 /* 		delete s_instance; */
 	};
-	virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0,
+	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/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp
index 66a4f2a..b03242a 100644
--- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp
+++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp
@@ -37,7 +37,7 @@
 #include "../../core/kmfnetwork.h"
 #include "../../core/kmfundoengine.h"
 namespace KMF {
-KMFRuleEditTargetLog::KMFRuleEditTargetLog( TQWidget *tqparent, const char *name, WFlags fl ) : KMyFirewallRuleEditorTargetLog( tqparent, name, fl ) {}
+KMFRuleEditTargetLog::KMFRuleEditTargetLog( TQWidget *parent, const char *name, WFlags fl ) : KMyFirewallRuleEditorTargetLog( parent, name, fl ) {}
 KMFRuleEditTargetLog::~KMFRuleEditTargetLog() {}
 
 void KMFRuleEditTargetLog::loadRule( IPTRule* rule ) {
diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.h b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.h
index 08c1a11..d793e36 100644
--- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.h
+++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.h
@@ -29,7 +29,7 @@ class KMFRuleEditTargetLog : public KMyFirewallRuleEditorTargetLog {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleEditTargetLog( TQWidget *tqparent = 0, const char *name = 0, WFlags fl = 0 );
+	KMFRuleEditTargetLog( TQWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
 	~KMFRuleEditTargetLog();
 
 	TQPtrList<TQString>* options;
diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp
index 074e8ad..ce632c6 100644
--- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp
+++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.cpp
@@ -25,14 +25,14 @@
 #include "kmfruleedittargetlog.h"
 
 namespace KMF {
-KMFRuleTargetOptionEditLog::KMFRuleTargetOptionEditLog(TQObject *tqparent, const char *name)
-		: KMFRuleTargetOptionEditInterface(tqparent, name) {
-	kdDebug() <<"KMFRuleTargetOptionEditLog::KMFRuleTargetOptionEditLog(TQObject *tqparent, const char *name)" << endl;
+KMFRuleTargetOptionEditLog::KMFRuleTargetOptionEditLog(TQObject *parent, const char *name)
+		: KMFRuleTargetOptionEditInterface(parent, name) {
+	kdDebug() <<"KMFRuleTargetOptionEditLog::KMFRuleTargetOptionEditLog(TQObject *parent, const char *name)" << endl;
 	
 	m_managedTargets << "LOG";
 	
 	
-	kdDebug() << "Parent has Type: " << tqparent->className()  << endl;
+	kdDebug() << "Parent has Type: " << parent->className()  << endl;
 	
 	m_edit = new KMFRuleEditTargetLog( 0 , "Edit", 0 );
 	m_edit->hide();
@@ -43,10 +43,10 @@ KMFRuleTargetOptionEditLog::KMFRuleTargetOptionEditLog(TQObject *tqparent, const
 KMFRuleTargetOptionEditLog::~KMFRuleTargetOptionEditLog() {}
 
 void KMFRuleTargetOptionEditLog::slotShowOverview() {
-	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( tqparent() ) ) {
+	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( parent() ) ) {
 		ruleedit->showOverview();
 	} else {
-		kdDebug() << "KMFRuleTargetOptionEditLog::slotShowOverview(): tqparent() not of type KMFRuleEditInterface" << endl;
+		kdDebug() << "KMFRuleTargetOptionEditLog::slotShowOverview(): parent() not of type KMFRuleEditInterface" << endl;
 	}
 }
 
@@ -94,14 +94,14 @@ bool KMFRuleTargetOptionEditLog::setTarget( const TQString& target ){
 // KInstance* KMFRuleTargetOptionEditLogFactory::s_instance = 0L;
 // KAboutData* KMFRuleTargetOptionEditLogFactory::s_about = 0L;
 
-KMFRuleTargetOptionEditLogFactory::KMFRuleTargetOptionEditLogFactory( TQObject* tqparent, const char* name )
-		: KLibFactory( tqparent, name ) {
+KMFRuleTargetOptionEditLogFactory::KMFRuleTargetOptionEditLogFactory( TQObject* parent, const char* name )
+		: KLibFactory( parent, name ) {
 // 	s_instance = new KInstance( "KMFRuleTargetOptionEditLogFactory" );
 }
 
-TQObject* KMFRuleTargetOptionEditLogFactory::createObject( TQObject* tqparent, const char* name,
+TQObject* KMFRuleTargetOptionEditLogFactory::createObject( TQObject* parent, const char* name,
         const char*, const TQStringList & ) {
-	TQObject * obj = new KMFRuleTargetOptionEditLog( tqparent, name );
+	TQObject * obj = new KMFRuleTargetOptionEditLog( parent, name );
 	emit objectCreated( obj );
 	return obj;
 }
diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h
index 6f5c6fa..5c27778 100644
--- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h
+++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h
@@ -30,7 +30,7 @@ class KMFRuleTargetOptionEditLog : public KMFRuleTargetOptionEditInterface {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleTargetOptionEditLog(TQObject *tqparent = 0, const char *name = 0);
+	KMFRuleTargetOptionEditLog(TQObject *parent = 0, const char *name = 0);
 
 	~KMFRuleTargetOptionEditLog();
 	void loadRule( IPTRule* rule );	
@@ -54,11 +54,11 @@ class KMFRuleTargetOptionEditLogFactory : public KLibFactory {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleTargetOptionEditLogFactory( TQObject *tqparent = 0, const char *name = 0 );
+	KMFRuleTargetOptionEditLogFactory( TQObject *parent = 0, const char *name = 0 );
 	virtual ~KMFRuleTargetOptionEditLogFactory() {
 /* 		delete s_instance; */
 	};
-	virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0,
+	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/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp
index 4ae3fc4..876c92c 100644
--- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp
+++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp
@@ -42,14 +42,14 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
 
 namespace KMF {
 /*
- *  Constructs a KMFRuleEditMac which is a child of 'tqparent', with the
+ *  Constructs a KMFRuleEditMac which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f' 
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-KMFRuleEditMac::KMFRuleEditMac( TQWidget* tqparent, const char* name, WFlags fl )
-		: KMyFirewallRuleEditorMac( tqparent, name, fl ) {
+KMFRuleEditMac::KMFRuleEditMac( TQWidget* parent, const char* name, WFlags fl )
+		: KMyFirewallRuleEditorMac( parent, name, fl ) {
 	m_err_handler = new KMFErrorHandler( "KMFRuleEditMac" );
 	m_check_input = new KMFCheckInput();
 	m_err = new KMFError();
diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.h b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.h
index 781f21e..adbbe62 100644
--- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.h
+++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.h
@@ -31,7 +31,7 @@ class KMFRuleEditMac : public KMyFirewallRuleEditorMac {
   TQ_OBJECT
 
 public:
-	KMFRuleEditMac( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+	KMFRuleEditMac( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 	~KMFRuleEditMac();
 
 	void loadRule( IPTRule* );
diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp
index 7358606..c62ecf9 100644
--- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp
+++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.cpp
@@ -26,10 +26,10 @@
 #include "kmfruleeditmac.h"
 
 namespace KMF {
-KMFRuleOptionEditMAC::KMFRuleOptionEditMAC(TQObject *tqparent, const char *name)
-		: KMFRuleOptionEditInterface(tqparent, name) {
-	kdDebug() <<"KMFRuleOptionEditMAC::KMFRuleOptionEditMAC(TQObject *tqparent, const char *name)" << endl;
-	kdDebug() << "Parent has Type: " << tqparent->className()  << endl;
+KMFRuleOptionEditMAC::KMFRuleOptionEditMAC(TQObject *parent, const char *name)
+		: KMFRuleOptionEditInterface(parent, name) {
+	kdDebug() <<"KMFRuleOptionEditMAC::KMFRuleOptionEditMAC(TQObject *parent, const char *name)" << endl;
+	kdDebug() << "Parent has Type: " << parent->className()  << endl;
 	
 	m_edit = new KMFRuleEditMac( 0 , "Edit", 0 );
 	m_edit->hide();
@@ -41,10 +41,10 @@ KMFRuleOptionEditMAC::KMFRuleOptionEditMAC(TQObject *tqparent, const char *name)
 KMFRuleOptionEditMAC::~KMFRuleOptionEditMAC() {}
 
 void KMFRuleOptionEditMAC::slotShowOverview() {
-	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( tqparent() ) ) {
+	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( parent() ) ) {
 		ruleedit->showOverview();
 	} else {
-		kdDebug() << "KMFRuleOptionEditMAC::slotShowOverview(): tqparent() not of type KMFRuleEditInterface" << endl;
+		kdDebug() << "KMFRuleOptionEditMAC::slotShowOverview(): parent() not of type KMFRuleEditInterface" << endl;
 	}
 }
 
@@ -86,14 +86,14 @@ TQWidget* KMFRuleOptionEditMAC::editWidget() {
 // KInstance* KMFRuleOptionEditMACFactory::s_instance = 0L;
 // KAboutData* KMFRuleOptionEditMACFactory::s_about = 0L;
 
-KMFRuleOptionEditMACFactory::KMFRuleOptionEditMACFactory( TQObject* tqparent, const char* name )
-		: KLibFactory( tqparent, name ) {
+KMFRuleOptionEditMACFactory::KMFRuleOptionEditMACFactory( TQObject* parent, const char* name )
+		: KLibFactory( parent, name ) {
 // 	s_instance = new KInstance( "KMFRuleOptionEditMACFactory" );
 }
 
-TQObject* KMFRuleOptionEditMACFactory::createObject( TQObject* tqparent, const char* name,
+TQObject* KMFRuleOptionEditMACFactory::createObject( TQObject* parent, const char* name,
         const char*, const TQStringList & ) {
-	TQObject * obj = new KMFRuleOptionEditMAC( tqparent, name );
+	TQObject * obj = new KMFRuleOptionEditMAC( parent, name );
 	emit objectCreated( obj );
 	return obj;
 }
diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h
index d790245..22b8d66 100644
--- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h
+++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h
@@ -46,7 +46,7 @@ class KMFRuleOptionEditMAC : public KMFRuleOptionEditInterface {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditMAC(TQObject *tqparent = 0, const char *name = 0);
+	KMFRuleOptionEditMAC(TQObject *parent = 0, const char *name = 0);
 
 	~KMFRuleOptionEditMAC();
 	void loadRule( IPTRule* rule );	
@@ -69,11 +69,11 @@ class KMFRuleOptionEditMACFactory : public KLibFactory {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditMACFactory( TQObject *tqparent = 0, const char *name = 0 );
+	KMFRuleOptionEditMACFactory( TQObject *parent = 0, const char *name = 0 );
 	virtual ~KMFRuleOptionEditMACFactory() {
 /* 		delete s_instance; */
 	};
-	virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0,
+	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/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp
index 2cc8d27..0ba0e49 100644
--- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp
+++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp
@@ -36,7 +36,7 @@
 #include "../../core/kmfundoengine.h"
 
 namespace KMF {
-KMFRuleEditTargetMark::KMFRuleEditTargetMark( TQWidget *tqparent, const char *name, WFlags fl ) : KMyFirewallRuleEditorTargetMark( tqparent, name, fl ) {}
+KMFRuleEditTargetMark::KMFRuleEditTargetMark( TQWidget *parent, const char *name, WFlags fl ) : KMyFirewallRuleEditorTargetMark( parent, name, fl ) {}
 KMFRuleEditTargetMark::~KMFRuleEditTargetMark() {}
 
 void KMFRuleEditTargetMark::loadRule( IPTRule* rule ) {
diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.h b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.h
index 1b645c5..b7d5129 100644
--- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.h
+++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.h
@@ -31,7 +31,7 @@ class KMFRuleEditTargetMark : public KMyFirewallRuleEditorTargetMark {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleEditTargetMark( TQWidget *tqparent = 0, const char *name = 0, WFlags fl = 0 );
+	KMFRuleEditTargetMark( TQWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
 	~KMFRuleEditTargetMark();
 	void loadRule( IPTRule* );
 	void accept();
diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp
index fa38620..a3909a8 100644
--- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp
+++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.cpp
@@ -25,14 +25,14 @@
 #include "kmfruleedittargetmark.h"
 
 namespace KMF {
-KMFRuleTargetOptionEditMark::KMFRuleTargetOptionEditMark(TQObject *tqparent, const char *name)
-		: KMFRuleTargetOptionEditInterface(tqparent, name) {
-	kdDebug() <<"KMFRuleTargetOptionEditMark::KMFRuleTargetOptionEditMark(TQObject *tqparent, const char *name)" << endl;
+KMFRuleTargetOptionEditMark::KMFRuleTargetOptionEditMark(TQObject *parent, const char *name)
+		: KMFRuleTargetOptionEditInterface(parent, name) {
+	kdDebug() <<"KMFRuleTargetOptionEditMark::KMFRuleTargetOptionEditMark(TQObject *parent, const char *name)" << endl;
 	
 	m_managedTargets << "MARK";
 	
 	
-	kdDebug() << "Parent has Type: " << tqparent->className()  << endl;
+	kdDebug() << "Parent has Type: " << parent->className()  << endl;
 	
 	m_edit = new KMFRuleEditTargetMark( 0 , "Edit", 0 );
 	m_edit->hide();
@@ -48,10 +48,10 @@ KMFRuleTargetOptionEditMark::KMFRuleTargetOptionEditMark(TQObject *tqparent, con
 KMFRuleTargetOptionEditMark::~KMFRuleTargetOptionEditMark() {}
 
 void KMFRuleTargetOptionEditMark::slotShowOverview() {
-	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( tqparent() ) ) {
+	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( parent() ) ) {
 		ruleedit->showOverview();
 	} else {
-		kdDebug() << "KMFRuleTargetOptionEditMark::slotShowOverview(): tqparent() not of type KMFRuleEditInterface" << endl;
+		kdDebug() << "KMFRuleTargetOptionEditMark::slotShowOverview(): parent() not of type KMFRuleEditInterface" << endl;
 	}
 }
 
@@ -99,14 +99,14 @@ bool KMFRuleTargetOptionEditMark::setTarget( const TQString& target ){
 // KInstance* KMFRuleTargetOptionEditMarkFactory::s_instance = 0L;
 // KAboutData* KMFRuleTargetOptionEditMarkFactory::s_about = 0L;
 
-KMFRuleTargetOptionEditMarkFactory::KMFRuleTargetOptionEditMarkFactory( TQObject* tqparent, const char* name )
-		: KLibFactory( tqparent, name ) {
+KMFRuleTargetOptionEditMarkFactory::KMFRuleTargetOptionEditMarkFactory( TQObject* parent, const char* name )
+		: KLibFactory( parent, name ) {
 // 	s_instance = new KInstance( "KMFRuleTargetOptionEditMarkFactory" );
 }
 
-TQObject* KMFRuleTargetOptionEditMarkFactory::createObject( TQObject* tqparent, const char* name,
+TQObject* KMFRuleTargetOptionEditMarkFactory::createObject( TQObject* parent, const char* name,
         const char*, const TQStringList & ) {
-	TQObject * obj = new KMFRuleTargetOptionEditMark( tqparent, name );
+	TQObject * obj = new KMFRuleTargetOptionEditMark( parent, name );
 	emit objectCreated( obj );
 	return obj;
 }
diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h
index 9ccb602..56052fe 100644
--- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h
+++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h
@@ -32,7 +32,7 @@ class KMFRuleTargetOptionEditMark : public KMFRuleTargetOptionEditInterface {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleTargetOptionEditMark(TQObject *tqparent = 0, const char *name = 0);
+	KMFRuleTargetOptionEditMark(TQObject *parent = 0, const char *name = 0);
 
 	~KMFRuleTargetOptionEditMark();
 	void loadRule( IPTRule* rule );	
@@ -57,11 +57,11 @@ class KMFRuleTargetOptionEditMarkFactory : public KLibFactory {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleTargetOptionEditMarkFactory( TQObject *tqparent = 0, const char *name = 0 );
+	KMFRuleTargetOptionEditMarkFactory( TQObject *parent = 0, const char *name = 0 );
 	virtual ~KMFRuleTargetOptionEditMarkFactory() {
 /* 		delete s_instance; */
 	};
-	virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0,
+	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/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp
index dc11b37..7435dd9 100644
--- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp
+++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp
@@ -42,7 +42,7 @@ email                : chubinger@irrsinnig.org
 #include "../../core/kmfnetwork.h"
 #include "../../core/kmfundoengine.h"
 namespace KMF {
-KMFRuleEditorTargetNat::KMFRuleEditorTargetNat( TQWidget *tqparent, const char *name, WFlags fl ) : KMyFirewallRuleEditorTargetNat( tqparent, name, fl ) {
+KMFRuleEditorTargetNat::KMFRuleEditorTargetNat( TQWidget *parent, const char *name, WFlags fl ) : KMyFirewallRuleEditorTargetNat( parent, name, fl ) {
 	m_CheckInput = new KMFCheckInput();
 	m_ErrorHandler = new KMFErrorHandler( "KMFRuleEditProtocol" );
 	m_err = new KMFError() ;
diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.h b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.h
index 330dccb..63d83ca 100644
--- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.h
+++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.h
@@ -33,7 +33,7 @@ class KMFRuleEditorTargetNat : public KMyFirewallRuleEditorTargetNat {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleEditorTargetNat( TQWidget *tqparent = 0, const char *name = 0, WFlags fl = 0 );
+	KMFRuleEditorTargetNat( TQWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
 	~KMFRuleEditorTargetNat();
 
 
diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp
index 9e9558a..717030b 100644
--- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp
+++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.cpp
@@ -37,14 +37,14 @@
 #include "kmfruleeditortargetnat.h"
 
 namespace KMF {
-KMFRuleTargetOptionEditNat::KMFRuleTargetOptionEditNat(TQObject *tqparent, const char *name)
-		: KMFRuleTargetOptionEditInterface(tqparent, name) {
-	kdDebug() <<"KMFRuleTargetOptionEditNat::KMFRuleTargetOptionEditNat(TQObject *tqparent, const char *name)" << endl;
+KMFRuleTargetOptionEditNat::KMFRuleTargetOptionEditNat(TQObject *parent, const char *name)
+		: KMFRuleTargetOptionEditInterface(parent, name) {
+	kdDebug() <<"KMFRuleTargetOptionEditNat::KMFRuleTargetOptionEditNat(TQObject *parent, const char *name)" << endl;
 	
 	m_managedTargets << "SNAT" << "DNAT";
 	
 	
-	kdDebug() << "Parent has Type: " << tqparent->className()  << endl;
+	kdDebug() << "Parent has Type: " << parent->className()  << endl;
 	
 	m_edit = new KMFRuleEditorTargetNat( 0 , "Edit", 0 );
 	m_edit->hide();
@@ -56,10 +56,10 @@ KMFRuleTargetOptionEditNat::KMFRuleTargetOptionEditNat(TQObject *tqparent, const
 KMFRuleTargetOptionEditNat::~KMFRuleTargetOptionEditNat() {}
 
 void KMFRuleTargetOptionEditNat::slotShowOverview() {
-	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( tqparent() ) ) {
+	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( parent() ) ) {
 		ruleedit->showOverview();
 	} else {
-		kdDebug() << "KMFRuleTargetOptionEditNat::slotShowOverview(): tqparent() not of type KMFRuleEditInterface" << endl;
+		kdDebug() << "KMFRuleTargetOptionEditNat::slotShowOverview(): parent() not of type KMFRuleEditInterface" << endl;
 	}
 }
 
@@ -111,14 +111,14 @@ bool KMFRuleTargetOptionEditNat::setTarget( const TQString& target ){
 // KInstance* KMFRuleTargetOptionEditNatFactory::s_instance = 0L;
 // KAboutData* KMFRuleTargetOptionEditNatFactory::s_about = 0L;
 
-KMFRuleTargetOptionEditNatFactory::KMFRuleTargetOptionEditNatFactory( TQObject* tqparent, const char* name )
-		: KLibFactory( tqparent, name ) {
+KMFRuleTargetOptionEditNatFactory::KMFRuleTargetOptionEditNatFactory( TQObject* parent, const char* name )
+		: KLibFactory( parent, name ) {
 // 	s_instance = new KInstance( "KMFRuleTargetOptionEditNatFactory" );
 }
 
-TQObject* KMFRuleTargetOptionEditNatFactory::createObject( TQObject* tqparent, const char* name,
+TQObject* KMFRuleTargetOptionEditNatFactory::createObject( TQObject* parent, const char* name,
         const char*, const TQStringList & ) {
-	TQObject * obj = new KMFRuleTargetOptionEditNat( tqparent, name );
+	TQObject * obj = new KMFRuleTargetOptionEditNat( parent, name );
 	emit objectCreated( obj );
 	return obj;
 }
diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h
index b76025d..253ce3a 100644
--- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h
+++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h
@@ -42,7 +42,7 @@ class KMFRuleTargetOptionEditNat : public KMFRuleTargetOptionEditInterface {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleTargetOptionEditNat(TQObject *tqparent = 0, const char *name = 0);
+	KMFRuleTargetOptionEditNat(TQObject *parent = 0, const char *name = 0);
 
 	~KMFRuleTargetOptionEditNat();
 	void loadRule( IPTRule* rule );	
@@ -66,11 +66,11 @@ class KMFRuleTargetOptionEditNatFactory : public KLibFactory {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleTargetOptionEditNatFactory( TQObject *tqparent = 0, const char *name = 0 );
+	KMFRuleTargetOptionEditNatFactory( TQObject *parent = 0, const char *name = 0 );
 	virtual ~KMFRuleTargetOptionEditNatFactory() {
 /* 		delete s_instance; */
 	};
-	virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0,
+	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/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp
index 96f5c71..84897a3 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp
@@ -44,7 +44,7 @@
 #include "../../kmfwidgets/kmfportwidget.h"
 #include "../../kmfwidgets/kmfmultiportwidget.h"
 namespace KMF {
-KMFRuleEditorProtocol::KMFRuleEditorProtocol( TQWidget *tqparent, const char *name, WFlags fl ) : KMyFirewallRuleEditorProtocol( tqparent, name, fl ) {
+KMFRuleEditorProtocol::KMFRuleEditorProtocol( TQWidget *parent, const char *name, WFlags fl ) : KMyFirewallRuleEditorProtocol( parent, name, fl ) {
 	use_multiport = false;
 	cb_icmp_type->insertItem( "echo-request" );
 	cb_icmp_type->insertItem( "echo-reply" );
@@ -53,8 +53,8 @@ KMFRuleEditorProtocol::KMFRuleEditorProtocol( TQWidget *tqparent, const char *na
 	cb_icmp_type->insertItem( "router-solicitation" );
 	cb_icmp_type->insertItem( "timestamp-request" );
 	cb_icmp_type->insertItem( "timestamp-reply" );
-	cb_icmp_type->insertItem( "address-tqmask-request" );
-	cb_icmp_type->insertItem( "address-tqmask-reply" );
+	cb_icmp_type->insertItem( "address-mask-request" );
+	cb_icmp_type->insertItem( "address-mask-reply" );
 	cb_icmp_type->insertItem( "destination-unreachable" );
 	cb_icmp_type->insertItem( "network-unreachable" );
 	cb_icmp_type->insertItem( "host-unreachable" );
@@ -207,14 +207,14 @@ void KMFRuleEditorProtocol::loadRule( IPTRule* rule ) {
 	c_tcp_option->setChecked( false );
 	c_inv_tcp_option->setChecked( false );
 	sb_tcp_option_num->setValue( 0 );
-	c_all_tqmask->setChecked( false );
-	c_none_tqmask->setChecked( false );
-	c_syn_tqmask->setChecked( false );
-	c_ack_tqmask->setChecked( false );
-	c_fin_tqmask->setChecked( false );
-	c_urg_tqmask->setChecked( false );
-	c_rst_tqmask->setChecked( false );
-	c_psh_tqmask->setChecked( false );
+	c_all_mask->setChecked( false );
+	c_none_mask->setChecked( false );
+	c_syn_mask->setChecked( false );
+	c_ack_mask->setChecked( false );
+	c_fin_mask->setChecked( false );
+	c_urg_mask->setChecked( false );
+	c_rst_mask->setChecked( false );
+	c_psh_mask->setChecked( false );
 	c_all_comp->setChecked( false );
 	c_none_comp->setChecked( false );
 	c_syn_comp->setChecked( false );
@@ -320,7 +320,7 @@ void KMFRuleEditorProtocol::loadRule( IPTRule* rule ) {
 	}
 	if ( !flags.isEmpty() &&  flags != XML::Undefined_Value && flags != XML::BoolOff_Value  ) {
 		kdDebug() << "Option Value --tcp-flags: " << flags << endl;
-		gb_tqmask->setEnabled( true );
+		gb_mask->setEnabled( true );
 		gb_comp->setEnabled( true );
 		c_tcp_flags->setChecked( true );
 		int delim = flags.find( " " );
@@ -336,21 +336,21 @@ void KMFRuleEditorProtocol::loadRule( IPTRule* rule ) {
 		kdDebug() << "Flags for Comp: " << comp_lst << endl;
 
 		if ( mask_lst.contains( "SYN" ) > 0 )
-			c_syn_tqmask->setChecked( true );
+			c_syn_mask->setChecked( true );
 		if ( mask_lst.contains( "ACK" ) > 0 )
-			c_ack_tqmask->setChecked( true );
+			c_ack_mask->setChecked( true );
 		if ( mask_lst.contains( "FIN" ) > 0 )
-			c_fin_tqmask->setChecked( true );
+			c_fin_mask->setChecked( true );
 		if ( mask_lst.contains( "RST" ) > 0 )
-			c_rst_tqmask->setChecked( true );
+			c_rst_mask->setChecked( true );
 		if ( mask_lst.contains( "URG" ) > 0 )
-			c_urg_tqmask->setChecked( true );
+			c_urg_mask->setChecked( true );
 		if ( mask_lst.contains( "PSH" ) > 0 )
-			c_psh_tqmask->setChecked( true );
+			c_psh_mask->setChecked( true );
 		if ( mask_lst.contains( "NONE" ) > 0 )
-			c_none_tqmask->setChecked( true );
+			c_none_mask->setChecked( true );
 		if ( mask_lst.contains( "ALL" ) > 0 )
-			c_all_tqmask->setChecked( true );
+			c_all_mask->setChecked( true );
 
 		if ( comp_lst.contains( "SYN" ) > 0 )
 			c_syn_comp->setChecked( true );
@@ -561,28 +561,28 @@ void KMFRuleEditorProtocol::accept() {
 			if ( c_inv_flags->isChecked() ) {
 				flags.prepend( "! " );
 			}
-			TQString tqmask = "";
+			TQString mask = "";
 			if ( ( c_all_comp->isChecked() || c_none_comp->isChecked() || c_syn_comp->isChecked() || c_fin_comp->isChecked() || c_ack_comp->isChecked() || c_rst_comp->isChecked() || c_urg_comp->isChecked() || c_psh_comp->isChecked() ) &&
-					( c_all_tqmask->isChecked() || c_none_tqmask->isChecked() || c_syn_tqmask->isChecked() || c_fin_tqmask->isChecked() || c_ack_tqmask->isChecked() || c_rst_tqmask->isChecked() || c_urg_tqmask->isChecked() || c_psh_tqmask->isChecked() ) ) {
-				if ( c_all_tqmask->isChecked() )
-					tqmask.append( "ALL" );
-				if ( c_none_tqmask->isChecked() )
-					tqmask.append( "NONE" );
-				if ( !c_all_tqmask->isChecked() && !c_none_tqmask->isChecked() ) {
-					if ( c_syn_tqmask->isChecked() )
-						tqmask.append( ",SYN" );
-					if ( c_fin_tqmask->isChecked() )
-						tqmask.append( ",FIN" );
-					if ( c_ack_tqmask->isChecked() )
-						tqmask.append( ",ACK" );
-					if ( c_rst_tqmask->isChecked() )
-						tqmask.append( ",RST" );
-					if ( c_psh_tqmask->isChecked() )
-						tqmask.append( ",PSH" );
-					if ( c_urg_tqmask->isChecked() )
-						tqmask.append( ",URG" );
-					if ( tqmask.startsWith( "," ) )
-						tqmask = tqmask.right( tqmask.length() - 1 );
+					( c_all_mask->isChecked() || c_none_mask->isChecked() || c_syn_mask->isChecked() || c_fin_mask->isChecked() || c_ack_mask->isChecked() || c_rst_mask->isChecked() || c_urg_mask->isChecked() || c_psh_mask->isChecked() ) ) {
+				if ( c_all_mask->isChecked() )
+					mask.append( "ALL" );
+				if ( c_none_mask->isChecked() )
+					mask.append( "NONE" );
+				if ( !c_all_mask->isChecked() && !c_none_mask->isChecked() ) {
+					if ( c_syn_mask->isChecked() )
+						mask.append( ",SYN" );
+					if ( c_fin_mask->isChecked() )
+						mask.append( ",FIN" );
+					if ( c_ack_mask->isChecked() )
+						mask.append( ",ACK" );
+					if ( c_rst_mask->isChecked() )
+						mask.append( ",RST" );
+					if ( c_psh_mask->isChecked() )
+						mask.append( ",PSH" );
+					if ( c_urg_mask->isChecked() )
+						mask.append( ",URG" );
+					if ( mask.startsWith( "," ) )
+						mask = mask.right( mask.length() - 1 );
 				}
 				TQString comp = "";
 				if ( c_all_comp->isChecked() )
@@ -606,7 +606,7 @@ void KMFRuleEditorProtocol::accept() {
 
 				if ( comp.startsWith( "," ) )
 					comp = comp.right( comp.length() - 1 );
-				flags.append( tqmask );
+				flags.append( mask );
 				flags.append( " " );
 				flags.append( comp );
 			} else {
diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.h b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.h
index 117a30a..2a1d79f 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.h
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.h
@@ -35,7 +35,7 @@ class KMFRuleEditorProtocol : public KMyFirewallRuleEditorProtocol {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleEditorProtocol( TQWidget *tqparent = 0, const char *name = 0, WFlags fl = 0 );
+	KMFRuleEditorProtocol( TQWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
 	~KMFRuleEditorProtocol();
 
 	void loadRule( IPTRule* rule );
diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp
index 7c46cf7..982c22b 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.cpp
@@ -37,10 +37,10 @@
 #include "kmfruleeditorprotocol.h"
 
 namespace KMF {
-KMFRuleOptionEditProtocol::KMFRuleOptionEditProtocol(TQObject *tqparent, const char *name)
-		: KMFRuleOptionEditInterface(tqparent, name) {
-	kdDebug() <<"KMFRuleOptionEditProtocol::KMFRuleOptionEditProtocol(TQObject *tqparent, const char *name)" << endl;
-	kdDebug() << "Parent has Type: " << tqparent->className()  << endl;
+KMFRuleOptionEditProtocol::KMFRuleOptionEditProtocol(TQObject *parent, const char *name)
+		: KMFRuleOptionEditInterface(parent, name) {
+	kdDebug() <<"KMFRuleOptionEditProtocol::KMFRuleOptionEditProtocol(TQObject *parent, const char *name)" << endl;
+	kdDebug() << "Parent has Type: " << parent->className()  << endl;
 	
 	m_edit = new KMFRuleEditorProtocol( 0 , "Edit", 0 );
 	m_edit->hide();
@@ -54,10 +54,10 @@ KMFRuleOptionEditProtocol::~KMFRuleOptionEditProtocol() {}
 
 
 void KMFRuleOptionEditProtocol::slotShowOverview() {
-	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( tqparent() ) ) {
+	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( parent() ) ) {
 		ruleedit->showOverview();
 	} else {
-		kdDebug() << "KMFRuleOptionEditProtocol::slotShowOverview(): tqparent() not of type KMFRuleEditInterface" << endl;
+		kdDebug() << "KMFRuleOptionEditProtocol::slotShowOverview(): parent() not of type KMFRuleEditInterface" << endl;
 	}
 }
 
@@ -101,14 +101,14 @@ TQWidget* KMFRuleOptionEditProtocol::editWidget() {
 // KInstance* KMFRuleOptionEditProtocolFactory::s_instance = 0L;
 // KAboutData* KMFRuleOptionEditProtocolFactory::s_about = 0L;
 
-KMFRuleOptionEditProtocolFactory::KMFRuleOptionEditProtocolFactory( TQObject* tqparent, const char* name )
-		: KLibFactory( tqparent, name ) {
+KMFRuleOptionEditProtocolFactory::KMFRuleOptionEditProtocolFactory( TQObject* parent, const char* name )
+		: KLibFactory( parent, name ) {
 // 	s_instance = new KInstance( "KMFRuleOptionEditProtocolFactory" );
 }
 
-TQObject* KMFRuleOptionEditProtocolFactory::createObject( TQObject* tqparent, const char* name,
+TQObject* KMFRuleOptionEditProtocolFactory::createObject( TQObject* parent, const char* name,
         const char*, const TQStringList & ) {
-	TQObject * obj = new KMFRuleOptionEditProtocol( tqparent, name );
+	TQObject * obj = new KMFRuleOptionEditProtocol( parent, name );
 	emit objectCreated( obj );
 	return obj;
 }
diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h
index 5e57eb0..d59df18 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h
@@ -44,7 +44,7 @@ class KMFRuleOptionEditProtocol : public KMFRuleOptionEditInterface {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditProtocol(TQObject *tqparent = 0, const char *name = 0);
+	KMFRuleOptionEditProtocol(TQObject *parent = 0, const char *name = 0);
 
 	~KMFRuleOptionEditProtocol();
 	void loadRule( IPTRule* rule );	
@@ -67,11 +67,11 @@ class KMFRuleOptionEditProtocolFactory : public KLibFactory {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditProtocolFactory( TQObject *tqparent = 0, const char *name = 0 );
+	KMFRuleOptionEditProtocolFactory( TQObject *parent = 0, const char *name = 0 );
 	virtual ~KMFRuleOptionEditProtocolFactory() {
 /* 		delete s_instance; */
 	};
-	virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0,
+	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/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui b/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui
index 9945c82..647f256 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui
@@ -306,7 +306,7 @@ You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;
                     </property>
                     <widget class="TQGroupBox" row="1" column="1">
                         <property name="name">
-                            <cstring>gb_tqmask</cstring>
+                            <cstring>gb_mask</cstring>
                         </property>
                         <property name="enabled">
                             <bool>false</bool>
@@ -338,7 +338,7 @@ You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;
                             </property>
                             <widget class="TQCheckBox" row="0" column="0">
                                 <property name="name">
-                                    <cstring>c_all_tqmask</cstring>
+                                    <cstring>c_all_mask</cstring>
                                 </property>
                                 <property name="text">
                                     <string>ALL</string>
@@ -346,7 +346,7 @@ You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;
                             </widget>
                             <widget class="TQCheckBox" row="0" column="1">
                                 <property name="name">
-                                    <cstring>c_none_tqmask</cstring>
+                                    <cstring>c_none_mask</cstring>
                                 </property>
                                 <property name="text">
                                     <string>NONE</string>
@@ -354,7 +354,7 @@ You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;
                             </widget>
                             <widget class="TQCheckBox" row="2" column="1">
                                 <property name="name">
-                                    <cstring>c_fin_tqmask</cstring>
+                                    <cstring>c_fin_mask</cstring>
                                 </property>
                                 <property name="sizePolicy">
                                     <sizepolicy>
@@ -370,7 +370,7 @@ You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;
                             </widget>
                             <widget class="TQCheckBox" row="4" column="1">
                                 <property name="name">
-                                    <cstring>c_urg_tqmask</cstring>
+                                    <cstring>c_urg_mask</cstring>
                                 </property>
                                 <property name="sizePolicy">
                                     <sizepolicy>
@@ -386,7 +386,7 @@ You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;
                             </widget>
                             <widget class="TQCheckBox" row="4" column="0">
                                 <property name="name">
-                                    <cstring>c_psh_tqmask</cstring>
+                                    <cstring>c_psh_mask</cstring>
                                 </property>
                                 <property name="text">
                                     <string>PSH</string>
@@ -394,7 +394,7 @@ You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;
                             </widget>
                             <widget class="TQCheckBox" row="3" column="1">
                                 <property name="name">
-                                    <cstring>c_rst_tqmask</cstring>
+                                    <cstring>c_rst_mask</cstring>
                                 </property>
                                 <property name="sizePolicy">
                                     <sizepolicy>
@@ -410,7 +410,7 @@ You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;
                             </widget>
                             <widget class="TQCheckBox" row="2" column="0">
                                 <property name="name">
-                                    <cstring>c_syn_tqmask</cstring>
+                                    <cstring>c_syn_mask</cstring>
                                 </property>
                                 <property name="text">
                                     <string>SYN</string>
@@ -418,7 +418,7 @@ You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;
                             </widget>
                             <widget class="TQCheckBox" row="3" column="0">
                                 <property name="name">
-                                    <cstring>c_ack_tqmask</cstring>
+                                    <cstring>c_ack_mask</cstring>
                                 </property>
                                 <property name="text">
                                     <string>ACK</string>
@@ -981,7 +981,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal
     <connection>
         <sender>c_tcp_flags</sender>
         <signal>toggled(bool)</signal>
-        <receiver>gb_tqmask</receiver>
+        <receiver>gb_mask</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
@@ -1099,15 +1099,15 @@ A misuse of this functionality may result in a hard to detect bug in the firewal
         <slot>setDisabled(bool)</slot>
     </connection>
     <connection>
-        <sender>c_none_tqmask</sender>
+        <sender>c_none_mask</sender>
         <signal>toggled(bool)</signal>
-        <receiver>c_all_tqmask</receiver>
+        <receiver>c_all_mask</receiver>
         <slot>setDisabled(bool)</slot>
     </connection>
     <connection>
-        <sender>c_all_tqmask</sender>
+        <sender>c_all_mask</sender>
         <signal>toggled(bool)</signal>
-        <receiver>c_none_tqmask</receiver>
+        <receiver>c_none_mask</receiver>
         <slot>setDisabled(bool)</slot>
     </connection>
     <connection>
@@ -1155,14 +1155,14 @@ A misuse of this functionality may result in a hard to detect bug in the firewal
     <tabstop>c_inv_flags</tabstop>
     <tabstop>c_inv_tcp_option</tabstop>
     <tabstop>c_inv_syn</tabstop>
-    <tabstop>c_all_tqmask</tabstop>
-    <tabstop>c_none_tqmask</tabstop>
-    <tabstop>c_syn_tqmask</tabstop>
-    <tabstop>c_fin_tqmask</tabstop>
-    <tabstop>c_ack_tqmask</tabstop>
-    <tabstop>c_rst_tqmask</tabstop>
-    <tabstop>c_psh_tqmask</tabstop>
-    <tabstop>c_urg_tqmask</tabstop>
+    <tabstop>c_all_mask</tabstop>
+    <tabstop>c_none_mask</tabstop>
+    <tabstop>c_syn_mask</tabstop>
+    <tabstop>c_fin_mask</tabstop>
+    <tabstop>c_ack_mask</tabstop>
+    <tabstop>c_rst_mask</tabstop>
+    <tabstop>c_psh_mask</tabstop>
+    <tabstop>c_urg_mask</tabstop>
     <tabstop>c_all_comp</tabstop>
     <tabstop>c_none_comp</tabstop>
     <tabstop>c_syn_comp</tabstop>
diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp b/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp
index 3124ba5..cb04caf 100644
--- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp
+++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp
@@ -38,7 +38,7 @@
 #include "../../core/kmfnetwork.h"
 #include "../../core/kmfundoengine.h"
 namespace KMF {
-KMFRuleEditorState::KMFRuleEditorState( TQWidget *tqparent, const char *name, WFlags fl /*,IPTRule* cr*/ ) : KMyFirewallRuleEditorState( tqparent, name, fl ) {}
+KMFRuleEditorState::KMFRuleEditorState( TQWidget *parent, const char *name, WFlags fl /*,IPTRule* cr*/ ) : KMyFirewallRuleEditorState( parent, name, fl ) {}
 KMFRuleEditorState::~KMFRuleEditorState() {}
 
 void KMFRuleEditorState::loadRule( IPTRule *rule ) {
diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.h b/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.h
index 4cd220a..83db692 100644
--- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.h
+++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.h
@@ -28,7 +28,7 @@ class KMFRuleEditorState : public KMyFirewallRuleEditorState {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleEditorState( TQWidget *tqparent = 0, const char *name = 0, WFlags fl = 0 );
+	KMFRuleEditorState( TQWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
 	~KMFRuleEditorState();
 	TQPtrList<TQString>* options;
 
diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp
index 8290f5c..dd9409d 100644
--- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp
+++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.cpp
@@ -37,10 +37,10 @@
 #include "kmfruleeditorstate.h"
 
 namespace KMF {
-KMFRuleOptionEditState::KMFRuleOptionEditState(TQObject *tqparent, const char *name)
-		: KMFRuleOptionEditInterface(tqparent, name) {
-	kdDebug() <<"KMFRuleOptionEditState::KMFRuleOptionEditState(TQObject *tqparent, const char *name)" << endl;
-	kdDebug() << "Parent has Type: " << tqparent->className()  << endl;
+KMFRuleOptionEditState::KMFRuleOptionEditState(TQObject *parent, const char *name)
+		: KMFRuleOptionEditInterface(parent, name) {
+	kdDebug() <<"KMFRuleOptionEditState::KMFRuleOptionEditState(TQObject *parent, const char *name)" << endl;
+	kdDebug() << "Parent has Type: " << parent->className()  << endl;
 	
 	m_edit = new KMFRuleEditorState( 0 , "Edit", 0 );
 	m_edit->hide();
@@ -52,10 +52,10 @@ KMFRuleOptionEditState::KMFRuleOptionEditState(TQObject *tqparent, const char *n
 KMFRuleOptionEditState::~KMFRuleOptionEditState() {}
 
 void KMFRuleOptionEditState::slotShowOverview() {
-	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( tqparent() ) ) {
+	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( parent() ) ) {
 		ruleedit->showOverview();
 	} else {
-		kdDebug() << "KMFRuleOptionEditState::slotShowOverview(): tqparent() not of type KMFRuleEditInterface" << endl;
+		kdDebug() << "KMFRuleOptionEditState::slotShowOverview(): parent() not of type KMFRuleEditInterface" << endl;
 	}
 }
 
@@ -94,14 +94,14 @@ TQWidget* KMFRuleOptionEditState::editWidget() {
 // KInstance* KMFRuleOptionEditStateFactory::s_instance = 0L;
 // KAboutData* KMFRuleOptionEditStateFactory::s_about = 0L;
 
-KMFRuleOptionEditStateFactory::KMFRuleOptionEditStateFactory( TQObject* tqparent, const char* name )
-		: KLibFactory( tqparent, name ) {
+KMFRuleOptionEditStateFactory::KMFRuleOptionEditStateFactory( TQObject* parent, const char* name )
+		: KLibFactory( parent, name ) {
 // 	s_instance = new KInstance( "KMFRuleOptionEditStateFactory" );
 }
 
-TQObject* KMFRuleOptionEditStateFactory::createObject( TQObject* tqparent, const char* name,
+TQObject* KMFRuleOptionEditStateFactory::createObject( TQObject* parent, const char* name,
         const char*, const TQStringList & ) {
-	TQObject * obj = new KMFRuleOptionEditState( tqparent, name );
+	TQObject * obj = new KMFRuleOptionEditState( parent, name );
 	emit objectCreated( obj );
 	return obj;
 }
diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h
index 3e8bb39..7ded5de 100644
--- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h
+++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h
@@ -42,7 +42,7 @@ class KMFRuleOptionEditState : public KMFRuleOptionEditInterface {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditState(TQObject *tqparent = 0, const char *name = 0);
+	KMFRuleOptionEditState(TQObject *parent = 0, const char *name = 0);
 
 	~KMFRuleOptionEditState();
 	void loadRule( IPTRule* rule );	
@@ -65,11 +65,11 @@ class KMFRuleOptionEditStateFactory : public KLibFactory {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditStateFactory( TQObject *tqparent = 0, const char *name = 0 );
+	KMFRuleOptionEditStateFactory( TQObject *parent = 0, const char *name = 0 );
 	virtual ~KMFRuleOptionEditStateFactory() {
 /* 		delete s_instance; */
 	};
-	virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0,
+	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/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp
index 23efac1..a6744a1 100644
--- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp
+++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp
@@ -38,7 +38,7 @@
 #include "../../core/kmfnetwork.h"
 #include "../../core/kmfundoengine.h"
 namespace KMF {
-KMFRuleEditorTos::KMFRuleEditorTos( TQWidget *tqparent, const char *name, WFlags fl ) : KMyFirewallRuleEditorTos( tqparent, name, fl ) {
+KMFRuleEditorTos::KMFRuleEditorTos( TQWidget *parent, const char *name, WFlags fl ) : KMyFirewallRuleEditorTos( parent, name, fl ) {
 	m_option_type = "CHECKTOS";
 }
 KMFRuleEditorTos::~KMFRuleEditorTos() {}
diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.h b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.h
index 63307da..2d67fd6 100644
--- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.h
+++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.h
@@ -31,7 +31,7 @@ class KMFRuleEditorTos : public KMyFirewallRuleEditorTos {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleEditorTos( TQWidget *tqparent = 0, const char *name = 0, WFlags fl = 0 );
+	KMFRuleEditorTos( TQWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
 	~KMFRuleEditorTos();
 	TQPtrList<TQString>* options;
 
diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp
index 94af477..681957a 100644
--- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp
+++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.cpp
@@ -37,10 +37,10 @@
 #include "kmfruleeditortos.h"
 
 namespace KMF {
-KMFRuleOptionEditTos::KMFRuleOptionEditTos(TQObject *tqparent, const char *name)
-		: KMFRuleOptionEditInterface(tqparent, name) {
-	kdDebug() <<"KMFRuleOptionEditTos::KMFRuleOptionEditTos(TQObject *tqparent, const char *name)" << endl;
-	kdDebug() << "Parent has Type: " << tqparent->className()  << endl;
+KMFRuleOptionEditTos::KMFRuleOptionEditTos(TQObject *parent, const char *name)
+		: KMFRuleOptionEditInterface(parent, name) {
+	kdDebug() <<"KMFRuleOptionEditTos::KMFRuleOptionEditTos(TQObject *parent, const char *name)" << endl;
+	kdDebug() << "Parent has Type: " << parent->className()  << endl;
 	
 	m_edit = new KMFRuleEditorTos( 0 , "Edit", 0 );
 	m_edit->hide();
@@ -53,10 +53,10 @@ KMFRuleOptionEditTos::~KMFRuleOptionEditTos() {}
 
 
 void KMFRuleOptionEditTos::slotShowOverview() {
-	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( tqparent() ) ) {
+	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( parent() ) ) {
 		ruleedit->showOverview();
 	} else {
-		kdDebug() << "KMFRuleOptionEditTos::slotShowOverview(): tqparent() not of type KMFRuleEditInterface" << endl;
+		kdDebug() << "KMFRuleOptionEditTos::slotShowOverview(): parent() not of type KMFRuleEditInterface" << endl;
 	}
 }
 
@@ -99,14 +99,14 @@ TQWidget* KMFRuleOptionEditTos::editWidget() {
 // KInstance* KMFRuleOptionEditTosFactory::s_instance = 0L;
 // KAboutData* KMFRuleOptionEditTosFactory::s_about = 0L;
 
-KMFRuleOptionEditTosFactory::KMFRuleOptionEditTosFactory( TQObject* tqparent, const char* name )
-		: KLibFactory( tqparent, name ) {
+KMFRuleOptionEditTosFactory::KMFRuleOptionEditTosFactory( TQObject* parent, const char* name )
+		: KLibFactory( parent, name ) {
 // 	s_instance = new KInstance( "KMFRuleOptionEditTosFactory" );
 }
 
-TQObject* KMFRuleOptionEditTosFactory::createObject( TQObject* tqparent, const char* name,
+TQObject* KMFRuleOptionEditTosFactory::createObject( TQObject* parent, const char* name,
         const char*, const TQStringList & ) {
-	TQObject * obj = new KMFRuleOptionEditTos( tqparent, name );
+	TQObject * obj = new KMFRuleOptionEditTos( parent, name );
 	emit objectCreated( obj );
 	return obj;
 }
diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h
index 1cd4a49..9e1bfcd 100644
--- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h
+++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h
@@ -42,7 +42,7 @@ class KMFRuleOptionEditTos : public KMFRuleOptionEditInterface {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditTos(TQObject *tqparent = 0, const char *name = 0);
+	KMFRuleOptionEditTos(TQObject *parent = 0, const char *name = 0);
 
 	~KMFRuleOptionEditTos();
 	void loadRule( IPTRule* rule );	
@@ -65,11 +65,11 @@ class KMFRuleOptionEditTosFactory : public KLibFactory {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleOptionEditTosFactory( TQObject *tqparent = 0, const char *name = 0 );
+	KMFRuleOptionEditTosFactory( TQObject *parent = 0, const char *name = 0 );
 	virtual ~KMFRuleOptionEditTosFactory() {
 /* 		delete s_instance; */
 	};
-	virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0,
+	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/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp
index 0ccb582..48bb63b 100644
--- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp
+++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp
@@ -39,7 +39,7 @@
 #include "../../core/kmfundoengine.h"
 
 namespace KMF {
-KMFRuleEditorTos::KMFRuleEditorTos( TQWidget *tqparent, const char *name, WFlags fl ) : KMyFirewallRuleEditorTos( tqparent, name, fl ) {
+KMFRuleEditorTos::KMFRuleEditorTos( TQWidget *parent, const char *name, WFlags fl ) : KMyFirewallRuleEditorTos( parent, name, fl ) {
 	m_option_type = "SETTOS";
 }
 KMFRuleEditorTos::~KMFRuleEditorTos() {}
diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.h b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.h
index 63307da..2d67fd6 100644
--- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.h
+++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.h
@@ -31,7 +31,7 @@ class KMFRuleEditorTos : public KMyFirewallRuleEditorTos {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleEditorTos( TQWidget *tqparent = 0, const char *name = 0, WFlags fl = 0 );
+	KMFRuleEditorTos( TQWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
 	~KMFRuleEditorTos();
 	TQPtrList<TQString>* options;
 
diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp
index f66db52..f8470a6 100644
--- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp
+++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.cpp
@@ -25,14 +25,14 @@
 #include "kmfruleeditortos.h"
 
 namespace KMF {
-KMFRuleTargetOptionEditTos::KMFRuleTargetOptionEditTos(TQObject *tqparent, const char *name)
-		: KMFRuleTargetOptionEditInterface(tqparent, name) {
-	kdDebug() <<"KMFRuleTargetOptionEditTos::KMFRuleTargetOptionEditTos(TQObject *tqparent, const char *name)" << endl;
+KMFRuleTargetOptionEditTos::KMFRuleTargetOptionEditTos(TQObject *parent, const char *name)
+		: KMFRuleTargetOptionEditInterface(parent, name) {
+	kdDebug() <<"KMFRuleTargetOptionEditTos::KMFRuleTargetOptionEditTos(TQObject *parent, const char *name)" << endl;
 	
 	m_managedTargets << "TOS" << "REJECT";
 	
 	
-	kdDebug() << "Parent has Type: " << tqparent->className()  << endl;
+	kdDebug() << "Parent has Type: " << parent->className()  << endl;
 	
 	m_edit = new KMFRuleEditorTos( 0 , "Edit", 0 );
 	m_edit->hide();
@@ -44,10 +44,10 @@ KMFRuleTargetOptionEditTos::KMFRuleTargetOptionEditTos(TQObject *tqparent, const
 KMFRuleTargetOptionEditTos::~KMFRuleTargetOptionEditTos() {}
 
 void KMFRuleTargetOptionEditTos::slotShowOverview() {
-	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( tqparent() ) ) {
+	if ( KMFRuleEditInterface* ruleedit = dynamic_cast<KMFRuleEditInterface*> ( parent() ) ) {
 		ruleedit->showOverview();
 	} else {
-		kdDebug() << "KMFRuleTargetOptionEditTos::slotShowOverview(): tqparent() not of type KMFRuleEditInterface" << endl;
+		kdDebug() << "KMFRuleTargetOptionEditTos::slotShowOverview(): parent() not of type KMFRuleEditInterface" << endl;
 	}
 }
 
@@ -98,14 +98,14 @@ bool KMFRuleTargetOptionEditTos::setTarget( const TQString& target ){
 // KInstance* KMFRuleTargetOptionEditTosFactory::s_instance = 0L;
 // KAboutData* KMFRuleTargetOptionEditTosFactory::s_about = 0L;
 
-KMFRuleTargetOptionEditTosFactory::KMFRuleTargetOptionEditTosFactory( TQObject* tqparent, const char* name )
-		: KLibFactory( tqparent, name ) {
+KMFRuleTargetOptionEditTosFactory::KMFRuleTargetOptionEditTosFactory( TQObject* parent, const char* name )
+		: KLibFactory( parent, name ) {
 // 	s_instance = new KInstance( "KMFRuleTargetOptionEditTosFactory" );
 }
 
-TQObject* KMFRuleTargetOptionEditTosFactory::createObject( TQObject* tqparent, const char* name,
+TQObject* KMFRuleTargetOptionEditTosFactory::createObject( TQObject* parent, const char* name,
         const char*, const TQStringList & ) {
-	TQObject * obj = new KMFRuleTargetOptionEditTos( tqparent, name );
+	TQObject * obj = new KMFRuleTargetOptionEditTos( parent, name );
 	emit objectCreated( obj );
 	return obj;
 }
diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h
index 8d77da9..6d7ea78 100644
--- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h
+++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h
@@ -30,7 +30,7 @@ class KMFRuleTargetOptionEditTos : public KMFRuleTargetOptionEditInterface {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleTargetOptionEditTos(TQObject *tqparent = 0, const char *name = 0);
+	KMFRuleTargetOptionEditTos(TQObject *parent = 0, const char *name = 0);
 
 	~KMFRuleTargetOptionEditTos();
 	void loadRule( IPTRule* rule );	
@@ -54,11 +54,11 @@ class KMFRuleTargetOptionEditTosFactory : public KLibFactory {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMFRuleTargetOptionEditTosFactory( TQObject *tqparent = 0, const char *name = 0 );
+	KMFRuleTargetOptionEditTosFactory( TQObject *parent = 0, const char *name = 0 );
 	virtual ~KMFRuleTargetOptionEditTosFactory() {
 /* 		delete s_instance; */
 	};
-	virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0,
+	virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0,
 	                               const char* name = TQOBJECT_OBJECT_NAME_STRING,
 	                               const TQStringList &args = TQStringList() );
 	/*     static KInstance* instance(); */