Rename obsolete tq methods to standard names

31 files changed, 62 insertions, 62 deletions

diff --git a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui
index 8539054..6f0eded 100644
--- a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui
+++ b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -103,7 +103,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>tqlayout19</cstring>
+                                <cstring>layout19</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacenatwidget.ui b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacenatwidget.ui
index f154502..28871b0 100644
--- a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacenatwidget.ui
+++ b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacenatwidget.ui
@@ -97,7 +97,7 @@ are using your computer a their default gateway.&lt;/p&gt;</string>
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout19</cstring>
+                                <cstring>layout19</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui b/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui
index fda29aa..12d10b5 100644
--- a/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui
+++ b/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui
@@ -264,7 +264,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>tqlayout36</cstring>
+                <cstring>layout36</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -388,7 +388,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout12</cstring>
+                                    <cstring>layout12</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -396,7 +396,7 @@
                                     </property>
                                     <widget class="TQLayoutWidget" row="2" column="0">
                                         <property name="name">
-                                            <cstring>tqlayout11</cstring>
+                                            <cstring>layout11</cstring>
                                         </property>
                                         <grid>
                                             <property name="name">
@@ -694,7 +694,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget" row="0" column="1">
                                         <property name="name">
-                                            <cstring>tqlayout8</cstring>
+                                            <cstring>layout8</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
diff --git a/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui b/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui
index 116ac70..e1bac64 100644
--- a/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui
+++ b/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui
@@ -176,7 +176,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout14</cstring>
+                            <cstring>layout14</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -463,7 +463,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout12</cstring>
+                            <cstring>layout12</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -527,7 +527,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout20</cstring>
+                            <cstring>layout20</cstring>
                         </property>
                         <hbox>
                             <property name="name">
