From 935498300299dc6ef92a75d862670a3dd4028277 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Sun, 29 Aug 2010 16:40:46 +0000
Subject: deprecate some connectToServer() variants

---
 src/QXmppClient.cpp | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

(limited to 'src/QXmppClient.cpp')

diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index a5f721a3..ac63db56 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -223,17 +223,18 @@ void QXmppClient::connectToServer(const QXmppConfiguration& config,
     d->stream->connectToHost();
 }
 
-/// Overloaded function to simply connect to an XMPP server.
+/// Overloaded function to simply connect to an XMPP server with a JID and password.
 ///
 /// \param jid JID for the account.
 /// \param password Password for the account.
 
 void QXmppClient::connectToServer(const QString &jid, const QString &passwd)
 {
-    d->stream->configuration().setUser(jidToUser(jid));
-    d->stream->configuration().setDomain(jidToDomain(jid));
-    d->stream->configuration().setPasswd(jidToDomain(passwd));
-    d->stream->connectToHost();
+    QXmppConfiguration config;
+    config.setUser(jidToUser(jid));
+    config.setDomain(jidToDomain(jid));
+    config.setPasswd(jidToDomain(passwd));
+    connectToServer(config);
 }
 
 /// Overloaded function.
@@ -261,11 +262,7 @@ void QXmppClient::connectToServer(const QString& host, const QString& user,
     config.setPasswd(passwd);
     config.setDomain(domain);
     config.setPort(port);
-
-    d->clientPresence = initialPresence;
-    d->clientPresence.setExtensions(d->stream->presenceExtensions());
-
-    d->stream->connectToHost();
+    connectToServer(config, initialPresence);
 }
 
 /// Overloaded function.
@@ -286,18 +283,13 @@ void QXmppClient::connectToServer(const QString& host,
                                   int port,
                                   const QXmppPresence& initialPresence)
 {
-    QString user, domain;
-    QStringList list = bareJid.split("@");
-    if(list.size() == 2)
-    {
-        user = list.at(0);
-        domain = list.at(1);
-        connectToServer(host, user, passwd, domain, port, initialPresence);
-    }
-    else
-    {
-        emit logMessage(QXmppLogger::WarningMessage, "Invalid bareJid");
-    }
+    QXmppConfiguration config;
+    config.setHost(host);
+    config.setUser(jidToUser(bareJid));
+    config.setDomain(jidToDomain(bareJid));
+    config.setPasswd(passwd);
+    config.setPort(port);
+    connectToServer(config, initialPresence);
 }
 
 /// After successfully connecting to the server use this function to send
-- 
cgit v1.2.3