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 --- core/divecomputer.cpp | 1 + core/subsurface-qt/SettingsObjectWrapper.cpp | 1 + core/subsurface-qt/SettingsObjectWrapper.h | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/divecomputer.cpp b/core/divecomputer.cpp index e9de3f64b..b3f01fb78 100644 --- a/core/divecomputer.cpp +++ b/core/divecomputer.cpp @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "divecomputer.h" +#include "dive.h" #include "subsurface-string.h" #include "subsurface-qt/SettingsObjectWrapper.h" 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 #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 #include -#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 -- cgit v1.2.3-70-g09d2