diff options
Diffstat (limited to 'kopete/protocols/jabber/libiris')
23 files changed, 70 insertions, 70 deletions
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h index c7cb1e23..7e16d0bd 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h @@ -29,7 +29,7 @@ class BSocket : public ByteStream { - Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound }; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h index 07c08b2e..8201d81a 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h @@ -27,7 +27,7 @@ class HttpConnect : public ByteStream { - Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h index 4342d763..d2af2a5f 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h @@ -27,7 +27,7 @@ class HttpPoll : public ByteStream { - Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; @@ -70,7 +70,7 @@ private: class HttpProxyPost : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused, ErrHostNotFound, ErrSocket, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h index 50a702f7..8e19c1d7 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h @@ -34,7 +34,7 @@ class NDnsManager; class NDns : public TQObject { - Q_OBJECT + TQ_OBJECT public: NDns(TQObject *parent=0); @@ -59,7 +59,7 @@ private: class NDnsManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: ~NDnsManager(); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h index ac88719b..eef40db7 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h @@ -27,7 +27,7 @@ class ServSock : public TQObject { - Q_OBJECT + TQ_OBJECT public: ServSock(TQObject *parent=0); @@ -52,7 +52,7 @@ private: class ServSockSignal : public TQServerSocket { - Q_OBJECT + TQ_OBJECT public: ServSockSignal(int port); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h index a09c14c7..6badc865 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h @@ -31,7 +31,7 @@ class SocksServer; class SocksUDP : public TQObject { - Q_OBJECT + TQ_OBJECT public: ~SocksUDP(); @@ -55,7 +55,7 @@ private: class SocksClient : public ByteStream { - Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; @@ -129,7 +129,7 @@ private: class SocksServer : public TQObject { - Q_OBJECT + TQ_OBJECT public: SocksServer(TQObject *parent=0); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h index cfedae4e..d7581e16 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h @@ -28,7 +28,7 @@ class SrvResolver : public TQObject { - Q_OBJECT + TQ_OBJECT public: SrvResolver(TQObject *parent=0); diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h index e64ce68d..c3e050cb 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h @@ -29,7 +29,7 @@ // CS_EXPORT_BEGIN class ByteStream : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Error { ErrRead, ErrWrite, ErrCustom = 10 }; diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h index e1e06da1..079ce2dd 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h @@ -40,7 +40,7 @@ private: class SafeDeleteLater : public TQObject { - Q_OBJECT + TQ_OBJECT public: static SafeDeleteLater *ensureExists(); diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h index 060dfa60..fb5c2963 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h @@ -25,7 +25,7 @@ class ShowTextDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT public: ShowTextDlg(const TQString &fname, bool rich=FALSE, TQWidget *parent=0, const char *name=0); diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h index b164ef99..9f07a824 100644 --- a/kopete/protocols/jabber/libiris/iris/include/im.h +++ b/kopete/protocols/jabber/libiris/iris/include/im.h @@ -494,7 +494,7 @@ namespace XMPP class Task : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum { ErrDisc }; @@ -542,7 +542,7 @@ namespace XMPP class Client : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kopete/protocols/jabber/libiris/iris/include/xmpp.h b/kopete/protocols/jabber/libiris/iris/include/xmpp.h index d5a8821a..930a14d3 100644 --- a/kopete/protocols/jabber/libiris/iris/include/xmpp.h +++ b/kopete/protocols/jabber/libiris/iris/include/xmpp.h @@ -62,7 +62,7 @@ namespace XMPP class Connector : public TQObject { - Q_OBJECT + TQ_OBJECT public: Connector(TQObject *parent=0); @@ -95,7 +95,7 @@ namespace XMPP class AdvancedConnector : public Connector { - Q_OBJECT + TQ_OBJECT public: enum Error { ErrConnectionRefused, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth, ErrStream }; @@ -170,7 +170,7 @@ namespace XMPP class TLSHandler : public TQObject { - Q_OBJECT + TQ_OBJECT public: TLSHandler(TQObject *parent=0); @@ -191,7 +191,7 @@ namespace XMPP class TQCATLSHandler : public TLSHandler { - Q_OBJECT + TQ_OBJECT public: TQCATLSHandler(TQCA::TLS *parent); @@ -359,7 +359,7 @@ namespace XMPP class Stream : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Error { ErrParse, ErrProtocol, ErrStream, ErrCustom = 10 }; @@ -408,7 +408,7 @@ namespace XMPP class ClientStream : public Stream { - Q_OBJECT + TQ_OBJECT public: enum Error { diff --git a/kopete/protocols/jabber/libiris/iris/jabber/Makefile.am b/kopete/protocols/jabber/libiris/iris/jabber/Makefile.am index 47a6dca8..2611a959 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/Makefile.am +++ b/kopete/protocols/jabber/libiris/iris/jabber/Makefile.am @@ -1,4 +1,4 @@ -# we deal with s5b.moc separately since KDE's build system can't cope with Q_OBJECT in .cpp files +# we deal with s5b.moc separately since KDE's build system can't cope with TQ_OBJECT in .cpp files METASOURCES = filetransfer.moc xmpp_ibb.moc xmpp_jidlink.moc noinst_LTLIBRARIES = libiris_jabber.la diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h index 36171a76..34bd5a2b 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.h @@ -30,7 +30,7 @@ namespace XMPP class FileTransfer : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum { ErrReject, ErrNeg, ErrConnect, ErrProxy, ErrStream }; @@ -88,7 +88,7 @@ namespace XMPP class FileTransferManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: FileTransferManager(Client *); @@ -120,7 +120,7 @@ namespace XMPP class JT_FT : public Task { - Q_OBJECT + TQ_OBJECT public: JT_FT(Task *parent); @@ -151,7 +151,7 @@ namespace XMPP }; class JT_PushFT : public Task { - Q_OBJECT + TQ_OBJECT public: JT_PushFT(Task *parent); diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp index 7cbf759a..8f2e01b6 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp @@ -63,7 +63,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 }; @@ -1748,7 +1748,7 @@ void S5BManager::Item::finished() //---------------------------------------------------------------------------- class S5BConnector::Item : public TQObject { - Q_OBJECT + TQ_OBJECT public: SocksClient *client; @@ -1980,7 +1980,7 @@ void S5BConnector::man_udpSuccess(const Jid &streamHost) //---------------------------------------------------------------------------- class S5BServer::Item : public TQObject { - Q_OBJECT + TQ_OBJECT public: SocksClient *client; diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h index 47ca1a36..eaf06647 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h @@ -59,7 +59,7 @@ namespace XMPP class S5BConnection : public ByteStream { - Q_OBJECT + TQ_OBJECT public: enum Mode { Stream, Datagram }; @@ -130,7 +130,7 @@ namespace XMPP class S5BManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: S5BManager(Client *); @@ -200,7 +200,7 @@ namespace XMPP class S5BConnector : public TQObject { - Q_OBJECT + TQ_OBJECT public: S5BConnector(TQObject *parent=0); @@ -232,7 +232,7 @@ namespace XMPP // listens on a port for serving class S5BServer : public TQObject { - Q_OBJECT + TQ_OBJECT public: S5BServer(TQObject *par=0); @@ -266,7 +266,7 @@ namespace XMPP class JT_S5B : public Task { - Q_OBJECT + TQ_OBJECT public: JT_S5B(Task *); @@ -301,7 +301,7 @@ namespace XMPP }; class JT_PushS5B : public Task { - Q_OBJECT + TQ_OBJECT public: JT_PushS5B(Task *); diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h index 6f33d721..10870942 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h @@ -36,7 +36,7 @@ namespace XMPP // this is an IBB connection. use it much like a qsocket class IBBConnection : public ByteStream { - Q_OBJECT + TQ_OBJECT public: enum { ErrRequest, ErrData }; @@ -81,7 +81,7 @@ namespace XMPP typedef TQPtrListIterator<IBBConnection> IBBConnectionListIt; class IBBManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: IBBManager(Client *); @@ -115,7 +115,7 @@ namespace XMPP class JT_IBB : public Task { - Q_OBJECT + TQ_OBJECT public: enum { ModeRequest, ModeSendData }; diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h index 394a7497..806203cc 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h +++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h @@ -37,7 +37,7 @@ namespace XMPP class JidLink : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum { None, DTCP, IBB }; @@ -97,7 +97,7 @@ namespace XMPP // the job of JidLinkManager is to keep track of streams and properly shut them down class JidLinkManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: JidLinkManager(Client *); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am b/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am index 19fdc5d4..f2af1b1b 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.am @@ -1,5 +1,5 @@ -# The only Q_OBJECT lines are in securestream.{h,cpp} and we deal with them below. -# Give metasources a file with no Q_OBJECT line to stop unsermake assuming we want METASOURCES = AUTO +# The only TQ_OBJECT lines are in securestream.{h,cpp} and we deal with them below. +# Give metasources a file with no TQ_OBJECT line to stop unsermake assuming we want METASOURCES = AUTO #METASOURCES = AUTO noinst_LTLIBRARIES = libiris_xmpp_core.la diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp index 1dbc6e92..84b387e8 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp @@ -111,7 +111,7 @@ int LayerTracker::finished(int encoded) //---------------------------------------------------------------------------- class SecureLayer : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum { TLS, SASL, TLSH }; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h index ac4f60b6..59c6393a 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h @@ -35,7 +35,7 @@ namespace XMPP class SecureStream : public ByteStream { - Q_OBJECT + TQ_OBJECT public: enum Error { ErrTLS = ErrCustom, ErrSASL }; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp index 9e8632dd..86713d1b 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp @@ -1599,7 +1599,7 @@ bool Features::haveVCard() const class Features::FeatureName : public TQObject { - Q_OBJECT + TQ_OBJECT public: FeatureName() 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 35c9f6a7..15cf25f4 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h @@ -34,7 +34,7 @@ namespace XMPP class JT_Register : public Task { - Q_OBJECT + TQ_OBJECT public: JT_Register(Task *parent); @@ -61,7 +61,7 @@ namespace XMPP class JT_UnRegister : public Task { - Q_OBJECT + TQ_OBJECT public: JT_UnRegister(Task *parent); @@ -82,7 +82,7 @@ namespace XMPP class JT_Roster : public Task { - Q_OBJECT + TQ_OBJECT public: JT_Roster(Task *parent); @@ -111,7 +111,7 @@ namespace XMPP class JT_PushRoster : public Task { - Q_OBJECT + TQ_OBJECT public: JT_PushRoster(Task *parent); @@ -129,7 +129,7 @@ namespace XMPP class JT_Presence : public Task { - Q_OBJECT + TQ_OBJECT public: JT_Presence(Task *parent); @@ -151,7 +151,7 @@ namespace XMPP class JT_PushPresence : public Task { - Q_OBJECT + TQ_OBJECT public: JT_PushPresence(Task *parent); @@ -170,7 +170,7 @@ namespace XMPP class JT_Message : public Task { - Q_OBJECT + TQ_OBJECT public: JT_Message(Task *parent, const Message &); @@ -187,7 +187,7 @@ namespace XMPP class JT_PushMessage : public Task { - Q_OBJECT + TQ_OBJECT public: JT_PushMessage(Task *parent); @@ -205,7 +205,7 @@ namespace XMPP class JT_GetLastActivity : public Task { - Q_OBJECT + TQ_OBJECT public: JT_GetLastActivity(Task *); @@ -229,7 +229,7 @@ namespace XMPP class JT_GetServices : public Task { - Q_OBJECT + TQ_OBJECT public: JT_GetServices(Task *); @@ -252,7 +252,7 @@ namespace XMPP class JT_VCard : public Task { - Q_OBJECT + TQ_OBJECT public: JT_VCard(Task *parent); @@ -276,7 +276,7 @@ namespace XMPP class JT_Search : public Task { - Q_OBJECT + TQ_OBJECT public: JT_Search(Task *parent); @@ -301,7 +301,7 @@ namespace XMPP class JT_ClientVersion : public Task { - Q_OBJECT + TQ_OBJECT public: JT_ClientVersion(Task *); @@ -324,7 +324,7 @@ namespace XMPP /* class JT_ClientTime : public Task { - Q_OBJECT + TQ_OBJECT public: JT_ClientTime(Task *, const Jid &); @@ -342,7 +342,7 @@ namespace XMPP */ class JT_ServInfo : public Task { - Q_OBJECT + TQ_OBJECT public: JT_ServInfo(Task *); @@ -353,7 +353,7 @@ namespace XMPP class JT_Gateway : public Task { - Q_OBJECT + TQ_OBJECT public: JT_Gateway(Task *); @@ -377,7 +377,7 @@ namespace XMPP class JT_Browse : public Task { - Q_OBJECT + TQ_OBJECT public: JT_Browse(Task *); @@ -400,7 +400,7 @@ namespace XMPP class JT_DiscoItems : public Task { - Q_OBJECT + TQ_OBJECT public: JT_DiscoItems(Task *); @@ -421,7 +421,7 @@ namespace XMPP class JT_DiscoInfo : public Task { - Q_OBJECT + TQ_OBJECT public: JT_DiscoInfo(Task *); @@ -444,7 +444,7 @@ namespace XMPP class JT_DiscoPublish : public Task { - Q_OBJECT + TQ_OBJECT public: JT_DiscoPublish(Task *); @@ -462,7 +462,7 @@ namespace XMPP class JT_MucPresence : public Task { - Q_OBJECT + TQ_OBJECT public: JT_MucPresence(Task *parent); @@ -483,7 +483,7 @@ namespace XMPP class JT_PrivateStorage : public Task { - Q_OBJECT + TQ_OBJECT public: JT_PrivateStorage(Task *parent); @@ -505,7 +505,7 @@ namespace XMPP class PongServer : public Task { - Q_OBJECT + TQ_OBJECT public: PongServer(Task *); |