Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

5 files changed, 34 insertions, 34 deletions

diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp
index 6e224f8..3aeb2b1 100644
--- a/ksim/monitors/snmp/browsedialog.cpp
+++ b/ksim/monitors/snmp/browsedialog.cpp
@@ -96,10 +96,10 @@ void BrowseDialog::startWalk( const Identifier &startOid )
     stopWalker();
 
     m_walker = new Walker( m_host, startOid, this );
-    connect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ),
-             this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) );
-    connect( m_walker, TQT_SIGNAL( finished() ),
-             this, TQT_SLOT( nextWalk() ) );
+    connect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ),
+             this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) );
+    connect( m_walker, TQ_SIGNAL( finished() ),
+             this, TQ_SLOT( nextWalk() ) );
 
     stop->setEnabled( true );
 }
@@ -109,10 +109,10 @@ void BrowseDialog::stopWalker()
     if ( !m_walker )
         return;
 
-    disconnect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ),
-                this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) );
-    disconnect( m_walker, TQT_SIGNAL( finished() ),
-                this, TQT_SLOT( nextWalk() ) );
+    disconnect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ),
+                this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) );
+    disconnect( m_walker, TQ_SIGNAL( finished() ),
+                this, TQ_SLOT( nextWalk() ) );
 
     m_walker->deleteLater();
     m_walker = 0;
diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp
index e1dfcca..4ecd44e 100644
--- a/ksim/monitors/snmp/configpage.cpp
+++ b/ksim/monitors/snmp/configpage.cpp
@@ -50,24 +50,24 @@ ConfigPage::ConfigPage( Plugin *parent, const char *name )
 
     m_page = new ConfigWidget( this );
 
-    connect( m_page->addHost, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( addNewHost() ) );
-    connect( m_page->modifyHost, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( modifyHost() ) );
-    connect( m_page->removeHost, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( removeHost() ) );
-
-    connect( m_page->addMonitor, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( addNewMonitor() ) );
-    connect( m_page->modifyMonitor, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( modifyMonitor() ) );
-    connect( m_page->removeMonitor, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( removeMonitor() ) );
-
-    connect( m_page->hosts, TQT_SIGNAL( selectionChanged() ),
-             this, TQT_SLOT( disableOrEnableSomeWidgets() ) );
-    connect( m_page->monitors, TQT_SIGNAL( selectionChanged() ),
-             this, TQT_SLOT( disableOrEnableSomeWidgets() ) );
+    connect( m_page->addHost, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( addNewHost() ) );
+    connect( m_page->modifyHost, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( modifyHost() ) );
+    connect( m_page->removeHost, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( removeHost() ) );
+
+    connect( m_page->addMonitor, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( addNewMonitor() ) );
+    connect( m_page->modifyMonitor, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( modifyMonitor() ) );
+    connect( m_page->removeMonitor, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( removeMonitor() ) );
+
+    connect( m_page->hosts, TQ_SIGNAL( selectionChanged() ),
+             this, TQ_SLOT( disableOrEnableSomeWidgets() ) );
+    connect( m_page->monitors, TQ_SIGNAL( selectionChanged() ),
+             this, TQ_SLOT( disableOrEnableSomeWidgets() ) );
 }
 
 ConfigPage::~ConfigPage()
diff --git a/ksim/monitors/snmp/monitor.cpp b/ksim/monitors/snmp/monitor.cpp
index aa645cf..1294c10 100644
--- a/ksim/monitors/snmp/monitor.cpp
+++ b/ksim/monitors/snmp/monitor.cpp
@@ -32,7 +32,7 @@ Monitor::Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQ
     else
         m_timerId = -1;
 
-    TQTimer::singleShot( 0, this, TQT_SLOT( performSnmpRequest() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( performSnmpRequest() ) );
 }
 
 Monitor::~Monitor()
diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp
index 5242ee0..4e42bda 100644
--- a/ksim/monitors/snmp/monitorconfig.cpp
+++ b/ksim/monitors/snmp/monitorconfig.cpp
@@ -108,8 +108,8 @@ TQWidget *MonitorConfig::createMonitorWidget( TQWidget *parent, const char *name
         w = new ChartMonitor( *this, parent, name );
 
     Monitor *monitor = new Monitor( host, id, refresh, w );
-    TQObject::connect( monitor, TQT_SIGNAL( newData( const Value & ) ),
-                      w, TQT_SLOT( setData( const Value & ) ) );
+    TQObject::connect( monitor, TQ_SIGNAL( newData( const Value & ) ),
+                      w, TQ_SLOT( setData( const Value & ) ) );
     return w;
 }
 
diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp
index 736c534..2c9e930 100644
--- a/ksim/monitors/snmp/probedialog.cpp
+++ b/ksim/monitors/snmp/probedialog.cpp
@@ -79,10 +79,10 @@ void ProbeDialog::probeOne()
     delete m_currentMonitor;
     m_currentMonitor = new Monitor( m_host, oid, 0 /* no refresh */, this );
 
-    connect( m_currentMonitor, TQT_SIGNAL( newData( const Identifier &, const Value & ) ),
-             this, TQT_SLOT( probeResult( const Identifier &, const Value & ) ) );
-    connect( m_currentMonitor, TQT_SIGNAL( error( const Identifier &, const ErrorInfo & ) ),
-             this, TQT_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) );
+    connect( m_currentMonitor, TQ_SIGNAL( newData( const Identifier &, const Value & ) ),
+             this, TQ_SLOT( probeResult( const Identifier &, const Value & ) ) );
+    connect( m_currentMonitor, TQ_SIGNAL( error( const Identifier &, const ErrorInfo & ) ),
+             this, TQ_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) );
 }
 
 void ProbeDialog::probeResult( const Identifier &oid, const Value &value )
@@ -108,7 +108,7 @@ void ProbeDialog::nextProbe()
     if ( m_canceled )
         KProgressDialog::done( TQDialog::Rejected );
     else
-        TQTimer::singleShot( 0, this, TQT_SLOT( probeOne() ) );
+        TQTimer::singleShot( 0, this, TQ_SLOT( probeOne() ) );
 }
 
 #include "probedialog.moc"