Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

14 files changed, 27 insertions, 27 deletions

diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui b/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui
index 396b319..dd225ea 100644
--- a/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui
+++ b/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui
@@ -365,7 +365,7 @@
     <slot>reject()</slot>
     <slot>accept()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>tqwidget.h</includehint>
 </includehints>
diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
index 0c808c8..c3242c4 100644
--- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
+++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
@@ -93,7 +93,7 @@ void KMFRuleEditorInterface::loadRule( IPTRule * rule ) {
 
 /** No descriptions */
 void KMFRuleEditorInterface::slotOk() {
-	//  KMyFirewallRuleEditor* ed = (KMyFirewallRuleEditor*)tqparentWidget();
+	//  KMyFirewallRuleEditor* ed = (KMyFirewallRuleEditor*)parentWidget();
 	KMFUndoEngine::instance()->startTransaction( 
 		m_rule,
 		i18n("Edit Rule: %1 Interface Option").tqarg( m_rule->name() ) 
diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui b/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui
index a099765..1270ef6 100644
--- a/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui
+++ b/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui
@@ -432,7 +432,7 @@
     <slot>accept()</slot>
     <slot>reject()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui b/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui
index b158b31..49096b8 100644
--- a/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui
+++ b/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui
@@ -296,7 +296,7 @@
     <slot>accept()</slot>
     <slot>reject()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui b/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui
index 3312e20..20cf8c2 100644
--- a/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui
+++ b/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui
@@ -435,7 +435,7 @@
     <slot>slotOk()</slot>
     <slot>reject()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>tqwidget.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmyfirewallruleeditortargetlog.ui b/kmyfirewall/ruleoptionplugins/log_target_option/kmyfirewallruleeditortargetlog.ui
index 594edcf..c4c961b 100644
--- a/kmyfirewall/ruleoptionplugins/log_target_option/kmyfirewallruleeditortargetlog.ui
+++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmyfirewallruleeditortargetlog.ui
@@ -263,5 +263,5 @@
     <slot>reject()</slot>
     <slot>accept()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui b/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui
index 0c5c301..e54139a 100644
--- a/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui
+++ b/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui
@@ -495,7 +495,7 @@
     <slot>accept()</slot>
     <slot>reject()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui b/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui
index 6d0775d..324a4c2 100644
--- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui
+++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui
@@ -138,5 +138,5 @@
     <slot>accept()</slot>
     <slot>reject()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui b/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui
index 97ecad3..4b0656d 100644
--- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui
+++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui
@@ -335,5 +335,5 @@
     <slot>accept()</slot>
     <slot>reject()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp
index 316e544..ffab444 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp
@@ -330,26 +330,26 @@ void KMFRuleEditorProtocol::loadRule( IPTRule* rule ) {
 		}
 		delim = flags.tqfind( " " );
 		kdDebug() << "found Whitespace at " << delim << endl;
-		TQString tqmask_lst = flags.left( delim );
-		kdDebug() << "Flags for Mask: " << tqmask_lst << endl;
+		TQString mask_lst = flags.left( delim );
+		kdDebug() << "Flags for Mask: " << mask_lst << endl;
 		TQString comp_lst = flags.right( flags.length() - delim );
 		kdDebug() << "Flags for Comp: " << comp_lst << endl;
 
-		if ( tqmask_lst.tqcontains( "SYN" ) > 0 )
+		if ( mask_lst.tqcontains( "SYN" ) > 0 )
 			c_syn_tqmask->setChecked( true );
-		if ( tqmask_lst.tqcontains( "ACK" ) > 0 )
+		if ( mask_lst.tqcontains( "ACK" ) > 0 )
 			c_ack_tqmask->setChecked( true );
-		if ( tqmask_lst.tqcontains( "FIN" ) > 0 )
+		if ( mask_lst.tqcontains( "FIN" ) > 0 )
 			c_fin_tqmask->setChecked( true );
-		if ( tqmask_lst.tqcontains( "RST" ) > 0 )
+		if ( mask_lst.tqcontains( "RST" ) > 0 )
 			c_rst_tqmask->setChecked( true );
-		if ( tqmask_lst.tqcontains( "URG" ) > 0 )
+		if ( mask_lst.tqcontains( "URG" ) > 0 )
 			c_urg_tqmask->setChecked( true );
-		if ( tqmask_lst.tqcontains( "PSH" ) > 0 )
+		if ( mask_lst.tqcontains( "PSH" ) > 0 )
 			c_psh_tqmask->setChecked( true );
-		if ( tqmask_lst.tqcontains( "NONE" ) > 0 )
+		if ( mask_lst.tqcontains( "NONE" ) > 0 )
 			c_none_tqmask->setChecked( true );
-		if ( tqmask_lst.tqcontains( "ALL" ) > 0 )
+		if ( mask_lst.tqcontains( "ALL" ) > 0 )
 			c_all_tqmask->setChecked( true );
 
 		if ( comp_lst.tqcontains( "SYN" ) > 0 )
diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui b/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui
index 2c8abb8..9945c82 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui
@@ -322,9 +322,9 @@ You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;
                         <property name="title">
                             <string>Mask</string>
                         </property>
-                        <property name="tqlayoutMargin" stdset="0">
+                        <property name="layoutMargin" stdset="0">
                         </property>
-                        <property name="tqlayoutSpacing" stdset="0">
+                        <property name="layoutSpacing" stdset="0">
                         </property>
                         <grid>
                             <property name="name">
@@ -466,9 +466,9 @@ You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;
                         <property name="title">
                             <string>Comp</string>
                         </property>
-                        <property name="tqlayoutMargin" stdset="0">
+                        <property name="layoutMargin" stdset="0">
                         </property>
-                        <property name="tqlayoutSpacing" stdset="0">
+                        <property name="layoutSpacing" stdset="0">
                         </property>
                         <grid>
                             <property name="name">
@@ -1185,5 +1185,5 @@ A misuse of this functionality may result in a hard to detect bug in the firewal
     <slot>accept()</slot>
     <slot>reject()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui b/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui
index bb20cdc..ec6adf3 100644
--- a/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui
+++ b/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui
@@ -434,5 +434,5 @@
     <slot>slotOk()</slot>
     <slot>reject()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui b/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui
index c070a02..756998a 100644
--- a/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui
+++ b/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui
@@ -169,5 +169,5 @@
     <slot>accept()</slot>
     <slot>reject()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui b/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui
index c070a02..756998a 100644
--- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui
+++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui
@@ -169,5 +169,5 @@
     <slot>accept()</slot>
     <slot>reject()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>