diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-17 16:08:14 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-17 16:08:14 -0600 |
commit | 6f114e7935d43127c6c0269532fb2674cee9a4f5 (patch) | |
tree | 222adc3ae4db93c92937de3d09195aca96ae99ce /kopete/protocols/jabber | |
parent | a484f7e6af77fe25155e9be30a4166c6f479e46d (diff) | |
download | tdenetwork-6f114e7935d43127c6c0269532fb2674cee9a4f5.tar.gz tdenetwork-6f114e7935d43127c6c0269532fb2674cee9a4f5.zip |
Remove spurious TQ_OBJECT instances
Diffstat (limited to 'kopete/protocols/jabber')
62 files changed, 113 insertions, 113 deletions
diff --git a/kopete/protocols/jabber/jabberaccount.h b/kopete/protocols/jabber/jabberaccount.h index 9ce7c9c4..f30c2aa3 100644 --- a/kopete/protocols/jabber/jabberaccount.h +++ b/kopete/protocols/jabber/jabberaccount.h @@ -57,7 +57,7 @@ class VoiceCaller; class JabberAccount : public Kopete::PasswordedAccount { Q_OBJECT - TQ_OBJECT + public: JabberAccount (JabberProtocol * parent, const TQString & accountID, const char *name = 0L); diff --git a/kopete/protocols/jabber/jabberbasecontact.h b/kopete/protocols/jabber/jabberbasecontact.h index 2dcc26b7..bb430f11 100644 --- a/kopete/protocols/jabber/jabberbasecontact.h +++ b/kopete/protocols/jabber/jabberbasecontact.h @@ -35,7 +35,7 @@ class JabberBaseContact : public Kopete::Contact { Q_OBJECT - TQ_OBJECT + friend class JabberAccount; /* Friends can touch each other's private parts. */ public: diff --git a/kopete/protocols/jabber/jabberbookmarks.h b/kopete/protocols/jabber/jabberbookmarks.h index 65ea8e36..f60f1ccf 100644 --- a/kopete/protocols/jabber/jabberbookmarks.h +++ b/kopete/protocols/jabber/jabberbookmarks.h @@ -36,7 +36,7 @@ class KAction; class JabberBookmarks : public TQObject { Q_OBJECT - TQ_OBJECT + public: /** * Constructor diff --git a/kopete/protocols/jabber/jabberbytestream.h b/kopete/protocols/jabber/jabberbytestream.h index 91351160..d72ce9ab 100644 --- a/kopete/protocols/jabber/jabberbytestream.h +++ b/kopete/protocols/jabber/jabberbytestream.h @@ -31,7 +31,7 @@ class JabberByteStream : public ByteStream { Q_OBJECT - TQ_OBJECT + public: JabberByteStream ( TQObject *parent = 0, const char *name = 0 ); diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.h b/kopete/protocols/jabber/jabbercapabilitiesmanager.h index 8e2a95a6..6c8389f4 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.h +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.h @@ -36,7 +36,7 @@ class JabberAccount; class JabberCapabilitiesManager : public TQObject { Q_OBJECT - TQ_OBJECT + public: /** * Construct diff --git a/kopete/protocols/jabber/jabberchatsession.h b/kopete/protocols/jabber/jabberchatsession.h index 564523de..956b17fd 100644 --- a/kopete/protocols/jabber/jabberchatsession.h +++ b/kopete/protocols/jabber/jabberchatsession.h @@ -35,7 +35,7 @@ class TQString; class JabberChatSession : public Kopete::ChatSession { Q_OBJECT - TQ_OBJECT + public: JabberChatSession ( JabberProtocol *protocol, const JabberBaseContact *user, diff --git a/kopete/protocols/jabber/jabberclient.h b/kopete/protocols/jabber/jabberclient.h index 7ba389f9..81c11a02 100644 --- a/kopete/protocols/jabber/jabberclient.h +++ b/kopete/protocols/jabber/jabberclient.h @@ -58,7 +58,7 @@ class JabberClient : public TQObject { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/kopete/protocols/jabber/jabberconnector.h b/kopete/protocols/jabber/jabberconnector.h index f4a561e9..5116c823 100644 --- a/kopete/protocols/jabber/jabberconnector.h +++ b/kopete/protocols/jabber/jabberconnector.h @@ -33,7 +33,7 @@ class JabberConnector : public XMPP::Connector { Q_OBJECT - TQ_OBJECT + public: JabberConnector ( TQObject *parent = 0, const char *name = 0 ); diff --git a/kopete/protocols/jabber/jabbercontact.h b/kopete/protocols/jabber/jabbercontact.h index 15b5096e..4dcb6f8b 100644 --- a/kopete/protocols/jabber/jabbercontact.h +++ b/kopete/protocols/jabber/jabbercontact.h @@ -34,7 +34,7 @@ class JabberContact : public JabberBaseContact { Q_OBJECT - TQ_OBJECT + public: diff --git a/kopete/protocols/jabber/jabbercontactpool.h b/kopete/protocols/jabber/jabbercontactpool.h index e6bb1a88..563fc9c3 100644 --- a/kopete/protocols/jabber/jabbercontactpool.h +++ b/kopete/protocols/jabber/jabbercontactpool.h @@ -37,7 +37,7 @@ class JabberContactPool : public TQObject { Q_OBJECT - TQ_OBJECT + public: /** @@ -109,7 +109,7 @@ private: class JabberContactPoolItem : TQObject { Q_OBJECT - TQ_OBJECT + public: JabberContactPoolItem ( JabberBaseContact *contact ); ~JabberContactPoolItem (); diff --git a/kopete/protocols/jabber/jabberfiletransfer.h b/kopete/protocols/jabber/jabberfiletransfer.h index 2a5e4810..e5285e0e 100644 --- a/kopete/protocols/jabber/jabberfiletransfer.h +++ b/kopete/protocols/jabber/jabberfiletransfer.h @@ -31,7 +31,7 @@ class JabberFileTransfer : public TQObject { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/kopete/protocols/jabber/jabberformlineedit.h b/kopete/protocols/jabber/jabberformlineedit.h index d4f0de39..1b2567b2 100644 --- a/kopete/protocols/jabber/jabberformlineedit.h +++ b/kopete/protocols/jabber/jabberformlineedit.h @@ -32,7 +32,7 @@ class JabberFormLineEdit:public TQLineEdit { Q_OBJECT - TQ_OBJECT + public: JabberFormLineEdit (const int type, const TQString & realName, const TQString & value, TQWidget * parent = 0, const char *name = 0); @@ -50,7 +50,7 @@ class JabberFormPasswordEdit:public KPasswordEdit { Q_OBJECT - TQ_OBJECT + public: JabberFormPasswordEdit(const int type, const TQString & realName, const TQString & value, TQWidget * parent = 0, const char *name = 0); diff --git a/kopete/protocols/jabber/jabberformtranslator.h b/kopete/protocols/jabber/jabberformtranslator.h index 2ee316d6..1e594329 100644 --- a/kopete/protocols/jabber/jabberformtranslator.h +++ b/kopete/protocols/jabber/jabberformtranslator.h @@ -31,7 +31,7 @@ class JabberFormTranslator:public TQWidget { Q_OBJECT - TQ_OBJECT + public: JabberFormTranslator (const XMPP::Form & form, TQWidget * parent = 0, const char *name = 0); diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.h b/kopete/protocols/jabber/jabbergroupchatmanager.h index fb92ba40..655063ca 100644 --- a/kopete/protocols/jabber/jabbergroupchatmanager.h +++ b/kopete/protocols/jabber/jabbergroupchatmanager.h @@ -33,7 +33,7 @@ class TQString; class JabberGroupChatManager : public Kopete::ChatSession { Q_OBJECT - TQ_OBJECT + public: JabberGroupChatManager ( JabberProtocol *protocol, const JabberBaseContact *user, diff --git a/kopete/protocols/jabber/jabbergroupcontact.h b/kopete/protocols/jabber/jabbergroupcontact.h index 46bdad2a..07ae6f40 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.h +++ b/kopete/protocols/jabber/jabbergroupcontact.h @@ -27,7 +27,7 @@ class JabberGroupContact : public JabberBaseContact { Q_OBJECT - TQ_OBJECT + public: diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.h b/kopete/protocols/jabber/jabbergroupmembercontact.h index cddc0a58..49dd9417 100644 --- a/kopete/protocols/jabber/jabbergroupmembercontact.h +++ b/kopete/protocols/jabber/jabbergroupmembercontact.h @@ -28,7 +28,7 @@ class JabberGroupMemberContact : public JabberBaseContact { Q_OBJECT - TQ_OBJECT + public: diff --git a/kopete/protocols/jabber/jabberprotocol.h b/kopete/protocols/jabber/jabberprotocol.h index 6e647f74..117b683c 100644 --- a/kopete/protocols/jabber/jabberprotocol.h +++ b/kopete/protocols/jabber/jabberprotocol.h @@ -50,7 +50,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 5f274668..16ba49d6 100644 --- a/kopete/protocols/jabber/jabberresource.h +++ b/kopete/protocols/jabber/jabberresource.h @@ -38,7 +38,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 1f892d24..d7720d1e 100644 --- a/kopete/protocols/jabber/jabberresourcepool.h +++ b/kopete/protocols/jabber/jabberresourcepool.h @@ -32,7 +32,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 2cfcd4c1..8ed1360f 100644 --- a/kopete/protocols/jabber/jabbertransport.h +++ b/kopete/protocols/jabber/jabbertransport.h @@ -40,7 +40,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 ad5d68a7..91ac2123 100644 --- a/kopete/protocols/jabber/jingle/jinglesession.h +++ b/kopete/protocols/jabber/jingle/jinglesession.h @@ -32,7 +32,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 2ec3ef46..03ad0a4d 100644 --- a/kopete/protocols/jabber/jingle/jinglesessionmanager.h +++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.h @@ -39,7 +39,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 e29eaf16..ab403233 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.h +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.h @@ -31,7 +31,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 0089a1bf..58365f2d 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.h +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.h @@ -38,7 +38,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 738b2cb4..5221829e 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.h @@ -30,7 +30,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 8c37b0c8..52b03665 100644 --- a/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h +++ b/kopete/protocols/jabber/jingle/jinglewatchsessiontask.h @@ -26,7 +26,7 @@ class JingleWatchSessionTask : public XMPP::Task { Q_OBJECT - TQ_OBJECT + public: JingleWatchSessionTask(XMPP::Task *parent); ~JingleWatchSessionTask(); diff --git a/kopete/protocols/jabber/jingle/voicecaller.h b/kopete/protocols/jabber/jingle/voicecaller.h index 6907f09d..fab047f5 100644 --- a/kopete/protocols/jabber/jingle/voicecaller.h +++ b/kopete/protocols/jabber/jingle/voicecaller.h @@ -17,7 +17,7 @@ using namespace XMPP; class VoiceCaller : public TQObject { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.h b/kopete/protocols/jabber/kioslave/jabberdisco.h index 19a12d8a..9b8f5be0 100644 --- a/kopete/protocols/jabber/kioslave/jabberdisco.h +++ b/kopete/protocols/jabber/kioslave/jabberdisco.h @@ -37,7 +37,7 @@ class JabberDiscoProtocol : public TQObject, public KIO::SlaveBase { Q_OBJECT - TQ_OBJECT + public: JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h index 25e33c04..38aa4912 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h @@ -30,7 +30,7 @@ class BSocket : public ByteStream { Q_OBJECT - TQ_OBJECT + public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound }; enum State { Idle, HostLookup, Connecting, Connected, Closing }; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h index 6c73acd5..148356e8 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h @@ -28,7 +28,7 @@ class HttpConnect : public ByteStream { Q_OBJECT - TQ_OBJECT + public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; HttpConnect(TQObject *parent=0); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h index a4c542f6..088d5c33 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h @@ -28,7 +28,7 @@ class HttpPoll : public ByteStream { Q_OBJECT - TQ_OBJECT + public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; HttpPoll(TQObject *parent=0); @@ -71,7 +71,7 @@ private: class HttpProxyPost : public TQObject { Q_OBJECT - TQ_OBJECT + public: enum Error { ErrConnectionRefused, ErrHostNotFound, ErrSocket, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; HttpProxyPost(TQObject *parent=0); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h index 3b000d9b..01907ccd 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h @@ -35,7 +35,7 @@ class NDnsManager; class NDns : public TQObject { Q_OBJECT - TQ_OBJECT + public: NDns(TQObject *parent=0); ~NDns(); @@ -60,7 +60,7 @@ private: class NDnsManager : public TQObject { Q_OBJECT - TQ_OBJECT + public: ~NDnsManager(); class Item; diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h index fe63abef..c77b57c8 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h @@ -28,7 +28,7 @@ class ServSock : public TQObject { Q_OBJECT - TQ_OBJECT + public: ServSock(TQObject *parent=0); ~ServSock(); @@ -53,7 +53,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 14c2a176..3205ceb2 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h @@ -32,7 +32,7 @@ class SocksServer; class SocksUDP : public TQObject { Q_OBJECT - TQ_OBJECT + public: ~SocksUDP(); @@ -56,7 +56,7 @@ private: class SocksClient : public ByteStream { Q_OBJECT - TQ_OBJECT + public: enum Error { ErrConnectionRefused = ErrCustom, ErrHostNotFound, ErrProxyConnect, ErrProxyNeg, ErrProxyAuth }; enum Method { AuthNone=0x0001, AuthUsername=0x0002 }; @@ -130,7 +130,7 @@ private: class SocksServer : public TQObject { Q_OBJECT - TQ_OBJECT + public: SocksServer(TQObject *parent=0); ~SocksServer(); diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h index 8ef15684..669bcf80 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h @@ -29,7 +29,7 @@ class SrvResolver : public TQObject { Q_OBJECT - TQ_OBJECT + public: SrvResolver(TQObject *parent=0); ~SrvResolver(); diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h index b72fad78..0ffab15b 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h @@ -30,7 +30,7 @@ class ByteStream : public TQObject { Q_OBJECT - TQ_OBJECT + public: enum Error { ErrRead, ErrWrite, ErrCustom = 10 }; ByteStream(TQObject *parent=0); diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h index 01c47a32..ce7a789a 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h @@ -41,7 +41,7 @@ private: class SafeDeleteLater : public TQObject { Q_OBJECT - TQ_OBJECT + public: static SafeDeleteLater *ensureExists(); void deleteItLater(TQObject *o); diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h index 8c84be12..f8eb7095 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h +++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h @@ -26,7 +26,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 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(); diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.h b/kopete/protocols/jabber/libiris/qca/src/qca.h index 79b028bf..4c27f047 100644 --- a/kopete/protocols/jabber/libiris/qca/src/qca.h +++ b/kopete/protocols/jabber/libiris/qca/src/qca.h @@ -314,7 +314,7 @@ namespace QCA class QCA_EXPORT TLS : public TQObject { Q_OBJECT - TQ_OBJECT + public: enum Validity { NoCert, @@ -376,7 +376,7 @@ namespace QCA class QCA_EXPORT SASL : public TQObject { Q_OBJECT - TQ_OBJECT + public: enum Error { ErrAuth, ErrCrypt }; enum ErrorCond { diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.h b/kopete/protocols/jabber/ui/dlgjabberbrowse.h index 57549852..3926e987 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.h +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.h @@ -35,7 +35,7 @@ class dlgJabberBrowse:public dlgBrowse { Q_OBJECT - TQ_OBJECT + public: dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0); diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h index ffeed22b..39756858 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.h +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.h @@ -32,7 +32,7 @@ class DlgJabberChangePassword : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: DlgJabberChangePassword ( JabberAccount *account, TQWidget *parent = 0, const char *name = 0); diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h index 1327ba47..45bd649a 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.h @@ -25,7 +25,7 @@ class dlgJabberChatJoin : public dlgChatJoin { Q_OBJECT - TQ_OBJECT + public: dlgJabberChatJoin(JabberAccount *account, TQWidget* parent = 0, const char* name = 0); diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h index f16802cc..c2c6cf33 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.h @@ -21,7 +21,7 @@ class dlgJabberChatRoomsList : public dlgChatRoomsList { Q_OBJECT - TQ_OBJECT + public: dlgJabberChatRoomsList(JabberAccount* account, const TQString& server = TQString(), const TQString& nick = TQString(), TQWidget* parent = 0, const char* name = 0); diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.h b/kopete/protocols/jabber/ui/dlgjabberregister.h index bc0bfe44..cd24c929 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.h +++ b/kopete/protocols/jabber/ui/dlgjabberregister.h @@ -39,7 +39,7 @@ class dlgJabberRegister:public dlgRegister { Q_OBJECT - TQ_OBJECT + public: dlgJabberRegister (JabberAccount *account, const XMPP::Jid & jid, TQWidget * parent = 0, const char *name = 0); diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.h b/kopete/protocols/jabber/ui/dlgjabbersendraw.h index 898ba739..b85e37af 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.h +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.h @@ -36,7 +36,7 @@ class JabberClient; class dlgJabberSendRaw:public DlgSendRaw { Q_OBJECT - TQ_OBJECT + public: dlgJabberSendRaw ( JabberClient *client, TQWidget * parent = 0, const char *name = 0); diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.h b/kopete/protocols/jabber/ui/dlgjabberservices.h index 4ef09d9e..ea85658f 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.h +++ b/kopete/protocols/jabber/ui/dlgjabberservices.h @@ -34,7 +34,7 @@ class dlgJabberServices:public dlgServices { Q_OBJECT - TQ_OBJECT + public: dlgJabberServices (JabberAccount *account, TQWidget *parent = 0, const char *name = 0); @@ -60,7 +60,7 @@ private: class dlgJabberServies_item : protected TQObject, public TQListViewItem { Q_OBJECT - TQ_OBJECT + public: dlgJabberServies_item( TQListView *parent , const TQString &s1 , const TQString &s2 ) : TQListViewItem(parent,s1,s2), can_browse(false) , can_register(false) {} diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.h b/kopete/protocols/jabber/ui/dlgjabbervcard.h index a20f2812..44711c44 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.h +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.h @@ -45,7 +45,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 f7c328c2..ed4fa41c 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.h +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.h @@ -32,7 +32,7 @@ class TQLabel; class JabberAddContactPage:public AddContactPage { Q_OBJECT - TQ_OBJECT + public: JabberAddContactPage (Kopete::Account * owner, TQWidget * parent = 0, const char *name = 0); @@ -55,7 +55,7 @@ class JabberTransport; */ 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); Kopete::MetaContact *metacontact; diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.h b/kopete/protocols/jabber/ui/jabberchooseserver.h index aee2668e..8523a0dc 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.h +++ b/kopete/protocols/jabber/ui/jabberchooseserver.h @@ -39,7 +39,7 @@ class JabberChooseServer : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: JabberChooseServer ( JabberRegisterAccount *parent = 0, const char *name = 0); diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h index 82f56215..f53c566c 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.h +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.h @@ -35,7 +35,7 @@ class JabberEditAccountWidget:public DlgJabberEditAccountWidget, public KopeteEd { Q_OBJECT - TQ_OBJECT + public: JabberEditAccountWidget (JabberProtocol * proto, JabberAccount *, TQWidget * parent = 0, const char *name = 0); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.h b/kopete/protocols/jabber/ui/jabberregisteraccount.h index 74de6387..9979f59f 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.h +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.h @@ -36,7 +36,7 @@ class JabberRegisterAccount : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: JabberRegisterAccount ( JabberEditAccountWidget *parent = 0, const char *name = 0 ); |