From 18a342ef1446997427de45095109f24c9352296d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Tue, 1 Jul 2014 01:48:09 +0200
Subject: Move settings lib into the main code, fixing error logging in it.

---
 gui/dialogs/SettingsDialog.cpp | 2 +-
 gui/pagedialog/PageDialog.cpp  | 2 +-
 gui/widgets/PageContainer.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'gui')

diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp
index 87da0c68..5108daa2 100644
--- 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>
diff --git a/gui/pagedialog/PageDialog.cpp b/gui/pagedialog/PageDialog.cpp
index 07027a84..4dd4a811 100644
--- 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>
diff --git a/gui/widgets/PageContainer.cpp b/gui/widgets/PageContainer.cpp
index 237e7224..928e15dd 100644
--- 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>
-- 
cgit v1.2.3