From 47709babf194fdc8fa71eb188782e737f0004a9a Mon Sep 17 00:00:00 2001 From: Manjeet Dahiya Date: Thu, 19 Aug 2010 11:53:24 +0000 Subject: mark disconnect deprecated and use disconnectFromServer instead --- src/QXmppClient.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/QXmppClient.h') diff --git a/src/QXmppClient.h b/src/QXmppClient.h index f7de191f..4d3bc7c7 100644 --- a/src/QXmppClient.h +++ b/src/QXmppClient.h @@ -108,7 +108,7 @@ public: void connectToServer(const QXmppConfiguration&, const QXmppPresence& initialPresence = QXmppPresence()); - void disconnect(); + void disconnectFromServer(); bool isConnected() const; QXmppPresence clientPresence() const; @@ -158,6 +158,9 @@ public: QAbstractSocket::SocketError Q_DECL_DEPRECATED getSocketError(); QXmppStanza::Error::Condition Q_DECL_DEPRECATED getXmppStreamError(); + /// was clashing with QObject::disconnect use disconnectFromServer() instead + void Q_DECL_DEPRECATED disconnect(); + // deprecated methods, use setClientPresence(QXmppPresence) instead. void Q_DECL_DEPRECATED setClientPresence(const QString& statusText); void Q_DECL_DEPRECATED setClientPresence(QXmppPresence::Type presenceType); -- cgit v1.2.3