deprecate some connectToServer() variants

2 files changed, 30 insertions, 35 deletions

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
diff --git a/src/QXmppClient.h b/src/QXmppClient.h
index ae67d392..2566caf6 100644
--- a/src/QXmppClient.h
+++ b/src/QXmppClient.h
@@ -95,19 +95,6 @@ public:
 
     void addExtension(QXmppClientExtension *extension);
 
-    void connectToServer(const QString& host,
-                         const QString& user,
-                         const QString& passwd,
-                         const QString& domain,
-                         int port = 5222,
-                         const QXmppPresence& initialPresence =
-                         QXmppPresence());
-    void connectToServer(const QString& host,
-                         const QString& bareJid,
-                         const QString& passwd,
-                         int port = 5222,
-                         const QXmppPresence& initialPresence =
-                         QXmppPresence());
     void connectToServer(const QXmppConfiguration&,
                          const QXmppPresence& initialPresence = 
                          QXmppPresence());
@@ -152,6 +139,22 @@ public:
                                               const QVariant &arg8 = QVariant(),
                                               const QVariant &arg9 = QVariant(),
                                               const QVariant &arg10 = QVariant() );
+
+    // FIXME: these methods are deprecated, their API is just too hard to read.
+    // If you need this level of customisation, work directly with QXmppConfiguration.
+    void Q_DECL_DEPRECATED connectToServer(const QString& host,
+                         const QString& user,
+                         const QString& passwd,
+                         const QString& domain,
+                         int port = 5222,
+                         const QXmppPresence& initialPresence =
+                         QXmppPresence());
+    void Q_DECL_DEPRECATED connectToServer(const QString& host,
+                         const QString& bareJid,
+                         const QString& passwd,
+                         int port = 5222,
+                         const QXmppPresence& initialPresence =
+                         QXmppPresence());
     /// \endcond
 
 signals: