introduce a simpler connectToServer() function requiring only JID + password

8 files changed, 25 insertions, 13 deletions

diff --git a/examples/example_0_connected/main.cpp b/examples/example_0_connected/main.cpp
index bb34f177..fee52c51 100644
--- a/examples/example_0_connected/main.cpp
+++ b/examples/example_0_connected/main.cpp
@@ -31,17 +31,14 @@ int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
     
-    QXmppLogger::getLogger()->setLoggingType(QXmppLogger::STDOUT);
-
+    QXmppLogger::getLogger()->setLoggingType(QXmppLogger::StdoutLogging);
     QXmppClient client;
 
-//  For google talk
-//    client.connectToServer("talk.google.com", "usernamewithoutdomain", "passwd", "gmail.com");
-
-//  For jabber
-//    client.connectToServer("jabber.org", "usernamewithoutdomain", "passwd", "jabber.org");
+    // For jabber
+    // client.connectToServer("username@jabber.org", "passwd");
 
-    client.connectToServer("talk.google.com", "qxmpp.test1", "qxmpp123", "gmail.com");
+    // For google talk
+    client.connectToServer("qxmpp.test1@gmail.com", "qxmpp123");
 
     return a.exec();
 }
diff --git a/examples/example_1_echoClient/main.cpp b/examples/example_1_echoClient/main.cpp
index dc26371f..da53457f 100644
--- a/examples/example_1_echoClient/main.cpp
+++ b/examples/example_1_echoClient/main.cpp
@@ -33,6 +33,6 @@ int main(int argc, char *argv[])
     QXmppLogger::getLogger()->setLoggingType(QXmppLogger::StdoutLogging);
 
     echoClient client;
-    client.connectToServer("talk.google.com", "qxmpp.test1", "qxmpp123", "gmail.com");
+    client.connectToServer("qxmpp.test1@gmail.com", "qxmpp123");
     return a.exec();
 }
diff --git a/examples/example_2_rosterHandling/main.cpp b/examples/example_2_rosterHandling/main.cpp
index 74f8bc62..79ee0070 100644
--- a/examples/example_2_rosterHandling/main.cpp
+++ b/examples/example_2_rosterHandling/main.cpp
@@ -33,6 +33,6 @@ int main(int argc, char *argv[])
     QXmppLogger::getLogger()->setLoggingType(QXmppLogger::FileLogging);
 
     xmppClient client;
-    client.connectToServer("talk.google.com", "qxmpp.test1@gmail.com", "qxmpp123");
+    client.connectToServer("qxmpp.test1@gmail.com", "qxmpp123");
     return a.exec();
 }
diff --git a/examples/example_3_transferHandling/main.cpp b/examples/example_3_transferHandling/main.cpp
index 1d6b49b2..397a9b0e 100644
--- a/examples/example_3_transferHandling/main.cpp
+++ b/examples/example_3_transferHandling/main.cpp
@@ -44,6 +44,6 @@ int main(int argc, char *argv[])
     const QString username = (!strcmp(argv[1], "send")) ? QLatin1String("qxmpp.test1") : QLatin1String("qxmpp.test2");
 
     xmppClient client;
-    client.connectToServer("talk.google.com", username, "qxmpp123", "gmail.com");
+    client.connectToServer(username + "@gmail.com", "qxmpp123");
     return a.exec();
 }
diff --git a/examples/example_4_callHandling/main.cpp b/examples/example_4_callHandling/main.cpp
index 237da8ee..a6446f3a 100644
--- a/examples/example_4_callHandling/main.cpp
+++ b/examples/example_4_callHandling/main.cpp
@@ -44,6 +44,6 @@ int main(int argc, char *argv[])
     const QString username = (!strcmp(argv[1], "send")) ? QLatin1String("qxmpp.test1") : QLatin1String("qxmpp.test2");
 
     xmppClient client;
-    client.connectToServer("talk.google.com", username, "qxmpp123", "gmail.com");
+    client.connectToServer(username + "@gmail.com", "qxmpp123");
     return a.exec();
 }
diff --git a/src/QXmppClient.cpp b/src/QXmppClient.cpp
index 62a7f03d..84749cc0 100644
--- a/src/QXmppClient.cpp
+++ b/src/QXmppClient.cpp
@@ -223,6 +223,19 @@ void QXmppClient::connectToServer(const QXmppConfiguration& config,
     d->stream->connectToHost();
 }
 
+/// Overloaded function to simply connect to an XMPP server.
+///
+/// \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();
+}
+
 /// Overloaded function.
 /// \param host host name of the XMPP server where connection has to be made
 /// (e.g. "jabber.org" and "talk.google.com"). It can also be an IP address in
diff --git a/src/QXmppClient.h b/src/QXmppClient.h
index 8b684ff3..8f042797 100644
--- a/src/QXmppClient.h
+++ b/src/QXmppClient.h
@@ -111,6 +111,8 @@ public:
     void connectToServer(const QXmppConfiguration&,
                          const QXmppPresence& initialPresence = 
                          QXmppPresence());
+    void connectToServer(const QString &jid,
+                         const QString &passwd);
     void disconnectFromServer();
     bool isConnected() const;
 
diff --git a/src/src.pro b/src/src.pro
index 78edbc42..8f6c2139 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -14,7 +14,7 @@ CONFIG += staticlib
 # LIBS += -lspeex
 
 # DNS support
-macx {
+unix {
     LIBS += -lresolv
 }
 win32 {