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

21 files changed, 70 insertions, 70 deletions

diff --git a/kmyfirewall/core/iptable.cpp b/kmyfirewall/core/iptable.cpp
index 72eca1d..695981d 100644
--- a/kmyfirewall/core/iptable.cpp
+++ b/kmyfirewall/core/iptable.cpp
@@ -189,7 +189,7 @@ IPTChain* IPTable::addChain( const TQString& chain_name, const TQString& chain_t
 		TQString found_name = tmp_chain->name();
 		if ( found_name == chain_name ) {
 			const TQString msg = i18n( "<qt><p>Chain: <b>%1</b> already exists in table: <b>%2</b>.<br>"
-			                          "Please try again with another name. A chain name must be unique in a table.</p></qt>" ).tqarg( found_name ).tqarg( name() );
+			                          "Please try again with another name. A chain name must be unique in a table.</p></qt>" ).arg( found_name ).arg( name() );
 			err->setErrType( KMFError::NORMAL );
 			err->setErrMsg( msg );
 			kdDebug() << "\n\nWARNING: Couldn't add chain because of dupilcate name\n\n" << endl;
@@ -212,7 +212,7 @@ KMFError* IPTable::delChain( IPTChain *chain ) {
 	m_err = new KMFError();
 	TQString name = chain->name();
 	if ( chain->isBuildIn() ) {
-		const TQString msg = i18n( "Cannot delete built-in chain: %1" ).tqarg( name );
+		const TQString msg = i18n( "Cannot delete built-in chain: %1" ).arg( name );
 		m_err->setErrMsg( msg );
 		m_err->setErrType( KMFError::NORMAL );
 		return m_err;
@@ -255,7 +255,7 @@ KMFError* IPTable::moveRuleToChain( IPTRule* rule, IPTChain *target_chain ) {
 	}
 	// 	kdDebug() << "Move Rule: " << rule->name() <<" from Chain: " <<  rule->chain() ->name() << "to chain" <<  target_chain->name()  << endl;
 
-	IPTRule* new_rule = target_chain->addRule( i18n( "%1_Copy" ).tqarg( rule->name() ), m_err );
+	IPTRule* new_rule = target_chain->addRule( i18n( "%1_Copy" ).arg( rule->name() ), m_err );
 	if ( m_err->errNum() == 0 ) {
 		rule->createRuleClone( new_rule );
 		IPTRule* ru = rule;
@@ -282,7 +282,7 @@ KMFError* IPTable::copyRuleToChain( IPTRule* rule, IPTChain *target_chain ) {
 	}
 	// 	kdDebug() << "Copy Rule: " << rule->name() << " from Chain: " <<  rule->chain() ->name() << "to chain" <<  target_chain->name()  << endl;
 
-	IPTRule* new_rule = target_chain->addRule( i18n( "%1_Copy" ).tqarg( rule->name() ), m_err );
+	IPTRule* new_rule = target_chain->addRule( i18n( "%1_Copy" ).arg( rule->name() ), m_err );
 	if ( m_err->errNum() == 0 ) {
 		rule->createRuleClone( new_rule );
 	}
diff --git a/kmyfirewall/core/iptchain.cpp b/kmyfirewall/core/iptchain.cpp
index 14c4f1c..f5dfd0c 100644
--- a/kmyfirewall/core/iptchain.cpp
+++ b/kmyfirewall/core/iptchain.cpp
@@ -140,7 +140,7 @@ IPTRule* IPTChain::addRule( const TQString& rule_name, KMFError *err, int index
 		TQString tmp_name = m_ruleset.at( i ) ->name();
 		if ( tmp_name == name ) {
 			err->setErrType(KMFError::NORMAL);
-			err->setErrMsg( i18n( "<qt><p>Unable to add rule: <b>%1</b> into chain: <b>%2</b>.<br>There is already a rule defined with that name. Please try again with another name (must be unique in that chain).</p></qt>" ).tqarg( tmp_name ).tqarg( NetfilterObject::name() ) );
+			err->setErrMsg( i18n( "<qt><p>Unable to add rule: <b>%1</b> into chain: <b>%2</b>.<br>There is already a rule defined with that name. Please try again with another name (must be unique in that chain).</p></qt>" ).arg( tmp_name ).arg( NetfilterObject::name() ) );
 			return 0;
 		}
 	}
@@ -158,7 +158,7 @@ IPTRule* IPTChain::addRule( const TQString& rule_name, KMFError *err, int index
 	} else {
 		if ( index < 0 || index > (int) chainRuleset().count() - -1 ) {
 			err->setErrType(KMFError::FATAL);
-			err->setErrMsg( i18n("Cannot insert rule at %1 This is a bug ;-(").tqarg( index ) );
+			err->setErrMsg( i18n("Cannot insert rule at %1 This is a bug ;-(").arg( index ) );
 			return 0;
 		}
 		kdDebug() << "IPTChain::addRule: inserting rule at: " << index << endl;
@@ -182,7 +182,7 @@ KMFError* IPTChain::delRule( IPTRule* rule ) {
 			rule->deleteLater();
 			rule = 0;
 			m_err->setErrType( KMFError::FATAL );
-			const TQString& msg = i18n( "Sorry, can't find Rule: %1 in the Ruleset of this chain." ).tqarg( rule->name() );
+			const TQString& msg = i18n( "Sorry, can't find Rule: %1 in the Ruleset of this chain." ).arg( rule->name() );
 			m_err->setErrMsg( msg );
 			return m_err;
 		}
@@ -192,7 +192,7 @@ KMFError* IPTChain::delRule( IPTRule* rule ) {
 		return m_err;
 	} else {
 		m_err->setErrType( KMFError::FATAL );
-		const TQString& msg = i18n( "Sorry, can't find Rule: %1 in the Ruleset of this chain." ).tqarg( rule->name() );
+		const TQString& msg = i18n( "Sorry, can't find Rule: %1 in the Ruleset of this chain." ).arg( rule->name() );
 		m_err->setErrMsg( msg );
 		return m_err;
 	}
@@ -539,7 +539,7 @@ TQPtrList<TQStringList>& IPTChain::createIPTablesChainRules() {
 		}
 		kdDebug() << chain_log << endl;
 		TQStringList* chainDefs = new TQStringList();
-		TQString rule_name = i18n( "Chain: %1 Drop Logging" ).tqarg( name() );
+		TQString rule_name = i18n( "Chain: %1 Drop Logging" ).arg( name() );
 		chainDefs->append( rule_name );
 		chainDefs->append( chain_log );
 		all_rules->append( chainDefs );
@@ -548,7 +548,7 @@ TQPtrList<TQStringList>& IPTChain::createIPTablesChainRules() {
 	if ( has_default_target && !m_cmd_default_target.isEmpty() ) {
 		TQString deftg = createIPTablesChainDefaultTarget();
 		TQStringList* chainDefs = new TQStringList();
-		TQString rule_name = i18n( "Chain: %1 Default Target" ).tqarg( name() );
+		TQString rule_name = i18n( "Chain: %1 Default Target" ).arg( name() );
 		chainDefs->append( rule_name );
 		chainDefs->append( deftg );
 		all_rules->append( chainDefs );
diff --git a/kmyfirewall/core/iptruleoption.cpp b/kmyfirewall/core/iptruleoption.cpp
index e795766..b356d7d 100644
--- a/kmyfirewall/core/iptruleoption.cpp
+++ b/kmyfirewall/core/iptruleoption.cpp
@@ -132,7 +132,7 @@ void IPTRuleOption::loadXML( TQDomNode root, TQStringList& errors ) {
 			if ( curr.nodeName() == XML::RuleOptionValue_Element ) {
 				for ( int i = 0; i < MAXOPTNUM;i++ ) {
 					TQDomText textChild = curr.firstChild().toText();
-					TQString attrib = TQString( "value%1" ).tqarg( i );
+					TQString attrib = TQString( "value%1" ).arg( i );
 					TQString val = curr.toElement().attribute( attrib );
 
 					if ( !val.isEmpty() && val != XML::Undefined_Value ) {
@@ -199,7 +199,7 @@ const TQDomDocument& IPTRuleOption::getDOMTree() {
 				TQDomElement tag = doc.createElement( XML::RuleOptionValue_Element );
 				tag.setTagName( XML::RuleOptionValue_Element );
 				//			kdDebug() << "Writing Attribute: value" << i << " val: " << val << endl;
-				TQString attrib = TQString( "value%1" ).tqarg( i );
+				TQString attrib = TQString( "value%1" ).arg( i );
 				tag.setAttribute( attrib, val );
 				root.appendChild( tag );
 			}
diff --git a/kmyfirewall/core/kmfapp.cpp b/kmyfirewall/core/kmfapp.cpp
index f94931a..f948b77 100644
--- a/kmyfirewall/core/kmfapp.cpp
+++ b/kmyfirewall/core/kmfapp.cpp
@@ -41,7 +41,7 @@ static TQLabel *splash = 0;
 void set_splash_status( const TQString& msg ) {
 	if ( !splash )
 		return ;
-	splash->tqrepaint( FALSE );
+	splash->repaint( FALSE );
 	TQPainter p( splash );
 	TQFont f( KGlobalSettings::generalFont().family(), 8, TQFont::Bold );
 	p.setFont( f );
@@ -68,14 +68,14 @@ void showSplash() {
 		TQPainter p( &pic );
 		p.setFont( f );
 		p.setPen( TQt::white );
-		p.drawText( 280, 93, TQString( "Version %1" ).tqarg( KMYFIREWALL_VERSION ) );
+		p.drawText( 280, 93, TQString( "Version %1" ).arg( KMYFIREWALL_VERSION ) );
 		splash = new TQLabel( 0, "splash", TQWidget::WDestructiveClose | TQWidget::WStyle_Customize | TQWidget::WStyle_NoBorder | TQWidget::WX11BypassWM | TQWidget::WStyle_StaysOnTop );
 		splash->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
 		splash->setPixmap( pic );
 		splash->adjustSize();
-		splash->setFixedSize( splash->tqsizeHint() );
+		splash->setFixedSize( splash->sizeHint() );
 		splash->move( screen.center() - TQPoint( splash->width() / 2, splash->height() / 2 ) );
-		splash->tqrepaint( FALSE );
+		splash->repaint( FALSE );
 		splash->show();
 		set_splash_status( "Initializing..." );
 		TQApplication::flush();
diff --git a/kmyfirewall/core/kmfdoc.cpp b/kmyfirewall/core/kmfdoc.cpp
index 15e08f5..619fef4 100644
--- a/kmyfirewall/core/kmfdoc.cpp
+++ b/kmyfirewall/core/kmfdoc.cpp
@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 
 // QT includes
-#include "tqtextstream.h"
+#include "textstream.h"
 #include "tqfile.h"
 #include "tqxml.h"
 #include "tqregexp.h"
@@ -151,7 +151,7 @@ KMFError* KMFDoc::exportXMLRuleset( bool promptFile, bool asTemplate ) {
 					return exportXMLRuleset( promptFile, asTemplate );
 				} else {
 					answer = KMessageBox::questionYesNo( 0, i18n( "<qt>File <b>%1</b> already exists!</p>"
-														"<p><b>Overwrite the existing file?</b></p></qt>" ).tqarg( saveUrl.url() ) );
+														"<p><b>Overwrite the existing file?</b></p></qt>" ).arg( saveUrl.url() ) );
 				}
 			} else {
 				answer = 3;
@@ -184,7 +184,7 @@ KMFError* KMFDoc::exportXMLRuleset( const KURL& url ) {
 				                        "<p>Please make sure that you have the permissions to write to this Directory.<br>"
 				                        "If you are working with remotely stored files "
 				                        "make sure that the target host and the directory is reachable. "
-				                        "</p></qt>" ).tqarg( url.url() ) );
+				                        "</p></qt>" ).arg( url.url() ) );
 				file.unlink();
 				return m_err;
 			}
@@ -201,7 +201,7 @@ KMFError* KMFDoc::exportXMLRuleset( const KURL& url ) {
 			// generate retrun error object
 			m_err -> setErrType( KMFError::NORMAL );
 			const TQString& msg = i18n( "Opening file %1 for writing failed.\n"
-			                           "Please make sure that you are logged in as root" ).tqarg( file.name() );
+			                           "Please make sure that you are logged in as root" ).arg( file.name() );
 			m_err -> setErrMsg( msg );
 			file.unlink();
 			return m_err;
@@ -211,7 +211,7 @@ KMFError* KMFDoc::exportXMLRuleset( const KURL& url ) {
 		// generate retrun error object
 		m_err -> setErrType( KMFError::NORMAL );
 		const TQString& msg = i18n( "Opening file %1 for writing failed.\n"
-		                           "Please make sure that you are logged in as root" ).tqarg( file.name() );
+		                           "Please make sure that you are logged in as root" ).arg( file.name() );
 		m_err -> setErrMsg( msg );
 		file.unlink();
 		return m_err;
diff --git a/kmyfirewall/core/kmfgenericdoc.cpp b/kmyfirewall/core/kmfgenericdoc.cpp
index a97cf12..9454a9a 100644
--- a/kmyfirewall/core/kmfgenericdoc.cpp
+++ b/kmyfirewall/core/kmfgenericdoc.cpp
@@ -230,7 +230,7 @@ KMFNetZone* KMFGenericDoc::addZone( const TQString& name, KMFError* err ) {
 		err->setErrType( KMFError::NORMAL );
 		err->setErrMsg( i18n( "<qt>Sorry, cannot create Zone with name '<b>%1</b>':<br>"
 		                        "there already exists a zone with that name. Please try again"
-		                        " with another name that is unique within your configuration.</qt>" ).tqarg(name) );
+		                        " with another name that is unique within your configuration.</qt>" ).arg(name) );
 		return 0;
 	}
 
@@ -258,7 +258,7 @@ KMFError* KMFGenericDoc::delZone( KMFNetZone* zone ) {
 		m_err->setErrType( KMFError::NORMAL );
 		m_err->setErrMsg( i18n( "<qt>Sorry, cannot create Zone with name: <b>%1</b>.<br>"
 		                        "There already exists a zone with that name; please try again"
-		                        " with another name that is unique within your configuration.</qt>" ).tqarg( zone->name() ) );
+		                        " with another name that is unique within your configuration.</qt>" ).arg( zone->name() ) );
 	}
 	return m_err;
 }
@@ -410,7 +410,7 @@ void KMFGenericDoc::loadXML( const TQDomDocument& doc, TQStringList& errors ) {
 	TQDomElement root = doc.documentElement();
 	if ( root.nodeName() != XML::GenericDoc_DocumentElement ) {
 		kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl;
-		errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfgrs").tqarg( root.nodeName() ) ) );
+		errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfgrs").arg( root.nodeName() ) ) );
 		return;
  	}
  	loadXML( root, errors );
diff --git a/kmyfirewall/core/kmfiptdoc.cpp b/kmyfirewall/core/kmfiptdoc.cpp
index a566dd2..1c1792a 100644
--- a/kmyfirewall/core/kmfiptdoc.cpp
+++ b/kmyfirewall/core/kmfiptdoc.cpp
@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 
 // QT includes
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqxml.h>
 #include <tqregexp.h>
@@ -281,7 +281,7 @@ void KMFIPTDoc::loadXML( const TQDomDocument& doc, TQStringList& errors ) {
  	TQDomElement root = doc.documentElement();
  	if ( root.nodeName() != XML::IPTDoc_DocumentElement ) {
 		kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl;
-		errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfrs").tqarg( root.nodeName() ) ) );
+		errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfrs").arg( root.nodeName() ) ) );
 		return;
  	}
  	loadXML( root, errors );
@@ -290,7 +290,7 @@ void KMFIPTDoc::loadXML( TQDomNode root, TQStringList& errors ) {
 	kdDebug() << "void KMFIPTDoc::loadXML( TQDomNode root, TQStringList& errors )" << endl;
 	if ( root.nodeName() != XML::IPTDoc_DocumentElement ) {
 		kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl;
-		errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfrs").tqarg( root.nodeName() ) ) );
+		errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfrs").arg( root.nodeName() ) ) );
 		return;
  	}
 	NetfilterObject::loadUuid( root, errors );
diff --git a/kmyfirewall/core/kmfnethost.cpp b/kmyfirewall/core/kmfnethost.cpp
index 1b5cac3..d925db6 100644
--- a/kmyfirewall/core/kmfnethost.cpp
+++ b/kmyfirewall/core/kmfnethost.cpp
@@ -341,7 +341,7 @@ void KMFNetHost::loadXML( TQDomNode root, TQStringList& errors ) {
 			protocol_doc.appendChild( curr.cloneNode(true) );
 			KMFProtocol *protocol = KMFProtocolLibrary::instance()->findProtocolByName( name );
 			if ( ! protocol ) {
-				KMFUndoEngine::instance()->log( i18n("No Protocol Found by name: %1").tqarg( name ), KMFError::OK, this );
+				KMFUndoEngine::instance()->log( i18n("No Protocol Found by name: %1").arg( name ), KMFError::OK, this );
 				continue;
 			}
 			
@@ -380,7 +380,7 @@ void KMFNetHost::loadXML( TQDomNode root, TQStringList& errors ) {
 			}
 			
 			if ( ! found ) {
-				KMFUndoEngine::instance()->log( i18n("Removing unused oldProtocolUsage: %1").tqarg( oldProtocolUsage->name() ), KMFError::OK, this );
+				KMFUndoEngine::instance()->log( i18n("Removing unused oldProtocolUsage: %1").arg( oldProtocolUsage->name() ), KMFError::OK, this );
 				delProtocolUsage( oldProtocolUsage, true );
 			}
 		}
diff --git a/kmyfirewall/core/kmfnetwork.cpp b/kmyfirewall/core/kmfnetwork.cpp
index 3a15ab6..3699920 100644
--- a/kmyfirewall/core/kmfnetwork.cpp
+++ b/kmyfirewall/core/kmfnetwork.cpp
@@ -286,7 +286,7 @@ void KMFNetwork::loadXML( const TQDomDocument& doc, TQStringList& errors ) {
  	TQDomElement root = doc.documentElement();
  	if ( root.nodeName() != XML::KMFNetwork_DocumentElement ) {
 		kdDebug() << "!!! ERROR: Wrong XML format " << root.nodeName() << " found !!!" << endl;
-		errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfnet").tqarg( root.nodeName() ) ) );
+		errors.append( KMFError::getAsString( KMFError::FATAL, i18n("Wrong XML format <b>%1</b> found! Expected kmfnet").arg( root.nodeName() ) ) );
 		return;
  	}
  	
diff --git a/kmyfirewall/core/kmfnetzone.cpp b/kmyfirewall/core/kmfnetzone.cpp
index 9b4a974..0736df0 100644
--- a/kmyfirewall/core/kmfnetzone.cpp
+++ b/kmyfirewall/core/kmfnetzone.cpp
@@ -216,7 +216,7 @@ void KMFNetZone::setGuiName( const TQString& name ) {
 }
 
 TQString KMFNetZone::zoneInfo() {
-	return TQString("Zone: guiName: %1 name: %2 objectUuid: %3" ).tqarg( guiName() ).tqarg( name() ).tqarg( uuid() );
+	return TQString("Zone: guiName: %1 name: %2 objectUuid: %3" ).arg( guiName() ).arg( name() ).arg( uuid() );
 }
 
 void KMFNetZone::setMaskLength( int len ){
@@ -406,7 +406,7 @@ KMFNetZone* KMFNetZone::addZone( const TQString& name, KMFError* err ) {
 		++it;
 		if ( z->name() == name ) {
 			err->setErrType( KMFError::NORMAL );
-			err->setErrMsg( i18n( "Zone %1 already exists, please try again with another name" ).tqarg( name ) );
+			err->setErrMsg( i18n( "Zone %1 already exists, please try again with another name" ).arg( name ) );
 			return 0;
 		}
 	}
@@ -532,7 +532,7 @@ TQString KMFNetZone::toString() {
 	"Zone: " +  address()->toString() + 
 	"/%1" + 
 	" name: " + NetfilterObject::name() + 
-	" GUIName: " + guiName() ).tqarg(maskLength()) ;
+	" GUIName: " + guiName() ).arg(maskLength()) ;
 
 	return ret;
 }
@@ -901,7 +901,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) {
 			
 			KMFProtocol *p = KMFProtocolLibrary::instance()->findProtocolByName( name );
 			if ( ! p ) {
-				KMFUndoEngine::instance()->log( i18n("No Protocol Found by name: %1").tqarg( name ), KMFError::NORMAL, this );
+				KMFUndoEngine::instance()->log( i18n("No Protocol Found by name: %1").arg( name ), KMFError::NORMAL, this );
 				continue;
 			}
 			
@@ -910,7 +910,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) {
 			if ( ! pu ) {
 				pu = findProtocolUsageByProtocolUuid( p->uuid() );
 			}
-			KMFUndoEngine::instance()->log( i18n("Adding xml protocol: %1").tqarg( pu->name() ), KMFError::OK, this );
+			KMFUndoEngine::instance()->log( i18n("Adding xml protocol: %1").arg( pu->name() ), KMFError::OK, this );
 			xmlDefinedProtocols.append( pu );
 		}
 		if ( curr.isElement() && (  curr.nodeName() == XML::ProtocolUsage_Element ) ) {
@@ -922,7 +922,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) {
 			if ( ! pu ) {
 				pu = findProtocolUsageByProtocolUuid( protocolUuid );
 			}
-			KMFUndoEngine::instance()->log( i18n("Adding xml protocol: %1").tqarg( pu->name() ), KMFError::OK, this );
+			KMFUndoEngine::instance()->log( i18n("Adding xml protocol: %1").arg( pu->name() ), KMFError::OK, this );
 			xmlDefinedProtocols.append( pu );
 
 		}
@@ -981,7 +981,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) {
 			}
 			
 			if ( ! found ) {
-				KMFUndoEngine::instance()->log( i18n("Removing unused Zone: %1").tqarg( oldZone->guiName() ), KMFError::OK, this );
+				KMFUndoEngine::instance()->log( i18n("Removing unused Zone: %1").arg( oldZone->guiName() ), KMFError::OK, this );
 				delZone( oldZone, true );
 			}
 		}
@@ -1003,7 +1003,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) {
 			}
 			
 			if ( ! found ) {
-				KMFUndoEngine::instance()->log( i18n("Removing unused target: %1").tqarg( oldTarget->guiName() ), KMFError::OK, this );
+				KMFUndoEngine::instance()->log( i18n("Removing unused target: %1").arg( oldTarget->guiName() ), KMFError::OK, this );
 				delHost( oldTarget, true );
 			}
 		}
