From ef9f9a57f1dd2e70d29afa26fa0d1ab38a5e3aca Mon Sep 17 00:00:00 2001 From: Jeremy Lainé 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/QXmppOutgoingClient.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'src/client/QXmppOutgoingClient.cpp') diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp index 10f82ad0..0d0da95a 100644 --- a/src/client/QXmppOutgoingClient.cpp +++ b/src/client/QXmppOutgoingClient.cpp @@ -339,21 +339,7 @@ void QXmppOutgoingClient::handleStanza(const QDomElement &nodeRecv) { // supported and preferred SASL auth mechanisms const QStringList supportedMechanisms = QStringList() << "PLAIN" << "DIGEST-MD5" << "ANONYMOUS" << "X-FACEBOOK-PLATFORM"; - QString preferredMechanism; - switch (configuration().sASLAuthMechanism()) { - case QXmppConfiguration::SASLPlain: - preferredMechanism = "PLAIN"; - break; - case QXmppConfiguration::SASLDigestMD5: - preferredMechanism = "DIGEST-MD5"; - break; - case QXmppConfiguration::SASLAnonymous: - preferredMechanism = "ANONYMOUS"; - break; - case QXmppConfiguration::SASLXFacebookPlatform: - preferredMechanism = "X-FACEBOOK-PLATFORM"; - break; - } + const QString preferredMechanism = configuration().saslAuthMechanism(); // determine SASL Authentication mechanism to use QStringList commonMechanisms; -- cgit v1.2.3