From 30542e1fac912283b3958edd40d9701f6e8e46b4 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 3 Sep 2012 13:23:37 +0200
Subject: remove deprecated QXmppConfiguration::sASLAuthMechanism

---
 src/client/QXmppConfiguration.cpp | 37 -------------------------------------
 src/client/QXmppConfiguration.h   | 13 -------------
 2 files changed, 50 deletions(-)

(limited to 'src/client')

diff --git a/src/client/QXmppConfiguration.cpp b/src/client/QXmppConfiguration.cpp
index eb30e0df..b9452f38 100644
--- a/src/client/QXmppConfiguration.cpp
+++ b/src/client/QXmppConfiguration.cpp
@@ -565,40 +565,3 @@ QList<QSslCertificate> QXmppConfiguration::caCertificates() const
 {
     return d->caCertificates;
 }
-
-// obsolete
-
-/// \cond
-QXmppConfiguration::SASLAuthMechanism QXmppConfiguration::sASLAuthMechanism() const
-{
-    if (d->saslAuthMechanism == "PLAIN")
-        return SASLPlain;
-    else if (d->saslAuthMechanism == "DIGEST-MD5")
-        return SASLDigestMD5;
-    else if (d->saslAuthMechanism == "ANONYMOUS")
-        return SASLAnonymous;
-    else if (d->saslAuthMechanism == "X-FACEBOOK-PLATFORM")
-        return SASLXFacebookPlatform;
-    else
-        return SASLDigestMD5;
-}
-
-void QXmppConfiguration::setSASLAuthMechanism(
-        QXmppConfiguration::SASLAuthMechanism mech)
-{
-    switch (mech) {
-    case QXmppConfiguration::SASLPlain:
-        d->saslAuthMechanism = "PLAIN";
-        break;
-    case QXmppConfiguration::SASLDigestMD5:
-        d->saslAuthMechanism = "DIGEST-MD5";
-        break;
-    case QXmppConfiguration::SASLAnonymous:
-        d->saslAuthMechanism = "ANONYMOUS";
-        break;
-    case QXmppConfiguration::SASLXFacebookPlatform:
-        d->saslAuthMechanism = "X-FACEBOOK-PLATFORM";
-        break;
-    }
-}
-/// \endcond
diff --git a/src/client/QXmppConfiguration.h b/src/client/QXmppConfiguration.h
index dc384520..34017973 100644
--- a/src/client/QXmppConfiguration.h
+++ b/src/client/QXmppConfiguration.h
@@ -143,19 +143,6 @@ public:
     QList<QSslCertificate> caCertificates() const;
     void setCaCertificates(const QList<QSslCertificate> &);
 
-    /// \cond
-    // deprecated since 0.6.0
-    enum SASLAuthMechanism
-    {
-        SASLPlain = 0,
-        SASLDigestMD5,
-        SASLAnonymous,
-        SASLXFacebookPlatform
-    };
-    QXmppConfiguration::SASLAuthMechanism Q_DECL_DEPRECATED sASLAuthMechanism() const;
-    void Q_DECL_DEPRECATED setSASLAuthMechanism(QXmppConfiguration::SASLAuthMechanism);
-    /// \endcond
-
 private:
     QSharedDataPointer<QXmppConfigurationPrivate> d;
 };
-- 
cgit v1.2.3