Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 6df466c45ad202eea7d7401a2e5ff67ee783e272)

5 files changed, 20 insertions, 20 deletions

diff --git a/KMFSysTray/app.cpp b/KMFSysTray/app.cpp
index 4ca7bf1..e1cb5d9 100644
--- a/KMFSysTray/app.cpp
+++ b/KMFSysTray/app.cpp
@@ -42,11 +42,11 @@ MainApp::MainApp() : TDEApplication() {
 //	TDEConfig *ksConfig = config();
 //	KMFIPTWatcher *watch = new KMFIPTWatcher( this, "KMFIPTWatcher" );
 //	MainWidget *mainWid = new MainWidget( 0 );
-//	connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), mainWid, TQT_SLOT( slotSetRunningStatus( bool ) ) );
-//	connect( watch, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ), 
-//		mainWid, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ) );
+//	connect( watch, TQ_SIGNAL( sigUpdateActive( bool ) ), mainWid, TQ_SLOT( slotSetRunningStatus( bool ) ) );
+//	connect( watch, TQ_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ), 
+//		mainWid, TQ_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ) );
 
-//	connect( mainWid, TQT_SIGNAL( sigQueryDetails( bool ) ), watch, TQT_SLOT( slotQueryDetails( bool ) ) );
+//	connect( mainWid, TQ_SIGNAL( sigQueryDetails( bool ) ), watch, TQ_SLOT( slotQueryDetails( bool ) ) );
 /*	
 	TQHBoxLayout *_layout = new TQHBoxLayout(this);
   	_layout->add(mainWid);*/
diff --git a/KMFSysTray/details.cpp b/KMFSysTray/details.cpp
index a213ebd..1d94bf1 100644
--- a/KMFSysTray/details.cpp
+++ b/KMFSysTray/details.cpp
@@ -31,7 +31,7 @@
 Details::Details( TQWidget* parent, const char* name, WFlags fl )
 		: DetailsDesigner( parent, name, fl ) {
 
-	TQObject::connect( m_cmd_close, TQT_SIGNAL( clicked() ), this, TQT_SLOT ( close() ) );
+	TQObject::connect( m_cmd_close, TQ_SIGNAL( clicked() ), this, TQ_SLOT ( close() ) );
 
 }
 
diff --git a/KMFSysTray/kmfiptwatcher.cpp b/KMFSysTray/kmfiptwatcher.cpp
index 65c92ec..451dfaf 100644
--- a/KMFSysTray/kmfiptwatcher.cpp
+++ b/KMFSysTray/kmfiptwatcher.cpp
@@ -55,7 +55,7 @@ KMFIPTWatcher::~KMFIPTWatcher() {}
 void KMFIPTWatcher::go() {
 	// KMessageBox::information( 0, i18n( "go()" ) );
 	m_timer = new TQTimer();
-	TQObject::connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( timeout() ) );
+	TQObject::connect( m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timeout() ) );
 	m_timer->start( 3000, false );
 }
 
diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp
index afd5914..880dd5d 100644
--- a/KMFSysTray/kmfsystray.cpp
+++ b/KMFSysTray/kmfsystray.cpp
@@ -54,19 +54,19 @@ KMFSysTray::KMFSysTray( TQWidget* w ) :  KSystemTray ( w ) , DCOPObject( "KMFSys
 	setPixmap( baseIcon );
 	
 	// Connect the watch deamon
-	connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), this, TQT_SLOT( slotSetRunningStatus( bool ) ) );
-	connect( watch, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ), 
-		this, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ) );
+	connect( watch, TQ_SIGNAL( sigUpdateActive( bool ) ), this, TQ_SLOT( slotSetRunningStatus( bool ) ) );
+	connect( watch, TQ_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ), 
+		this, TQ_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ) );
 
-	connect( watch, TQT_SIGNAL( sigUpdateIPTDoc( KMFIPTDoc* ) ), 
-		this, TQT_SIGNAL( sigUpdateIPTDoc( KMFIPTDoc* ) ) );
+	connect( watch, TQ_SIGNAL( sigUpdateIPTDoc( KMFIPTDoc* ) ), 
+		this, TQ_SIGNAL( sigUpdateIPTDoc( KMFIPTDoc* ) ) );
 
-	connect( this, TQT_SIGNAL( sigQueryDetails( bool ) ), watch, TQT_SLOT( slotQueryDetails( bool ) ) );
+	connect( this, TQ_SIGNAL( sigQueryDetails( bool ) ), watch, TQ_SLOT( slotQueryDetails( bool ) ) );
 
 	// Connect view
-	connect( w, TQT_SIGNAL( closing() ), this, TQT_SLOT ( slotDetailsClosed() ) );
-	connect( w, TQT_SIGNAL( showing() ), this, TQT_SLOT ( slotQueryDetails() ) );
-	connect( this, TQT_SIGNAL( sigUpdateIPTDoc( KMFIPTDoc* ) ), w, TQT_SLOT( slotLoadDoc( KMFIPTDoc* ) ) );
+	connect( w, TQ_SIGNAL( closing() ), this, TQ_SLOT ( slotDetailsClosed() ) );
+	connect( w, TQ_SIGNAL( showing() ), this, TQ_SLOT ( slotQueryDetails() ) );
+	connect( this, TQ_SIGNAL( sigUpdateIPTDoc( KMFIPTDoc* ) ), w, TQ_SLOT( slotLoadDoc( KMFIPTDoc* ) ) );
 
 
 	initMenu();
@@ -82,7 +82,7 @@ KMFSysTray::~KMFSysTray() {}
 
 void KMFSysTray::initMenu() {
 	TDEPopupMenu* menu = contextMenu ();
-	menu->insertItem( TDEGlobal::iconLoader()->loadIcon( "kmyfirewall", TDEIcon::Small ), i18n( "Launch KMyFirewall..."), this, TQT_SLOT( slotLaunchKMF() ), CTRL+Key_K );
+	menu->insertItem( TDEGlobal::iconLoader()->loadIcon( "kmyfirewall", TDEIcon::Small ), i18n( "Launch KMyFirewall..."), this, TQ_SLOT( slotLaunchKMF() ), CTRL+Key_K );
 	
 }
 
diff --git a/KMFSysTray/mainwidget.cpp b/KMFSysTray/mainwidget.cpp
index 14387f5..dab8315 100644
--- a/KMFSysTray/mainwidget.cpp
+++ b/KMFSysTray/mainwidget.cpp
@@ -39,10 +39,10 @@ MainWidget::MainWidget(TQWidget* parent, const char* name, WFlags fl)
 	m_ledActive->off();
 	m_cmd_info->setEnabled( false );
 	m_wid_details = new Details( 0 );
-	connect( m_wid_details, TQT_SIGNAL( closing() ), this, TQT_SLOT ( slotDetailsClosed() ) );
-	connect( this, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ),
-		m_wid_details, TQT_SLOT( slotUpdateRuleCount( const TQString&, const TQString&, int ) ) );
-	connect( m_cmd_info, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowDetails() ) ) ;
+	connect( m_wid_details, TQ_SIGNAL( closing() ), this, TQ_SLOT ( slotDetailsClosed() ) );
+	connect( this, TQ_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ),
+		m_wid_details, TQ_SLOT( slotUpdateRuleCount( const TQString&, const TQString&, int ) ) );
+	connect( m_cmd_info, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowDetails() ) ) ;
 }
 
 MainWidget::~MainWidget()