From 7dd8ea551cfc4672d04a86223916c5f1d88e12ee Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:04:48 -0600 Subject: [PATCH] Rename obsolete tq methods to standard names (cherry picked from commit 1a5e70f423b816acef471e774c4b056f2bd6882b) --- .../kmyfirewallgenericinterfacehostwidget.ui | 4 ++-- .../kmyfirewallgenericinterfacenatwidget.ui | 2 +- kmyfirewall/ipteditor/kmyfirewallchaineditor.ui | 8 ++++---- kmyfirewall/ipteditor/kmyfirewallruleeditor.ui | 6 +++--- kmyfirewall/kmfwidgets/kmfprocout.cpp | 2 +- kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui | 2 +- .../kmyfirewallgenericinterfaceeditprotocolwidget.ui | 12 ++++++------ kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui | 4 ++-- kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui | 2 +- .../kmfwidgets/kmyfirewallipv4adddresswidget.ui | 2 +- .../kmfwidgets/kmyfirewallnethostproperties.ui | 6 +++--- kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui | 10 +++++----- kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui | 4 ++-- kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui | 2 +- .../kmyfirewallprotocolpropertieswidget.ui | 2 +- kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui | 10 +++++----- kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui | 8 ++++---- kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui | 6 +++--- kmyfirewall/kmyfirewall.cpp | 6 +++--- .../custom_option/kmyfirewallruleeditorcustomrule.ui | 2 +- .../kmyfirewallruleeditorinterface.ui | 2 +- .../ip_option/kmyfirewallruleeditorip.ui | 2 +- .../limit_option/kmyfirewallruleeditorlimit.ui | 2 +- .../kmyfirewallruleeditortargetlog.ui | 2 +- .../mac_option/kmyfirewallruleeditormac.ui | 2 +- .../kmyfirewallruleeditortargetmark.ui | 2 +- .../kmyfirewallruleeditortargetnat.ui | 2 +- .../protocol_option/kmyfirewallruleeditorprotocol.ui | 4 ++-- .../state_option/kmyfirewallruleeditorstate.ui | 2 +- .../tos_option/kmyfirewallruleeditortos.ui | 2 +- .../tos_target_option/kmyfirewallruleeditortos.ui | 2 +- 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 @@ - tqlayout2 + layout2 @@ -103,7 +103,7 @@ - tqlayout19 + layout19 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.</p> - tqlayout19 + layout19 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 @@ - tqlayout36 + layout36 @@ -388,7 +388,7 @@ - tqlayout12 + layout12 @@ -396,7 +396,7 @@ - tqlayout11 + layout11 @@ -694,7 +694,7 @@ - tqlayout8 + layout8 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 @@ - tqlayout14 + layout14 @@ -463,7 +463,7 @@ - tqlayout12 + layout12 @@ -527,7 +527,7 @@ - tqlayout20 + layout20 diff --git a/kmyfirewall/kmfwidgets/kmfprocout.cpp b/kmyfirewall/kmfwidgets/kmfprocout.cpp index 671d24c..f95c8be 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 @@ - tqlayout2 + layout2 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 - tqlayout13 + layout13 @@ -111,7 +111,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa - tqlayout15 + layout15 @@ -119,7 +119,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa - tqlayout14 + layout14 @@ -165,7 +165,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa - tqlayout33 + layout33 @@ -267,7 +267,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa - tqlayout27 + layout27 @@ -290,7 +290,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa - tqlayout37 + layout37 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 @@ - tqlayout19_3 + layout19_3 @@ -154,7 +154,7 @@ - tqlayout2 + layout2 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 @@ - tqlayout10 + layout10 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 @@ - tqlayout19 + layout19 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 @@ - tqlayout16 + layout16 @@ -69,7 +69,7 @@ - tqlayout10 + layout10 @@ -126,7 +126,7 @@ - tqlayout9_2 + layout9_2 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 @@ - tqlayout7 + layout7 @@ -32,7 +32,7 @@ - tqlayout27 + layout27 @@ -74,7 +74,7 @@ - tqlayout22 + layout22 @@ -82,7 +82,7 @@ - tqlayout19 + layout19 @@ -193,7 +193,7 @@ - tqlayout21 + layout21 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 @@ - tqlayout20 + layout20 @@ -329,7 +329,7 @@ - tqlayout6 + layout6 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 @@ - tqlayout3 + layout3 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 @@ - tqlayout9 + layout9 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 @@ - tqlayout6 + layout6 @@ -136,7 +136,7 @@ - tqlayout2 + layout2 @@ -192,7 +192,7 @@ - tqlayout9 + layout9 @@ -226,7 +226,7 @@ - tqlayout8 + layout8 @@ -313,7 +313,7 @@ - tqlayout1 + layout1 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 @@ - tqlayout8 + layout8 @@ -259,7 +259,7 @@ - tqlayout10 + layout10 @@ -303,7 +303,7 @@ - tqlayout9 + layout9 @@ -379,7 +379,7 @@ - tqlayout14 + layout14 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 @@ - tqlayout3 + layout3 @@ -118,7 +118,7 @@ - tqlayout2 + layout2 @@ -217,7 +217,7 @@ - tqlayout4 + layout4 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 @@ - tqlayout61 + layout61 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 @@ - tqlayout5 + layout5 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 @@ - tqlayout3 + layout3 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 @@ - tqlayout10 + layout10 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 @@ - tqlayout22 + layout22 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 @@ - tqlayout13 + layout13 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 @@ - tqlayout24 + layout24 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 @@ - tqlayout27 + layout27 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 - tqlayout21 + layout21 @@ -879,7 +879,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal - tqlayout16 + layout16 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 @@ - tqlayout18 + layout18 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 @@ - tqlayout30 + layout30 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 @@ - tqlayout30 + layout30