diff options
Diffstat (limited to 'kopete/protocols/jabber')
63 files changed, 114 insertions, 114 deletions
diff --git a/kopete/protocols/jabber/jabberaccount.h b/kopete/protocols/jabber/jabberaccount.h index ebd4bff5..94a1a9e2 100644 --- a/kopete/protocols/jabber/jabberaccount.h +++ b/kopete/protocols/jabber/jabberaccount.h @@ -56,7 +56,7 @@ class VoiceCaller; class JabberAccount : public Kopete::PasswordedAccount { - Q_OBJECT + TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jabberbasecontact.h b/kopete/protocols/jabber/jabberbasecontact.h index e813ac5d..984f2085 100644 --- a/kopete/protocols/jabber/jabberbasecontact.h +++ b/kopete/protocols/jabber/jabberbasecontact.h @@ -34,7 +34,7 @@ namespace XMPP { class VCard; } class JabberBaseContact : public Kopete::Contact { -Q_OBJECT +TQ_OBJECT friend class JabberAccount; /* Friends can touch each other's private parts. */ diff --git a/kopete/protocols/jabber/jabberbookmarks.h b/kopete/protocols/jabber/jabberbookmarks.h index 16014e6d..23c2222e 100644 --- a/kopete/protocols/jabber/jabberbookmarks.h +++ b/kopete/protocols/jabber/jabberbookmarks.h @@ -35,7 +35,7 @@ class TDEAction; */ class JabberBookmarks : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kopete/protocols/jabber/jabberbytestream.h b/kopete/protocols/jabber/jabberbytestream.h index 82f84bac..3b898b72 100644 --- a/kopete/protocols/jabber/jabberbytestream.h +++ b/kopete/protocols/jabber/jabberbytestream.h @@ -30,7 +30,7 @@ class JabberByteStream : public ByteStream { -Q_OBJECT +TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.h b/kopete/protocols/jabber/jabbercapabilitiesmanager.h index 6c8389f4..7d2c5d85 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.h +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.h @@ -35,7 +35,7 @@ class JabberAccount; */ class JabberCapabilitiesManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kopete/protocols/jabber/jabberchatsession.h b/kopete/protocols/jabber/jabberchatsession.h index e3bea68f..63795043 100644 --- a/kopete/protocols/jabber/jabberchatsession.h +++ b/kopete/protocols/jabber/jabberchatsession.h @@ -34,7 +34,7 @@ class TQString; */ class JabberChatSession : public Kopete::ChatSession { - Q_OBJECT + TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jabberclient.h b/kopete/protocols/jabber/jabberclient.h index 81c11a02..c95933f9 100644 --- a/kopete/protocols/jabber/jabberclient.h +++ b/kopete/protocols/jabber/jabberclient.h @@ -57,7 +57,7 @@ class JabberConnector; class JabberClient : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jabberconnector.h b/kopete/protocols/jabber/jabberconnector.h index c0062100..c81581d9 100644 --- a/kopete/protocols/jabber/jabberconnector.h +++ b/kopete/protocols/jabber/jabberconnector.h @@ -33,7 +33,7 @@ class KResolverEntry; class JabberConnector : public XMPP::Connector { -Q_OBJECT +TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jabbercontact.h b/kopete/protocols/jabber/jabbercontact.h index 472360ab..f08fa52d 100644 --- a/kopete/protocols/jabber/jabbercontact.h +++ b/kopete/protocols/jabber/jabbercontact.h @@ -33,7 +33,7 @@ class TQTimer; class JabberContact : public JabberBaseContact { -Q_OBJECT +TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jabbercontactpool.h b/kopete/protocols/jabber/jabbercontactpool.h index 563fc9c3..82bd634e 100644 --- a/kopete/protocols/jabber/jabbercontactpool.h +++ b/kopete/protocols/jabber/jabbercontactpool.h @@ -36,7 +36,7 @@ class JabberTransport; class JabberContactPool : public TQObject { -Q_OBJECT +TQ_OBJECT public: @@ -108,7 +108,7 @@ private: class JabberContactPoolItem : TQObject { -Q_OBJECT +TQ_OBJECT public: JabberContactPoolItem ( JabberBaseContact *contact ); diff --git a/kopete/protocols/jabber/jabberfiletransfer.h b/kopete/protocols/jabber/jabberfiletransfer.h index 1439de34..a1a6745c 100644 --- a/kopete/protocols/jabber/jabberfiletransfer.h +++ b/kopete/protocols/jabber/jabberfiletransfer.h @@ -30,7 +30,7 @@ class JabberBaseContact; class JabberFileTransfer : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jabberformlineedit.h b/kopete/protocols/jabber/jabberformlineedit.h index 1b2567b2..a56a684a 100644 --- a/kopete/protocols/jabber/jabberformlineedit.h +++ b/kopete/protocols/jabber/jabberformlineedit.h @@ -31,7 +31,7 @@ class JabberFormLineEdit:public TQLineEdit { - Q_OBJECT + TQ_OBJECT public: @@ -49,7 +49,7 @@ public: class JabberFormPasswordEdit:public KPasswordEdit { - Q_OBJECT + TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jabberformtranslator.h b/kopete/protocols/jabber/jabberformtranslator.h index 1e594329..3f796b0c 100644 --- a/kopete/protocols/jabber/jabberformtranslator.h +++ b/kopete/protocols/jabber/jabberformtranslator.h @@ -30,7 +30,7 @@ class JabberFormTranslator:public TQWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.h b/kopete/protocols/jabber/jabbergroupchatmanager.h index 4ab05c9a..5d826185 100644 --- a/kopete/protocols/jabber/jabbergroupchatmanager.h +++ b/kopete/protocols/jabber/jabbergroupchatmanager.h @@ -32,7 +32,7 @@ class TQString; */ class JabberGroupChatManager : public Kopete::ChatSession { - Q_OBJECT + TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jabbergroupcontact.h b/kopete/protocols/jabber/jabbergroupcontact.h index 899ba96a..f6a2de2a 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.h +++ b/kopete/protocols/jabber/jabbergroupcontact.h @@ -26,7 +26,7 @@ class JabberGroupChatManager; class JabberGroupContact : public JabberBaseContact { -Q_OBJECT +TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.h b/kopete/protocols/jabber/jabbergroupmembercontact.h index 1202f1f7..c6a53c83 100644 --- a/kopete/protocols/jabber/jabbergroupmembercontact.h +++ b/kopete/protocols/jabber/jabbergroupmembercontact.h @@ -27,7 +27,7 @@ class JabberChatSession; class JabberGroupMemberContact : public JabberBaseContact { -Q_OBJECT +TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jabberprotocol.h b/kopete/protocols/jabber/jabberprotocol.h index 8fdec271..0ce15ef5 100644 --- a/kopete/protocols/jabber/jabberprotocol.h +++ b/kopete/protocols/jabber/jabberprotocol.h @@ -49,7 +49,7 @@ class JabberCapabilitiesManager; class JabberProtocol:public Kopete::Protocol { - Q_OBJECT + TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jabberresource.h b/kopete/protocols/jabber/jabberresource.h index 70860aa7..9dea1cf3 100644 --- a/kopete/protocols/jabber/jabberresource.h +++ b/kopete/protocols/jabber/jabberresource.h @@ -37,7 +37,7 @@ class Features; class JabberResource : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jabberresourcepool.h b/kopete/protocols/jabber/jabberresourcepool.h index d7720d1e..65bc5e87 100644 --- a/kopete/protocols/jabber/jabberresourcepool.h +++ b/kopete/protocols/jabber/jabberresourcepool.h @@ -31,7 +31,7 @@ class JabberAccount; */ class JabberResourcePool : public TQObject { - Q_OBJECT + TQ_OBJECT public: static XMPP::Resource EmptyResource; diff --git a/kopete/protocols/jabber/jabbertransport.h b/kopete/protocols/jabber/jabbertransport.h index 83f5e502..7a7dde09 100644 --- a/kopete/protocols/jabber/jabbertransport.h +++ b/kopete/protocols/jabber/jabbertransport.h @@ -39,7 +39,7 @@ class JabberProtocol; class JabberTransport : public Kopete::Account { - Q_OBJECT + TQ_OBJECT public: diff --git a/kopete/protocols/jabber/jingle/jinglesession.h b/kopete/protocols/jabber/jingle/jinglesession.h index 91ac2123..af5366d3 100644 --- a/kopete/protocols/jabber/jingle/jinglesession.h +++ b/kopete/protocols/jabber/jingle/jinglesession.h @@ -31,7 +31,7 @@ class JabberAccount; */ class JingleSession : public TQObject { - Q_OBJECT + TQ_OBJECT public: typedef TQValueList<XMPP::Jid> JidList; diff --git a/kopete/protocols/jabber/jingle/jinglesessionmanager.h b/kopete/protocols/jabber/jingle/jinglesessionmanager.h index 03ad0a4d..ce13ca31 100644 --- a/kopete/protocols/jabber/jingle/jinglesessionmanager.h +++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.h @@ -38,7 +38,7 @@ class JabberAccount; */ class JingleSessionManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: typedef TQValueList<XMPP::Jid> JidList; diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.h b/kopete/protocols/jabber/jingle/jinglevoicecaller.h index ab403233..d8599c5c 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.h +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.h @@ -30,7 +30,7 @@ class JingleCallSlots; class JingleVoiceCaller : public VoiceCaller { - Q_OBJECT + TQ_OBJECT friend class JingleClientSlots; diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.h b/kopete/protocols/jabber/jingle/jinglevoicesession.h index 58365f2d..877c5909 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.h +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.h @@ -37,7 +37,7 @@ class JingleSession; */ class JingleVoiceSession : public JingleSession { - Q_OBJECT + TQ_OBJECT public: typedef TQValueList<XMPP::Jid> JidList; diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h index 5221829e..21016103 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h @@ -29,7 +29,7 @@ class VoiceCaller; class JingleVoiceSessionDialog : public JingleVoiceSessionDialogBase { - Q_OBJECT + TQ_OBJECT public: enum SessionState { Incoming, Waiting, Accepted, Declined, Started, Terminated }; diff --git a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h index 0a4aef78..9c0f084b 100644 --- a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h +++ b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h @@ -25,7 +25,7 @@ */ class JingleWatchSessionTask : public XMPP::Task { - Q_OBJECT + TQ_OBJECT public: JingleWatchSessionTask(XMPP::Task *parent); diff --git a/kopete/protocols/jabber/jingle/voicecaller.h b/kopete/protocols/jabber/jingle/voicecaller.h index fab047f5..187e509b 100644 --- a/kopete/protocols/jabber/jingle/voicecaller.h +++ b/kopete/protocols/jabber/jingle/voicecaller.h @@ -16,7 +16,7 @@ using namespace XMPP; */ class VoiceCaller : public TQObject { - Q_OBJECT + TQ_OBJECT public: 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 *); diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.h b/kopete/protocols/jabber/tdeioslave/jabberdisco.h index c5817ec6..a4fd67e3 100644 --- a/kopete/protocols/jabber/tdeioslave/jabberdisco.h +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.h @@ -36,7 +36,7 @@ class JabberClient; class JabberDiscoProtocol : public TQObject, public TDEIO::SlaveBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.h b/kopete/protocols/jabber/ui/dlgjabberbrowse.h index 3926e987..2a60b3c9 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.h +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.h @@ -34,7 +34,7 @@ class dlgJabberBrowse:public dlgBrowse { - Q_OBJECT + TQ_OBJECT public: diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h index 39756858..a5c11ea1 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h @@ -31,7 +31,7 @@ class DlgChangePassword; class DlgJabberChangePassword : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h index 45bd649a..4eab2edb 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h @@ -24,7 +24,7 @@ class dlgJabberChatJoin : public dlgChatJoin { - Q_OBJECT + TQ_OBJECT public: diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h index c2c6cf33..0cf1eab5 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h @@ -20,7 +20,7 @@ class dlgJabberChatRoomsList : public dlgChatRoomsList { - Q_OBJECT + TQ_OBJECT public: diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.h b/kopete/protocols/jabber/ui/dlgjabberregister.h index cd24c929..394cde70 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.h +++ b/kopete/protocols/jabber/ui/dlgjabberregister.h @@ -38,7 +38,7 @@ class dlgJabberRegister:public dlgRegister { - Q_OBJECT + TQ_OBJECT public: diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.h b/kopete/protocols/jabber/ui/dlgjabbersendraw.h index 4b9cdee3..9bb1c79f 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.h +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.h @@ -35,7 +35,7 @@ class JabberClient; */ class dlgJabberSendRaw:public DlgSendRaw { -Q_OBJECT +TQ_OBJECT public: diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.h b/kopete/protocols/jabber/ui/dlgjabberservices.h index ea85658f..c5ca15b7 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.h +++ b/kopete/protocols/jabber/ui/dlgjabberservices.h @@ -33,7 +33,7 @@ class dlgJabberServices:public dlgServices { - Q_OBJECT + TQ_OBJECT public: @@ -59,7 +59,7 @@ private: class dlgJabberServies_item : protected TQObject, public TQListViewItem { - Q_OBJECT + TQ_OBJECT public: dlgJabberServies_item( TQListView *parent , const TQString &s1 , const TQString &s2 ) diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.h b/kopete/protocols/jabber/ui/dlgjabbervcard.h index 4861c4aa..16f71386 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.h +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.h @@ -44,7 +44,7 @@ class dlgVCard; */ class dlgJabberVCard : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.h b/kopete/protocols/jabber/ui/jabberaddcontactpage.h index 07fee352..c104d2ff 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.h +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.h @@ -31,7 +31,7 @@ class TQLabel; class JabberAddContactPage:public AddContactPage { - Q_OBJECT + TQ_OBJECT public: @@ -54,7 +54,7 @@ class JabberTransport; * this class is just there to workaround the fact that it's not possible to add contact assync with Kopete::AddContactPage::apply */ class JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND : public TQObject -{ Q_OBJECT +{ TQ_OBJECT public: JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( JabberTransport * , Kopete::MetaContact *mc, TQObject *parent); diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.h b/kopete/protocols/jabber/ui/jabberchooseserver.h index d6109a33..e883edc8 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.h +++ b/kopete/protocols/jabber/ui/jabberchooseserver.h @@ -38,7 +38,7 @@ namespace TDEIO class JabberChooseServer : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h index f53c566c..22ffd4bf 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h @@ -34,7 +34,7 @@ class JabberEditAccountWidget:public DlgJabberEditAccountWidget, public KopeteEditAccountWidget { -Q_OBJECT +TQ_OBJECT public: diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.h b/kopete/protocols/jabber/ui/jabberregisteraccount.h index 9979f59f..30175834 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.h +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.h @@ -35,7 +35,7 @@ class JabberEditAccountWidget; class JabberRegisterAccount : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: |