summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp')
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp88
1 files changed, 44 insertions, 44 deletions
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
index 55b43c06..3ba5cb16 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
@@ -31,12 +31,12 @@
#include"xmpp.h"
-#include<qguardedptr.h>
+#include<tqguardedptr.h>
#include<qca.h>
#include"safedelete.h"
#ifdef NO_NDNS
-#include<qdns.h>
+#include<tqdns.h>
#else
#include"ndns.h"
#endif
@@ -55,8 +55,8 @@ using namespace XMPP;
//----------------------------------------------------------------------------
// Connector
//----------------------------------------------------------------------------
-Connector::Connector(QObject *parent)
-:QObject(parent)
+Connector::Connector(TQObject *parent)
+:TQObject(parent)
{
setUseSSL(false);
setPeerAddressNone();
@@ -76,7 +76,7 @@ bool Connector::havePeerAddress() const
return haveaddr;
}
-QHostAddress Connector::peerAddress() const
+TQHostAddress Connector::peerAddress() const
{
return addr;
}
@@ -94,11 +94,11 @@ void Connector::setUseSSL(bool b)
void Connector::setPeerAddressNone()
{
haveaddr = false;
- addr = QHostAddress();
+ addr = TQHostAddress();
port = 0;
}
-void Connector::setPeerAddress(const QHostAddress &_addr, Q_UINT16 _port)
+void Connector::setPeerAddress(const TQHostAddress &_addr, Q_UINT16 _port)
{
haveaddr = true;
addr = _addr;
@@ -124,7 +124,7 @@ int AdvancedConnector::Proxy::type() const
return t;
}
-QString AdvancedConnector::Proxy::host() const
+TQString AdvancedConnector::Proxy::host() const
{
return v_host;
}
@@ -134,17 +134,17 @@ Q_UINT16 AdvancedConnector::Proxy::port() const
return v_port;
}
-QString AdvancedConnector::Proxy::url() const
+TQString AdvancedConnector::Proxy::url() const
{
return v_url;
}
-QString AdvancedConnector::Proxy::user() const
+TQString AdvancedConnector::Proxy::user() const
{
return v_user;
}
-QString AdvancedConnector::Proxy::pass() const
+TQString AdvancedConnector::Proxy::pass() const
{
return v_pass;
}
@@ -154,14 +154,14 @@ int AdvancedConnector::Proxy::pollInterval() const
return v_poll;
}
-void AdvancedConnector::Proxy::setHttpConnect(const QString &host, Q_UINT16 port)
+void AdvancedConnector::Proxy::setHttpConnect(const TQString &host, Q_UINT16 port)
{
t = HttpConnect;
v_host = host;
v_port = port;
}
-void AdvancedConnector::Proxy::setHttpPoll(const QString &host, Q_UINT16 port, const QString &url)
+void AdvancedConnector::Proxy::setHttpPoll(const TQString &host, Q_UINT16 port, const TQString &url)
{
t = HttpPoll;
v_host = host;
@@ -169,14 +169,14 @@ void AdvancedConnector::Proxy::setHttpPoll(const QString &host, Q_UINT16 port, c
v_url = url;
}
-void AdvancedConnector::Proxy::setSocks(const QString &host, Q_UINT16 port)
+void AdvancedConnector::Proxy::setSocks(const TQString &host, Q_UINT16 port)
{
t = Socks;
v_host = host;
v_port = port;
}
-void AdvancedConnector::Proxy::setUserPass(const QString &user, const QString &pass)
+void AdvancedConnector::Proxy::setUserPass(const TQString &user, const TQString &pass)
{
v_user = user;
v_pass = pass;
@@ -198,21 +198,21 @@ public:
int mode;
ByteStream *bs;
#ifdef NO_NDNS
- QDns *qdns;
+ TQDns *qdns;
#else
NDns dns;
#endif
SrvResolver srv;
- QString server;
- QString opt_host;
+ TQString server;
+ TQString opt_host;
int opt_port;
bool opt_probe, opt_ssl;
Proxy proxy;
- QString host;
+ TQString host;
int port;
- QValueList<QDns::Server> servers;
+ TQValueList<TQDns::Server> servers;
int errorCode;
bool multi, using_srv;
@@ -223,7 +223,7 @@ public:
SafeDelete sd;
};
-AdvancedConnector::AdvancedConnector(QObject *parent)
+AdvancedConnector::AdvancedConnector(TQObject *parent)
:Connector(parent)
{
d = new Private;
@@ -231,9 +231,9 @@ AdvancedConnector::AdvancedConnector(QObject *parent)
#ifdef NO_NDNS
d->qdns = 0;
#else
- connect(&d->dns, SIGNAL(resultsReady()), SLOT(dns_done()));
+ connect(&d->dns, TQT_SIGNAL(resultsReady()), TQT_SLOT(dns_done()));
#endif
- connect(&d->srv, SIGNAL(resultsReady()), SLOT(srv_done()));
+ connect(&d->srv, TQT_SIGNAL(resultsReady()), TQT_SLOT(srv_done()));
d->opt_probe = false;
d->opt_ssl = false;
cleanup();
@@ -285,7 +285,7 @@ void AdvancedConnector::setProxy(const Proxy &proxy)
d->proxy = proxy;
}
-void AdvancedConnector::setOptHostPort(const QString &host, Q_UINT16 _port)
+void AdvancedConnector::setOptHostPort(const TQString &host, Q_UINT16 _port)
{
if(d->mode != Idle)
return;
@@ -307,7 +307,7 @@ void AdvancedConnector::setOptSSL(bool b)
d->opt_ssl = b;
}
-void AdvancedConnector::connectToServer(const QString &server)
+void AdvancedConnector::connectToServer(const TQString &server)
{
if(d->mode != Idle)
return;
@@ -326,10 +326,10 @@ void AdvancedConnector::connectToServer(const QString &server)
HttpPoll *s = new HttpPoll;
d->bs = s;
- connect(s, SIGNAL(connected()), SLOT(bs_connected()));
- connect(s, SIGNAL(syncStarted()), SLOT(http_syncStarted()));
- connect(s, SIGNAL(syncFinished()), SLOT(http_syncFinished()));
- connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
+ connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected()));
+ connect(s, TQT_SIGNAL(syncStarted()), TQT_SLOT(http_syncStarted()));
+ connect(s, TQT_SIGNAL(syncFinished()), TQT_SLOT(http_syncFinished()));
+ connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int)));
if(!d->proxy.user().isEmpty())
s->setAuth(d->proxy.user(), d->proxy.pass());
s->setPollInterval(d->proxy.pollInterval());
@@ -348,7 +348,7 @@ void AdvancedConnector::connectToServer(const QString &server)
else {
d->multi = true;
- QGuardedPtr<QObject> self = this;
+ TQGuardedPtr<TQObject> self = this;
srvLookup(d->server);
if(!self)
return;
@@ -389,11 +389,11 @@ void AdvancedConnector::do_resolve()
#ifdef NO_NDNS
printf("resolving (aaaa=%d)\n", d->aaaa);
d->qdns = new QDns;
- connect(d->qdns, SIGNAL(resultsReady()), SLOT(dns_done()));
+ connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(dns_done()));
if(d->aaaa)
- d->qdns->setRecordType(QDns::Aaaa); // IPv6
+ d->qdns->setRecordType(TQDns::Aaaa); // IPv6
else
- d->qdns->setRecordType(QDns::A); // IPv4
+ d->qdns->setRecordType(TQDns::A); // IPv4
d->qdns->setLabel(d->host);
#else
d->dns.resolve(d->host);
@@ -403,7 +403,7 @@ void AdvancedConnector::do_resolve()
void AdvancedConnector::dns_done()
{
bool failed = false;
- QHostAddress addr;
+ TQHostAddress addr;
#ifdef NO_NDNS
//if(!d->qdns)
@@ -416,7 +416,7 @@ void AdvancedConnector::dns_done()
//SafeDeleteLock s(&d->sd);
// grab the address list and destroy the qdns object
- QValueList<QHostAddress> list = d->qdns->addresses();
+ TQValueList<TQHostAddress> list = d->qdns->addresses();
d->qdns->disconnect(this);
d->qdns->deleteLater();
//d->sd.deleteLater(d->qdns);
@@ -438,7 +438,7 @@ void AdvancedConnector::dns_done()
if(d->dns.result() == 0)
failed = true;
else
- addr = QHostAddress(d->dns.result());
+ addr = TQHostAddress(d->dns.result());
#endif
if(failed) {
@@ -502,8 +502,8 @@ void AdvancedConnector::do_connect()
#endif
BSocket *s = new BSocket;
d->bs = s;
- connect(s, SIGNAL(connected()), SLOT(bs_connected()));
- connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
+ connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected()));
+ connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int)));
s->connectToHost(d->host, d->port);
}
else if(t == Proxy::HttpConnect) {
@@ -512,8 +512,8 @@ void AdvancedConnector::do_connect()
#endif
HttpConnect *s = new HttpConnect;
d->bs = s;
- connect(s, SIGNAL(connected()), SLOT(bs_connected()));
- connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
+ connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected()));
+ connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int)));
if(!d->proxy.user().isEmpty())
s->setAuth(d->proxy.user(), d->proxy.pass());
s->connectToHost(d->proxy.host(), d->proxy.port(), d->host, d->port);
@@ -524,8 +524,8 @@ void AdvancedConnector::do_connect()
#endif
SocksClient *s = new SocksClient;
d->bs = s;
- connect(s, SIGNAL(connected()), SLOT(bs_connected()));
- connect(s, SIGNAL(error(int)), SLOT(bs_error(int)));
+ connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected()));
+ connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int)));
if(!d->proxy.user().isEmpty())
s->setAuth(d->proxy.user(), d->proxy.pass());
s->connectToHost(d->proxy.host(), d->proxy.port(), d->host, d->port);
@@ -545,7 +545,7 @@ void AdvancedConnector::tryNextSrv()
void AdvancedConnector::srv_done()
{
- QGuardedPtr<QObject> self = this;
+ TQGuardedPtr<TQObject> self = this;
#ifdef XMPP_DEBUG
printf("srv_done1\n");
#endif
@@ -591,7 +591,7 @@ void AdvancedConnector::srv_done()
void AdvancedConnector::bs_connected()
{
if(d->proxy.type() == Proxy::None) {
- QHostAddress h = (static_cast<BSocket*>(d->bs))->peerAddress();
+ TQHostAddress h = (static_cast<BSocket*>(d->bs))->peerAddress();
int p = (static_cast<BSocket*>(d->bs))->peerPort();
setPeerAddress(h, p);
}