rework example

4 files changed, 21 insertions, 49 deletions

diff --git a/examples/example_9_vCard/xmppClient.cpp b/examples/example_9_vCard/example_9_vCard.cpp
index 9f05c397..b43f849d 100644
--- a/examples/example_9_vCard/xmppClient.cpp
+++ b/examples/example_9_vCard/example_9_vCard.cpp
@@ -21,21 +21,22 @@
  *
  */
 
-#include "xmppClient.h"
-
 #include <iostream>
 
+#include <QBuffer>
+#include <QCoreApplication>
+#include <QDir>
+#include <QFile>
+#include <QImage>
+#include <QImageReader>
+#include <QXmlStreamWriter>
+
 #include "QXmppMessage.h"
 #include "QXmppRosterManager.h"
 #include "QXmppVCardIq.h"
 #include "QXmppVCardManager.h"
 
-#include <QFile>
-#include <QDir>
-#include <QXmlStreamWriter>
-#include <QImage>
-#include <QBuffer>
-#include <QImageReader>
+#include "example_9_vCard.h"
 
 xmppClient::xmppClient(QObject *parent)
     : QXmppClient(parent)
@@ -113,3 +114,13 @@ void xmppClient::vCardReceived(const QXmppVCardIq& vCard)
         std::cout<<"example_9_vCard:: Avatar saved to file" <<std::endl<<std::endl;
     }
 }
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+
+    xmppClient client;
+    client.connectToServer("qxmpp.test1@qxmpp.org", "qxmpp123");
+
+    return a.exec();
+}
diff --git a/examples/example_9_vCard/xmppClient.h b/examples/example_9_vCard/example_9_vCard.h
index 21c0a950..21c0a950 100644
--- a/examples/example_9_vCard/xmppClient.h
+++ b/examples/example_9_vCard/example_9_vCard.h
diff --git a/examples/example_9_vCard/example_9_vCard.pro b/examples/example_9_vCard/example_9_vCard.pro
index 965a6c2a..4ecdc816 100644
--- a/examples/example_9_vCard/example_9_vCard.pro
+++ b/examples/example_9_vCard/example_9_vCard.pro
@@ -2,7 +2,6 @@ include(../examples.pri)
 
 TARGET = example_9_vCard
 
-SOURCES +=  main.cpp \
-            xmppClient.cpp
+SOURCES += example_9_vCard.cpp
 
-HEADERS +=  xmppClient.h
+HEADERS += example_9_vCard.h
diff --git a/examples/example_9_vCard/main.cpp b/examples/example_9_vCard/main.cpp
deleted file mode 100644
index 7223ddc1..00000000
--- a/examples/example_9_vCard/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();
-}