@@ -1017,21 +1017,21 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) {
 		while( itAllProtocols.current() ) {
 			KMFProtocolUsage *oldProtocoUsagel = itAllProtocols.current();
 			++itAllProtocols;
-			KMFUndoEngine::instance()->log( i18n("Existing protocol: %1").tqarg( oldProtocoUsagel->name() ), KMFError::OK, this );
+			KMFUndoEngine::instance()->log( i18n("Existing protocol: %1").arg( oldProtocoUsagel->name() ), KMFError::OK, this );
 			
 			
 			bool found = false;
 			TQValueList< KMFProtocolUsage* >::iterator itProtocols;
 			for( itProtocols = xmlDefinedProtocols.begin(); itProtocols != xmlDefinedProtocols.end() && ! found; ++itProtocols ) {
 				KMFProtocolUsage* protocolUsage = *itProtocols;
-				KMFUndoEngine::instance()->log( i18n("Compare with xml protocol: %1").tqarg( protocolUsage->name() ), KMFError::OK, this );
+				KMFUndoEngine::instance()->log( i18n("Compare with xml protocol: %1").arg( protocolUsage->name() ), KMFError::OK, this );
 				if ( protocolUsage == oldProtocoUsagel ) {
 					found = true;
 				}
 			}
 			
  			if ( ! found ) {
- 				KMFUndoEngine::instance()->log( i18n("Removing unused protocol: %1").tqarg( oldProtocoUsagel->name() ), KMFError::OK, this );
+ 				KMFUndoEngine::instance()->log( i18n("Removing unused protocol: %1").arg( oldProtocoUsagel->name() ), KMFError::OK, this );
  				delProtocolUsage( oldProtocoUsagel, true );
  				// delHost( oldTarget, true );
  			}
diff --git a/kmyfirewall/core/kmfplugin.cpp b/kmyfirewall/core/kmfplugin.cpp
index 1780bf4..1a9bcfc 100644
--- a/kmyfirewall/core/kmfplugin.cpp
+++ b/kmyfirewall/core/kmfplugin.cpp
@@ -85,8 +85,8 @@ void KMFPlugin::showOutput() {
 	 KMyFirewallInterface::instance()->showOutput();
 }
 
-void KMFPlugin::checktqStatus() {
-	 KMyFirewallInterface::instance()->checktqStatus();
+void KMFPlugin::checkStatus() {
+	 KMyFirewallInterface::instance()->checkStatus();
 }
 
 }
diff --git a/kmyfirewall/core/kmfplugin.h b/kmyfirewall/core/kmfplugin.h
index ac2e74a..c689246 100644
--- a/kmyfirewall/core/kmfplugin.h
+++ b/kmyfirewall/core/kmfplugin.h
@@ -42,7 +42,7 @@ public:
 	void setOutputWidget( TQWidget* wid );
 	void showEditor();
 	void showOutput();
-	void checktqStatus();
+	void checkStatus();
 
 protected:
 	KMFRulesetDoc* rulesetDoc();
diff --git a/kmyfirewall/core/kmfpluginfactory.cpp b/kmyfirewall/core/kmfpluginfactory.cpp
index 8d12e05..987b207 100644
--- a/kmyfirewall/core/kmfpluginfactory.cpp
+++ b/kmyfirewall/core/kmfpluginfactory.cpp
@@ -66,7 +66,7 @@ KParts::ReadWritePart* KMFPluginFactory::KMFMainView( KParts::MainWindow* parent
 			return 0;
 		} else {
 			err->setErrType( KMFError::FATAL );
-			err->setErrMsg( i18n( "Could not find %1 in the library search path." ).tqarg( libName ) );
+			err->setErrMsg( i18n( "Could not find %1 in the library search path." ).arg( libName ) );
 			return 0;
 		}
 		err->setErrType( KMFError::FATAL );
diff --git a/kmyfirewall/core/kmfprotocollibrary.cpp b/kmyfirewall/core/kmfprotocollibrary.cpp
index 2b4e5c8..3d9c7c0 100644
--- a/kmyfirewall/core/kmfprotocollibrary.cpp
+++ b/kmyfirewall/core/kmfprotocollibrary.cpp
@@ -152,7 +152,7 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url,  KMFEr
 		
 		const TQString msg = i18n( "<qt><p>The file <b>%1</b> could not be loaded.</p>"
 		                          "<p>If you are working with files stored on remote computers "
-		                          "make sure that the network is up and the fileserver running.</qt>" ).tqarg( url.url() );
+		                          "make sure that the network is up and the fileserver running.</qt>" ).arg( url.url() );
 		err->setErrType( KMFError::NORMAL );
 		err->setErrMsg( msg );
 		return;
@@ -161,7 +161,7 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url,  KMFEr
 	KFileItem *props = new KFileItem( f_props, url );
 	kdDebug() << "Found file permissions: " << props->permissionsString() << endl;
 	if ( !props->isReadable() ) {
-		const TQString msg = i18n( "<qt><p>You don't have the permissions to read file: <b>%1</b></p></qt>" ).tqarg( url.url() );
+		const TQString msg = i18n( "<qt><p>You don't have the permissions to read file: <b>%1</b></p></qt>" ).arg( url.url() );
 		err->setErrType( KMFError::NORMAL );
 		err->setErrMsg( msg );
 		return;
@@ -169,14 +169,14 @@ void KMFProtocolLibrary::loadProtocolDefinitionsFromURL( const KURL& url,  KMFEr
 
 	TQString xmlfile;
 	if ( ! KIO::NetAccess::download( url, xmlfile, KApplication::kApplication()->mainWidget() ) ) {
-		const TQString msg = i18n( "<qt><p>Could not download file: <b>%1</b></p></qt>" ).tqarg( url.url() );
+		const TQString msg = i18n( "<qt><p>Could not download file: <b>%1</b></p></qt>" ).arg( url.url() );
 		err->setErrType( KMFError::NORMAL );
 		err->setErrMsg( msg );
 		return;
 	}
 
 	if ( xmlfile.isEmpty() ) {
-		const TQString msg = i18n( "<qt><p>No File found at URL: <b>%1</b></p></qt>" ).tqarg( url.url() );
+		const TQString msg = i18n( "<qt><p>No File found at URL: <b>%1</b></p></qt>" ).arg( url.url() );
 		err->setErrType( KMFError::NORMAL );
 		err->setErrMsg( msg );
 		return;
@@ -285,7 +285,7 @@ KMFError* KMFProtocolLibrary::saveProtocolLibrary() {
 				                        "<p>Please make sure that you have the permissions to write to this Directory.<br>"
 				                        "If you are working with remotely stored files "
 				                        "make sure that the target host and the directory is reachable."
-				                        "</p></qt>" ).tqarg( url.url() ) );
+				                        "</p></qt>" ).arg( url.url() ) );
 				file.unlink();
 				// errH->showError( err );
 				return err;
@@ -304,7 +304,7 @@ KMFError* KMFProtocolLibrary::saveProtocolLibrary() {
 			// generate retrun error object
 			err -> setErrType( KMFError::NORMAL );
 			const TQString& msg = i18n( "Opening file %1 for writing failed.\n"
-			                           "Please make sure that you are logged in as root" ).tqarg( file.name() );
+			                           "Please make sure that you are logged in as root" ).arg( file.name() );
 			err -> setErrMsg( msg );
 			file.unlink();
 			// errH->showError( err );
@@ -315,7 +315,7 @@ KMFError* KMFProtocolLibrary::saveProtocolLibrary() {
 		// generate retrun error object
 		err -> setErrType( KMFError::NORMAL );
 		const TQString& msg = i18n( "Opening file %1 for writing failed.\n"
-		                           "Please make sure that you are logged in as root" ).tqarg( file.name() );
+		                           "Please make sure that you are logged in as root" ).arg( file.name() );
 		err -> setErrMsg( msg );
 		file.unlink();
 		// errH->showError( err );
diff --git a/kmyfirewall/core/kmfprotocolusage.cpp b/kmyfirewall/core/kmfprotocolusage.cpp
index 90e68a1..e621828 100644
--- a/kmyfirewall/core/kmfprotocolusage.cpp
+++ b/kmyfirewall/core/kmfprotocolusage.cpp
@@ -200,7 +200,7 @@ void KMFProtocolUsage::loadXML( TQDomNode root, TQStringList& errors ) {
 // 		kdDebug() << "Using Protocol Uuid!" << endl;
 		KMFProtocol* prot = KMFProtocolLibrary::instance()->findProtocolByUuid( *( new TQUuid( protocolUuid ) ) );
 		if ( ! prot ) {
-			errors.append( KMFError::getAsString( KMFError::NORMAL, i18n( "Could not find Protocol: %1 in protocol Library" ).tqarg( protocolUuid ) ) );
+			errors.append( KMFError::getAsString( KMFError::NORMAL, i18n( "Could not find Protocol: %1 in protocol Library" ).arg( protocolUuid ) ) );
 			kdDebug() << "ERROR: Could not find Protocol: " << protocolUuid << " in protocol Library" << endl;
 			return;
 		}
@@ -211,7 +211,7 @@ void KMFProtocolUsage::loadXML( TQDomNode root, TQStringList& errors ) {
 		
 		KMFProtocol* prot = KMFProtocolLibrary::instance()->findProtocolByName( protocolName );
 		if ( ! prot ) {
-			errors.append( KMFError::getAsString( KMFError::NORMAL, i18n( "Could not find Protocol: %1 in protocol Library" ).tqarg( protocolName ) ) );
+			errors.append( KMFError::getAsString( KMFError::NORMAL, i18n( "Could not find Protocol: %1 in protocol Library" ).arg( protocolName ) ) );
 			kdDebug() << "ERROR: Could not find Protocol: " << protocolName << " in protocol Library" << endl;
 			return;
 		}
diff --git a/kmyfirewall/core/kmftarget.cpp b/kmyfirewall/core/kmftarget.cpp
index 7ea64d1..d774e19 100644
--- a/kmyfirewall/core/kmftarget.cpp
+++ b/kmyfirewall/core/kmftarget.cpp
@@ -233,7 +233,7 @@ KMFError* KMFTarget::tryAutoConfiguration() {
 		kdDebug() << "No autoconfigure script found for os: " << config()->oS() << endl;
 		emit sigTargetChanged( this );
 		err->setErrType( KMFError::NORMAL );
-		err->setErrMsg( i18n("No autoconfigure script found for os: %1").tqarg( config()->oS() ) );
+		err->setErrMsg( i18n("No autoconfigure script found for os: %1").arg( config()->oS() ) );
 		return err;
 	}
 	
diff --git a/kmyfirewall/core/kmftransaction.cpp b/kmyfirewall/core/kmftransaction.cpp
index f4005f5..e8d8c6d 100644
--- a/kmyfirewall/core/kmftransaction.cpp
+++ b/kmyfirewall/core/kmftransaction.cpp
@@ -42,7 +42,7 @@ void KMFTransaction::commit() {
 NetfilterObject* KMFTransaction::undo() {
 	NetfilterObject* obj = NetfilterObject::findObject( m_objectUuid );
 	if ( ! obj ) {
-		KMFUndoEngine::instance()->log( i18n("KMFTransaction::undo() No object found with uuid: %1").tqarg( m_objectUuid ), KMFError::WARNING, 0 );
+		KMFUndoEngine::instance()->log( i18n("KMFTransaction::undo() No object found with uuid: %1").arg( m_objectUuid ), KMFError::WARNING, 0 );
 		return 0;
 	}
 	if( m_undoXML.isNull() ) {
@@ -58,7 +58,7 @@ NetfilterObject* KMFTransaction::undo() {
 NetfilterObject* KMFTransaction::redo() {
 	NetfilterObject* obj = NetfilterObject::findObject( m_objectUuid );
 	if ( ! obj ) {
-		KMFUndoEngine::instance()->log( i18n("KMFTransaction::redo() No object found with uuid: %1").tqarg( m_objectUuid ), KMFError::WARNING, 0 );
+		KMFUndoEngine::instance()->log( i18n("KMFTransaction::redo() No object found with uuid: %1").arg( m_objectUuid ), KMFError::WARNING, 0 );
 		return 0;
 	}
 	if ( m_redoXML.isNull() ) {
@@ -73,8 +73,8 @@ NetfilterObject* KMFTransaction::redo() {
 
 const TQString& KMFTransaction::toString() {
 	TQString s = "";
-	s.append( i18n("Transaction: %1 uuid: %2\n" ).tqarg( name() ).tqarg( uuid().toString() ) );
-	s.append( i18n("-- Changed ObjectUuid: %1").tqarg( m_objectUuid.toString() ) );
+	s.append( i18n("Transaction: %1 uuid: %2\n" ).arg( name() ).arg( uuid().toString() ) );
+	s.append( i18n("-- Changed ObjectUuid: %1").arg( m_objectUuid.toString() ) );
 	return *( new TQString( s ) );
 }
 
diff --git a/kmyfirewall/core/kmfundoengine.cpp b/kmyfirewall/core/kmfundoengine.cpp
index 972eced..584f0e2 100644
--- a/kmyfirewall/core/kmfundoengine.cpp
+++ b/kmyfirewall/core/kmfundoengine.cpp
@@ -101,7 +101,7 @@ void KMFUndoEngine::log( const TQString& msg, int kmfErrorType = KMFError::NORMA
 	TQString m = msg;
 	TQString s = "";
 	if ( obj ) {
-		m.prepend( i18n("<i>%1:</i> ").tqarg( obj->name() ) );
+		m.prepend( i18n("<i>%1:</i> ").arg( obj->name() ) );
 	}
 	s.append( KMFError::getAsString( kmfErrorType, m ) );
 	emit sigLog( *( new TQString(s) ) );
@@ -110,7 +110,7 @@ void KMFUndoEngine::log( const TQString& msg, int kmfErrorType = KMFError::NORMA
 void KMFUndoEngine::changed ( const TQUuid& id ) {
 	NetfilterObject* obj = NetfilterObject::findObject ( id );
 	if ( ! obj ) {
-		log( i18n("Change non exiting object id: %1.").tqarg( id ), KMFError::FATAL );
+		log( i18n("Change non exiting object id: %1.").arg( id ), KMFError::FATAL );
 		return;
 	}
 	is_saved = false;
@@ -118,13 +118,13 @@ void KMFUndoEngine::changed ( const TQUuid& id ) {
 		m_app->updateCaption();
 	}
 	if ( ! m_in_transaction ) {
-		// log( i18n("Change object: %1 without transaction.").tqarg( obj->name() ), KMFError::WARNING  );
+		// log( i18n("Change object: %1 without transaction.").arg( obj->name() ), KMFError::WARNING  );
 		return;
 	}
 	
 	NetfilterObject *highestAffected = NetfilterObject::findObject( m_currentTransaction->objectUuid() );
 	if ( ! highestAffected || obj != highestAffected && ! obj->isChildOf( highestAffected->uuid() ) ) {
-		log( i18n("Change object: %1 outside of declared highestAffectedObject: %2 in transaction: %3.").tqarg( obj->name() ).tqarg( highestAffected->name() ).tqarg( m_currentTransaction->name() ), KMFError::WARNING  );
+		log( i18n("Change object: %1 outside of declared highestAffectedObject: %2 in transaction: %3.").arg( obj->name() ).arg( highestAffected->name() ).arg( m_currentTransaction->name() ), KMFError::WARNING  );
 	}
 }
 
diff --git a/kmyfirewall/core/kmyfirewallinterface.h b/kmyfirewall/core/kmyfirewallinterface.h
index 1aa2773..2cd091e 100644
--- a/kmyfirewall/core/kmyfirewallinterface.h
+++ b/kmyfirewall/core/kmyfirewallinterface.h
@@ -47,7 +47,7 @@ public:
 	virtual void showEditor() = 0;
 	virtual void showOutput() = 0;
 	virtual void setOutputWidget( TQWidget* wid ) = 0;
-	virtual void checktqStatus() = 0;
+	virtual void checkStatus() = 0;
 	virtual void updateCaption() = 0;
 	virtual	void enableUndo( bool ) = 0;
 	virtual void enableRedo( bool ) = 0;
diff --git a/kmyfirewall/core/kprocesswrapper.cpp b/kmyfirewall/core/kprocesswrapper.cpp
index 104b398..c267f4c 100644
--- a/kmyfirewall/core/kprocesswrapper.cpp
+++ b/kmyfirewall/core/kprocesswrapper.cpp
@@ -15,7 +15,7 @@
 #include <tqwidget.h>
 #include <tquuid.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // KDE includes
 #include <kapplication.h>
@@ -187,7 +187,7 @@ void KProcessWrapper::slotReceivedOutput( KProcess *, char *buffer, int buflen )
 		*m_stderrbuf = "";
 	}
 
-	*m_stdoutbuf += TQString::tqfromLatin1( buffer, buflen );
+	*m_stdoutbuf += TQString::fromLatin1( buffer, buflen );
 	m_allOut.append( *m_stdoutbuf );
 	m_stdOut.append( *m_stdoutbuf );
 	
@@ -214,7 +214,7 @@ void KProcessWrapper::slotReceivedError( KProcess *, char *buffer, int buflen )
 		*m_stdoutbuf = "";
 	}
 
-	*m_stderrbuf += TQString::tqfromLatin1( buffer, buflen );
+	*m_stderrbuf += TQString::fromLatin1( buffer, buflen );
 	m_allOut.append( *m_stderrbuf );
 	m_stdErr.append( *m_stderrbuf );
 	*m_stderrbuf = "";
diff --git a/kmyfirewall/core/netfilterobject.cpp b/kmyfirewall/core/netfilterobject.cpp
index b975ee0..b7b4310 100644
--- a/kmyfirewall/core/netfilterobject.cpp
+++ b/kmyfirewall/core/netfilterobject.cpp
@@ -179,16 +179,16 @@ const TQString& NetfilterObject::getXMLSniplet() {
 
 void NetfilterObject::loadUuid( TQDomNode& node, TQStringList& errors ) {
 	if ( ! node.toElement().hasAttribute( XML::Uuid_Attribute ) ) {
-		errors.append( KMFError::getAsString( KMFError::WARNING, i18n( "No uuid saved in node %1" ).tqarg( node.nodeName () ) ) );
+		errors.append( KMFError::getAsString( KMFError::WARNING, i18n( "No uuid saved in node %1" ).arg( node.nodeName () ) ) );
 		return;
 	}
 // 	if ( KMFUndoEngine::instance()->preserveObjectUuid() ) {
 		const TQString& newUuid = node.toElement().attribute( XML::Uuid_Attribute );
 		if ( newUuid.isEmpty() ) {
-			errors.append( KMFError::getAsString( KMFError::WARNING, i18n( "No uuid saved in node %1" ).tqarg( node.nodeName () ) ) );
+			errors.append( KMFError::getAsString( KMFError::WARNING, i18n( "No uuid saved in node %1" ).arg( node.nodeName () ) ) );
 			return;
 		}
-		// KMFUndoEngine::instance()->log( i18n( "Overwrite my uuid: %1 with %2" ).tqarg( uuid().toString() ).tqarg( newUuid ), KMFError::OK, this );
+		// KMFUndoEngine::instance()->log( i18n( "Overwrite my uuid: %1 with %2" ).arg( uuid().toString() ).arg( newUuid ), KMFError::OK, this );
 		setUuid( newUuid );
 // 	}