fix example

4 files changed, 15 insertions, 45 deletions

diff --git a/examples/example_7_archiveHandling/xmppClient.cpp b/examples/example_7_archiveHandling/example_7_archiveHandling.cpp
index bc54b990..9cbb0943 100644
--- a/examples/example_7_archiveHandling/xmppClient.cpp
+++ b/examples/example_7_archiveHandling/example_7_archiveHandling.cpp
@@ -21,13 +21,13 @@
  *
  */
 
-
+#include <QCoreApplication>
 #include <QDateTime>
 
 #include "QXmppArchiveIq.h"
 #include "QXmppArchiveManager.h"
 
-#include "xmppClient.h"
+#include "example_7_archiveHandling.h"
 
 static void logStart(const QString &msg)
 {
@@ -142,3 +142,14 @@ void xmppClient::archiveChatReceived(const QXmppArchiveChat &chat, const QXmppRe
     }
 }
 
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+
+    xmppClient client;
+    client.setPageSize(15);
+    client.setPageDirection(xmppClient::PageBackwards);
+    client.connectToServer("qxmpp.test1@qxmpp.org", "qxmpp123");
+
+    return a.exec();
+}
diff --git a/examples/example_7_archiveHandling/xmppClient.h b/examples/example_7_archiveHandling/example_7_archiveHandling.h
index 9299c4f8..9299c4f8 100644
--- a/examples/example_7_archiveHandling/xmppClient.h
+++ b/examples/example_7_archiveHandling/example_7_archiveHandling.h
diff --git a/examples/example_7_archiveHandling/example_7_archiveHandling.pro b/examples/example_7_archiveHandling/example_7_archiveHandling.pro
index 0d7d75df..fc80314a 100644
--- a/examples/example_7_archiveHandling/example_7_archiveHandling.pro
+++ b/examples/example_7_archiveHandling/example_7_archiveHandling.pro
@@ -2,7 +2,6 @@ include(../examples.pri)
 
 TARGET = example_7_archiveHandling
 
-SOURCES +=  main.cpp \
-            xmppClient.cpp
+SOURCES += example_7_archiveHandling.cpp
 
-HEADERS +=  xmppClient.h
+HEADERS += example_7_archiveHandling.h
diff --git a/examples/example_7_archiveHandling/main.cpp b/examples/example_7_archiveHandling/main.cpp
deleted file mode 100644
index 98338b20..00000000
--- a/examples/example_7_archiveHandling/main.cpp
+++ /dev/null
@@ -1,40 +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.setPageSize(15);
-    client.setPageDirection(xmppClient::PageBackwards);
-    client.connectToServer("qxmpp.test1@gmail.com", "qxmpp123");
-    return a.exec();
-}