Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

8 files changed, 81 insertions, 81 deletions

diff --git a/src/knemod/backends/nettoolsbackend.cpp b/src/knemod/backends/nettoolsbackend.cpp
index 1437e47..20bca58 100644
--- a/src/knemod/backends/nettoolsbackend.cpp
+++ b/src/knemod/backends/nettoolsbackend.cpp
@@ -71,10 +71,10 @@ void NetToolsBackend::update()
         mIfconfigProcess->setEnvironment( "LANG", "C" );
         mIfconfigProcess->setEnvironment( "LC_ALL", "C" );
         *mIfconfigProcess << PATH_IFCONFIG << "-a";
-        connect( mIfconfigProcess,  TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
-                 this, TQT_SLOT( ifconfigProcessStdout( TDEProcess*, char*, int ) ) );
-        connect( mIfconfigProcess,  TQT_SIGNAL( processExited( TDEProcess* ) ),
-                 this, TQT_SLOT( ifconfigProcessExited( TDEProcess* ) ) );
+        connect( mIfconfigProcess,  TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+                 this, TQ_SLOT( ifconfigProcessStdout( TDEProcess*, char*, int ) ) );
+        connect( mIfconfigProcess,  TQ_SIGNAL( processExited( TDEProcess* ) ),
+                 this, TQ_SLOT( ifconfigProcessExited( TDEProcess* ) ) );
 
         if ( !mIfconfigProcess->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) )
         {
@@ -91,12 +91,12 @@ void NetToolsBackend::update()
         mIwconfigProcess->setEnvironment( "LANG", "C" );
         mIwconfigProcess->setEnvironment( "LC_ALL", "C" );
         *mIwconfigProcess << PATH_IWCONFIG;
-        connect( mIwconfigProcess,  TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
-                 this, TQT_SLOT( iwconfigProcessStdout( TDEProcess*, char*, int ) ) );
-        connect( mIwconfigProcess,  TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
-                 this, TQT_SLOT( iwconfigProcessStdout( TDEProcess*, char*, int ) ) );
-        connect( mIwconfigProcess,  TQT_SIGNAL( processExited( TDEProcess* ) ),
-                 this, TQT_SLOT( iwconfigProcessExited( TDEProcess* ) ) );
+        connect( mIwconfigProcess,  TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+                 this, TQ_SLOT( iwconfigProcessStdout( TDEProcess*, char*, int ) ) );
+        connect( mIwconfigProcess,  TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
+                 this, TQ_SLOT( iwconfigProcessStdout( TDEProcess*, char*, int ) ) );
+        connect( mIwconfigProcess,  TQ_SIGNAL( processExited( TDEProcess* ) ),
+                 this, TQ_SLOT( iwconfigProcessExited( TDEProcess* ) ) );
 
         if ( !mIwconfigProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
         {
@@ -114,12 +114,12 @@ void NetToolsBackend::update()
         mRouteProcess->setEnvironment( "LANG", "C" );
         mRouteProcess->setEnvironment( "LC_ALL", "C" );
         *mRouteProcess << PATH_ROUTE << "-n";
-        connect( mRouteProcess,  TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
-                 this, TQT_SLOT( routeProcessStdout( TDEProcess*, char*, int ) ) );
-        connect( mRouteProcess,  TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
-                 this, TQT_SLOT( routeProcessStdout( TDEProcess*, char*, int ) ) );
-        connect( mRouteProcess,  TQT_SIGNAL( processExited( TDEProcess* ) ),
-                 this, TQT_SLOT( routeProcessExited( TDEProcess* ) ) );
+        connect( mRouteProcess,  TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+                 this, TQ_SLOT( routeProcessStdout( TDEProcess*, char*, int ) ) );
+        connect( mRouteProcess,  TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
+                 this, TQ_SLOT( routeProcessStdout( TDEProcess*, char*, int ) ) );
+        connect( mRouteProcess,  TQ_SIGNAL( processExited( TDEProcess* ) ),
+                 this, TQ_SLOT( routeProcessExited( TDEProcess* ) ) );
 
         if ( !mRouteProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) )
         {
diff --git a/src/knemod/interface.cpp b/src/knemod/interface.cpp
index ed672a4..c2c09ee 100644
--- a/src/knemod/interface.cpp
+++ b/src/knemod/interface.cpp
@@ -51,20 +51,20 @@ Interface::Interface( TQString ifname,
       mGeneralData( generalData ),
       mPlotterSettings( plotterSettings )
 {
-    connect( &mMonitor, TQT_SIGNAL( statusChanged( int ) ),
-             &mIcon, TQT_SLOT( updateStatus( int ) ) );
-    connect( &mMonitor, TQT_SIGNAL( available( int ) ),
-             &mIcon, TQT_SLOT( updateTrayStatus( int ) ) );
-    connect( &mMonitor, TQT_SIGNAL( notAvailable( int ) ),
-             &mIcon, TQT_SLOT( updateTrayStatus( int ) ) );
-    connect( &mMonitor, TQT_SIGNAL( notExisting( int ) ),
-             &mIcon, TQT_SLOT( updateTrayStatus( int ) ) );
-    connect( &mMonitor, TQT_SIGNAL( available( int ) ),
-             this, TQT_SLOT( setStartTime( int ) ) );
-    connect( &mMonitor, TQT_SIGNAL( statusChanged( int ) ),
-             this, TQT_SLOT( resetData( int ) ) );
-    connect( &mIcon, TQT_SIGNAL( statisticsSelected() ),
-             this, TQT_SLOT( showStatisticsDialog() ) );
+    connect( &mMonitor, TQ_SIGNAL( statusChanged( int ) ),
+             &mIcon, TQ_SLOT( updateStatus( int ) ) );
+    connect( &mMonitor, TQ_SIGNAL( available( int ) ),
+             &mIcon, TQ_SLOT( updateTrayStatus( int ) ) );
+    connect( &mMonitor, TQ_SIGNAL( notAvailable( int ) ),
+             &mIcon, TQ_SLOT( updateTrayStatus( int ) ) );
+    connect( &mMonitor, TQ_SIGNAL( notExisting( int ) ),
+             &mIcon, TQ_SLOT( updateTrayStatus( int ) ) );
+    connect( &mMonitor, TQ_SIGNAL( available( int ) ),
+             this, TQ_SLOT( setStartTime( int ) ) );
+    connect( &mMonitor, TQ_SIGNAL( statusChanged( int ) ),
+             this, TQ_SLOT( resetData( int ) ) );
+    connect( &mIcon, TQ_SIGNAL( statisticsSelected() ),
+             this, TQ_SLOT( showStatisticsDialog() ) );
 }
 
 Interface::~Interface()
@@ -143,16 +143,16 @@ void Interface::showStatusDialog()
     if ( mStatusDialog == 0L )
     {
         mStatusDialog = new InterfaceStatusDialog( this );
-        connect( &mMonitor, TQT_SIGNAL( available( int ) ),
-                 mStatusDialog, TQT_SLOT( enableNetworkGroups( int ) ) );
-        connect( &mMonitor, TQT_SIGNAL( notAvailable( int ) ),
-                 mStatusDialog, TQT_SLOT( disableNetworkGroups( int ) ) );
-        connect( &mMonitor, TQT_SIGNAL( notExisting( int ) ),
-                 mStatusDialog, TQT_SLOT( disableNetworkGroups( int ) ) );
+        connect( &mMonitor, TQ_SIGNAL( available( int ) ),
+                 mStatusDialog, TQ_SLOT( enableNetworkGroups( int ) ) );
+        connect( &mMonitor, TQ_SIGNAL( notAvailable( int ) ),
+                 mStatusDialog, TQ_SLOT( disableNetworkGroups( int ) ) );
+        connect( &mMonitor, TQ_SIGNAL( notExisting( int ) ),
+                 mStatusDialog, TQ_SLOT( disableNetworkGroups( int ) ) );
         if ( mStatistics != 0 )
         {
-            connect( mStatistics, TQT_SIGNAL( currentEntryChanged() ),
-                     mStatusDialog, TQT_SLOT( statisticsChanged() ) );
+            connect( mStatistics, TQ_SIGNAL( currentEntryChanged() ),
+                     mStatusDialog, TQ_SLOT( statisticsChanged() ) );
             mStatusDialog->statisticsChanged();
         }
         activateOrHide( mStatusDialog, true );
@@ -177,8 +177,8 @@ void Interface::showSignalPlotter( bool wasMiddleButton )
         activateOrHide( mPlotter, true );
 
         mPlotterTimer = new TQTimer();
-        connect( mPlotterTimer, TQT_SIGNAL( timeout() ),
-                 this, TQT_SLOT( updatePlotter() ) );
+        connect( mPlotterTimer, TQ_SIGNAL( timeout() ),
+                 this, TQ_SLOT( updatePlotter() ) );
         mPlotterTimer->start( 1000 );
     }
     else
@@ -206,20 +206,20 @@ void Interface::showStatisticsDialog()
             // should never happen but you never know...
             startStatistics();
         }
-        connect( mStatistics, TQT_SIGNAL( dayStatisticsChanged() ),
-                 mStatisticsDialog, TQT_SLOT( updateDays() ) );
-        connect( mStatistics, TQT_SIGNAL( monthStatisticsChanged() ),
-                 mStatisticsDialog, TQT_SLOT( updateMonths() ) );
-        connect( mStatistics, TQT_SIGNAL( yearStatisticsChanged() ),
-                 mStatisticsDialog, TQT_SLOT( updateYears() ) );
-        connect( mStatistics, TQT_SIGNAL( currentEntryChanged() ),
-                 mStatisticsDialog, TQT_SLOT( updateCurrentEntry() ) );
-        connect( mStatisticsDialog, TQT_SIGNAL( clearDailyStatisticsClicked() ),
-                 mStatistics, TQT_SLOT( clearDayStatistics() ) );
-        connect( mStatisticsDialog, TQT_SIGNAL( clearMonthlyStatisticsClicked() ),
-                 mStatistics, TQT_SLOT( clearMonthStatistics() ) );
-        connect( mStatisticsDialog, TQT_SIGNAL( clearYearlyStatisticsClicked() ),
-                 mStatistics, TQT_SLOT( clearYearStatistics() ) );
+        connect( mStatistics, TQ_SIGNAL( dayStatisticsChanged() ),
+                 mStatisticsDialog, TQ_SLOT( updateDays() ) );
+        connect( mStatistics, TQ_SIGNAL( monthStatisticsChanged() ),
+                 mStatisticsDialog, TQ_SLOT( updateMonths() ) );
+        connect( mStatistics, TQ_SIGNAL( yearStatisticsChanged() ),
+                 mStatisticsDialog, TQ_SLOT( updateYears() ) );
+        connect( mStatistics, TQ_SIGNAL( currentEntryChanged() ),
+                 mStatisticsDialog, TQ_SLOT( updateCurrentEntry() ) );
+        connect( mStatisticsDialog, TQ_SIGNAL( clearDailyStatisticsClicked() ),
+                 mStatistics, TQ_SLOT( clearDayStatistics() ) );
+        connect( mStatisticsDialog, TQ_SIGNAL( clearMonthlyStatisticsClicked() ),
+                 mStatistics, TQ_SLOT( clearMonthStatistics() ) );
+        connect( mStatisticsDialog, TQ_SIGNAL( clearYearlyStatisticsClicked() ),
+                 mStatistics, TQ_SLOT( clearYearStatistics() ) );
 
         mStatisticsDialog->updateDays();
         mStatisticsDialog->updateMonths();
@@ -404,14 +404,14 @@ void Interface::configurePlotter()
 void Interface::startStatistics()
 {
     mStatistics = new InterfaceStatistics( this );
-    connect( &mMonitor, TQT_SIGNAL( incomingData( unsigned long ) ),
-             mStatistics, TQT_SLOT( addIncomingData( unsigned long ) ) );
-    connect( &mMonitor, TQT_SIGNAL( outgoingData( unsigned long ) ),
-             mStatistics, TQT_SLOT( addOutgoingData( unsigned long ) ) );
+    connect( &mMonitor, TQ_SIGNAL( incomingData( unsigned long ) ),
+             mStatistics, TQ_SLOT( addIncomingData( unsigned long ) ) );
+    connect( &mMonitor, TQ_SIGNAL( outgoingData( unsigned long ) ),
+             mStatistics, TQ_SLOT( addOutgoingData( unsigned long ) ) );
     if ( mStatusDialog != 0 )
     {
-        connect( mStatistics, TQT_SIGNAL( currentEntryChanged() ),
-                 mStatusDialog, TQT_SLOT( statisticsChanged() ) );
+        connect( mStatistics, TQ_SIGNAL( currentEntryChanged() ),
+                 mStatusDialog, TQ_SLOT( statisticsChanged() ) );
         mStatusDialog->statisticsChanged();
     }
 
diff --git a/src/knemod/interfaceicon.cpp b/src/knemod/interfaceicon.cpp
index cebcbc2..2508bcd 100644
--- a/src/knemod/interfaceicon.cpp
+++ b/src/knemod/interfaceicon.cpp
@@ -137,7 +137,7 @@ void InterfaceIcon::updateMenu()
     if ( settings.activateStatistics )
     {
         menu->insertItem( i18n( "Open &Statistics" ), this,
-                          TQT_SIGNAL( statisticsSelected() ) );
+                          TQ_SIGNAL( statisticsSelected() ) );
     }
 
     // If the user wants custom commands, add them.
@@ -233,16 +233,16 @@ void InterfaceIcon::updateTrayStatus( int previousState, bool notify )
         mTray = new InterfaceTray( mInterface->getName() );
         TQToolTip::add( mTray, mInterface->getName() );
         TDEPopupMenu* menu = mTray->contextMenu();
-        connect( menu, TQT_SIGNAL( activated( int ) ),
-                 this, TQT_SLOT( menuActivated( int ) ) );
-        connect( mTray, TQT_SIGNAL( leftClicked() ),
-                 mInterface, TQT_SLOT( showStatusDialog() ) );
-        connect( mTray, TQT_SIGNAL( graphSelected( bool ) ),
-                 mInterface, TQT_SLOT( showSignalPlotter( bool ) ) );
-        connect( mTray, TQT_SIGNAL( configSelected() ),
-                 this, TQT_SLOT( showConfigDialog() ) );
-        connect( mTray, TQT_SIGNAL( iconResized() ),
-                 this, TQT_SLOT( resizeIcon() ) );
+        connect( menu, TQ_SIGNAL( activated( int ) ),
+                 this, TQ_SLOT( menuActivated( int ) ) );
+        connect( mTray, TQ_SIGNAL( leftClicked() ),
+                 mInterface, TQ_SLOT( showStatusDialog() ) );
+        connect( mTray, TQ_SIGNAL( graphSelected( bool ) ),
+                 mInterface, TQ_SLOT( showSignalPlotter( bool ) ) );
+        connect( mTray, TQ_SIGNAL( configSelected() ),
+                 this, TQ_SLOT( showConfigDialog() ) );
+        connect( mTray, TQ_SIGNAL( iconResized() ),
+                 this, TQ_SLOT( resizeIcon() ) );
 
         updateStatus( mInterface->getState() );
         updateToolTip();
diff --git a/src/knemod/interfacestatistics.cpp b/src/knemod/interfacestatistics.cpp
index 11212f3..4dcf915 100644
--- a/src/knemod/interfacestatistics.cpp
+++ b/src/knemod/interfacestatistics.cpp
@@ -38,7 +38,7 @@ InterfaceStatistics::InterfaceStatistics( Interface* interface )
     initStatistics();
 
     mSaveTimer = new TQTimer();
-    connect( mSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( saveStatistics() ) );
+    connect( mSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( saveStatistics() ) );
     mSaveTimer->start( mInterface->getGeneralData().saveInterval * 1000 );
 }
 
diff --git a/src/knemod/interfacestatisticsdialog.cpp b/src/knemod/interfacestatisticsdialog.cpp
index 5fe9634..3da5d32 100644
--- a/src/knemod/interfacestatisticsdialog.cpp
+++ b/src/knemod/interfacestatisticsdialog.cpp
@@ -43,9 +43,9 @@ InterfaceStatisticsDialog::InterfaceStatisticsDialog( Interface* interface, TQWi
     setIcon( SmallIcon( "knemo" ) );
     setCaption( interface->getName() + " " + i18n( "Statistics" ) );
 
-    connect( buttonClearDaily, TQT_SIGNAL( clicked() ), TQT_SIGNAL( clearDailyStatisticsClicked() ) );
-    connect( buttonClearMonthly, TQT_SIGNAL( clicked() ), TQT_SIGNAL( clearMonthlyStatisticsClicked() ) );
-    connect( buttonClearYearly, TQT_SIGNAL( clicked() ), TQT_SIGNAL( clearYearlyStatisticsClicked() ) );
+    connect( buttonClearDaily, TQ_SIGNAL( clicked() ), TQ_SIGNAL( clearDailyStatisticsClicked() ) );
+    connect( buttonClearMonthly, TQ_SIGNAL( clicked() ), TQ_SIGNAL( clearMonthlyStatisticsClicked() ) );
+    connect( buttonClearYearly, TQ_SIGNAL( clicked() ), TQ_SIGNAL( clearYearlyStatisticsClicked() ) );
 }
 
 InterfaceStatisticsDialog::~InterfaceStatisticsDialog()
diff --git a/src/knemod/interfacestatusdialog.cpp b/src/knemod/interfacestatusdialog.cpp
index 12bc469..2ba911b 100644
--- a/src/knemod/interfacestatusdialog.cpp
+++ b/src/knemod/interfacestatusdialog.cpp
@@ -85,7 +85,7 @@ InterfaceStatusDialog::InterfaceStatusDialog( Interface* interface, TQWidget* pa
     statisticsChanged();
 
     mTimer = new TQTimer();
-    connect( mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateDialog() ) );
+    connect( mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateDialog() ) );
     mTimer->start( 1000 );
 }
 
