Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

8 files changed, 55 insertions, 55 deletions

diff --git a/tdeio/misc/kpac/discovery.cpp b/tdeio/misc/kpac/discovery.cpp
index e076a083e..9e3cafd19 100644
--- a/tdeio/misc/kpac/discovery.cpp
+++ b/tdeio/misc/kpac/discovery.cpp
@@ -53,12 +53,12 @@ namespace KPAC
         : Downloader( parent ),
           m_helper( new KProcIO )
     {
-        connect( m_helper, TQT_SIGNAL( readReady( KProcIO* ) ), TQT_SLOT( helperOutput() ) );
-        connect( m_helper, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( failed() ) );
+        connect( m_helper, TQ_SIGNAL( readReady( KProcIO* ) ), TQ_SLOT( helperOutput() ) );
+        connect( m_helper, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( failed() ) );
         *m_helper << "kpac_dhcp_helper";
 
         if ( !m_helper->start() )
-            TQTimer::singleShot( 0, this, TQT_SLOT( failed() ) );
+            TQTimer::singleShot( 0, this, TQ_SLOT( failed() ) );
     }
 
     bool Discovery::initHostName()
diff --git a/tdeio/misc/kpac/downloader.cpp b/tdeio/misc/kpac/downloader.cpp
index 298d660dc..30857df0c 100644
--- a/tdeio/misc/kpac/downloader.cpp
+++ b/tdeio/misc/kpac/downloader.cpp
@@ -44,9 +44,9 @@ namespace KPAC
         m_scriptURL = url;
 
         TDEIO::TransferJob* job = TDEIO::get( url, false, false );
-        connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-                 TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
-        connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( result( TDEIO::Job* ) ) );
+        connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+                 TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+        connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( result( TDEIO::Job* ) ) );
     }
 
     void Downloader::failed()
diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp
index 695d06858..c1140af1b 100644
--- a/tdeio/misc/kpac/proxyscout.cpp
+++ b/tdeio/misc/kpac/proxyscout.cpp
@@ -105,8 +105,8 @@ namespace KPAC
             default:
                 return false;
         }
-        connect( m_downloader, TQT_SIGNAL( result( bool ) ),
-                 TQT_SLOT( downloadResult( bool ) ) );
+        connect( m_downloader, TQ_SIGNAL( result( bool ) ),
+                 TQ_SLOT( downloadResult( bool ) ) );
         return true;
     }
 
diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp
index bf3099094..d1e8ae483 100644
--- a/tdeio/misc/tdesendbugmail/main.cpp
+++ b/tdeio/misc/tdesendbugmail/main.cpp
@@ -122,8 +122,8 @@ int main(int argc, char **argv) {
     SMTP *sm = new SMTP;
     BugMailer bm(sm);
 
-    TQObject::connect(sm, TQT_SIGNAL(messageSent()), &bm, TQT_SLOT(slotSend()));
-    TQObject::connect(sm, TQT_SIGNAL(error(int)), &bm, TQT_SLOT(slotError(int)));
+    TQObject::connect(sm, TQ_SIGNAL(messageSent()), &bm, TQ_SLOT(slotSend()));
+    TQObject::connect(sm, TQ_SIGNAL(error(int)), &bm, TQ_SLOT(slotError(int)));
     sm->setServerHost(server);
     sm->setPort(25);
     sm->setSenderAddress(fromaddr);
diff --git a/tdeio/misc/tdesendbugmail/smtp.cpp b/tdeio/misc/tdesendbugmail/smtp.cpp
index 470f24050..ae507e76a 100644
--- a/tdeio/misc/tdesendbugmail/smtp.cpp
+++ b/tdeio/misc/tdesendbugmail/smtp.cpp
@@ -38,12 +38,12 @@ SMTP::SMTP(char *serverhost, unsigned short int port, int timeout)
 
     kdDebug() << "SMTP object created" << endl;
 
-    connect(&connectTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(connectTimerTick()));
-    connect(&timeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(connectTimedOut()));
-    connect(&interactTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(interactTimedOut()));
+    connect(&connectTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(connectTimerTick()));
+    connect(&timeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(connectTimedOut()));
+    connect(&interactTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(interactTimedOut()));
 
     // some sendmail will give 'duplicate helo' error, quick fix for now
-    connect(this, TQT_SIGNAL(messageSent()), TQT_SLOT(closeConnection()));
+    connect(this, TQ_SIGNAL(messageSent()), TQ_SLOT(closeConnection()));
 }
 
 SMTP::~SMTP()
