Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 27 insertions, 27 deletions

diff --git a/kmyfirewall/genericinterface/kmfgenericinterface.cpp b/kmyfirewall/genericinterface/kmfgenericinterface.cpp
index 1a062cf..85a0a18 100644
--- a/kmyfirewall/genericinterface/kmfgenericinterface.cpp
+++ b/kmyfirewall/genericinterface/kmfgenericinterface.cpp
@@ -49,19 +49,19 @@
 namespace KMF {
 
 KMFGenericInterface::KMFGenericInterface( TQWidget *parent, const char *name ) : KJanusWidget( parent, name,  KJanusWidget::IconList ) {
-	connect( this,TQT_SIGNAL( aboutToShowPage( TQWidget* ) ),
-		this,TQT_SLOT( slotPageChanged( TQWidget* ) ) );
+	connect( this,TQ_SIGNAL( aboutToShowPage( TQWidget* ) ),
+		this,TQ_SLOT( slotPageChanged( TQWidget* ) ) );
 	loadIcons();
 	
 	//###################### My Network Widget ###################################
 	myNetworkFrame = addPage(i18n("My Network"), i18n("Define and configure the  firewall host you like to configure"), icon_zone_page );
 	m_myNetworkWidget =  new KMFMyNetworkWidget( myNetworkFrame, "m_myNetworkWidget" );
-	connect( this, TQT_SIGNAL( sigUpdateView() ),
-		m_myNetworkWidget, TQT_SLOT( slotUpdateView() ) );
-	connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
-		m_myNetworkWidget, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+	connect( this, TQ_SIGNAL( sigUpdateView() ),
+		m_myNetworkWidget, TQ_SLOT( slotUpdateView() ) );
+	connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+		m_myNetworkWidget, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
 	
-	connect( m_myNetworkWidget, TQT_SIGNAL( sigActiveTargetChanged() ), this, TQT_SIGNAL( sigTargetChanged() ) );
+	connect( m_myNetworkWidget, TQ_SIGNAL( sigActiveTargetChanged() ), this, TQ_SIGNAL( sigTargetChanged() ) );
 	
 	TQGridLayout *myNetworkLayout = new TQGridLayout( myNetworkFrame, 1, 1, 2, 2 );
 	myNetworkLayout->addWidget( m_myNetworkWidget,0,0 );
@@ -70,10 +70,10 @@ KMFGenericInterface::KMFGenericInterface( TQWidget *parent, const char *name ) :
 	protocolFrame = addPage(i18n("Access Control"), i18n("Access configuration for incoming and outgoing connections"), icon_protocol_page );
 
 	m_protocolPageZones = new KMFGenericInterfaceProtocol( protocolFrame, "m_protocolPageIncoming");
-	connect( this, TQT_SIGNAL( sigUpdateView() ),
-		m_protocolPageZones, TQT_SLOT( slotUpdateView() ) );
-	connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
-		m_protocolPageZones, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+	connect( this, TQ_SIGNAL( sigUpdateView() ),
+		m_protocolPageZones, TQ_SLOT( slotUpdateView() ) );
+	connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+		m_protocolPageZones, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
 	
 	TQGridLayout *protocoLayout = new TQGridLayout( protocolFrame, 1, 1, 2, 2 );
 	protocoLayout->addWidget( m_protocolPageZones,0,0 );
@@ -81,10 +81,10 @@ KMFGenericInterface::KMFGenericInterface( TQWidget *parent, const char *name ) :
 	//###################### HOSTS PAGE ###################################
 	hostFrame = addPage(i18n("Special Hosts"), i18n("Define Hosts that should be treated specially."), icon_host_page );
 	m_hostPage = new KMFGenericInterfaceHost(hostFrame,"m_hostPageTrusted");
-	connect( this, TQT_SIGNAL( sigUpdateView() ),
-		m_hostPage, TQT_SLOT( slotUpdateView() ) );
-	connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
-		m_hostPage, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+	connect( this, TQ_SIGNAL( sigUpdateView() ),
+		m_hostPage, TQ_SLOT( slotUpdateView() ) );
+	connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+		m_hostPage, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
 
 	TQGridLayout *hostLayout = new TQGridLayout( hostFrame, 1, 1, 2, 2 );
 	hostLayout->addWidget( m_hostPage,0,0 );
@@ -93,10 +93,10 @@ KMFGenericInterface::KMFGenericInterface( TQWidget *parent, const char *name ) :
 	icmpFrame = addPage(i18n("ICMP Options"), i18n("Define how ICMP packets should be handled."), icon_icmp_page );
 	TQGridLayout *icmpLayout = new TQGridLayout( icmpFrame, 1, 1, 2, 2 );
 	m_icmpPage = new KMFGenericInterfaceIcmp(icmpFrame,"m_icmpPage");
-	connect( this, TQT_SIGNAL( sigUpdateView() ),
-		m_icmpPage, TQT_SLOT( slotUpdateView() ) );
-	connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
-		m_icmpPage, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+	connect( this, TQ_SIGNAL( sigUpdateView() ),
+		m_icmpPage, TQ_SLOT( slotUpdateView() ) );
+	connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+		m_icmpPage, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
 	
 	icmpLayout->addWidget( m_icmpPage,0,0 );
 
@@ -105,10 +105,10 @@ KMFGenericInterface::KMFGenericInterface( TQWidget *parent, const char *name ) :
 	natFrame = addPage(i18n("NAT Configuration"), i18n("Configure NAT (Network Address Translation) here."), icon_nat_page );
 	TQGridLayout *natLayout = new TQGridLayout( natFrame, 1, 1, 2, 2 );
 	m_natPage = new KMFGenericInterfaceNat(natFrame,"m_natPage");
-	connect( this, TQT_SIGNAL( sigUpdateView() ),
-		m_natPage, TQT_SLOT( slotUpdateView() ) );
-	connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
-		m_natPage, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+	connect( this, TQ_SIGNAL( sigUpdateView() ),
+		m_natPage, TQ_SLOT( slotUpdateView() ) );
+	connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+		m_natPage, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
 	
 	natLayout->addWidget( m_natPage,0,0 );
 
@@ -116,10 +116,10 @@ KMFGenericInterface::KMFGenericInterface( TQWidget *parent, const char *name ) :
 	logFrame = addPage(i18n("Logging"), i18n("Configure your firewall's logging behavior here."), icon_logging_page );
 	TQGridLayout *logLayout = new TQGridLayout( logFrame, 1, 1, 2, 2 );
 	m_loggingPage = new KMFGenericInterfaceLogging(logFrame,"m_loggingPage");
-	connect( this, TQT_SIGNAL( sigUpdateView() ),
-		m_loggingPage, TQT_SLOT( slotUpdateView() ) );
-	connect( this, TQT_SIGNAL( sigUpdateView( NetfilterObject* ) ),
-		m_loggingPage, TQT_SLOT( slotUpdateView( NetfilterObject* ) ) );
+	connect( this, TQ_SIGNAL( sigUpdateView() ),
+		m_loggingPage, TQ_SLOT( slotUpdateView() ) );
+	connect( this, TQ_SIGNAL( sigUpdateView( NetfilterObject* ) ),
+		m_loggingPage, TQ_SLOT( slotUpdateView( NetfilterObject* ) ) );
 	
 	logLayout->addWidget( m_loggingPage,0,0 );