cleanup examples

4 files changed, 19 insertions, 53 deletions

diff --git a/examples/example_2_rosterHandling/xmppClient.cpp b/examples/example_2_rosterHandling/example_2_rosterHandling.cpp
index 61f1956d..2b5709bb 100644
--- a/examples/example_2_rosterHandling/xmppClient.cpp
+++ b/examples/example_2_rosterHandling/example_2_rosterHandling.cpp
@@ -21,12 +21,12 @@
  *
  */
 
-#include <iostream>
+#include <QCoreApplication>
 
 #include "QXmppMessage.h"
 #include "QXmppRosterManager.h"
 
-#include "xmppClient.h"
+#include "example_2_rosterHandling.h"
 
 xmppClient::xmppClient(QObject *parent)
     : QXmppClient(parent)
@@ -56,27 +56,32 @@ xmppClient::~xmppClient()
 
 void xmppClient::clientConnected()
 {
-    std::cout<<"example_2_rosterHandling:: CONNECTED"<<std::endl;
+    qDebug("example_2_rosterHandling:: CONNECTED");
 }
 
 void xmppClient::rosterReceived()
 {
-    std::cout<<"example_2_rosterHandling:: Roster Received"<<std::endl;
-    QStringList list = rosterManager().getRosterBareJids();
-    QString rosterEntry = "Roster Received:: %1 [%2]";
-    for(int i = 0; i < list.size(); ++i)
-    {
-        QString bareJid = list.at(i);
+    qDebug("example_2_rosterHandling:: Roster received");
+    foreach (const QString &bareJid, rosterManager().getRosterBareJids()) {
         QString name = rosterManager().getRosterEntry(bareJid).name();
         if(name.isEmpty())
             name = "-";
-        std::cout << qPrintable(rosterEntry.arg(bareJid).arg(name)) << std::endl;
+        qDebug("example_2_rosterHandling:: Roster received: %s [%s]", qPrintable(bareJid), qPrintable(name));
     }
 }
 
 void xmppClient::presenceChanged(const QString& bareJid,
                                  const QString& resource)
 {
-    QString presenceStr = "Presence Changed:: %1/%2";
-    std::cout<<qPrintable(presenceStr.arg(bareJid).arg(resource))<<std::endl;
+    qDebug("example_2_rosterHandling:: Presence changed %s/%s", qPrintable(bareJid), qPrintable(resource));
+}
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+
+    xmppClient client;
+    client.connectToServer("qxmpp.test1@qxmpp.org", "qxmpp123");
+
+    return app.exec();
 }
diff --git a/examples/example_2_rosterHandling/xmppClient.h b/examples/example_2_rosterHandling/example_2_rosterHandling.h
index 17d04c70..17d04c70 100644
--- a/examples/example_2_rosterHandling/xmppClient.h
+++ b/examples/example_2_rosterHandling/example_2_rosterHandling.h
diff --git a/examples/example_2_rosterHandling/example_2_rosterHandling.pro b/examples/example_2_rosterHandling/example_2_rosterHandling.pro
index 1098a221..c9c886f9 100644
--- a/examples/example_2_rosterHandling/example_2_rosterHandling.pro
+++ b/examples/example_2_rosterHandling/example_2_rosterHandling.pro
@@ -2,9 +2,8 @@ include(../examples.pri)
 
 TARGET = example_2_rosterHandling
 
-SOURCES +=  main.cpp \
-            xmppClient.cpp
+SOURCES += example_2_rosterHandling.cpp
 
-HEADERS +=  xmppClient.h
+HEADERS += example_2_rosterHandling.h
 
 OTHER_FILES += README
diff --git a/examples/example_2_rosterHandling/main.cpp b/examples/example_2_rosterHandling/main.cpp
deleted file mode 100644
index 7223ddc1..00000000
--- a/examples/example_2_rosterHandling/main.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2008-2012 The QXmpp developers
- *
- * Author:
- *	Manjeet Dahiya
- *
- * Source:
- *	http://code.google.com/p/qxmpp
- *
- * This file is a part of QXmpp library.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- */
-
-
-#include <QtCore/QCoreApplication>
-#include "xmppClient.h"
-#include "QXmppLogger.h"
-
-int main(int argc, char *argv[])
-{
-    QCoreApplication a(argc, argv);
-    
-    QXmppLogger::getLogger()->setLoggingType(QXmppLogger::FileLogging);
-
-    xmppClient client;
-    client.connectToServer("qxmpp.test1@gmail.com", "qxmpp123");
-    return a.exec();
-}