summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp')
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp60
1 files changed, 30 insertions, 30 deletions
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
index e0d09d8e..18b19688 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
@@ -618,11 +618,11 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *pa
d = new Private;
d->mode = Client;
d->conn = conn;
- connect(d->conn, TQT_SIGNAL(connected()), TQT_SLOT(cr_connected()));
- connect(d->conn, TQT_SIGNAL(error()), TQT_SLOT(cr_error()));
+ connect(d->conn, TQ_SIGNAL(connected()), TQ_SLOT(cr_connected()));
+ connect(d->conn, TQ_SIGNAL(error()), TQ_SLOT(cr_error()));
d->noop_time = 0;
- connect(&d->noopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doNoop()));
+ connect(&d->noopTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doNoop()));
d->tlsHandler = tlsHandler;
}
@@ -633,18 +633,18 @@ ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteS
d = new Private;
d->mode = Server;
d->bs = bs;
- connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed()));
- connect(d->bs, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(bs_delayedCloseFinished()));
- connect(d->bs, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int)));
+ connect(d->bs, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed()));
+ connect(d->bs, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(bs_delayedCloseFinished()));
+ connect(d->bs, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int)));
TQByteArray spare = d->bs->read();
d->ss = new SecureStream(d->bs);
- connect(d->ss, TQT_SIGNAL(readyRead()), TQT_SLOT(ss_readyRead()));
- connect(d->ss, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(ss_bytesWritten(int)));
- connect(d->ss, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(ss_tlsHandshaken()));
- connect(d->ss, TQT_SIGNAL(tlsClosed()), TQT_SLOT(ss_tlsClosed()));
- connect(d->ss, TQT_SIGNAL(error(int)), TQT_SLOT(ss_error(int)));
+ connect(d->ss, TQ_SIGNAL(readyRead()), TQ_SLOT(ss_readyRead()));
+ connect(d->ss, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(ss_bytesWritten(int)));
+ connect(d->ss, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(ss_tlsHandshaken()));
+ connect(d->ss, TQ_SIGNAL(tlsClosed()), TQ_SLOT(ss_tlsClosed()));
+ connect(d->ss, TQ_SIGNAL(error(int)), TQ_SLOT(ss_error(int)));
d->server = host;
d->defRealm = defRealm;
@@ -940,17 +940,17 @@ void ClientStream::write(const Stanza &s)
void ClientStream::cr_connected()
{
d->bs = d->conn->stream();
- connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed()));
- connect(d->bs, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(bs_delayedCloseFinished()));
+ connect(d->bs, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed()));
+ connect(d->bs, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(bs_delayedCloseFinished()));
TQByteArray spare = d->bs->read();
d->ss = new SecureStream(d->bs);
- connect(d->ss, TQT_SIGNAL(readyRead()), TQT_SLOT(ss_readyRead()));
- connect(d->ss, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(ss_bytesWritten(int)));
- connect(d->ss, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(ss_tlsHandshaken()));
- connect(d->ss, TQT_SIGNAL(tlsClosed()), TQT_SLOT(ss_tlsClosed()));
- connect(d->ss, TQT_SIGNAL(error(int)), TQT_SLOT(ss_error(int)));
+ connect(d->ss, TQ_SIGNAL(readyRead()), TQ_SLOT(ss_readyRead()));
+ connect(d->ss, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(ss_bytesWritten(int)));
+ connect(d->ss, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(ss_tlsHandshaken()));
+ connect(d->ss, TQ_SIGNAL(tlsClosed()), TQ_SLOT(ss_tlsClosed()));
+ connect(d->ss, TQ_SIGNAL(error(int)), TQ_SLOT(ss_error(int)));
//d->client.startDialbackOut("andbit.net", "im.pyxa.org");
//d->client.startServerOut(d->server);
@@ -1163,10 +1163,10 @@ void ClientStream::srvProcessNext()
else if(need == CoreProtocol::NSASLMechs) {
if(!d->sasl) {
d->sasl = new TQCA::SASL;
- connect(d->sasl, TQT_SIGNAL(authCheck(const TQString &, const TQString &)), TQT_SLOT(sasl_authCheck(const TQString &, const TQString &)));
- connect(d->sasl, TQT_SIGNAL(nextStep(const TQByteArray &)), TQT_SLOT(sasl_nextStep(const TQByteArray &)));
- connect(d->sasl, TQT_SIGNAL(authenticated()), TQT_SLOT(sasl_authenticated()));
- connect(d->sasl, TQT_SIGNAL(error(int)), TQT_SLOT(sasl_error(int)));
+ connect(d->sasl, TQ_SIGNAL(authCheck(const TQString &, const TQString &)), TQ_SLOT(sasl_authCheck(const TQString &, const TQString &)));
+ connect(d->sasl, TQ_SIGNAL(nextStep(const TQByteArray &)), TQ_SLOT(sasl_nextStep(const TQByteArray &)));
+ connect(d->sasl, TQ_SIGNAL(authenticated()), TQ_SLOT(sasl_authenticated()));
+ connect(d->sasl, TQ_SIGNAL(error(int)), TQ_SLOT(sasl_error(int)));
//d->sasl->setAllowAnonymous(false);
//d->sasl->setRequirePassCredentials(true);
@@ -1258,7 +1258,7 @@ void ClientStream::srvProcessNext()
}
case CoreProtocol::ESASLSuccess: {
printf("Break SASL Success\n");
- disconnect(d->sasl, TQT_SIGNAL(error(int)), this, TQT_SLOT(sasl_error(int)));
+ disconnect(d->sasl, TQ_SIGNAL(error(int)), this, TQ_SLOT(sasl_error(int)));
TQByteArray a = d->srv.spare;
d->ss->setLayerSASL(d->sasl, a);
break;
@@ -1324,7 +1324,7 @@ void ClientStream::processNext()
//if(!d->in_rrsig && !d->in.isEmpty()) {
if(!d->in.isEmpty()) {
//d->in_rrsig = true;
- TQTimer::singleShot(0, this, TQT_SLOT(doReadyRead()));
+ TQTimer::singleShot(0, this, TQ_SLOT(doReadyRead()));
}
if(cont)
@@ -1480,11 +1480,11 @@ bool ClientStream::handleNeed()
}
d->sasl = new TQCA::SASL;
- connect(d->sasl, TQT_SIGNAL(clientFirstStep(const TQString &, const TQByteArray *)), TQT_SLOT(sasl_clientFirstStep(const TQString &, const TQByteArray *)));
- connect(d->sasl, TQT_SIGNAL(nextStep(const TQByteArray &)), TQT_SLOT(sasl_nextStep(const TQByteArray &)));
- connect(d->sasl, TQT_SIGNAL(needParams(bool, bool, bool, bool)), TQT_SLOT(sasl_needParams(bool, bool, bool, bool)));
- connect(d->sasl, TQT_SIGNAL(authenticated()), TQT_SLOT(sasl_authenticated()));
- connect(d->sasl, TQT_SIGNAL(error(int)), TQT_SLOT(sasl_error(int)));
+ connect(d->sasl, TQ_SIGNAL(clientFirstStep(const TQString &, const TQByteArray *)), TQ_SLOT(sasl_clientFirstStep(const TQString &, const TQByteArray *)));
+ connect(d->sasl, TQ_SIGNAL(nextStep(const TQByteArray &)), TQ_SLOT(sasl_nextStep(const TQByteArray &)));
+ connect(d->sasl, TQ_SIGNAL(needParams(bool, bool, bool, bool)), TQ_SLOT(sasl_needParams(bool, bool, bool, bool)));
+ connect(d->sasl, TQ_SIGNAL(authenticated()), TQ_SLOT(sasl_authenticated()));
+ connect(d->sasl, TQ_SIGNAL(error(int)), TQ_SLOT(sasl_error(int)));
if(d->haveLocalAddr)
d->sasl->setLocalAddr(d->localAddr, d->localPort);
@@ -1531,7 +1531,7 @@ bool ClientStream::handleNeed()
}
case CoreProtocol::NSASLLayer: {
// SecureStream will handle the errors from this point
- disconnect(d->sasl, TQT_SIGNAL(error(int)), this, TQT_SLOT(sasl_error(int)));
+ disconnect(d->sasl, TQ_SIGNAL(error(int)), this, TQ_SLOT(sasl_error(int)));
d->ss->setLayerSASL(d->sasl, d->client.spare);
if(d->sasl_ssf > 0) {
TQGuardedPtr<TQObject> self = this;