diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:30:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:30:51 -0600 |
| commit | d737fa5621adb2f9504b4119a151615eeacba574 (patch) | |
| tree | b219ca93c9910b179c0891e9b0e353f94465b03a /kmyfirewall/ruleoptionplugins | |
| parent | 88c5eb48afe6160b21916f2c4bb779de9c8992a0 (diff) | |
| download | kmyfirewall-d737fa5621adb2f9504b4119a151615eeacba574.tar.gz kmyfirewall-d737fa5621adb2f9504b4119a151615eeacba574.zip | |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kmyfirewall/ruleoptionplugins')
24 files changed, 108 insertions, 108 deletions
diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp index 66641a5..cb3d0f2 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp +++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleeditcustomopt.cpp @@ -84,7 +84,7 @@ void KMFRuleEditCustomOpt::loadRule( IPTRule * rule ) { void KMFRuleEditCustomOpt::accept() { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Custom Rule: %1 Option").tqarg( m_rule->name() ) + i18n("Edit Custom Rule: %1 Option").arg( m_rule->name() ) ); TQString target = ""; target = t_target->text(); diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui b/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui index dd225ea..f46d1a5 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui +++ b/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui @@ -34,13 +34,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>40</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>40</height> @@ -60,7 +60,7 @@ <property name="text"> <string>Custom Options</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -234,7 +234,7 @@ <property name="text"> <string>Here you may define the target option for the rule. Please keep in mind that not all targets have options to set. </string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -242,7 +242,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout61</cstring> + <cstring>layout61</cstring> </property> <hbox> <property name="name"> @@ -266,7 +266,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -291,7 +291,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>141</width> <height>20</height> diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp index 27ef89d..ebaf39b 100644 --- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp +++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp @@ -96,7 +96,7 @@ void KMFRuleEditorInterface::slotOk() { // KMyFirewallRuleEditor* ed = (KMyFirewallRuleEditor*)parentWidget(); KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 Interface Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 Interface Option").arg( m_rule->name() ) ); TQString out = cb_out_int->currentText(); diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui b/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui index 1270ef6..954d3eb 100644 --- a/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui +++ b/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui @@ -29,13 +29,13 @@ <property name="name"> <cstring>TextLabel1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>40</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>40</height> @@ -59,7 +59,7 @@ <property name="text"> <string>Interface Options</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> <property name="wordwrap" stdset="0"> @@ -72,7 +72,7 @@ <property name="text"> <string><b>ATTENTION: </b>Not All options are not always allowed! The program will attempt to check your settings, but as usual options may be accepted even if the configuration is not valid. If you get error messages at firewall startup, make sure that your configuration is valid. Have a look at the help or the "iptables" man page for more details.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -117,7 +117,7 @@ <property name="text"> <string>The incoming interface is only valid in the INPUT and FORWARD chains, and chains that are fed only by them.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -231,7 +231,7 @@ <property name="text"> <string>Checking for the outgoing interface is only possible in the OUTPUT and FORWARD chains, and chains that are fed only by them.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -283,7 +283,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -313,7 +313,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -337,7 +337,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -362,7 +362,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>20</height> diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp index b63ab42..485924c 100644 --- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp +++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleeditip.cpp @@ -18,7 +18,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004 #include <tqlabel.h> #include <tqlineedit.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvariant.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -120,7 +120,7 @@ void KMFRuleEditIP::accept() { kdDebug() << "KMFRuleEditIP::slotOk()" << endl; KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 IP Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 IP Option").arg( m_rule->name() ) ); TQString* src_ip = new TQString( t_src_ip->text() ); TQString* dest_ip = new TQString( t_dest_ip->text() ); diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui b/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui index 49096b8..7269736 100644 --- a/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui +++ b/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui @@ -37,13 +37,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>40</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>40</height> @@ -67,7 +67,7 @@ <property name="text"> <string>IP Options</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -100,7 +100,7 @@ <property name="text"> <string>NOTE: By checking the "Invert" checkbox the rule will only match if the specified address is not one of the values you defined.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -170,7 +170,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -179,7 +179,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -203,7 +203,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>20</height> @@ -228,7 +228,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>20</height> diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp index 39dd5fd..206587b 100644 --- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp +++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleeditorlimit.cpp @@ -92,7 +92,7 @@ void KMFRuleEditorLimit::readRuleConfig() { void KMFRuleEditorLimit::slotOk() { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 Limit Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 Limit Option").arg( m_rule->name() ) ); TQPtrList<TQString>* options = new TQPtrList<TQString>; TQString* name = new TQString( "limit_opt" ); diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui b/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui index 20cf8c2..084a88c 100644 --- a/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui +++ b/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui @@ -37,13 +37,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>40</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>40</height> @@ -67,7 +67,7 @@ <property name="text"> <string>Limit Options</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> <property name="wordwrap" stdset="0"> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -268,7 +268,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -303,7 +303,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -312,7 +312,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -336,7 +336,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>20</height> @@ -361,7 +361,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>20</height> diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp index b03242a..8bb5650 100644 --- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp +++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruleedittargetlog.cpp @@ -101,7 +101,7 @@ void KMFRuleEditTargetLog::loadRule( IPTRule* rule ) { void KMFRuleEditTargetLog::accept() { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 Target Log Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 Target Log Option").arg( m_rule->name() ) ); TQPtrList<TQString>* args = new TQPtrList<TQString>; TQString* name = new TQString( "target_log_opt" ); 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/kmfruleeditmac.cpp b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp index 876c92c..c69fa90 100644 --- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp +++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleeditmac.cpp @@ -17,7 +17,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004 #include <tqlabel.h> #include <tqlineedit.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvariant.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -162,7 +162,7 @@ void KMFRuleEditMac::accept() { kdDebug() << "KMFRuleEditMac::accept()" << endl; KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 MAC Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 MAC Option").arg( m_rule->name() ) ); TQString tok1 = t_src_mac1->text().upper(); TQString tok2 = t_src_mac2->text().upper(); diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui b/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui index e54139a..41b9215 100644 --- a/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui +++ b/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui @@ -37,13 +37,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>40</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>40</height> @@ -67,7 +67,7 @@ <property name="text"> <string>MAC Options</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -100,13 +100,13 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> @@ -120,7 +120,7 @@ <property name="name"> <cstring>TextLabel1_2_6</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>5</width> <height>32767</height> @@ -137,13 +137,13 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> @@ -157,7 +157,7 @@ <property name="name"> <cstring>TextLabel1_2_5</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>5</width> <height>32767</height> @@ -174,13 +174,13 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> @@ -194,7 +194,7 @@ <property name="name"> <cstring>TextLabel1_2_4</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>5</width> <height>32767</height> @@ -211,13 +211,13 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> @@ -231,7 +231,7 @@ <property name="name"> <cstring>TextLabel1_2_3</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>5</width> <height>32767</height> @@ -248,13 +248,13 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> @@ -268,7 +268,7 @@ <property name="name"> <cstring>TextLabel1_2_2</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>5</width> <height>32767</height> @@ -285,13 +285,13 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> @@ -337,7 +337,7 @@ <property name="text"> <string>NOTE: By checking the "Invert" checkbox the rule will only match if the address found in the packet header is not one you defined.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -351,7 +351,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>22</height> @@ -360,7 +360,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -384,7 +384,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -409,7 +409,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp index 0ba0e49..4ceff96 100644 --- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp +++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruleedittargetmark.cpp @@ -61,7 +61,7 @@ void KMFRuleEditTargetMark::loadRule( IPTRule* rule ) { void KMFRuleEditTargetMark::accept() { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 Mark Target Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 Mark Target Option").arg( m_rule->name() ) ); kdDebug() << "void KMFRuleEditTargetMark::accept()" << endl; TQPtrList<TQString>* options = new TQPtrList<TQString>; diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui b/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui index 324a4c2..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"> @@ -96,7 +96,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp index 7435dd9..7563bac 100644 --- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp +++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruleeditortargetnat.cpp @@ -178,7 +178,7 @@ void KMFRuleEditorTargetNat::accept() { kdDebug() << "KMFRuleEditorTargetNat::accept()"; KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 Target NAT Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 Target NAT Option").arg( m_rule->name() ) ); bool ip_range = c_ip_range->isChecked(); diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui b/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui index 4b0656d..d2065cb 100644 --- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui +++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui @@ -122,7 +122,7 @@ <property name="text"> <string>Translate to IP:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -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/kmfruleeditorprotocol.cpp b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp index 84897a3..c21a662 100644 --- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp +++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp @@ -22,7 +22,7 @@ #include <kapplication.h> // qt includes -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqtabwidget.h> #include <tqstring.h> @@ -468,7 +468,7 @@ void KMFRuleEditorProtocol::accept() { kdDebug() << "void KMFRuleEditorProtocol::accept()" << endl; KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 Protocol Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 Protocol Option").arg( m_rule->name() ) ); /////////////////////////////////////////////////////// diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui b/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui index 647f256..f424b63 100644 --- a/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui +++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui @@ -34,13 +34,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>40</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>40</height> @@ -64,7 +64,7 @@ <property name="text"> <string>Protocol Options</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> <property name="wordwrap" stdset="0"> @@ -88,7 +88,7 @@ <property name="title"> <string>Match Protocol</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -268,7 +268,7 @@ <string><p>Specifie the ports that should match you rule here.<br> You may use a portnumber an inclusive portrange or a service name from <i>/etc/sevices</i> to specifie the port.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -609,13 +609,13 @@ You may use a portnumber an inclusive portrange or a service name from <i> A misuse of this functionality may result in a hard to detect bug in the firewall.</p> </string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </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"> @@ -720,7 +720,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>48</width> <height>20</height> @@ -772,7 +772,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>48</width> <height>16</height> @@ -870,7 +870,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal <property name="text"> <string>Here you can decide which ICMP Type your rulr should Match.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -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"> @@ -903,7 +903,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> @@ -928,7 +928,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp b/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp index cb04caf..f551baa 100644 --- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp +++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleeditorstate.cpp @@ -55,7 +55,7 @@ void KMFRuleEditorState::loadRule( IPTRule *rule ) { void KMFRuleEditorState::slotOk() { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 State Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 State Option").arg( m_rule->name() ) ); bool s_new = c_new->isChecked(); bool s_related = c_related->isChecked(); diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui b/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui index ec6adf3..fd4ceaa 100644 --- a/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui +++ b/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui @@ -37,13 +37,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>40</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>40</height> @@ -66,7 +66,7 @@ <property name="text"> <string>Connection Tracking Options</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> <property name="wordwrap" stdset="0"> @@ -205,7 +205,7 @@ <property name="text"> <string>Packets that are associated with a connection that has packets sent in both directions.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -221,7 +221,7 @@ <property name="text"> <string>Packets that are not associated with any known connection.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -237,7 +237,7 @@ <property name="text"> <string>Packets that are associated with an existing bi-directional connection and start a new connection (e.g. FTP).</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -261,7 +261,7 @@ <property name="text"> <string>Packets that start new connections and are not associated with any known connection.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -277,7 +277,7 @@ <property name="text"> <string>Match packets with state:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -287,7 +287,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> @@ -311,7 +311,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -336,7 +336,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp index a6744a1..9f51885 100644 --- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp +++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleeditortos.cpp @@ -123,7 +123,7 @@ void KMFRuleEditorTos::loadRule( IPTRule* rule ) { void KMFRuleEditorTos::accept() { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 TOS Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 TOS Option").arg( m_rule->name() ) ); if ( m_option_type == "SETTOS" ) { bool use_tos = c_use_tos->isChecked(); diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui b/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui index 756998a..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"> @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp index 48bb63b..0cba2b0 100644 --- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp +++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruleeditortos.cpp @@ -123,7 +123,7 @@ void KMFRuleEditorTos::loadRule( IPTRule* rule ) { void KMFRuleEditorTos::accept() { KMFUndoEngine::instance()->startTransaction( m_rule, - i18n("Edit Rule: %1 TOS Target Option").tqarg( m_rule->name() ) + i18n("Edit Rule: %1 TOS Target Option").arg( m_rule->name() ) ); if ( m_option_type == "SETTOS" ) { bool use_tos = c_use_tos->isChecked(); diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui b/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui index 756998a..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"> @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> |