diff --git a/kmyfirewall/kmfwidgets/kmfprocout.cpp b/kmyfirewall/kmfwidgets/kmfprocout.cpp
index d3fe32c..a876830 100644
--- a/kmyfirewall/kmfwidgets/kmfprocout.cpp
+++ b/kmyfirewall/kmfwidgets/kmfprocout.cpp
@@ -61,7 +61,7 @@ void KMFProcOut::initGUI() {
 	icon_name = "quit";
 	icon_close = loader->loadIcon( icon_name, KIcon::Small );
 
-	m_layout = new TQGridLayout( this, 0, 0, 2, 2, "tqlayout" );
+	m_layout = new TQGridLayout( this, 0, 0, 2, 2, "layout" );
 
 	m_lbview = new TQTextBrowser( this, "m_lbview" );
 	m_lbview->setTextFormat( RichText );
diff --git a/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui b/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui
index 95150a0..e76ab81 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui
@@ -83,7 +83,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui
index 24e2971..2327266 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui
@@ -40,7 +40,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
             </property>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout13</cstring>
+                    <cstring>layout13</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -111,7 +111,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout15</cstring>
+                    <cstring>layout15</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -119,7 +119,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout14</cstring>
+                            <cstring>layout14</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -165,7 +165,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
                             </property>
                             <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
                                 <property name="name">
-                                    <cstring>tqlayout33</cstring>
+                                    <cstring>layout33</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -267,7 +267,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
                             </widget>
                             <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                                 <property name="name">
-                                    <cstring>tqlayout27</cstring>
+                                    <cstring>layout27</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -290,7 +290,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
                             </widget>
                             <widget class="TQLayoutWidget" row="1" column="1" rowspan="2" colspan="1">
                                 <property name="name">
-                                    <cstring>tqlayout37</cstring>
+                                    <cstring>layout37</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui
index 4f92f9d..c6a1882 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="3" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout19_3</cstring>
+                <cstring>layout19_3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -154,7 +154,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="3" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui
index f2e2fa8..b637295 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui
@@ -40,7 +40,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout10</cstring>
+                <cstring>layout10</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui
index c0d3334..e41e933 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout19</cstring>
+                <cstring>layout19</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallnethostproperties.ui b/kmyfirewall/kmfwidgets/kmyfirewallnethostproperties.ui
index fff8137..185e674 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallnethostproperties.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallnethostproperties.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout16</cstring>
+                <cstring>layout16</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -69,7 +69,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout10</cstring>
+                <cstring>layout10</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -126,7 +126,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="1" column="0">
                             <property name="name">
-                                <cstring>tqlayout9_2</cstring>
+                                <cstring>layout9_2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui
index 14f4c0e..cfa45fd 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout27</cstring>
+                        <cstring>layout27</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -74,7 +74,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout22</cstring>
+                        <cstring>layout22</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -82,7 +82,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout19</cstring>
+                                <cstring>layout19</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -193,7 +193,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout21</cstring>
+                                <cstring>layout21</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui b/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui
index 04da3cd..84e76f9 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui
@@ -95,7 +95,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout20</cstring>
+                        <cstring>layout20</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -329,7 +329,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui b/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui
index a365e5c..ad02c00 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui
@@ -69,7 +69,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallprotocolpropertieswidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallprotocolpropertieswidget.ui
index 9ee27a1..7017d5a 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallprotocolpropertieswidget.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallprotocolpropertieswidget.ui
@@ -46,7 +46,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui b/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui
index ffa59f3..9adcd5b 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui
@@ -88,7 +88,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -136,7 +136,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -192,7 +192,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -226,7 +226,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout8</cstring>
+                                <cstring>layout8</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -313,7 +313,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui b/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui
index 96bd6e7..6283909 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui
@@ -208,7 +208,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="1">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -259,7 +259,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -303,7 +303,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout9</cstring>
+                                <cstring>layout9</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -379,7 +379,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout14</cstring>
+                        <cstring>layout14</cstring>
                     </property>
                     <vbox>
                         <property name="name">
diff --git a/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui b/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui
index d85d639..6465669 100644
--- a/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui
+++ b/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui
@@ -64,7 +64,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout3</cstring>
+                                <cstring>layout3</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -118,7 +118,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -217,7 +217,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout4</cstring>
+                            <cstring>layout4</cstring>
                         </property>
                         <vbox>
                             <property name="name">
diff --git a/kmyfirewall/kmyfirewall.cpp b/kmyfirewall/kmyfirewall.cpp
index 990f3c6..94ad1d6 100644
--- a/kmyfirewall/kmyfirewall.cpp
+++ b/kmyfirewall/kmyfirewall.cpp
@@ -281,15 +281,15 @@ void KMyFirewall::slotShowTransactionLog() {
 void KMyFirewall::setOutputWidget( TQWidget* wid ) {
 	m_widgetStack->removeWidget( m_outputWidget );
 	TQWidget* widget = new TQWidget( this , "output" );
-	TQGridLayout *tqlayout = new TQGridLayout( widget, 1, 1 );
+	TQGridLayout *layout = new TQGridLayout( widget, 1, 1 );
 	wid->reparent( widget, ( unsigned int ) 0 , *( new TQPoint( 0, 0 ) ) );
-	tqlayout->addWidget( wid, 0, 0 );
+	layout->addWidget( wid, 0, 0 );
 	kdDebug() << "Adding outputwidget: " << wid->className() << endl;
 	if ( strcmp(wid->className(), "KMFObjectInfo") ) {
 		KPushButton * close = new KPushButton( i18n( "Return to Editor View" ), widget );
 		connect( close, TQT_SIGNAL( clicked() ),
 		         TQT_TQOBJECT(this), TQT_SLOT( slotShowEditor() ) );
-		tqlayout->addWidget( close, 1, 0 );
+		layout->addWidget( close, 1, 0 );
 	}
 	m_outputWidget = widget;
 	m_widgetStack->addWidget( widget );
diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui b/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui
index d9d3247..f46d1a5 100644
--- a/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui
+++ b/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui
@@ -242,7 +242,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout61</cstring>
+                <cstring>layout61</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui b/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui
index ee3fc2e..954d3eb 100644
--- a/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui
+++ b/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui
@@ -313,7 +313,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui b/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui
index 1d40d29..7269736 100644
--- a/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui
+++ b/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui
@@ -179,7 +179,7 @@
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui b/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui
index ece0c09..084a88c 100644
--- a/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui
+++ b/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui
@@ -312,7 +312,7 @@
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout10</cstring>
+                <cstring>layout10</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmyfirewallruleeditortargetlog.ui b/kmyfirewall/ruleoptionplugins/log_target_option/kmyfirewallruleeditortargetlog.ui
index c4c961b..944e042 100644
--- a/kmyfirewall/ruleoptionplugins/log_target_option/kmyfirewallruleeditortargetlog.ui
+++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmyfirewallruleeditortargetlog.ui
@@ -191,7 +191,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout22</cstring>
+                <cstring>layout22</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui b/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui
index 1d06a0c..41b9215 100644
--- a/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui
+++ b/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui
@@ -360,7 +360,7 @@
         </spacer>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui b/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui
index 3c7dac8..f333f30 100644
--- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui
+++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui
@@ -54,7 +54,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout24</cstring>
+                        <cstring>layout24</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui b/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui
index 203b567..d2065cb 100644
--- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui
+++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui
@@ -234,7 +234,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout27</cstring>
+                <cstring>layout27</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui b/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui
index 4b8097a..f424b63 100644
--- a/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui
+++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui
@@ -615,7 +615,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal
                     </widget>
                     <widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
                         <property name="name">
-                            <cstring>tqlayout21</cstring>
+                            <cstring>layout21</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -879,7 +879,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout16</cstring>
+                <cstring>layout16</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui b/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui
index 0491c5c..fd4ceaa 100644
--- a/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui
+++ b/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui
@@ -287,7 +287,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout18</cstring>
+                <cstring>layout18</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui b/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui
index 04646c5..abb654a 100644
--- a/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui
+++ b/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui
@@ -85,7 +85,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>tqlayout30</cstring>
+                        <cstring>layout30</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui b/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui
index 04646c5..abb654a 100644
--- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui
+++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui
@@ -85,7 +85,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>tqlayout30</cstring>
+                        <cstring>layout30</cstring>
                     </property>
                     <hbox>
                         <property name="name">