Move settings lib into the main code, fixing error logging in it.

2014-07-01 01:48:09 +02:00
parent 8b86306d48
commit 18a342ef14
33 changed files with 80 additions and 175 deletions
--- a/logic/updater/UpdateChecker.cpp
+++ b/logic/updater/UpdateChecker.cpp
@ -24,7 +24,7 @@
 #include <QJsonArray>
 #include <QJsonValue>

-#include <settingsobject.h>
+#include "logic/settings/SettingsObject.h"

 #define API_VERSION 0
 #define CHANLIST_FORMAT 0