remove deprecated QXmppClient methods

2 files changed, 0 insertions, 90 deletions

diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index 84749cc0..a5f721a3 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -659,75 +659,3 @@ void QXmppClient::xmppConnected()
     sendPacket(d->clientPresence);
 }
 
-// obsolete
-
-const QXmppPresence& QXmppClient::getClientPresence() const
-{
-    return d->clientPresence;
-}
-
-QXmppConfiguration& QXmppClient::getConfiguration()
-{
-    return d->stream->configuration();
-}
-
-const QXmppConfiguration& QXmppClient::getConfiguration() const
-{
-    return d->stream->configuration();
-}
-
-QXmppRosterManager& QXmppClient::getRoster()
-{
-    return *d->rosterManager;
-}
-
-QAbstractSocket::SocketError QXmppClient::getSocketError()
-{
-    return d->stream->socketError();
-}
-
-QXmppVCardManager& QXmppClient::getVCardManager()
-{
-    return *d->vCardManager;
-}
-
-QXmppStanza::Error::Condition QXmppClient::getXmppStreamError()
-{
-    return d->stream->xmppStreamError();
-}
-
-void QXmppClient::disconnect()
-{
-    disconnectFromServer();
-}
-
-void QXmppClient::setClientPresence(const QString& statusText)
-{
-    QXmppPresence newPresence = d->clientPresence;
-    newPresence.status().setStatusText(statusText);
-    setClientPresence(newPresence);
-}
-
-void QXmppClient::setClientPresence(QXmppPresence::Type presenceType)
-{
-    QXmppPresence newPresence = d->clientPresence;
-    newPresence.setType(presenceType);
-    setClientPresence(newPresence);
-}
-
-void QXmppClient::setClientPresence(QXmppPresence::Status::Type statusType)
-{
-    QXmppPresence newPresence = d->clientPresence;
-    if (statusType == QXmppPresence::Status::Offline)
-        newPresence.setType(QXmppPresence::Unavailable);
-    else
-        newPresence.setType(QXmppPresence::Available);
-    newPresence.status().setType(statusType);
-    setClientPresence(newPresence);
-}
-
-QXmppReconnectionManager* QXmppClient::getReconnectionManager()
-{
-    return d->reconnectionManager;
-}
-
diff --git a/src/QXmppClient.h b/src/QXmppClient.h
index 8f042797..ae67d392 100644
--- a/src/QXmppClient.h
+++ b/src/QXmppClient.h
@@ -152,24 +152,6 @@ public:
                                               const QVariant &arg8 = QVariant(),
                                               const QVariant &arg9 = QVariant(),
                                               const QVariant &arg10 = QVariant() );
-
-    // deprecated accessors, use the form without "get" instead
-    const QXmppPresence Q_DECL_DEPRECATED & getClientPresence() const;
-    QXmppConfiguration Q_DECL_DEPRECATED & getConfiguration();
-    const QXmppConfiguration Q_DECL_DEPRECATED & getConfiguration() const;
-    QXmppReconnectionManager* Q_DECL_DEPRECATED getReconnectionManager();
-    QXmppRosterManager Q_DECL_DEPRECATED & getRoster();
-    QXmppVCardManager Q_DECL_DEPRECATED & getVCardManager();
-    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);
-    void Q_DECL_DEPRECATED setClientPresence(QXmppPresence::Status::Type statusType);
     /// \endcond
 
 signals: