From 1329ec6abbcb7b79cd960e0ca138f16598d5f11f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 13 Jan 2024 17:34:53 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- .../jabber/libiris/cutestuff/network/bsocket.cpp | 22 ++++++++++---------- .../libiris/cutestuff/network/httpconnect.cpp | 12 +++++------ .../jabber/libiris/cutestuff/network/httppoll.cpp | 14 ++++++------- .../jabber/libiris/cutestuff/network/ndns.cpp | 2 +- .../jabber/libiris/cutestuff/network/servsock.cpp | 2 +- .../jabber/libiris/cutestuff/network/socks.cpp | 24 +++++++++++----------- .../libiris/cutestuff/network/srvresolver.cpp | 10 ++++----- .../jabber/libiris/cutestuff/util/safedelete.cpp | 2 +- .../jabber/libiris/cutestuff/util/showtextdlg.cpp | 2 +- 9 files changed, 45 insertions(+), 45 deletions(-) (limited to 'kopete/protocols/jabber/libiris/cutestuff') diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp index cabd62b3..96843678 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp @@ -63,9 +63,9 @@ BSocket::BSocket(TQObject *parent) { d = new Private; #ifndef NO_NDNS - connect(&d->ndns, TQT_SIGNAL(resultsReady()), TQT_SLOT(ndns_done())); + connect(&d->ndns, TQ_SIGNAL(resultsReady()), TQ_SLOT(ndns_done())); #endif - connect(&d->srv, TQT_SIGNAL(resultsReady()), TQT_SLOT(srv_done())); + connect(&d->srv, TQ_SIGNAL(resultsReady()), TQ_SLOT(srv_done())); reset(); } @@ -110,13 +110,13 @@ void BSocket::ensureSocket() if(!d->qsock) { d->qsock = new TQSocket; d->qsock->setReadBufferSize(READBUFSIZE); - connect(d->qsock, TQT_SIGNAL(hostFound()), TQT_SLOT(qs_hostFound())); - connect(d->qsock, TQT_SIGNAL(connected()), TQT_SLOT(qs_connected())); - connect(d->qsock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(qs_connectionClosed())); - connect(d->qsock, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(qs_delayedCloseFinished())); - connect(d->qsock, TQT_SIGNAL(readyRead()), TQT_SLOT(qs_readyRead())); - connect(d->qsock, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(qs_bytesWritten(int))); - connect(d->qsock, TQT_SIGNAL(error(int)), TQT_SLOT(qs_error(int))); + connect(d->qsock, TQ_SIGNAL(hostFound()), TQ_SLOT(qs_hostFound())); + connect(d->qsock, TQ_SIGNAL(connected()), TQ_SLOT(qs_connected())); + connect(d->qsock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(qs_connectionClosed())); + connect(d->qsock, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(qs_delayedCloseFinished())); + connect(d->qsock, TQ_SIGNAL(readyRead()), TQ_SLOT(qs_readyRead())); + connect(d->qsock, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(qs_bytesWritten(int))); + connect(d->qsock, TQ_SIGNAL(error(int)), TQ_SLOT(qs_error(int))); } } @@ -283,7 +283,7 @@ void BSocket::srv_done() d->host = d->srv.resultAddress().toString(); d->port = d->srv.resultPort(); do_connect(); - //TQTimer::singleShot(0, this, TQT_SLOT(do_connect())); + //TQTimer::singleShot(0, this, TQ_SLOT(do_connect())); //hostFound(); } @@ -294,7 +294,7 @@ void BSocket::ndns_done() d->host = d->ndns.resultString(); d->state = Connecting; do_connect(); - //TQTimer::singleShot(0, this, TQT_SLOT(do_connect())); + //TQTimer::singleShot(0, this, TQ_SLOT(do_connect())); //hostFound(); } else { diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp index e9cc5781..3c6273d6 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp @@ -100,12 +100,12 @@ HttpConnect::HttpConnect(TQObject *parent) :ByteStream(parent) { d = new Private; - connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); - connect(&d->sock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sock_connectionClosed())); - connect(&d->sock, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(sock_delayedCloseFinished())); - connect(&d->sock, TQT_SIGNAL(readyRead()), TQT_SLOT(sock_readyRead())); - connect(&d->sock, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sock_bytesWritten(int))); - connect(&d->sock, TQT_SIGNAL(error(int)), TQT_SLOT(sock_error(int))); + connect(&d->sock, TQ_SIGNAL(connected()), TQ_SLOT(sock_connected())); + connect(&d->sock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sock_connectionClosed())); + connect(&d->sock, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(sock_delayedCloseFinished())); + connect(&d->sock, TQ_SIGNAL(readyRead()), TQ_SLOT(sock_readyRead())); + connect(&d->sock, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sock_bytesWritten(int))); + connect(&d->sock, TQ_SIGNAL(error(int)), TQ_SLOT(sock_error(int))); reset(true); } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp index ed211ac5..c5192472 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp @@ -89,10 +89,10 @@ HttpPoll::HttpPoll(TQObject *parent) d->polltime = 30; d->t = new TQTimer; - connect(d->t, TQT_SIGNAL(timeout()), TQT_SLOT(do_sync())); + connect(d->t, TQ_SIGNAL(timeout()), TQ_SLOT(do_sync())); - connect(&d->http, TQT_SIGNAL(result()), TQT_SLOT(http_result())); - connect(&d->http, TQT_SIGNAL(error(int)), TQT_SLOT(http_error(int))); + connect(&d->http, TQ_SIGNAL(result()), TQ_SLOT(http_result())); + connect(&d->http, TQ_SIGNAL(error(int)), TQ_SLOT(http_error(int))); reset(true); } @@ -442,10 +442,10 @@ HttpProxyPost::HttpProxyPost(TQObject *parent) :TQObject(parent) { d = new Private; - connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); - connect(&d->sock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sock_connectionClosed())); - connect(&d->sock, TQT_SIGNAL(readyRead()), TQT_SLOT(sock_readyRead())); - connect(&d->sock, TQT_SIGNAL(error(int)), TQT_SLOT(sock_error(int))); + connect(&d->sock, TQ_SIGNAL(connected()), TQ_SLOT(sock_connected())); + connect(&d->sock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sock_connectionClosed())); + connect(&d->sock, TQ_SIGNAL(readyRead()), TQ_SLOT(sock_readyRead())); + connect(&d->sock, TQ_SIGNAL(error(int)), TQ_SLOT(sock_error(int))); reset(true); } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp index d36b1fd0..e3527855 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp @@ -157,7 +157,7 @@ NDnsManager::NDnsManager() d = new Private; d->list.setAutoDelete(true); - connect(tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(app_aboutToQuit())); + connect(tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(app_aboutToQuit())); } NDnsManager::~NDnsManager() diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp index 9ee26ee5..ce41d7ca 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp @@ -61,7 +61,7 @@ bool ServSock::listen(TQ_UINT16 port) d->serv = 0; return false; } - connect(d->serv, TQT_SIGNAL(connectionReady(int)), TQT_SLOT(sss_connectionReady(int))); + connect(d->serv, TQ_SIGNAL(connectionReady(int)), TQ_SLOT(sss_connectionReady(int))); return true; } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp index f314e23e..750abdcb 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp @@ -169,7 +169,7 @@ SocksUDP::SocksUDP(SocksClient *sc, const TQString &host, int port, const TQHost d->sd = new TQSocketDevice(TQSocketDevice::Datagram); d->sd->setBlocking(false); d->sn = new TQSocketNotifier(d->sd->socket(), TQSocketNotifier::Read); - connect(d->sn, TQT_SIGNAL(activated(int)), TQT_SLOT(sn_activated(int))); + connect(d->sn, TQ_SIGNAL(activated(int)), TQ_SLOT(sn_activated(int))); d->host = host; d->port = port; d->routeAddr = routeAddr; @@ -548,12 +548,12 @@ SocksClient::SocksClient(int s, TQObject *parent) void SocksClient::init() { d = new Private; - connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); - connect(&d->sock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sock_connectionClosed())); - connect(&d->sock, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(sock_delayedCloseFinished())); - connect(&d->sock, TQT_SIGNAL(readyRead()), TQT_SLOT(sock_readyRead())); - connect(&d->sock, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sock_bytesWritten(int))); - connect(&d->sock, TQT_SIGNAL(error(int)), TQT_SLOT(sock_error(int))); + connect(&d->sock, TQ_SIGNAL(connected()), TQ_SLOT(sock_connected())); + connect(&d->sock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sock_connectionClosed())); + connect(&d->sock, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(sock_delayedCloseFinished())); + connect(&d->sock, TQ_SIGNAL(readyRead()), TQ_SLOT(sock_readyRead())); + connect(&d->sock, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sock_bytesWritten(int))); + connect(&d->sock, TQ_SIGNAL(error(int)), TQ_SLOT(sock_error(int))); reset(true); } @@ -1108,7 +1108,7 @@ SocksServer::SocksServer(TQObject *parent) d = new Private; d->sd = 0; d->sn = 0; - connect(&d->serv, TQT_SIGNAL(connectionReady(int)), TQT_SLOT(connectionReady(int))); + connect(&d->serv, TQ_SIGNAL(connectionReady(int)), TQ_SLOT(connectionReady(int))); } SocksServer::~SocksServer() @@ -1139,7 +1139,7 @@ bool SocksServer::listen(TQ_UINT16 port, bool udp) return false; } d->sn = new TQSocketNotifier(d->sd->socket(), TQSocketNotifier::Read); - connect(d->sn, TQT_SIGNAL(activated(int)), TQT_SLOT(sn_activated(int))); + connect(d->sn, TQ_SIGNAL(activated(int)), TQ_SLOT(sn_activated(int))); } return true; } @@ -1172,10 +1172,10 @@ SocksClient *SocksServer::takeIncoming() d->incomingConns.removeRef(c); // we don't care about errors anymore - disconnect(c, TQT_SIGNAL(error(int)), this, TQT_SLOT(connectionError())); + disconnect(c, TQ_SIGNAL(error(int)), this, TQ_SLOT(connectionError())); // don't serve the connection until the event loop, to give the caller a chance to map signals - TQTimer::singleShot(0, c, TQT_SLOT(serve())); + TQTimer::singleShot(0, c, TQ_SLOT(serve())); return c; } @@ -1192,7 +1192,7 @@ void SocksServer::writeUDP(const TQHostAddress &addr, int port, const TQByteArra void SocksServer::connectionReady(int s) { SocksClient *c = new SocksClient(s, this); - connect(c, TQT_SIGNAL(error(int)), this, TQT_SLOT(connectionError())); + connect(c, TQ_SIGNAL(error(int)), this, TQ_SLOT(connectionError())); d->incomingConns.append(c); incomingReady(); } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp index 873d6c11..93b5cbfa 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp @@ -85,9 +85,9 @@ SrvResolver::SrvResolver(TQObject *parent) d->qdns = 0; #ifndef NO_NDNS - connect(&d->ndns, TQT_SIGNAL(resultsReady()), TQT_SLOT(ndns_done())); + connect(&d->ndns, TQ_SIGNAL(resultsReady()), TQ_SLOT(ndns_done())); #endif - connect(&d->t, TQT_SIGNAL(timeout()), TQT_SLOT(t_timeout())); + connect(&d->t, TQ_SIGNAL(timeout()), TQ_SLOT(t_timeout())); stop(); } @@ -106,7 +106,7 @@ void SrvResolver::resolve(const TQString &server, const TQString &type, const TQ d->srv = TQString("_") + type + "._" + proto + '.' + server; d->t.start(15000, true); d->qdns = new TQDns; - connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(qdns_done())); + connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(qdns_done())); d->qdns->setRecordType(TQDns::Srv); d->qdns->setLabel(d->srv); } @@ -120,7 +120,7 @@ void SrvResolver::resolveSrvOnly(const TQString &server, const TQString &type, c d->srv = TQString("_") + type + "._" + proto + '.' + server; d->t.start(15000, true); d->qdns = new TQDns; - connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(qdns_done())); + connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(qdns_done())); d->qdns->setRecordType(TQDns::Srv); d->qdns->setLabel(d->srv); } @@ -191,7 +191,7 @@ void SrvResolver::tryNext() d->ndns.resolve(d->servers.first().name); #else d->qdns = new TQDns; - connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(ndns_done())); + connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(ndns_done())); if(d->aaaa) d->qdns->setRecordType(TQDns::Aaaa); // IPv6 else diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp index 7f5dc901..ad9a7381 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp @@ -91,7 +91,7 @@ SafeDeleteLater::SafeDeleteLater() { list.setAutoDelete(true); self = this; - TQTimer::singleShot(0, this, TQT_SLOT(explode())); + TQTimer::singleShot(0, this, TQ_SLOT(explode())); } SafeDeleteLater::~SafeDeleteLater() diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp index 7dbb0dd3..9c099ae0 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp @@ -51,7 +51,7 @@ ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *parent, con TQHBoxLayout *hb1 = new TQHBoxLayout(vb1); hb1->addStretch(1); TQPushButton *pb = new TQPushButton(tr("&OK"), this); - connect(pb, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); + connect(pb, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); hb1->addWidget(pb); hb1->addStretch(1); -- cgit v1.2.1