diff options
| author |  jan Iversen <jani@apache.org> | 2018-06-29 08:57:27 +0200 |
|---|---|---|
| committer |  bstoeger <32835590+bstoeger@users.noreply.github.com> | 2018-07-01 22:06:28 +0200 |
| commit | f86dd889bffb791e94fb68d4069ebe0c220505e1 (patch) | |
| tree | e57f287154af2dc6087b357e19b1319dc2f39ee2 /core/subsurface-qt | |
| parent | bf60d29e99a7d201850766d9195a052599dfd018 (diff) | |
| download | subsurface-f86dd889bffb791e94fb68d4069ebe0c220505e1.tar.gz | |
core: remove prefs-macros.h where unused
move #include prefs-macros from SettingsObjectWrapper.h to SettingsObjectWrapper.cpp
include dive.h directly (only part of prefs-macros.h used) in preference classes
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'core/subsurface-qt')
| -rw-r--r-- | core/subsurface-qt/SettingsObjectWrapper.cpp | 1 | ||||
| -rw-r--r-- | core/subsurface-qt/SettingsObjectWrapper.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index ec80f62b8..80b9df8ee 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -7,6 +7,7 @@ #include <QNetworkProxy> #include "core/qthelper.h" +#include "core/prefs-macros.h" DiveComputerSettings::DiveComputerSettings(QObject *parent): QObject(parent) diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h index a56175ea7..64f0621b2 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.h +++ b/core/subsurface-qt/SettingsObjectWrapper.h @@ -5,8 +5,7 @@ #include <QObject> #include <QDate> -#include "../pref.h" -#include "../prefs-macros.h" +#include "core/pref.h" /* Wrapper class for the Settings. This will allow * seamlessy integration of the settings with the QML |