From f86dd889bffb791e94fb68d4069ebe0c220505e1 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Fri, 29 Jun 2018 08:57:27 +0200 Subject: 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 --- desktop-widgets/preferences/preferences_defaults.cpp | 2 +- desktop-widgets/preferences/preferences_georeference.cpp | 1 - desktop-widgets/preferences/preferences_graph.cpp | 1 - desktop-widgets/preferences/preferences_network.cpp | 2 +- desktop-widgets/preferences/preferences_units.cpp | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) (limited to 'desktop-widgets/preferences') 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 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 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 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" -- cgit v1.2.3-70-g09d2