summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp')
-rw-r--r--kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp88
1 files changed, 44 insertions, 44 deletions
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
index 8f2e01b6..971af3a4 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
@@ -394,15 +394,15 @@ void S5BConnection::man_waitForAccept(const S5BRequest &r)
void S5BConnection::man_clientReady(SocksClient *sc, SocksUDP *sc_udp)
{
d->sc = sc;
- connect(d->sc, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sc_connectionClosed()));
- connect(d->sc, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(sc_delayedCloseFinished()));
- connect(d->sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead()));
- connect(d->sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int)));
- connect(d->sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int)));
+ connect(d->sc, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sc_connectionClosed()));
+ connect(d->sc, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(sc_delayedCloseFinished()));
+ connect(d->sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead()));
+ connect(d->sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int)));
+ connect(d->sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int)));
if(sc_udp) {
d->su = sc_udp;
- connect(d->su, TQT_SIGNAL(packetReady(const TQByteArray &)), TQT_SLOT(su_packetReady(const TQByteArray &)));
+ connect(d->su, TQ_SIGNAL(packetReady(const TQByteArray &)), TQ_SLOT(su_packetReady(const TQByteArray &)));
}
d->state = Active;
@@ -425,7 +425,7 @@ void S5BConnection::man_clientReady(SocksClient *sc, SocksUDP *sc_udp)
d->notifyClose = true;
}
if(d->notifyRead || d->notifyClose)
- TQTimer::singleShot(0, this, TQT_SLOT(doPending()));
+ TQTimer::singleShot(0, this, TQ_SLOT(doPending()));
connected();
}
@@ -433,7 +433,7 @@ void S5BConnection::doPending()
{
if(d->notifyRead) {
if(d->notifyClose)
- TQTimer::singleShot(0, this, TQT_SLOT(doPending()));
+ TQTimer::singleShot(0, this, TQ_SLOT(doPending()));
sc_readyRead();
}
else if(d->notifyClose)
@@ -588,9 +588,9 @@ S5BManager::S5BManager(Client *parent)
d->activeList.setAutoDelete(true);
d->ps = new JT_PushS5B(d->client->rootTask());
- connect(d->ps, TQT_SIGNAL(incoming(const S5BRequest &)), TQT_SLOT(ps_incoming(const S5BRequest &)));
- connect(d->ps, TQT_SIGNAL(incomingUDPSuccess(const Jid &, const TQString &)), TQT_SLOT(ps_incomingUDPSuccess(const Jid &, const TQString &)));
- connect(d->ps, TQT_SIGNAL(incomingActivate(const Jid &, const TQString &, const Jid &)), TQT_SLOT(ps_incomingActivate(const Jid &, const TQString &, const Jid &)));
+ connect(d->ps, TQ_SIGNAL(incoming(const S5BRequest &)), TQ_SLOT(ps_incoming(const S5BRequest &)));
+ connect(d->ps, TQ_SIGNAL(incomingUDPSuccess(const Jid &, const TQString &)), TQ_SLOT(ps_incomingUDPSuccess(const Jid &, const TQString &)));
+ connect(d->ps, TQ_SIGNAL(incomingActivate(const Jid &, const TQString &, const Jid &)), TQ_SLOT(ps_incomingActivate(const Jid &, const TQString &, const Jid &)));
}
S5BManager::~S5BManager()
@@ -1008,12 +1008,12 @@ void S5BManager::entryContinue(Entry *e)
e->i = new Item(this);
e->i->proxy = e->proxyInfo;
- connect(e->i, TQT_SIGNAL(accepted()), TQT_SLOT(item_accepted()));
- connect(e->i, TQT_SIGNAL(tryingHosts(const StreamHostList &)), TQT_SLOT(item_tryingHosts(const StreamHostList &)));
- connect(e->i, TQT_SIGNAL(proxyConnect()), TQT_SLOT(item_proxyConnect()));
- connect(e->i, TQT_SIGNAL(waitingForActivation()), TQT_SLOT(item_waitingForActivation()));
- connect(e->i, TQT_SIGNAL(connected()), TQT_SLOT(item_connected()));
- connect(e->i, TQT_SIGNAL(error(int)), TQT_SLOT(item_error(int)));
+ connect(e->i, TQ_SIGNAL(accepted()), TQ_SLOT(item_accepted()));
+ connect(e->i, TQ_SIGNAL(tryingHosts(const StreamHostList &)), TQ_SLOT(item_tryingHosts(const StreamHostList &)));
+ connect(e->i, TQ_SIGNAL(proxyConnect()), TQ_SLOT(item_proxyConnect()));
+ connect(e->i, TQ_SIGNAL(waitingForActivation()), TQ_SLOT(item_waitingForActivation()));
+ connect(e->i, TQ_SIGNAL(connected()), TQ_SLOT(item_connected()));
+ connect(e->i, TQ_SIGNAL(error(int)), TQ_SLOT(item_error(int)));
if(e->c->isRemote()) {
const S5BRequest &req = e->c->d->req;
@@ -1036,7 +1036,7 @@ void S5BManager::queryProxy(Entry *e)
printf("querying proxy: [%s]\n", e->c->d->proxy.full().latin1());
#endif
e->query = new JT_S5B(d->client->rootTask());
- connect(e->query, TQT_SIGNAL(finished()), TQT_SLOT(query_finished()));
+ connect(e->query, TQ_SIGNAL(finished()), TQ_SLOT(query_finished()));
e->query->requestProxyInfo(e->c->d->proxy);
e->query->go(true);
}
@@ -1246,7 +1246,7 @@ void S5BManager::Item::doOutgoing()
allowIncoming = true;
task = new JT_S5B(m->client()->rootTask());
- connect(task, TQT_SIGNAL(finished()), TQT_SLOT(jt_finished()));
+ connect(task, TQ_SIGNAL(finished()), TQ_SLOT(jt_finished()));
task->request(peer, sid, hosts, state == Initiator ? wantFast : false, udp);
out_id = task->id();
task->go(true);
@@ -1292,7 +1292,7 @@ void S5BManager::Item::doIncoming()
}
conn = new S5BConnector;
- connect(conn, TQT_SIGNAL(result(bool)), TQT_SLOT(conn_result(bool)));
+ connect(conn, TQ_SIGNAL(result(bool)), TQ_SLOT(conn_result(bool)));
TQGuardedPtr<TQObject> self = this;
tryingHosts(list);
@@ -1308,9 +1308,9 @@ void S5BManager::Item::setIncomingClient(SocksClient *sc)
printf("S5BManager::Item: %s [%s] successful incoming connection\n", peer.full().latin1(), sid.latin1());
#endif
- connect(sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead()));
- connect(sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int)));
- connect(sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int)));
+ connect(sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead()));
+ connect(sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int)));
+ connect(sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int)));
client = sc;
allowIncoming = false;
@@ -1388,7 +1388,7 @@ void S5BManager::Item::jt_finished()
#endif
// connect to the proxy
proxy_conn = new S5BConnector;
- connect(proxy_conn, TQT_SIGNAL(result(bool)), TQT_SLOT(proxy_result(bool)));
+ connect(proxy_conn, TQ_SIGNAL(result(bool)), TQ_SLOT(proxy_result(bool)));
StreamHostList list;
list += proxy;
@@ -1442,9 +1442,9 @@ void S5BManager::Item::conn_result(bool b)
printf("S5BManager::Item: %s [%s] successful outgoing connection\n", peer.full().latin1(), sid.latin1());
#endif
- connect(sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead()));
- connect(sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int)));
- connect(sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int)));
+ connect(sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead()));
+ connect(sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int)));
+ connect(sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int)));
m->doSuccess(peer, in_id, h.jid());
@@ -1493,9 +1493,9 @@ void S5BManager::Item::proxy_result(bool b)
delete proxy_conn;
proxy_conn = 0;
- connect(sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead()));
- connect(sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int)));
- connect(sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int)));
+ connect(sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead()));
+ connect(sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int)));
+ connect(sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int)));
client = sc;
client_udp = sc_udp;
@@ -1505,7 +1505,7 @@ void S5BManager::Item::proxy_result(bool b)
printf("activating proxy stream\n");
#endif
proxy_task = new JT_S5B(m->client()->rootTask());
- connect(proxy_task, TQT_SIGNAL(finished()), TQT_SLOT(proxy_finished()));
+ connect(proxy_task, TQ_SIGNAL(finished()), TQ_SLOT(proxy_finished()));
proxy_task->requestActivation(proxy.jid(), sid, peer);
proxy_task->go(true);
}
@@ -1768,9 +1768,9 @@ public:
udp = _udp;
client = new SocksClient;
client_udp = 0;
- connect(client, TQT_SIGNAL(connected()), TQT_SLOT(sc_connected()));
- connect(client, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int)));
- connect(&t, TQT_SIGNAL(timeout()), TQT_SLOT(trySendUDP()));
+ connect(client, TQ_SIGNAL(connected()), TQ_SLOT(sc_connected()));
+ connect(client, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int)));
+ connect(&t, TQ_SIGNAL(timeout()), TQ_SLOT(trySendUDP()));
}
~Item()
@@ -1872,7 +1872,7 @@ S5BConnector::S5BConnector(TQObject *parent)
d->active = 0;
d->active_udp = 0;
d->itemList.setAutoDelete(true);
- connect(&d->t, TQT_SIGNAL(timeout()), TQT_SLOT(t_timeout()));
+ connect(&d->t, TQ_SIGNAL(timeout()), TQ_SLOT(t_timeout()));
}
S5BConnector::~S5BConnector()
@@ -1900,7 +1900,7 @@ void S5BConnector::start(const Jid &self, const StreamHostList &hosts, const TQS
#endif
for(StreamHostList::ConstIterator it = hosts.begin(); it != hosts.end(); ++it) {
Item *i = new Item(self, *it, key, udp);
- connect(i, TQT_SIGNAL(result(bool)), TQT_SLOT(item_result(bool)));
+ connect(i, TQ_SIGNAL(result(bool)), TQ_SLOT(item_result(bool)));
d->itemList.append(i);
i->start();
}
@@ -1990,11 +1990,11 @@ public:
Item(SocksClient *c) : TQObject(0)
{
client = c;
- connect(client, TQT_SIGNAL(incomingMethods(int)), TQT_SLOT(sc_incomingMethods(int)));
- connect(client, TQT_SIGNAL(incomingConnectRequest(const TQString &, int)), TQT_SLOT(sc_incomingConnectRequest(const TQString &, int)));
- connect(client, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int)));
+ connect(client, TQ_SIGNAL(incomingMethods(int)), TQ_SLOT(sc_incomingMethods(int)));
+ connect(client, TQ_SIGNAL(incomingConnectRequest(const TQString &, int)), TQ_SLOT(sc_incomingConnectRequest(const TQString &, int)));
+ connect(client, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int)));
- connect(&expire, TQT_SIGNAL(timeout()), TQT_SLOT(doError()));
+ connect(&expire, TQ_SIGNAL(timeout()), TQ_SLOT(doError()));
resetExpiration();
}
@@ -2059,8 +2059,8 @@ S5BServer::S5BServer(TQObject *parent)
{
d = new Private;
d->itemList.setAutoDelete(true);
- connect(&d->serv, TQT_SIGNAL(incomingReady()), TQT_SLOT(ss_incomingReady()));
- connect(&d->serv, TQT_SIGNAL(incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &)), TQT_SLOT(ss_incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &)));
+ connect(&d->serv, TQ_SIGNAL(incomingReady()), TQ_SLOT(ss_incomingReady()));
+ connect(&d->serv, TQ_SIGNAL(incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &)), TQ_SLOT(ss_incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &)));
}
S5BServer::~S5BServer()
@@ -2106,7 +2106,7 @@ void S5BServer::ss_incomingReady()
#ifdef S5B_DEBUG
printf("S5BServer: incoming connection from %s:%d\n", i->client->peerAddress().toString().latin1(), i->client->peerPort());
#endif
- connect(i, TQT_SIGNAL(result(bool)), TQT_SLOT(item_result(bool)));
+ connect(i, TQ_SIGNAL(result(bool)), TQ_SLOT(item_result(bool)));
d->itemList.append(i);
}
@@ -2200,7 +2200,7 @@ JT_S5B::JT_S5B(Task *parent)
{
d = new Private;
d->mode = -1;
- connect(&d->t, TQT_SIGNAL(timeout()), TQT_SLOT(t_timeout()));
+ connect(&d->t, TQ_SIGNAL(timeout()), TQ_SLOT(t_timeout()));
}
JT_S5B::~JT_S5B()