cleanup examples

4 files changed, 18 insertions, 42 deletions

diff --git a/examples/example_1_echoClient/echoClient.cpp b/examples/example_1_echoClient/example_1_echoClient.cpp
index 91cd5cec..28d144c9 100644
--- a/examples/example_1_echoClient/echoClient.cpp
+++ b/examples/example_1_echoClient/example_1_echoClient.cpp
@@ -22,9 +22,13 @@
  */
 
 
-#include "echoClient.h"
+#include <QCoreApplication>
+
+#include "QXmppLogger.h"
 #include "QXmppMessage.h"
 
+#include "example_1_echoClient.h"
+
 echoClient::echoClient(QObject *parent)
     : QXmppClient(parent)
 {
@@ -46,3 +50,14 @@ void echoClient::messageReceived(const QXmppMessage& message)
 
     sendPacket(QXmppMessage("", from, "Your message: " + msg));
 }
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+
+    echoClient client;
+    client.logger()->setLoggingType(QXmppLogger::StdoutLogging);
+    client.connectToServer("qxmpp.test1@qxmpp.org", "qxmpp123");
+
+    return app.exec();
+}
diff --git a/examples/example_1_echoClient/echoClient.h b/examples/example_1_echoClient/example_1_echoClient.h
index 7a4456d5..7a4456d5 100644
--- a/examples/example_1_echoClient/echoClient.h
+++ b/examples/example_1_echoClient/example_1_echoClient.h
diff --git a/examples/example_1_echoClient/example_1_echoClient.pro b/examples/example_1_echoClient/example_1_echoClient.pro
index dd296396..8a39a64a 100644
--- a/examples/example_1_echoClient/example_1_echoClient.pro
+++ b/examples/example_1_echoClient/example_1_echoClient.pro
@@ -2,9 +2,8 @@ include(../examples.pri)
 
 TARGET = example_1_echoClient
 
-SOURCES +=  main.cpp \
-            echoClient.cpp
+SOURCES += example_1_echoClient.cpp
 
-HEADERS +=  echoClient.h
+HEADERS += example_1_echoClient.h
 
 OTHER_FILES += README
diff --git a/examples/example_1_echoClient/main.cpp b/examples/example_1_echoClient/main.cpp
deleted file mode 100644
index d6d6628d..00000000
--- a/examples/example_1_echoClient/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 "echoClient.h"
-#include "QXmppLogger.h"
-
-int main(int argc, char *argv[])
-{
-    QCoreApplication a(argc, argv);
-    
-    QXmppLogger::getLogger()->setLoggingType(QXmppLogger::StdoutLogging);
-
-    echoClient client;
-    client.connectToServer("qxmpp.test1@gmail.com", "qxmpp123");
-    return a.exec();
-}