Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit d737fa5621adb2f9504b4119a151615eeacba574.

5 files changed, 30 insertions, 30 deletions

diff --git a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
index 891ba37..09c5b22 100644
--- a/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
+++ b/kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
@@ -107,7 +107,7 @@ void KMFIPTablesCompiler::slotExportIPT() {
 				return ;
 			} else {
 				answer = KMessageBox::warningYesNo( 0, i18n( "<qt>File <b>%1</b> already exists!</p>"
-				                                    "<p><b>Overwrite the existing file?</b></p></qt>" ).arg( url.url() ) );
+				                                    "<p><b>Overwrite the existing file?</b></p></qt>" ).tqarg( url.url() ) );
 			}
 		} else {
 			answer = 3;
@@ -129,7 +129,7 @@ void KMFIPTablesCompiler::slotExportIPT() {
 		//	statusBar() ->message( i18n( "Wrote file: " ) + url.fileName() , 5000 );
 		} else {
 			kdDebug() << "Couldn't upload file!!!" << tempfile.name() << endl;
-			KMessageBox::detailedError( 0, i18n( "<qt><p>Saving file: <b>%1</b> Failed.</p></qt>" ).arg( url.url() ),
+			KMessageBox::detailedError( 0, i18n( "<qt><p>Saving file: <b>%1</b> Failed.</p></qt>" ).tqarg( url.url() ),
 										i18n( "<qt><p>If you are working with remotely stored files "
 												"make sure that the target host and the directory is reachable. "
 												"</p></qt>" ) );
diff --git a/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp b/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp
index d60adbe..c4b79c7 100644
--- a/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp
+++ b/kmyfirewall/compilers/iptables/kmfiptablesdocumentconverter.cpp
@@ -175,8 +175,8 @@ void KMFIPTablesDocumentConverter::setupPolicies( KMFGenericDoc* gendoc, KMFIPTD
 }
 
 void KMFIPTablesDocumentConverter::addToChains( KMFNetZone* zone, KMFIPTDoc* doc, IPTChain* chain,  const TQString& root_chain ) {
-	TQPtrList<KMFNetZone>& children = zone->zones();
-	TQPtrListIterator<KMFNetZone> it( children );
+	TQPtrList<KMFNetZone>& tqchildren = zone->zones();
+	TQPtrListIterator<KMFNetZone> it( tqchildren );
 	static int i = 0;
 	while( it.current() ) {
 		addToChains(  it.current(), doc, chain, root_chain );
@@ -210,7 +210,7 @@ void KMFIPTablesDocumentConverter::addToChains( KMFNetZone* zone, KMFIPTDoc* doc
 			return;
 		rule->setDescription( i18n(	"This rule forwards all traffic to\n"
 		                            "chain: %1 which handles traffic for\n"
-		                            "zone: %2.").arg( name ).arg( zone->guiName() ) );
+		                            "zone: %2.").tqarg( name ).tqarg( zone->guiName() ) );
 		i++;
 		if ( ! rule ) {
 			kdDebug() << "KMFIPTablesCompiler: WARNING Couldn't create rule: Feed in chain: " <<  chain->name() << endl;
@@ -221,7 +221,7 @@ void KMFIPTablesDocumentConverter::addToChains( KMFNetZone* zone, KMFIPTDoc* doc
 			kdDebug() << "KMFIPTablesCompiler: WARNING Couldn't find chain: " <<  name << endl;
 			return;
 		}
-		ch->setDescription( i18n("The Chain created to handle\nrules defined in zone %1.").arg( zone->guiName() ) );
+		ch->setDescription( i18n("The Chain created to handle\nrules defined in zone %1.").tqarg( zone->guiName() ) );
 		
 		TQPtrList<TQString> args;
 		if ( root_chain == Constants::InputChain_Name ) {
@@ -309,7 +309,7 @@ void KMFIPTablesDocumentConverter::createZoneProtocol( IPTChain* chain, KMFProto
 
 	rule->addRuleOption( s , args );
 	rule->setDescription( i18n(	"Allow Protocol: %1\n"
-	                            "Protocol Description: %2" ).arg( prot->protocol()->name( ) ).arg( prot->protocol()->description() ) );
+	                            "Protocol Description: %2" ).tqarg( prot->protocol()->name( ) ).tqarg( prot->protocol()->description() ) );
 
 	
 	rule->setDescription( prot->protocol()->description() );
@@ -369,7 +369,7 @@ void KMFIPTablesDocumentConverter::createHostProtocol( IPTChain* chain, KMFNetHo
 	}
 	rule->setDescription( i18n(	"Rule created to apply filters for host: %1\n"
 	                            "Allow Protocol: %2\n"
-	                            "Protocol Description: %3" ).arg( host->guiName() ).arg( prot->protocol()->name( ) ).arg( prot->protocol()->description() ) );
+	                            "Protocol Description: %3" ).tqarg( host->guiName() ).tqarg( prot->protocol()->name( ) ).tqarg( prot->protocol()->description() ) );
 	if ( ! m_errorHandler->showError( m_err ) )
 		return;
 
@@ -431,9 +431,9 @@ void KMFIPTablesDocumentConverter::setupInAndOutHosts( KMFIPTDoc* iptdoc, KMFNet
 		args.append( new TQString( host->address()->toString() ) );
 		rule->addRuleOption( opt, args );
 		if ( target == "ACCEPT" ) {
-			rule->setDescription( i18n("This rule allows incoming packets from trusted host: %1.").arg( host->guiName() ) );
+			rule->setDescription( i18n("This rule allows incoming packets from trusted host: %1.").tqarg( host->guiName() ) );
 		} else {
-			rule->setDescription( i18n("This rule drops incoming packets from malicious host: %1.").arg( host->guiName() ) );
+			rule->setDescription( i18n("This rule drops incoming packets from malicious host: %1.").tqarg( host->guiName() ) );
 
 		}
 		rule->setTarget( target );
@@ -452,9 +452,9 @@ void KMFIPTablesDocumentConverter::setupInAndOutHosts( KMFIPTDoc* iptdoc, KMFNet
 			return;
 
 		if ( target == "ACCEPT" ) {
-			rule->setDescription( i18n("This rule allows outgoing packets to trusted host: %1.").arg( host->guiName() ) );
+			rule->setDescription( i18n("This rule allows outgoing packets to trusted host: %1.").tqarg( host->guiName() ) );
 		} else {
-			rule->setDescription( i18n("This rule drops outgoing packets to malicious host: %1.").arg( host->guiName() ) );
+			rule->setDescription( i18n("This rule drops outgoing packets to malicious host: %1.").tqarg( host->guiName() ) );
 
 		}
 		rule->setTarget( target );
@@ -499,9 +499,9 @@ void KMFIPTablesDocumentConverter::setupForbiddenHosts( KMFIPTDoc* iptdoc , KMFN
 		args.append( new TQString( host->address()->toString() ) );
 		rule->addRuleOption( opt, args );
 		if ( inOut =="in" ) {
-			rule->setDescription( i18n("This rule drops packets from forbidden client: %1.").arg( host->guiName() ) );
+			rule->setDescription( i18n("This rule drops packets from forbidden client: %1.").tqarg( host->guiName() ) );
 		} else {
-			rule->setDescription( i18n("This rule drops packets to forbidden server: %1.").arg( host->guiName() ) );
+			rule->setDescription( i18n("This rule drops packets to forbidden server: %1.").tqarg( host->guiName() ) );
 		}
 		rule->setTarget( "DROP" );
 		if ( inOut =="in" ) {
diff --git a/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.h b/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.h
index a67ccad..9c11c4c 100644
--- a/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.h
+++ b/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.h
@@ -18,7 +18,7 @@
 // QT includes
 #include <tqstring.h>
 #include <tqobject.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 // KDE includes
 #include <kparts/part.h>
diff --git a/kmyfirewall/compilers/pf/kmfpfcompiler.cpp b/kmyfirewall/compilers/pf/kmfpfcompiler.cpp
index 48c4e0d..0bd0374 100644
--- a/kmyfirewall/compilers/pf/kmfpfcompiler.cpp
+++ b/kmyfirewall/compilers/pf/kmfpfcompiler.cpp
@@ -186,8 +186,8 @@ void KMFPFCompiler::createIncommingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
 		zone = doc->incomingZone();
 	}
 	
-	TQPtrList<KMFNetZone>& children = zone->zones();
-	TQPtrListIterator<KMFNetZone> it( children );
+	TQPtrList<KMFNetZone>& tqchildren = zone->zones();
+	TQPtrListIterator<KMFNetZone> it( tqchildren );
 	while( it.current() ) {
 		createIncommingACCESSRules(  it.current(), doc );
 		++it;
@@ -198,7 +198,7 @@ void KMFPFCompiler::createIncommingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
 	while ( itZoneHosts.current() ) {
 		KMFNetHost* host = dynamic_cast<KMFNetHost*> ( itZoneHosts.current() );
 		++itZoneHosts;
-		m_compiledScript.append( TQString("\n# Settup rules for host %1 [%2]\n").arg( host->guiName() ).arg( zone->address()->toString() ) );
+		m_compiledScript.append( TQString("\n# Settup rules for host %1 [%2]\n").tqarg( host->guiName() ).tqarg( zone->address()->toString() ) );
 		
 		TQPtrList<KMFProtocolUsage>& hostProts = host->protocols();
 		TQPtrListIterator<KMFProtocolUsage> itHostProtocols ( hostProts );
@@ -206,7 +206,7 @@ void KMFPFCompiler::createIncommingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
 			KMFProtocolUsage* prot = itHostProtocols.current();
 			++itHostProtocols;
 			if ( ! host->protocolInherited( prot->protocol()->uuid() ) ) {
-				m_compiledScript.append( TQString("# Settup rules for protocol %1\n").arg( prot->protocol()->name() ) );
+				m_compiledScript.append( TQString("# Settup rules for protocol %1\n").tqarg( prot->protocol()->name() ) );
 				if ( prot->protocol()->tcpPorts().count() > 0 ) {
 					m_compiledScript.append( "pass in " ); 
 					if ( prot->logging() || host->logIncoming() ) {
@@ -239,14 +239,14 @@ void KMFPFCompiler::createIncommingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
 		}
 	}
 	
-	m_compiledScript.append( TQString("\n# Settup rules for zone %1 [%2/%3]\n").arg( zone->guiName() ).arg( zone->address()->toString() ).arg( zone->maskLength() ) );
+	m_compiledScript.append( TQString("\n# Settup rules for zone %1 [%2/%3]\n").tqarg( zone->guiName() ).tqarg( zone->address()->toString() ).tqarg( zone->maskLength() ) );
 	TQPtrList<KMFProtocolUsage>& zoneProts = zone->protocols();
 	TQPtrListIterator<KMFProtocolUsage> itZoneProtocols ( zoneProts );
 	while ( itZoneProtocols.current() ) {
 		KMFProtocolUsage* prot = itZoneProtocols.current();
 		++itZoneProtocols;
 		if ( ! zone->protocolInherited( prot->protocol()->uuid() ) ) {
-			m_compiledScript.append( TQString("# Settup rules for protocol %1\n").arg( prot->protocol()->name() ) );
+			m_compiledScript.append( TQString("# Settup rules for protocol %1\n").tqarg( prot->protocol()->name() ) );
 			if ( prot->protocol()->tcpPorts().count() > 0 ) {
 				m_compiledScript.append( "pass in " ); 
 				if ( prot->logging() ) {
@@ -291,8 +291,8 @@ void KMFPFCompiler::createOutgoingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
 		zone = doc->outgoingZone();
 	}
 	
-	TQPtrList<KMFNetZone>& children = zone->zones();
-	TQPtrListIterator<KMFNetZone> it( children );
+	TQPtrList<KMFNetZone>& tqchildren = zone->zones();
+	TQPtrListIterator<KMFNetZone> it( tqchildren );
 	while( it.current() ) {
 		createIncommingACCESSRules(  it.current(), doc );
 		++it;
@@ -303,7 +303,7 @@ void KMFPFCompiler::createOutgoingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
 	while ( itZoneHosts.current() ) {
 		KMFNetHost* host = dynamic_cast<KMFNetHost*> ( itZoneHosts.current() );
 		++itZoneHosts;
-		m_compiledScript.append( TQString("\n# Settup rules for host %1 [%2]\n").arg( host->guiName() ).arg( zone->address()->toString() ) );
+		m_compiledScript.append( TQString("\n# Settup rules for host %1 [%2]\n").tqarg( host->guiName() ).tqarg( zone->address()->toString() ) );
 		
 		TQPtrList<KMFProtocolUsage>& hostProts = host->protocols();
 		TQPtrListIterator<KMFProtocolUsage> itHostProtocols ( hostProts );
@@ -311,7 +311,7 @@ void KMFPFCompiler::createOutgoingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
 			KMFProtocolUsage* prot = itHostProtocols.current();
 			++itHostProtocols;
 			if ( ! host->protocolInherited( prot->protocol()->uuid() ) ) {
-				m_compiledScript.append( TQString("# Settup rules for protocol %1\n").arg( prot->protocol()->name() ) );
+				m_compiledScript.append( TQString("# Settup rules for protocol %1\n").tqarg( prot->protocol()->name() ) );
 				if ( prot->protocol()->tcpPorts().count() > 0 ) {
 					m_compiledScript.append( "pass out " ); 
 					if ( prot->logging() || host->logIncoming() ) {
@@ -344,14 +344,14 @@ void KMFPFCompiler::createOutgoingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
 		}
 	}
 	
-	m_compiledScript.append( TQString("\n# Settup rules for zone %1 [%2/%3]\n").arg( zone->guiName() ).arg( zone->address()->toString() ).arg( zone->maskLength() ) );
+	m_compiledScript.append( TQString("\n# Settup rules for zone %1 [%2/%3]\n").tqarg( zone->guiName() ).tqarg( zone->address()->toString() ).tqarg( zone->maskLength() ) );
 	TQPtrList<KMFProtocolUsage>& zoneProts = zone->protocols();
 	TQPtrListIterator<KMFProtocolUsage> itZoneProtocols ( zoneProts );
 	while ( itZoneProtocols.current() ) {
 		KMFProtocolUsage* prot = itZoneProtocols.current();
 		++itZoneProtocols;
 		if ( ! zone->protocolInherited( prot->protocol()->uuid() ) ) {
-			m_compiledScript.append( TQString("# Settup rules for protocol %1\n").arg( prot->protocol()->name() ) );
+			m_compiledScript.append( TQString("# Settup rules for protocol %1\n").tqarg( prot->protocol()->name() ) );
 			if ( prot->protocol()->tcpPorts().count() > 0 ) {
 				m_compiledScript.append( "pass out " ); 
 				if ( prot->logging() ) {
@@ -422,9 +422,9 @@ void KMFPFCompiler::setupNatRules( KMFGenericDoc* doc ) {
 
 	m_compiledScript.append( "\n# Setup NAT\n" );
 	if ( doc->useMasquerade() ) {
-		m_compiledScript.append( TQString("nat on %1 from any to any -> (%2)\n").arg( doc->outgoingInterface() ).arg( doc->outgoingInterface() ) );
+		m_compiledScript.append( TQString("nat on %1 from any to any -> (%2)\n").tqarg( doc->outgoingInterface() ).tqarg( doc->outgoingInterface() ) );
 	} else {
-		m_compiledScript.append( TQString("nat on %1 from any to any -> %2\n").arg( doc->outgoingInterface() ).arg( doc->natAddress()->toString() ) );
+		m_compiledScript.append( TQString("nat on %1 from any to any -> %2\n").tqarg( doc->outgoingInterface() ).tqarg( doc->natAddress()->toString() ) );
 	}
 	
 
diff --git a/kmyfirewall/compilers/pf/kmfpfscriptgenerator.h b/kmyfirewall/compilers/pf/kmfpfscriptgenerator.h
index a05e27e..eeae699 100644
--- a/kmyfirewall/compilers/pf/kmfpfscriptgenerator.h
+++ b/kmyfirewall/compilers/pf/kmfpfscriptgenerator.h
@@ -18,7 +18,7 @@
 // QT includes
 #include <tqstring.h>
 #include <tqobject.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 // KDE includes
 #include <kparts/part.h>