summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/libiris/iris
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-17 16:08:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-17 16:08:14 -0600
commit6f114e7935d43127c6c0269532fb2674cee9a4f5 (patch)
tree222adc3ae4db93c92937de3d09195aca96ae99ce /kopete/protocols/jabber/libiris/iris
parenta484f7e6af77fe25155e9be30a4166c6f479e46d (diff)
downloadtdenetwork-6f114e7935d43127c6c0269532fb2674cee9a4f5.tar.gz
tdenetwork-6f114e7935d43127c6c0269532fb2674cee9a4f5.zip
Remove spurious TQ_OBJECT instances
Diffstat (limited to 'kopete/protocols/jabber/libiris/iris')
-rw-r--r--kopete/protocols/jabber/libiris/iris/include/im.h4
-rw-r--r--kopete/protocols/jabber/libiris/iris/include/xmpp.h12
-rw-r--r--kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h8
-rw-r--r--kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp6
-rw-r--r--kopete/protocols/jabber/libiris/iris/jabber/s5b.h12
-rw-r--r--kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h6
-rw-r--r--kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h4
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp2
-rw-r--r--kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h46
11 files changed, 52 insertions, 52 deletions
diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h
index 835eed62..46a599b7 100644
--- a/kopete/protocols/jabber/libiris/iris/include/im.h
+++ b/kopete/protocols/jabber/libiris/iris/include/im.h
@@ -495,7 +495,7 @@ namespace XMPP
class Task : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { ErrDisc };
Task(Task *parent);
@@ -543,7 +543,7 @@ namespace XMPP
class Client : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
Client(TQObject *parent=0);
diff --git a/kopete/protocols/jabber/libiris/iris/include/xmpp.h b/kopete/protocols/jabber/libiris/iris/include/xmpp.h
index ef5604a1..38006b6f 100644
--- a/kopete/protocols/jabber/libiris/iris/include/xmpp.h
+++ b/kopete/protocols/jabber/libiris/iris/include/xmpp.h
@@ -63,7 +63,7 @@ namespace XMPP
class Connector : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
Connector(TQObject *parent=0);
virtual ~Connector();
@@ -96,7 +96,7 @@ namespace XMPP
class AdvancedConnector : public Connector
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrConnectionRefused, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth, ErrStream };
AdvancedConnector(TQObject *parent=0);
@@ -171,7 +171,7 @@ namespace XMPP
class TLSHandler : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
TLSHandler(TQObject *parent=0);
virtual ~TLSHandler();
@@ -192,7 +192,7 @@ namespace XMPP
class QCATLSHandler : public TLSHandler
{
Q_OBJECT
- TQ_OBJECT
+
public:
QCATLSHandler(QCA::TLS *parent);
~QCATLSHandler();
@@ -360,7 +360,7 @@ namespace XMPP
class Stream : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 };
enum StreamCond {
@@ -409,7 +409,7 @@ namespace XMPP
class ClientStream : public Stream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error {
ErrConnection = ErrCustom, // Connection error, ask Connector-subclass what's up
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h
index f3688768..36171a76 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h
+++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h
@@ -31,7 +31,7 @@ namespace XMPP
class FileTransfer : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { ErrReject, ErrNeg, ErrConnect, ErrProxy, ErrStream };
enum { Idle, Requesting, Connecting, WaitingForAccept, Active };
@@ -89,7 +89,7 @@ namespace XMPP
class FileTransferManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
FileTransferManager(Client *);
~FileTransferManager();
@@ -121,7 +121,7 @@ namespace XMPP
class JT_FT : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_FT(Task *parent);
~JT_FT();
@@ -152,7 +152,7 @@ namespace XMPP
class JT_PushFT : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_PushFT(Task *parent);
~JT_PushFT();
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
index 9e1f4ccd..3a9adf68 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
@@ -64,7 +64,7 @@ static bool haveHost(const StreamHostList &list, const Jid &j)
class S5BManager::Item : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { Idle, Initiator, Target, Active };
enum { ErrRefused, ErrConnect, ErrWrongHost, ErrProxy };
@@ -1749,7 +1749,7 @@ void S5BManager::Item::finished()
class S5BConnector::Item : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
SocksClient *client;
SocksUDP *client_udp;
@@ -1981,7 +1981,7 @@ void S5BConnector::man_udpSuccess(const Jid &streamHost)
class S5BServer::Item : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
SocksClient *client;
TQString host;
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h
index d925e25f..46bea1c8 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h
+++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h
@@ -60,7 +60,7 @@ namespace XMPP
class S5BConnection : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Mode { Stream, Datagram };
enum Error { ErrRefused, ErrConnect, ErrProxy, ErrSocket };
@@ -131,7 +131,7 @@ namespace XMPP
class S5BManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
S5BManager(Client *);
~S5BManager();
@@ -201,7 +201,7 @@ namespace XMPP
class S5BConnector : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
S5BConnector(TQObject *parent=0);
~S5BConnector();
@@ -233,7 +233,7 @@ namespace XMPP
class S5BServer : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
S5BServer(TQObject *par=0);
~S5BServer();
@@ -267,7 +267,7 @@ namespace XMPP
class JT_S5B : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_S5B(Task *);
~JT_S5B();
@@ -302,7 +302,7 @@ namespace XMPP
class JT_PushS5B : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_PushS5B(Task *);
~JT_PushS5B();
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h
index 27df2465..f177e3a8 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h
+++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h
@@ -37,7 +37,7 @@ namespace XMPP
class IBBConnection : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { ErrRequest, ErrData };
enum { Idle, Requesting, WaitingForAccept, Active };
@@ -82,7 +82,7 @@ namespace XMPP
class IBBManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
IBBManager(Client *);
~IBBManager();
@@ -116,7 +116,7 @@ namespace XMPP
class JT_IBB : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { ModeRequest, ModeSendData };
JT_IBB(Task *, bool serve=false);
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h
index a10547ff..055299f3 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h
+++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h
@@ -38,7 +38,7 @@ namespace XMPP
class JidLink : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { None, DTCP, IBB };
enum { Idle, Connecting, WaitingForAccept, Active };
@@ -98,7 +98,7 @@ namespace XMPP
class JidLinkManager : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
JidLinkManager(Client *);
~JidLinkManager();
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp
index 40872ce0..55555f04 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp
@@ -112,7 +112,7 @@ int LayerTracker::finished(int encoded)
class SecureLayer : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum { TLS, SASL, TLSH };
int type;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
index f76bd617..69826343 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
@@ -36,7 +36,7 @@ namespace XMPP
class SecureStream : public ByteStream
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum Error { ErrTLS = ErrCustom, ErrSASL };
SecureStream(ByteStream *s);
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
index f33e428f..f322802a 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
@@ -1600,7 +1600,7 @@ bool Features::haveVCard() const
class Features::FeatureName : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
FeatureName()
: TQObject(tqApp)
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
index 0a1fdac5..438d298c 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
@@ -35,7 +35,7 @@ namespace XMPP
class JT_Register : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_Register(Task *parent);
~JT_Register();
@@ -62,7 +62,7 @@ namespace XMPP
class JT_UnRegister : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_UnRegister(Task *parent);
~JT_UnRegister();
@@ -83,7 +83,7 @@ namespace XMPP
class JT_Roster : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_Roster(Task *parent);
~JT_Roster();
@@ -112,7 +112,7 @@ namespace XMPP
class JT_PushRoster : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_PushRoster(Task *parent);
~JT_PushRoster();
@@ -130,7 +130,7 @@ namespace XMPP
class JT_Presence : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_Presence(Task *parent);
~JT_Presence();
@@ -152,7 +152,7 @@ namespace XMPP
class JT_PushPresence : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_PushPresence(Task *parent);
~JT_PushPresence();
@@ -171,7 +171,7 @@ namespace XMPP
class JT_Message : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_Message(Task *parent, const Message &);
~JT_Message();
@@ -188,7 +188,7 @@ namespace XMPP
class JT_PushMessage : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_PushMessage(Task *parent);
~JT_PushMessage();
@@ -206,7 +206,7 @@ namespace XMPP
class JT_GetLastActivity : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_GetLastActivity(Task *);
~JT_GetLastActivity();
@@ -230,7 +230,7 @@ namespace XMPP
class JT_GetServices : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_GetServices(Task *);
@@ -253,7 +253,7 @@ namespace XMPP
class JT_VCard : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_VCard(Task *parent);
~JT_VCard();
@@ -277,7 +277,7 @@ namespace XMPP
class JT_Search : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_Search(Task *parent);
~JT_Search();
@@ -302,7 +302,7 @@ namespace XMPP
class JT_ClientVersion : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_ClientVersion(Task *);
@@ -325,7 +325,7 @@ namespace XMPP
class JT_ClientTime : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_ClientTime(Task *, const Jid &);
@@ -343,7 +343,7 @@ namespace XMPP
class JT_ServInfo : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_ServInfo(Task *);
~JT_ServInfo();
@@ -354,7 +354,7 @@ namespace XMPP
class JT_Gateway : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_Gateway(Task *);
@@ -378,7 +378,7 @@ namespace XMPP
class JT_Browse : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_Browse(Task *);
~JT_Browse();
@@ -401,7 +401,7 @@ namespace XMPP
class JT_DiscoItems : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_DiscoItems(Task *);
~JT_DiscoItems();
@@ -422,7 +422,7 @@ namespace XMPP
class JT_DiscoInfo : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_DiscoInfo(Task *);
~JT_DiscoInfo();
@@ -445,7 +445,7 @@ namespace XMPP
class JT_DiscoPublish : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_DiscoPublish(Task *);
~JT_DiscoPublish();
@@ -463,7 +463,7 @@ namespace XMPP
class JT_MucPresence : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_MucPresence(Task *parent);
~JT_MucPresence();
@@ -484,7 +484,7 @@ namespace XMPP
class JT_PrivateStorage : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
JT_PrivateStorage(Task *parent);
~JT_PrivateStorage();
@@ -506,7 +506,7 @@ namespace XMPP
class PongServer : public Task
{
Q_OBJECT
- TQ_OBJECT
+
public:
PongServer(Task *);
~PongServer();