summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/libiris
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-02 19:26:34 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-02 19:26:34 +0000
commit36e4074ba1536a63a121293b20663a38cad836b7 (patch)
tree5ec4cb3822a30ce8d43a9904931907ade1d7fe2c /kopete/protocols/jabber/libiris
parent47c8a359c5276062c4bc17f0e82410f29081b502 (diff)
downloadtdenetwork-36e4074ba1536a63a121293b20663a38cad836b7.tar.gz
tdenetwork-36e4074ba1536a63a121293b20663a38cad836b7.zip
TQt conversion fixes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1158449 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/jabber/libiris')
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp6
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/socks.h2
-rw-r--r--kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp6
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp4
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.h2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.h10
-rw-r--r--kopete/protocols/jabber/libiris/qca/src/qca.h4
11 files changed, 21 insertions, 21 deletions
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
index 33c5ec8a..a60c8040 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
@@ -108,7 +108,7 @@ void BSocket::reset(bool clear)
void BSocket::ensureSocket()
{
if(!d->qsock) {
- d->qsock = new QSocket;
+ d->qsock = new TQSocket;
#if QT_VERSION >= 0x030200
d->qsock->setReadBufferSize(READBUFSIZE);
#endif
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
index 3a182457..f20c054f 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
@@ -88,7 +88,7 @@ HttpPoll::HttpPoll(TQObject *parent)
d = new Private;
d->polltime = 30;
- d->t = new QTimer;
+ d->t = new TQTimer;
connect(d->t, TQT_SIGNAL(timeout()), TQT_SLOT(do_sync()));
connect(&d->http, TQT_SIGNAL(result()), TQT_SLOT(http_result()));
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
index 748db248..a060b23a 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
@@ -142,14 +142,14 @@ public:
NDnsManager::NDnsManager()
{
#ifndef HAVE_GETHOSTBYNAME_R
- workerMutex = new QMutex;
- workerCancelled = new QMutex;
+ workerMutex = new TQMutex;
+ workerCancelled = new TQMutex;
#endif
#ifdef Q_OS_WIN32
if(!winsock_init) {
winsock_init = true;
- TQSocketDevice *sd = new QSocketDevice;
+ TQSocketDevice *sd = new TQSocketDevice;
delete sd;
}
#endif
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h
index 507caf5f..00ed09b4 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h
@@ -25,7 +25,7 @@
// CS_NAMESPACE_BEGIN
-class QHostAddress;
+class TQHostAddress;
class SocksClient;
class SocksServer;
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp
index d462a17e..fd1c4992 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp
@@ -105,7 +105,7 @@ void SrvResolver::resolve(const TQString &server, const TQString &type, const TQ
d->srvonly = false;
d->srv = TQString("_") + type + "._" + proto + '.' + server;
d->t.start(15000, true);
- d->qdns = new QDns;
+ d->qdns = new TQDns;
connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(qdns_done()));
d->qdns->setRecordType(TQDns::Srv);
d->qdns->setLabel(d->srv);
@@ -119,7 +119,7 @@ void SrvResolver::resolveSrvOnly(const TQString &server, const TQString &type, c
d->srvonly = true;
d->srv = TQString("_") + type + "._" + proto + '.' + server;
d->t.start(15000, true);
- d->qdns = new QDns;
+ d->qdns = new TQDns;
connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(qdns_done()));
d->qdns->setRecordType(TQDns::Srv);
d->qdns->setLabel(d->srv);
@@ -190,7 +190,7 @@ void SrvResolver::tryNext()
#ifndef NO_NDNS
d->ndns.resolve(d->servers.first().name);
#else
- d->qdns = new QDns;
+ d->qdns = new TQDns;
connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(ndns_done()));
if(d->aaaa)
d->qdns->setRecordType(TQDns::Aaaa); // IPv6
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
index 3ba5cb16..3c8e5435 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
@@ -388,7 +388,7 @@ void AdvancedConnector::do_resolve()
{
#ifdef NO_NDNS
printf("resolving (aaaa=%d)\n", d->aaaa);
- d->qdns = new QDns;
+ d->qdns = new TQDns;
connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(dns_done()));
if(d->aaaa)
d->qdns->setRecordType(TQDns::Aaaa); // IPv6
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
index 2348c88e..4c10bd53 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
@@ -714,10 +714,10 @@ public:
delete doc;
if(create) {
- doc = new QDomDocument;
+ doc = new TQDomDocument;
in = new StreamInput;
handler = new ParserHandler(in, doc);
- reader = new QXmlSimpleReader;
+ reader = new TQXmlSimpleReader;
reader->setContentHandler(handler);
// initialize the reader
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
index 95f61e69..9e2fc061 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
@@ -387,7 +387,7 @@ TQString JT_Roster::toString() const
bool JT_Roster::fromString(const TQString &str)
{
- TQDomDocument *dd = new QDomDocument;
+ TQDomDocument *dd = new TQDomDocument;
if(!dd->setContent(lineDecode(str).utf8()))
return false;
TQDomElement e = doc()->importNode(dd->documentElement(), true).toElement();
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.h b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.h
index 885e08a9..e1ea742b 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.h
@@ -28,7 +28,7 @@
#include <tqvaluelist.h>
#include <tqdom.h>
-class QDate;
+class TQDate;
namespace XMPP
{
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.h b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.h
index 926395e9..f6a94e59 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.h
@@ -23,11 +23,11 @@
#include<tqdom.h>
-class QDateTime;
-class QRect;
-class QSize;
-class QColor;
-class QStringList;
+class TQDateTime;
+class TQRect;
+class TQSize;
+class TQColor;
+class TQStringList;
bool stamp2TS(const TQString &ts, TQDateTime *d);
TQString TS2stamp(const TQDateTime &d);
diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.h b/kopete/protocols/jabber/libiris/qca/src/qca.h
index 46b25cc9..9df6f7cd 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qca.h
+++ b/kopete/protocols/jabber/libiris/qca/src/qca.h
@@ -52,8 +52,8 @@
#define QCA_PLUGIN_EXPORT extern "C"
#endif
-class QHostAddress;
-class QStringList;
+class TQHostAddress;
+class TQStringList;
class QCAProvider;
class QCA_HashContext;