mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: remove prefs-macros.h where unused

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/divecomputer.cpp
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"

1
core/subsurface-qt/SettingsObjectWrapper.cpp
View file

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

3
core/subsurface-qt/SettingsObjectWrapper.h
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

2
desktop-widgets/preferences/preferences_defaults.cpp
View file

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

1
desktop-widgets/preferences/preferences_georeference.cpp
View file

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

1
desktop-widgets/preferences/preferences_graph.cpp
View file

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

2
desktop-widgets/preferences/preferences_network.cpp
View file

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

1
desktop-widgets/preferences/preferences_units.cpp
View file

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