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/tests/tst_UpdateChecker.cpp
+++ b/tests/tst_UpdateChecker.cpp
@@ -1,8 +1,8 @@
 #include <QTest>
 #include <QSignalSpy>

-#include "depends/settings/settingsobject.h"
-#include "depends/settings/setting.h"
+#include "logic/settings/SettingsObject.h"
+#include "logic/settings/Setting.h"

 #include "BuildConfig.h"
 #include "TestUtil.h"
--- a/tests/tst_inifile.cpp
+++ b/tests/tst_inifile.cpp
@@ -1,7 +1,7 @@
 #include <QTest>
 #include "TestUtil.h"

-#include "depends/settings/inifile.h"
+#include "logic/settings/INIFile.h"

 class IniFileTest : public QObject
 {