From ef9f9a57f1dd2e70d29afa26fa0d1ab38a5e3aca Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Wed, 18 Jul 2012 15:17:22 +0200
Subject: Make SASL mechanisms string based.

Deprecate QXmppConfiguration::setSASLAuthMechanism(), replaced by
the string-based QXmppConfiguration::setSaslAuthMechanism().
---
 src/client/QXmppConfiguration.h | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'src/client/QXmppConfiguration.h')

diff --git a/src/client/QXmppConfiguration.h b/src/client/QXmppConfiguration.h
index 9d6ce65f..c578cd74 100644
--- a/src/client/QXmppConfiguration.h
+++ b/src/client/QXmppConfiguration.h
@@ -72,13 +72,6 @@ public:
     /// The server may or may not allow any particular mechanism. So depending
     /// upon the availability of mechanisms on the server the library will choose
     /// a mechanism.
-    enum SASLAuthMechanism
-    {
-        SASLPlain = 0,         ///< Plain
-        SASLDigestMD5,         ///< Digest MD5 (default)
-        SASLAnonymous,         ///< Anonymous
-        SASLXFacebookPlatform, ///< Facebook Platform
-    };
 
     QXmppConfiguration();
     QXmppConfiguration(const QXmppConfiguration &other);
@@ -132,8 +125,8 @@ public:
     QXmppConfiguration::NonSASLAuthMechanism nonSASLAuthMechanism() const;
     void setNonSASLAuthMechanism(QXmppConfiguration::NonSASLAuthMechanism);
 
-    QXmppConfiguration::SASLAuthMechanism sASLAuthMechanism() const;
-    void setSASLAuthMechanism(QXmppConfiguration::SASLAuthMechanism);
+    QString saslAuthMechanism() const;
+    void setSaslAuthMechanism(const QString &mechanism);
 
     QNetworkProxy networkProxy() const;
     void setNetworkProxy(const QNetworkProxy& proxy);
@@ -147,6 +140,19 @@ 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