Fix inadvertent "TQ" changes.

(cherry picked from commit ee24e797ca)

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";

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;

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 ];

kmyfirewall/core/iptchain.cpp

@@ -248,7 +248,7 @@ TQPtrList<IPTRule>& 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 );
 		}

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";

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()
 					) &&
 					

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();