mark disconnect deprecated and use disconnectFromServer instead

2 files changed, 11 insertions, 3 deletions

diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index 19fb1c07..a6dcec30 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -305,10 +305,10 @@ bool QXmppClient::sendPacket(const QXmppPacket& packet)
 ///
 /// \note Make sure that the clientPresence is changed to
 /// QXmppPresence::Available, if you are again calling connectToServer() after
-/// calling the disconnect() function.
+/// calling the disconnectFromServer() function.
 ///
 
-void QXmppClient::disconnect()
+void QXmppClient::disconnectFromServer()
 {
     d->clientPresence.setType(QXmppPresence::Unavailable);
     d->clientPresence.status().setType(QXmppPresence::Status::Offline);
@@ -320,6 +320,11 @@ void QXmppClient::disconnect()
     }
 }
 
+void QXmppClient::disconnect()
+{
+    disconnectFromServer();
+}
+
 /// Returns true if the client is connected to the XMPP server.
 ///
 
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);