@@ -175,8 +175,8 @@ void SMTP::connectTimerTick(void)
     state = INIT;
     serverState = NONE;
 
-    connect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *)));
-    connect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *)));
+    connect(sock, TQ_SIGNAL(readEvent(TDESocket *)), this, TQ_SLOT(socketRead(TDESocket *)));
+    connect(sock, TQ_SIGNAL(closeEvent(TDESocket *)), this, TQ_SLOT(socketClose(TDESocket *)));
     //    sock->enableRead(true);
     timeOutTimer.stop();
     kdDebug() << "connected" << endl;
@@ -233,8 +233,8 @@ void SMTP::socketRead(TDESocket *socket)
 void SMTP::socketClose(TDESocket *socket)
 {
     timeOutTimer.stop();
-    disconnect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *)));
-    disconnect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *)));
+    disconnect(sock, TQ_SIGNAL(readEvent(TDESocket *)), this, TQ_SLOT(socketRead(TDESocket *)));
+    disconnect(sock, TQ_SIGNAL(closeEvent(TDESocket *)), this, TQ_SLOT(socketClose(TDESocket *)));
     socket->enableRead(false);
     kdDebug() << "connection terminated" << endl;
     connected = false;
diff --git a/tdeio/misc/tdewalletd/ktimeout.cpp b/tdeio/misc/tdewalletd/ktimeout.cpp
index c431ecf69..25108bdc5 100644
--- a/tdeio/misc/tdewalletd/ktimeout.cpp
+++ b/tdeio/misc/tdewalletd/ktimeout.cpp
@@ -52,7 +52,7 @@ void KTimeout::addTimer(int id, int timeout) {
 	}
 
 	TQTimer *t = new TQTimer;
-	connect(t, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
+	connect(t, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()));
 	t->start(timeout);
 	_timers.insert(id, t);
 }
diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index 0aaec0f9a..5b7840fd0 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -92,17 +92,17 @@ TDEWalletD::TDEWalletD(const TQCString &name)
 	_timeouts = new KTimeout(17);
 	_closeIdle = false;
 	_idleTime = 0;
-	connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int)));
+	connect(_timeouts, TQ_SIGNAL(timedOut(int)), this, TQ_SLOT(timedOut(int)));
 	reconfigure();
 	TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
 	connect(TDEApplication::dcopClient(),
-		TQT_SIGNAL(applicationRemoved(const TQCString&)),
+		TQ_SIGNAL(applicationRemoved(const TQCString&)),
 		this,
-		TQT_SLOT(slotAppUnregistered(const TQCString&)));
+		TQ_SLOT(slotAppUnregistered(const TQCString&)));
 	_dw = new KDirWatch(this, "TDEWallet Directory Watcher");
 	_dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet"));
 	_dw->startScan(true);
-	connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty()));
+	connect(_dw, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(emitWalletListDirty()));
 }
 
 
@@ -229,7 +229,7 @@ void TDEWalletD::openAsynchronous(const TQString& wallet, const TQCString& retur
 
 	DCOPRef(appid, returnObject).send("walletOpenResult", 0);
 
-	TQTimer::singleShot(0, this, TQT_SLOT(processTransactions()));
+	TQTimer::singleShot(0, this, TQ_SLOT(processTransactions()));
 	checkActiveDialog();
 }
 
