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

1 files changed, 12 insertions, 12 deletions

diff --git a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
index c42fb12..a748ecb 100644
--- a/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
+++ b/kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
@@ -18,9 +18,9 @@
 #include <tqframe.h>
 #include <tqpixmap.h>
 #include <tqwidgetstack.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 // KDe Includes
 #include <ktabwidget.h>
@@ -164,7 +164,7 @@ void KMFMyNetworkWidget::slotNewItemSelected( TQListViewItem* item ) {
 		if ( m_zone ) {
 // 			kdDebug() << "kmfitem->zone() pointer is valid" << endl;
 			kmfitem->setText( 0,m_zone->guiName() );
-			kmfitem->setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").tqarg( m_zone->maskLength() ) );	
+			kmfitem->setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").arg( m_zone->maskLength() ) );	
 
 			m_network_widget->loadZone( m_zone );
 			if (  m_zone->readOnly() ) {
@@ -206,7 +206,7 @@ void KMFMyNetworkWidget::slotZoneChanged( KMFNetZone* z ) {
 	kdDebug() << "void KMFMyNetworkWidget::slotZoneChanged( KMFNetZone* z )" << endl;
 	if ( KMFListViewItem *item = findItem( z->uuid() ) ) {
 		kdDebug() << "Updating item" << endl;
-				item->setText( 1, "[" + z->address()->toString() + i18n("/%1]").tqarg( z->maskLength() ) );	
+				item->setText( 1, "[" + z->address()->toString() + i18n("/%1]").arg( z->maskLength() ) );	
 				item->setText( 4, z->description() );
 	}
 
@@ -234,7 +234,7 @@ void KMFMyNetworkWidget::slotZoneRBM( TQListViewItem* item, const TQPoint& point
 		if ( m_zone ) {
 			m_contextMenu->clear();
 			TQString name = m_zone->name();
-			TQString lab_str = i18n("Zone: %1").tqarg( m_zone->guiName() );
+			TQString lab_str = i18n("Zone: %1").arg( m_zone->guiName() );
 			m_contextMenu->insertTitle( icon_chain, lab_str );
 			m_contextMenu->insertItem( icon_new, i18n( "Add Host..." ), this, TQT_SLOT( slotAddHost() ) );
 
@@ -256,7 +256,7 @@ void KMFMyNetworkWidget::slotZoneRBM( TQListViewItem* item, const TQPoint& point
 		if ( m_target ) {
 			m_contextMenu->clear();
 			TQString name = m_target->name();
-			TQString lab_str = i18n("Host: %1").tqarg( m_target->guiName() );
+			TQString lab_str = i18n("Host: %1").arg( m_target->guiName() );
 			m_contextMenu->insertTitle( icon_chain, lab_str );
 			if ( ! m_target->readOnly() ) {
 				m_contextMenu->insertItem( icon_rename, i18n( "Rename Host..." ), this, TQT_SLOT( slotRenameHost() ) );
@@ -292,7 +292,7 @@ void KMFMyNetworkWidget::slotAddHost() {
 	if ( m_zone ) {
 		KMFUndoEngine::instance()->startTransaction( 
 			m_network->netzone(),
-			i18n("Add Target: %1 to Zone: %2").tqarg( name ).tqarg( m_zone->guiName() ) 
+			i18n("Add Target: %1 to Zone: %2").arg( name ).arg( m_zone->guiName() ) 
 		);
 		TQString s = "";
 		s = s.setNum( m_zone->hosts().count() );
@@ -317,7 +317,7 @@ void KMFMyNetworkWidget::slotDelHost() {
 		return;
  	KMFUndoEngine::instance()->startTransaction( 
  		m_zone,
- 		i18n("Delete Target: %1 from Zone: %2").tqarg( m_target->guiName() ).tqarg( m_zone->guiName() ) 
+ 		i18n("Delete Target: %1 from Zone: %2").arg( m_target->guiName() ).arg( m_zone->guiName() ) 
  	);
 	m_zone->delHost( m_target );
     KMFUndoEngine::instance()->endTransaction();
@@ -338,7 +338,7 @@ void KMFMyNetworkWidget::slotAddZone() {
 	
 	KMFUndoEngine::instance()->startTransaction( 
 		m_network->netzone(),
-		i18n("Add Zone: %1 to Zone: %2").tqarg( name ).tqarg( m_network->netzone()->guiName() ) 
+		i18n("Add Zone: %1 to Zone: %2").arg( name ).arg( m_network->netzone()->guiName() ) 
 	);
 	
 	KMFNetZone * zone = m_network->netzone()->addZone( "",  new KMFError() );
@@ -362,7 +362,7 @@ void KMFMyNetworkWidget::slotDelZone() {
 	if ( m_zone->name() != i18n("world")  ) {
 		KMFUndoEngine::instance()->startTransaction( 
 			m_zone->zone(),
-			i18n("Delete Zone: %1 from Zone: %2").tqarg( m_zone->guiName() ).tqarg( m_zone->zone()->guiName() ) 
+			i18n("Delete Zone: %1 from Zone: %2").arg( m_zone->guiName() ).arg( m_zone->zone()->guiName() ) 
 		);
 		m_zone->zone()->delZone( m_zone );
 		m_zone = 0;
@@ -385,7 +385,7 @@ void KMFMyNetworkWidget::slotRenameItem( TQListViewItem* item, int, const TQStri
 		if ( kmfitem->type() == NetfilterObject::NETZONE ) {
 			KMFUndoEngine::instance()->startTransaction( 
 				kmfitem->zone(),
-				i18n("Rename Zone: %1 to %3").tqarg( m_zone->guiName() ).tqarg( name ) 
+				i18n("Rename Zone: %1 to %3").arg( m_zone->guiName() ).arg( name ) 
 			);
 			
 			kmfitem->zone()->setGuiName( name );
@@ -397,7 +397,7 @@ void KMFMyNetworkWidget::slotRenameItem( TQListViewItem* item, int, const TQStri
 		if ( kmfitem->type() == NetfilterObject::KMFTARGET ) {
 			KMFUndoEngine::instance()->startTransaction( 
 				kmfitem->target(),
-				i18n("Rename Host: %1 to %3").tqarg( m_zone->guiName() ).tqarg( name ) 
+				i18n("Rename Host: %1 to %3").arg( m_zone->guiName() ).arg( name ) 
 			);
 			kmfitem->target()->setGuiName( name );
 			kdDebug() << "Renaming Host: " << kmfitem->target()->name() << endl;