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 /desktop-widgets/preferences | |
| 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 'desktop-widgets/preferences')
5 files changed, 2 insertions, 5 deletions
diff --git a/desktop-widgets/preferences/preferences_defaults.cpp b/desktop-widgets/preferences/preferences_defaults.cpp index e0a24530a..7ae5e38ae 100644 --- a/desktop-widgets/preferences/preferences_defaults.cpp +++ b/desktop-widgets/preferences/preferences_defaults.cpp @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "preferences_defaults.h" #include "ui_preferences_defaults.h" -#include "core/prefs-macros.h" +#include "core/dive.h" #include "core/subsurface-qt/SettingsObjectWrapper.h" #include <QFileDialog> diff --git a/desktop-widgets/preferences/preferences_georeference.cpp b/desktop-widgets/preferences/preferences_georeference.cpp index a0a72dbd3..cb75cb646 100644 --- a/desktop-widgets/preferences/preferences_georeference.cpp +++ b/desktop-widgets/preferences/preferences_georeference.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "preferences_georeference.h" #include "ui_preferences_georeference.h" -#include "core/prefs-macros.h" #include "core/qthelper.h" #include "core/subsurface-qt/SettingsObjectWrapper.h" #include "qt-models/divelocationmodel.h" diff --git a/desktop-widgets/preferences/preferences_graph.cpp b/desktop-widgets/preferences/preferences_graph.cpp index 14025c82c..b35893bd3 100644 --- a/desktop-widgets/preferences/preferences_graph.cpp +++ b/desktop-widgets/preferences/preferences_graph.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "preferences_graph.h" #include "ui_preferences_graph.h" -#include "core/prefs-macros.h" #include "core/subsurface-qt/SettingsObjectWrapper.h" #include <QMessageBox> diff --git a/desktop-widgets/preferences/preferences_network.cpp b/desktop-widgets/preferences/preferences_network.cpp index be3c8b1fa..710c96422 100644 --- a/desktop-widgets/preferences/preferences_network.cpp +++ b/desktop-widgets/preferences/preferences_network.cpp @@ -2,7 +2,7 @@ #include "preferences_network.h" #include "ui_preferences_network.h" #include "subsurfacewebservices.h" -#include "core/prefs-macros.h" +#include "core/dive.h" #include "core/cloudstorage.h" #include "core/subsurface-qt/SettingsObjectWrapper.h" #include <QNetworkProxy> diff --git a/desktop-widgets/preferences/preferences_units.cpp b/desktop-widgets/preferences/preferences_units.cpp index 5ae03fba2..1dc006fc8 100644 --- a/desktop-widgets/preferences/preferences_units.cpp +++ b/desktop-widgets/preferences/preferences_units.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "preferences_units.h" #include "ui_preferences_units.h" -#include "core/prefs-macros.h" #include "core/qthelper.h" #include "core/subsurface-qt/SettingsObjectWrapper.h" |