@@ -266,7 +266,7 @@ int TDEWalletD::open(const TQString& wallet, uint wId) {
 	xact->wId = wId;
 	xact->tType = TDEWalletTransaction::Open;
 	xact->modal = true; // mark dialogs as modal, the app has blocking wait
-	TQTimer::singleShot(0, this, TQT_SLOT(processTransactions()));
+	TQTimer::singleShot(0, this, TQ_SLOT(processTransactions()));
 	checkActiveDialog();
 	return 0; // process later
 }
@@ -386,7 +386,7 @@ int TDEWalletD::tryOpen(const TQString& wallet, const TQCString& password)
         _tryOpenBlocked.start (30 * 1000, true /*single shot*/);
         if (++_failed > 5) {
             _failed = 0;
-            TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures()));
+            TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures()));
         }
 
         rc = -1;
@@ -627,7 +627,7 @@ void TDEWalletD::changePassword(const TQString& wallet, uint wId) {
 
 	_transactions.append(xact);
 
-	TQTimer::singleShot(0, this, TQT_SLOT(processTransactions()));
+	TQTimer::singleShot(0, this, TQ_SLOT(processTransactions()));
 	checkActiveDialog();
 }
 
@@ -801,7 +801,7 @@ bool TDEWalletD::isOpen(int handle) {
 
 	if (rc == 0 && ++_failed > 5) {
 		_failed = 0;
-		TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures()));
+		TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures()));
 	} else if (rc != 0) {
 		_failed = 0;
 	}
@@ -1229,7 +1229,7 @@ TDEWallet::Backend *TDEWalletD::getWallet(const TQCString& appid, int handle) {
 
 	if (++_failed > 5) {
 		_failed = 0;
-		TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures()));
+		TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures()));
 	}
 
 	return 0L;
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index a6ed43f03..e8309ea4c 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -94,11 +94,11 @@ class UIServerSystemTray:public KSystemTray
          :KSystemTray(uis)
       {
          TDEPopupMenu* pop= contextMenu();
-         pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure()));
-         pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon()));
+         pop->insertItem(i18n("Settings..."), uis, TQ_SLOT(slotConfigure()));
+         pop->insertItem(i18n("Remove"), uis, TQ_SLOT(slotRemoveSystemTrayIcon()));
          setPixmap(loadIcon("document-save"));
          //actionCollection()->action("file_quit")->setEnabled(true);
-         KStdAction::quit(uis, TQT_SLOT(slotQuit()), actionCollection());
+         KStdAction::quit(uis, TQ_SLOT(slotQuit()), actionCollection());
       }
 };
 
@@ -193,8 +193,8 @@ ProgressItem::ProgressItem( ListProgress* view, TQListViewItem *after, TQCString
   // create dialog, but don't show it
   defaultProgress = new TDEIO::DefaultProgress( false );
   defaultProgress->setOnlyClean( true );
-  connect ( defaultProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotCanceled() ) );
-  connect ( &m_showTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(slotShowDefaultProgress()) );
+  connect ( defaultProgress, TQ_SIGNAL( stopped() ), this, TQ_SLOT( slotCanceled() ) );
+  connect ( &m_showTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(slotShowDefaultProgress()) );
 
   if ( showDefault ) {
     m_showTimer.start( 500, true );
@@ -478,7 +478,7 @@ ListProgress::ListProgress (TQWidget *parent, const char *name)
   //used for squeezing the text in local file name and url
   m_squeezer=new KSqueezedTextLabel(this);
   m_squeezer->hide();
-  connect(header(),TQT_SIGNAL(sizeChange(int,int,int)),this,TQT_SLOT(columnWidthChanged(int)));
+  connect(header(),TQ_SIGNAL(sizeChange(int,int,int)),this,TQ_SLOT(columnWidthChanged(int)));
 }
 
 
