diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-07-01 01:48:09 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-07-01 01:48:09 +0200 |
| commit | 18a342ef1446997427de45095109f24c9352296d (patch) | |
| tree | 73f4dd5a79e3df896f10b36dec4496afa8517907 /gui | |
| parent | 8b86306d48fff4a6cc9291d00e1211a5e5dc1903 (diff) | |
| download | MultiMC-18a342ef1446997427de45095109f24c9352296d.tar MultiMC-18a342ef1446997427de45095109f24c9352296d.tar.gz MultiMC-18a342ef1446997427de45095109f24c9352296d.tar.lz MultiMC-18a342ef1446997427de45095109f24c9352296d.tar.xz MultiMC-18a342ef1446997427de45095109f24c9352296d.zip | |
Move settings lib into the main code, fixing error logging in it.
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/dialogs/SettingsDialog.cpp | 2 | ||||
| -rw-r--r-- | gui/pagedialog/PageDialog.cpp | 2 | ||||
| -rw-r--r-- | gui/widgets/PageContainer.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
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> |