From ee24e797caf7e072e88f504accf5eba763487f4a Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 13 Apr 2012 02:22:26 -0500 Subject: [PATCH] Fix inadvertent "TQ" changes. --- .../compilers/iptables/kmfiptablesdocumentconverter.cpp | 2 +- kmyfirewall/core/ipaddress.cpp | 2 +- kmyfirewall/core/ipaddress.h | 2 +- kmyfirewall/core/iptchain.cpp | 2 +- kmyfirewall/core/iptrule.cpp | 4 ++-- kmyfirewall/core/kmfnetzone.cpp | 2 +- kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp b/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp index d60adbe..09e8e37 100644 --- a/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp +++ b/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp @@ -553,7 +553,7 @@ void KMFIPTablesDocumentConverter::setupNatRules( KMFGenericDoc* doc, KMFIPTDoc* void KMFIPTablesDocumentConverter::setupNatTarget( KMFGenericDoc* doc, IPTRule* rule ) { if ( doc->useMasquerade() ) { - rule->setTarget( "MASTQUERADE" ); + rule->setTarget( "MASQUERADE" ); } else { rule->setTarget( "SNAT" ); TQString opt = "target_snat_opt"; diff --git a/kmyfirewall/core/ipaddress.cpp b/kmyfirewall/core/ipaddress.cpp index dc49fd6..7dbf46b 100644 --- a/kmyfirewall/core/ipaddress.cpp +++ b/kmyfirewall/core/ipaddress.cpp @@ -75,7 +75,7 @@ int IPAddress::operator==( const IPAddress& addr ) { } } if ( ident ) - return ETQUAL; + return EQUAL; if ( m_digits[ first_diff ] > addr.getDigit( first_diff ) ) return SMALLER; diff --git a/kmyfirewall/core/ipaddress.h b/kmyfirewall/core/ipaddress.h index 4252c7c..db38dee 100644 --- a/kmyfirewall/core/ipaddress.h +++ b/kmyfirewall/core/ipaddress.h @@ -68,7 +68,7 @@ public: const TQString& toString() const; /** Return values for the comparision operator== */ - enum { ETQUAL, BIGGER, SMALLER }; + enum { EQUAL, BIGGER, SMALLER }; private: int m_digits[ NUMDIGITS ]; diff --git a/kmyfirewall/core/iptchain.cpp b/kmyfirewall/core/iptchain.cpp index f5dfd0c..8865695 100644 --- a/kmyfirewall/core/iptchain.cpp +++ b/kmyfirewall/core/iptchain.cpp @@ -248,7 +248,7 @@ TQPtrList& IPTChain::chainFwds() { // FIXME: lots of targets missing !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! if ( !target.isEmpty() && target != "ACCEPT" && target != "DROP" && target != "LOG" && target != "REJECT" && target != "RETURN" && target != "DNAT" && target != "SNAT" - && target != "QUEUE" && target != "MIRROR" && target != "REDIRECT" && target != "MASTQUERADE" ) { + && target != "QUEUE" && target != "MIRROR" && target != "REDIRECT" && target != "MASQUERADE" ) { //kdDebug() << "Found Forward to chain: " << target << endl; fwds->append( rule ); } diff --git a/kmyfirewall/core/iptrule.cpp b/kmyfirewall/core/iptrule.cpp index c7cc99a..3fa9fd7 100644 --- a/kmyfirewall/core/iptrule.cpp +++ b/kmyfirewall/core/iptrule.cpp @@ -145,7 +145,7 @@ bool IPTRule::isForward() const { m_target == "RETURN" || m_target == "REJECT" || m_target == "MIRROR" || m_target == "SNAT" || m_target == "DNAT" || m_target == "REDIRECT" || - m_target == "MASTQUERADE" || m_target == "MARK" || + m_target == "MASQUERADE" || m_target == "MARK" || m_target == "TOS" ) { return true; } else { @@ -178,7 +178,7 @@ TQStringList IPTRule::availableTargets() const { } if ( table == Constants::NatTable_Name && name == Constants::PostRoutingChain_Name ) - targets << "MASTQUERADE"; + targets << "MASQUERADE"; if ( table == Constants::MangleTable_Name ) { targets << "MARK" << "TOS"; diff --git a/kmyfirewall/core/kmfnetzone.cpp b/kmyfirewall/core/kmfnetzone.cpp index 0736df0..f6467ac 100644 --- a/kmyfirewall/core/kmfnetzone.cpp +++ b/kmyfirewall/core/kmfnetzone.cpp @@ -600,7 +600,7 @@ void KMFNetZone::refreshNetworkTree() { for( int j = i - 1; allZones->count() > 1 && j >= 0; j-- ) { KMFNetZone *thisTry = allZones->at(j); if ( thisTry != currZone && ! ( - ( thisTry->address() == currZone->address() ) == IPAddress::ETQUAL && + ( thisTry->address() == currZone->address() ) == IPAddress::EQUAL && thisTry->maskLength() == currZone->maskLength() ) && diff --git a/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp b/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp index f4a6946..65ad3a4 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterfacenat.cpp @@ -152,7 +152,7 @@ void KMFGenericInterfaceNat::slotMasqueradeEnabled( bool onoff ) { } KMFUndoEngine::instance()->startTransaction( m_doc->currentDocAsGenericDoc(), - i18n( "%1 MASTQUERADE target for NAT." ).arg( onoff ? i18n( "Enable" ) : i18n( "Disable" ) ) + i18n( "%1 MASQUERADE target for NAT." ).arg( onoff ? i18n( "Enable" ) : i18n( "Disable" ) ) ); m_doc->currentDocAsGenericDoc()->setUseMasquerade( onoff ); KMFUndoEngine::instance()->endTransaction();