diff --git a/src/knemod/interfacetray.cpp b/src/knemod/interfacetray.cpp
index 17f4b7e..cd1daf5 100644
--- a/src/knemod/interfacetray.cpp
+++ b/src/knemod/interfacetray.cpp
@@ -49,16 +49,16 @@ InterfaceTray::InterfaceTray( const TQString& ifname,
                         "KNemo - " + ifname );
     popup->insertItem( SmallIcon( "knemo" ),
                        i18n( "&About KNemo" ), this,
-                       TQT_SLOT( showAboutDialog() ) );
+                       TQ_SLOT( showAboutDialog() ) );
     popup->insertItem( i18n( "&Report Bug..." ), this,
-                       TQT_SLOT( showReportBugDialog() ) );
+                       TQ_SLOT( showReportBugDialog() ) );
     popup->insertSeparator();
     popup->insertItem( SmallIcon( "configure" ),
                        i18n( "&Configure KNemo..." ), this,
-                       TQT_SIGNAL( configSelected() ) );
+                       TQ_SIGNAL( configSelected() ) );
     popup->insertItem( SmallIcon( "ksysguard" ),
                        i18n( "&Open Traffic Plotter" ), this,
-                       TQT_SLOT( showGraph() ) );
+                       TQ_SLOT( showGraph() ) );
 }
 
 InterfaceTray::~InterfaceTray()
diff --git a/src/knemod/knemodaemon.cpp b/src/knemod/knemodaemon.cpp
index 0ad399e..91ae99b 100644
--- a/src/knemod/knemodaemon.cpp
+++ b/src/knemod/knemodaemon.cpp
@@ -81,7 +81,7 @@ KNemoDaemon::KNemoDaemon( const TQCString& name )
     mInterfaceDict.setAutoDelete( true );
 
     mPollTimer = new TQTimer();
-    connect( mPollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateInterfaces() ) );
+    connect( mPollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateInterfaces() ) );
     mPollTimer->start( mGeneralData.pollInterval * 1000 );
 }