From 104cf580e3f8389e0e84ce11116fb833d31d287b Mon Sep 17 00:00:00 2001
From: Georg <s.g.b@gmx.de>
Date: Mon, 31 Oct 2016 20:47:02 +0100
Subject: [PATCH] Fixed pro file. Added test directory

---
 app/kaidan.pro         | 22 ++++++++++++----------
 app/source/EchoBot.cpp |  6 +-----
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/app/kaidan.pro b/app/kaidan.pro
index 80729d3..b7cb21b 100644
--- a/app/kaidan.pro
+++ b/app/kaidan.pro
@@ -1,12 +1,12 @@
 # path to local compiled swift 3 lib
-SWIFT3PATH = ../swift-3.0
+SWIFT3PATH = ../../swift-3.0
 # from swift-config
 SWIFTCXX = -DSWIFTEN_STATIC -DBOOST_ALL_NO_LIB -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_SIGNALS_NO_DEPRECATION_WARNING -DSWIFT_EXPERIMENTAL_FT
 SWIFTLIB = -lSwiften -lSwiften_Boost -lrt -lz -lssl -lcrypto -lxml2 -lresolv -lpthread -ldl -lm -lc -lstdc++
 
 
 TEMPLATE = app
-QT += qml quick
+QT += qml quick core
 
 INCLUDEPATH += $${SWIFT3PATH}/3rdParty/Boost/src
 INCLUDEPATH += $${SWIFT3PATH}/
@@ -14,18 +14,20 @@ INCLUDEPATH += $${SWIFT3PATH}/
 CXXFLAGS += $${SWIFTCXX}
 LIBS += -L$${SWIFT3PATH}/Swiften -L$${SWIFT3PATH}/3rdParty/Boost $${SWIFTLIB}
 
-SOURCES += main.cpp \
-        EchoBot.cpp
+DEFINES += BOOST_SIGNALS_NO_DEPRECATION_WARNING
 
-HEADERS += EchoBot.h \
-            EchoPayload.h \
-            EchoPayloadParserFactory.h \
-            EchoPayloadSerializer.h
+SOURCES += source/main.cpp \
+        source/EchoBot.cpp
 
-RESOURCES += qml.qrc
+HEADERS += source/EchoBot.h \
+            sourc/EchoPayload.h \
+            source/EchoPayloadParserFactory.h \
+            source/EchoPayloadSerializer.h
+
+RESOURCES += resources/qml.qrc
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =
 
 # Default rules for deployment.
-include(deployment.pri)
+include(resources/deployment.pri)
diff --git a/app/source/EchoBot.cpp b/app/source/EchoBot.cpp
index 7fc2679..27698a3 100644
--- a/app/source/EchoBot.cpp
+++ b/app/source/EchoBot.cpp
@@ -6,15 +6,11 @@
 
 #include "EchoPayload.h"
 
-// FIXME rewrite all binds to qt connects
-
 EchoBot::EchoBot(NetworkFactories* networkFactories)
 {
-    client = new Swift::Client("jid@jabber.lit", "pass", networkFactories);
+    client = new Swift::Client("jid@...", "pass", networkFactories);
     client->setAlwaysTrustCertificates();
     client->onConnected.connect(boost::bind(&EchoBot::handleConnected, this));
-
-
     client->onMessageReceived.connect(
                 boost::bind(&EchoBot::handleMessageReceived, this, _1));
     client->onPresenceReceived.connect(
-- 
GitLab