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/gui/dialogs/SettingsDialog.cpp
+++ b/gui/dialogs/SettingsDialog.cpp
@ -32,7 +32,7 @@

 #include "logic/tools/BaseProfiler.h"

-#include <settingsobject.h>
+#include "logic/settings/SettingsObject.h"
 #include <pathutils.h>
 #include <QFileDialog>
 #include <QMessageBox>
--- a/gui/pagedialog/PageDialog.cpp
+++ b/gui/pagedialog/PageDialog.cpp
@ -16,7 +16,7 @@
 #include "PageDialog.h"
 #include "gui/Platform.h"
 #include "MultiMC.h"
-#include <settingsobject.h>
+#include "logic/settings/SettingsObject.h"

 #include <gui/widgets/IconLabel.h>
 #include <gui/widgets/PageContainer.h>
--- a/gui/widgets/PageContainer.cpp
+++ b/gui/widgets/PageContainer.cpp
@ -27,7 +27,7 @@
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QDesktopServices>
-#include <settingsobject.h>
+#include "logic/settings/SettingsObject.h"

 #include "PageContainer_p.h"
 #include <gui/widgets/IconLabel.h>