From 677dae3bd35bd025d338292a296632d3d2f183e4 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 28 Dec 2023 21:15:50 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit 209ac1e561619ff446be4b3411ed74e59fff168e) --- src/modules/dcc/broker.cpp | 44 ++++++++++++++++++++-------------------- src/modules/dcc/canvas.cpp | 4 ++-- src/modules/dcc/canvaswidget.cpp | 28 ++++++++++++------------- src/modules/dcc/chat.cpp | 12 +++++------ src/modules/dcc/dialogs.cpp | 12 +++++------ src/modules/dcc/marshal.cpp | 18 ++++++++-------- src/modules/dcc/send.cpp | 30 +++++++++++++-------------- src/modules/dcc/voice.cpp | 14 ++++++------- 8 files changed, 81 insertions(+), 81 deletions(-) (limited to 'src/modules/dcc') diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index cfbc01ba..a766f932 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -291,10 +291,10 @@ void KviDccBroker::handleChatRequest(KviDccDescriptor * dcc) KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,caption); m_pBoxList->append(box); - connect(box,TQT_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(executeChat(KviDccBox *,KviDccDescriptor *))); - connect(box,TQT_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(executeChat(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); box->show(); } else { // auto accept @@ -345,10 +345,10 @@ void KviDccBroker::activeVoiceManage(KviDccDescriptor * dcc) KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC VOICE request","dcc")); m_pBoxList->append(box); - connect(box,TQT_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(activeVoiceExecute(KviDccBox *,KviDccDescriptor *))); - connect(box,TQT_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(activeVoiceExecute(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); box->show(); } else { // auto accept @@ -416,10 +416,10 @@ void KviDccBroker::activeCanvasManage(KviDccDescriptor * dcc) KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC CANVAS request","dcc")); m_pBoxList->append(box); - connect(box,TQT_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(activeCanvasExecute(KviDccBox *,KviDccDescriptor *))); - connect(box,TQT_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(activeCanvasExecute(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); box->show(); } else { // auto accept @@ -544,10 +544,10 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc) KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,title); m_pBoxList->append(box); - connect(box,TQT_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(chooseSaveFileName(KviDccBox *,KviDccDescriptor *))); - connect(box,TQT_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(chooseSaveFileName(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); box->show(); } else { // auto accept @@ -685,12 +685,12 @@ void KviDccBroker::renameOverwriteResume(KviDccBox *box,KviDccDescriptor * dcc) KviDccRenameBox * box = new KviDccRenameBox(this,dcc,tmp,bDisableResume); m_pBoxList->append(box); - connect(box,TQT_SIGNAL(renameSelected(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(renameDccSendFile(KviDccBox *,KviDccDescriptor *))); - connect(box,TQT_SIGNAL(overwriteSelected(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(recvFileExecute(KviDccBox *,KviDccDescriptor *))); - connect(box,TQT_SIGNAL(cancelSelected(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(renameSelected(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(renameDccSendFile(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(overwriteSelected(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(recvFileExecute(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(cancelSelected(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); box->show(); return; } else { diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp index 4acb85ce..d9ccd025 100644 --- a/src/modules/dcc/canvas.cpp +++ b/src/modules/dcc/canvas.cpp @@ -68,8 +68,8 @@ KviDccCanvas::KviDccCanvas(KviFrame *pFrm,KviDccDescriptor * dcc,const char * na // setFocusHandler(m_pInput,this); 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,TQ_SIGNAL(error(int)),this,TQ_SLOT(handleMarshalError(int))); + connect(m_pMarshal,TQ_SIGNAL(connected()),this,TQ_SLOT(connected())); if(!(m_pDescriptor->bActive)) diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index 252f789c..70e928e9 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -1409,7 +1409,7 @@ KviCanvasItemPropertiesWidget::KviCanvasItemPropertiesWidget(TQWidget * par) setSorting(false); setLeftMargin(0); verticalHeader()->hide(); - connect(this,TQT_SIGNAL(valueChanged(int,int)),this,TQT_SLOT(cellEdited(int,int))); + connect(this,TQ_SIGNAL(valueChanged(int,int)),this,TQ_SLOT(cellEdited(int,int))); } KviCanvasItemPropertiesWidget::~KviCanvasItemPropertiesWidget() @@ -1506,24 +1506,24 @@ KviCanvasWidget::KviCanvasWidget(TQWidget * par) l.append(20); m_pSplitter->setSizes(l); - connect(m_pPropertiesWidget,TQT_SIGNAL(propertyChanged(const TQString &,const TQVariant &)),m_pCanvasView,TQT_SLOT(propertyChanged(const TQString &,const TQVariant &))); + connect(m_pPropertiesWidget,TQ_SIGNAL(propertyChanged(const TQString &,const TQVariant &)),m_pCanvasView,TQ_SLOT(propertyChanged(const TQString &,const TQVariant &))); KviTalPopupMenu * add = new KviTalPopupMenu(m_pMenuBar); KviTalPopupMenu * shapes = new KviTalPopupMenu(add); KviTalPopupMenu * polygons = new KviTalPopupMenu(add); KviTalPopupMenu * items = new KviTalPopupMenu(add); - shapes->insertItem(__tr2qs_ctx("&Line","dcc"),m_pCanvasView,TQT_SLOT(insertLine())); - shapes->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQT_SLOT(insertRectangle())); - shapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,TQT_SLOT(insertEllipse())); - shapes->insertItem(__tr2qs_ctx("&Pie","dcc"),m_pCanvasView,TQT_SLOT(insertPie())); - shapes->insertItem(__tr2qs_ctx("&Chord","dcc"),m_pCanvasView,TQT_SLOT(insertChord())); - - items->insertItem(__tr2qs_ctx("&Rich text (html)","dcc"),m_pCanvasView,TQT_SLOT(insertRichText())); - - polygons->insertItem(__tr2qs_ctx("&Triangle","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonTriangle())); - polygons->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonRectangle())); - polygons->insertItem(__tr2qs_ctx("&Pentagon","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonPentagon())); - polygons->insertItem(__tr2qs_ctx("&Hexagon","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonHexagon())); + shapes->insertItem(__tr2qs_ctx("&Line","dcc"),m_pCanvasView,TQ_SLOT(insertLine())); + shapes->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQ_SLOT(insertRectangle())); + shapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,TQ_SLOT(insertEllipse())); + shapes->insertItem(__tr2qs_ctx("&Pie","dcc"),m_pCanvasView,TQ_SLOT(insertPie())); + shapes->insertItem(__tr2qs_ctx("&Chord","dcc"),m_pCanvasView,TQ_SLOT(insertChord())); + + items->insertItem(__tr2qs_ctx("&Rich text (html)","dcc"),m_pCanvasView,TQ_SLOT(insertRichText())); + + polygons->insertItem(__tr2qs_ctx("&Triangle","dcc"),m_pCanvasView,TQ_SLOT(insertPolygonTriangle())); + polygons->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQ_SLOT(insertPolygonRectangle())); + polygons->insertItem(__tr2qs_ctx("&Pentagon","dcc"),m_pCanvasView,TQ_SLOT(insertPolygonPentagon())); + polygons->insertItem(__tr2qs_ctx("&Hexagon","dcc"),m_pCanvasView,TQ_SLOT(insertPolygonHexagon())); add->insertItem(__tr2qs_ctx("&Shape","dcc"),shapes); add->insertItem(__tr2qs_ctx("&Item","dcc"),items); diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index 67f5647f..9ad8ded4 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -100,7 +100,7 @@ KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name) m_pSplitter = new TQSplitter(TQt::Horizontal,this,"splitter"); m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this); - connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); + connect(m_pIrcView,TQ_SIGNAL(rightClicked()),this,TQ_SLOT(textViewRightClicked())); m_pInput = new KviInput(this); //setFocusHandler(m_pInput,this); @@ -110,12 +110,12 @@ KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name) if(KVI_OPTION_BOOL(KviOption_boolAutoLogDccChat))m_pIrcView->startLogging(); 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_pSlaveThread = 0; diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp index 01d4a3b4..9f4e3967 100644 --- a/src/modules/dcc/dialogs.cpp +++ b/src/modules/dcc/dialogs.cpp @@ -62,9 +62,9 @@ KviDccAcceptBox::KviDccAcceptBox(KviDccBroker * br,KviDccDescriptor * dcc,const btn->setDefault(true); //btn->setFocus(); hb->addWidget(btn); - connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(acceptClicked())); + connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(acceptClicked())); btn = new TQPushButton(__tr2qs_ctx("&Reject","dcc"),this); - connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(rejectClicked())); + connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(rejectClicked())); hb->addWidget(btn); setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG))); @@ -122,20 +122,20 @@ KviDccRenameBox::KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const TQPushButton * btn = new TQPushButton(__tr2qs_ctx("&Rename","dcc"),this); hb->addWidget(btn); - connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(renameClicked())); + connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(renameClicked())); btn = new TQPushButton(__tr2qs_ctx("Over&write","dcc"),this); hb->addWidget(btn); - connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(overwriteClicked())); + connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(overwriteClicked())); btn = new TQPushButton(__tr2qs_ctx("Re&sume","dcc"),this); hb->addWidget(btn); - connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(resumeClicked())); + connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(resumeClicked())); if(bDisableResume)btn->setEnabled(false); btn = new TQPushButton(__tr2qs_ctx("Cancel","dcc"),this); hb->addWidget(btn); - connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked())); + connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked())); btn->setDefault(true); //btn->setFocus(); diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp index 0a386eec..ba920ec7 100644 --- a/src/modules/dcc/marshal.cpp +++ b/src/modules/dcc/marshal.cpp @@ -123,7 +123,7 @@ int KviDccMarshal::dccListen(const TQString &ip,const TQString &port,bool bUseTi if(m_pTimeoutTimer)delete m_pTimeoutTimer; m_pTimeoutTimer = new TQTimer(); - connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(doListen())); + connect(m_pTimeoutTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(doListen())); m_pTimeoutTimer->start(100,true); return KviError_success; @@ -277,7 +277,7 @@ void KviDccMarshal::doListen() // and setup the READ notifier... m_pSn = new TQSocketNotifier(m_fd,TQSocketNotifier::Read); - TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(snActivated(int))); + TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(snActivated(int))); m_pSn->setEnabled(true); // set the timer @@ -287,7 +287,7 @@ void KviDccMarshal::doListen() if(m_bUseTimeout) { m_pTimeoutTimer = new TQTimer(); - connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectionTimedOut())); + connect(m_pTimeoutTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(connectionTimedOut())); m_pTimeoutTimer->start(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000,true); } // and wait for connect @@ -312,7 +312,7 @@ int KviDccMarshal::dccConnect(const char * ip,const char * port,bool bUseTimeout if(m_pTimeoutTimer)delete m_pTimeoutTimer; m_pTimeoutTimer = new TQTimer(); - connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(doConnect())); + connect(m_pTimeoutTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(doConnect())); m_pTimeoutTimer->start(100,true); return KviError_success; @@ -415,7 +415,7 @@ void KviDccMarshal::doConnect() // and setup the WRITE notifier... m_pSn = new TQSocketNotifier(m_fd,TQSocketNotifier::Write); - TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(snActivated(int))); + TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(snActivated(int))); m_pSn->setEnabled(true); // set the timer @@ -425,7 +425,7 @@ void KviDccMarshal::doConnect() if(m_bUseTimeout) { m_pTimeoutTimer = new TQTimer(); - connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectionTimedOut())); + connect(m_pTimeoutTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(connectionTimedOut())); m_pTimeoutTimer->start(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000,true); } @@ -587,12 +587,12 @@ void KviDccMarshal::doSSLHandshake(int) break; case KviSSL::WantRead: m_pSn = new TQSocketNotifier((int)m_fd,TQSocketNotifier::Read); - TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int))); + TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int))); m_pSn->setEnabled(true); break; case KviSSL::WantWrite: m_pSn = new TQSocketNotifier((int)m_fd,TQSocketNotifier::Write); - TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int))); + TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int))); m_pSn->setEnabled(true); break; case KviSSL::RemoteEndClosedConnection: @@ -607,7 +607,7 @@ void KviDccMarshal::doSSLHandshake(int) { // can recover ? (EAGAIN , EINTR ?) m_pSn = new TQSocketNotifier((int)m_fd,TQSocketNotifier::Write); - TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int))); + TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int))); m_pSn->setEnabled(true); return; } else { 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); diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index 6b5267b6..be674ab8 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -686,7 +686,7 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name setMixerVolume(m_pVolumeSlider->value()); m_pVolumeSlider->setMaximumWidth(16); m_pVolumeSlider->setMaximumHeight(2*m_pPlayingLabel->height()); - connect(m_pVolumeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMixerVolume(int))); + connect(m_pVolumeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setMixerVolume(int))); m_pTalkButton = new TQToolButton(m_pHBox); m_pTalkButton->setEnabled(false); @@ -697,7 +697,7 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name m_pTalkButton->setIconSet(iset); m_pTalkButton->setUsesBigPixmap(true); - connect(m_pTalkButton,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(startOrStopTalking(bool))); + connect(m_pTalkButton,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(startOrStopTalking(bool))); m_pHBox->setStretchFactor(vbox,1); m_pHBox->setMargin(2); @@ -706,9 +706,9 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name //setFocusHandler(m_pIrcView,this); 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())); m_pUpdateTimer = new TQTimer(); @@ -923,7 +923,7 @@ void KviDccVoice::connected() } updateCaption(); - connect(m_pUpdateTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateInfo())); + connect(m_pUpdateTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(updateInfo())); m_pUpdateTimer->start(1000); KviDccVoiceThreadOptions * opt = new KviDccVoiceThreadOptions; @@ -940,7 +940,7 @@ void KviDccVoice::connected() opt->iSampleRate = m_pDescriptor->iSampleRate; m_pSlaveThread = new KviDccVoiceThread(this,m_pMarshal->releaseSocket(),opt); - connect(m_pUpdateTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateInfo())); + connect(m_pUpdateTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(updateInfo())); m_pSlaveThread->start(); m_pTalkButton->setEnabled(true); -- cgit v1.2.1