Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 15 insertions, 15 deletions

diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 385bd695..05236d95 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -736,12 +736,12 @@ KviDccFileTransfer::KviDccFileTransfer(KviDccDescriptor * dcc)
 
 	m_pMarshal = new KviDccMarshal(this);
 
-	connect(m_pMarshal,TQT_SIGNAL(error(int)),this,TQT_SLOT(handleMarshalError(int)));
-	connect(m_pMarshal,TQT_SIGNAL(connected()),this,TQT_SLOT(connected()));
-	connect(m_pMarshal,TQT_SIGNAL(inProgress()),this,TQT_SLOT(connectionInProgress()));
+	connect(m_pMarshal,TQ_SIGNAL(error(int)),this,TQ_SLOT(handleMarshalError(int)));
+	connect(m_pMarshal,TQ_SIGNAL(connected()),this,TQ_SLOT(connected()));
+	connect(m_pMarshal,TQ_SIGNAL(inProgress()),this,TQ_SLOT(connectionInProgress()));
 #ifdef COMPILE_SSL_SUPPORT
-	connect(m_pMarshal,TQT_SIGNAL(startingSSLHandshake()),this,TQT_SLOT(startingSSLHandshake()));
-	connect(m_pMarshal,TQT_SIGNAL(sslError(const char *)),this,TQT_SLOT(sslError(const char *)));
+	connect(m_pMarshal,TQ_SIGNAL(startingSSLHandshake()),this,TQ_SLOT(startingSSLHandshake()));
+	connect(m_pMarshal,TQ_SIGNAL(sslError(const char *)),this,TQ_SLOT(sslError(const char *)));
 #endif
 
 	m_szDccType = dcc->bIsTdcc ? (dcc->bRecvFile ? "TRECV" : "TSEND") : (dcc->bRecvFile ? "RECV" : "SEND");
@@ -851,7 +851,7 @@ void KviDccFileTransfer::startConnection()
 
 		if(m_pResumeTimer)delete m_pResumeTimer;
 		m_pResumeTimer = new TQTimer(this);
-		connect(m_pResumeTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(resumeTimedOut()));
+		connect(m_pResumeTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(resumeTimedOut()));
 		m_pResumeTimer->start(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000,true);
 	} else {
 		listenOrConnect();
@@ -933,15 +933,15 @@ void KviDccFileTransfer::abort()
 
 void KviDccFileTransfer::fillContextPopup(KviTalPopupMenu * m,int column)
 {
-	m->insertItem(__tr2qs_ctx("Configure Bandwidth...","dcc"),this,TQT_SLOT(configureBandwidth()));
+	m->insertItem(__tr2qs_ctx("Configure Bandwidth...","dcc"),this,TQ_SLOT(configureBandwidth()));
 	m->insertSeparator();
-	m->insertItem(__tr2qs_ctx("Resend DCC","dcc"),this,TQT_SLOT(retryDCC()));
-	m->insertItem(__tr2qs_ctx("Resend TDCC","dcc"),this,TQT_SLOT(retryTDCC()));
-	m->insertItem(__tr2qs_ctx("Resend RevDCC","dcc"),this,TQT_SLOT(retryRevDCC()));
+	m->insertItem(__tr2qs_ctx("Resend DCC","dcc"),this,TQ_SLOT(retryDCC()));
+	m->insertItem(__tr2qs_ctx("Resend TDCC","dcc"),this,TQ_SLOT(retryTDCC()));
+	m->insertItem(__tr2qs_ctx("Resend RevDCC","dcc"),this,TQ_SLOT(retryRevDCC()));
 	/* FIX ME credo che il problema sia che se riavvio un trasferimento, a sua volta gia'
 		   avviato, questo non ha irc contex, perche' la finestra "in cui e' nato"e' sta
 	   quella della dcc. Conservarsi l'id della finestra? */
-	int id = m->insertItem(__tr2qs_ctx("Abort","dcc"),this,TQT_SLOT(abort()));
+	int id = m->insertItem(__tr2qs_ctx("Abort","dcc"),this,TQ_SLOT(abort()));
 	if(!active())m->setItemEnabled(id,false);
 }
 
@@ -949,7 +949,7 @@ void KviDccFileTransfer::configureBandwidth()
 {
 	if(m_pBandwidthDialog)return;
 	m_pBandwidthDialog = new KviDccFileTransferBandwidthDialog(g_pFrame,this);
-	connect(m_pBandwidthDialog,TQT_SIGNAL(destroyed()),this,TQT_SLOT(bandwidthDialogDestroyed()));
+	connect(m_pBandwidthDialog,TQ_SIGNAL(destroyed()),this,TQ_SLOT(bandwidthDialogDestroyed()));
 	m_pBandwidthDialog->setModal(true);
 	m_pBandwidthDialog->show();
 }
@@ -1842,7 +1842,7 @@ KviDccFileTransferBandwidthDialog::KviDccFileTransferBandwidthDialog(TQWidget *
 
 	m_pLimitBox = new TQSpinBox(0,MAX_DCC_BANDWIDTH_LIMIT-1,1,this);
 	m_pLimitBox->setEnabled((iVal >= 0) && (iVal < MAX_DCC_BANDWIDTH_LIMIT));
-	connect(m_pEnableLimitCheck,TQT_SIGNAL(toggled(bool)),m_pLimitBox,TQT_SLOT(setEnabled(bool)));
+	connect(m_pEnableLimitCheck,TQ_SIGNAL(toggled(bool)),m_pLimitBox,TQ_SLOT(setEnabled(bool)));
 	g->addMultiCellWidget(m_pLimitBox,0,0,1,2);
 
 	szText = " ";
@@ -1851,12 +1851,12 @@ KviDccFileTransferBandwidthDialog::KviDccFileTransferBandwidthDialog(TQWidget *
 	m_pLimitBox->setValue(iVal < MAX_DCC_BANDWIDTH_LIMIT ? iVal : 0);
 
 	TQPushButton * pb = new TQPushButton(__tr2qs_ctx("OK","dcc"),this);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	pb->setMinimumWidth(80);
 	g->addWidget(pb,2,2);
 
 	pb = new TQPushButton(__tr2qs_ctx("Cancel","dcc"),this);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	pb->setMinimumWidth(80);
 	g->addWidget(pb,2,1);