@@ -595,11 +595,11 @@ UIServer::UIServer()
 
   // setup toolbar
   toolBar()->insertButton("edit-delete", TOOL_CANCEL,
-                          TQT_SIGNAL(clicked()), this,
-                          TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel"));
+                          TQ_SIGNAL(clicked()), this,
+                          TQ_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel"));
   toolBar()->insertButton("configure", TOOL_CONFIGURE,
-                          TQT_SIGNAL(clicked()), this,
-                          TQT_SLOT(slotConfigure()), true, i18n("Settings..."));
+                          TQ_SIGNAL(clicked()), this,
+                          TQ_SLOT(slotConfigure()), true, i18n("Settings..."));
 
   toolBar()->setBarPos( TDEToolBar::Left );
 
@@ -614,18 +614,18 @@ UIServer::UIServer()
 
   setCentralWidget( listProgress );
 
-  connect( listProgress, TQT_SIGNAL( selectionChanged() ),
-           TQT_SLOT( slotSelection() ) );
-  connect( listProgress, TQT_SIGNAL( executed( TQListViewItem* ) ),
-           TQT_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) );
-  connect( listProgress, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)),
-           TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
+  connect( listProgress, TQ_SIGNAL( selectionChanged() ),
+           TQ_SLOT( slotSelection() ) );
+  connect( listProgress, TQ_SIGNAL( executed( TQListViewItem* ) ),
+           TQ_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) );
+  connect( listProgress, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)),
+           TQ_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
 
 
   // setup animation timer
   updateTimer = new TQTimer( this );
-  connect( updateTimer, TQT_SIGNAL( timeout() ),
-           TQT_SLOT( slotUpdate() ) );
+  connect( updateTimer, TQ_SIGNAL( timeout() ),
+           TQ_SLOT( slotUpdate() ) );
   m_bUpdateNewJob=false;
 
   setCaption(i18n("Progress Dialog"));
@@ -675,10 +675,10 @@ void UIServer::slotShowContextMenu(TDEListView*, TQListViewItem* item, const TQP
    if (m_contextMenu==0)
    {
       m_contextMenu=new TQPopupMenu(this);
-      m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQT_SLOT(slotCancelCurrent()));
-//      m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQT_SLOT(slotToggleDefaultProgress()));
+      m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQ_SLOT(slotCancelCurrent()));
+//      m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQ_SLOT(slotToggleDefaultProgress()));
       m_contextMenu->insertSeparator();
-      m_contextMenu->insertItem(i18n("Settings..."), this, TQT_SLOT(slotConfigure()));
+      m_contextMenu->insertItem(i18n("Settings..."), this, TQ_SLOT(slotConfigure()));
    }
    if ( item )
        item->setSelected( true );
@@ -707,9 +707,9 @@ void UIServer::slotConfigure()
    if (m_configDialog==0)
    {
       m_configDialog=new ProgressConfigDialog(0);
-//      connect(m_configDialog,TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancelConfig()));
-      connect(m_configDialog,TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotApplyConfig()));
-      connect(m_configDialog,TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotApplyConfig()));
+//      connect(m_configDialog,TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCancelConfig()));
+      connect(m_configDialog,TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotApplyConfig()));
+      connect(m_configDialog,TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotApplyConfig()));
    }
    m_configDialog->m_showSystemTrayCb->setChecked(m_showSystemTray);
    m_configDialog->m_keepOpenCb->setChecked(m_keepListOpen);
@@ -760,8 +760,8 @@ int UIServer::newJob( TQCString observerAppId, bool showProgress )
   bool show = !m_bShowList && showProgress;
 
   ProgressItem *item = new ProgressItem( listProgress, it.current(), observerAppId, s_jobId, show );
-  connect( item, TQT_SIGNAL( jobCanceled( ProgressItem* ) ),
-           TQT_SLOT( slotJobCanceled( ProgressItem* ) ) );
+  connect( item, TQ_SIGNAL( jobCanceled( ProgressItem* ) ),
+           TQ_SLOT( slotJobCanceled( ProgressItem* ) ) );
 
   if ( m_bShowList && !updateTimer->isActive() )
     updateTimer->start( 1000 );