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>
This commit is contained in:
jan Iversen 2018-06-29 08:57:27 +02:00 committed by bstoeger
parent bf60d29e99
commit f86dd889bf
8 changed files with 5 additions and 7 deletions

View file

@ -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"

View file

@ -7,6 +7,7 @@
#include <QNetworkProxy>
#include "core/qthelper.h"
#include "core/prefs-macros.h"
DiveComputerSettings::DiveComputerSettings(QObject *parent):
QObject(parent)

View file

@ -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