From 2f951413303e10a80e540cacd0c6c282f8ce82cc Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Sat, 16 Jun 2018 10:08:34 +0200 Subject: core: remove double definition of enum cloud_storage_status Remove cloud_storage_status from qmlprefs.h. usage to qPref:: enum cloud_storage_status is not used from C, but only from C++, and having the same structure defined multiple times is a maintenance challenge. Signed-off-by: Jan Iversen --- desktop-widgets/mainwindow.cpp | 1 + desktop-widgets/preferences/preferences_network.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index a7cf6d82e..9ea1d25c0 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -47,6 +47,7 @@ #include "core/windowtitleupdate.h" #include "desktop-widgets/locationinformation.h" #include "preferences/preferencesdialog.h" +#include "core/settings/qPref.h" #ifndef NO_USERMANUAL #include "usermanual.h" diff --git a/desktop-widgets/preferences/preferences_network.cpp b/desktop-widgets/preferences/preferences_network.cpp index 710c96422..193a38c89 100644 --- a/desktop-widgets/preferences/preferences_network.cpp +++ b/desktop-widgets/preferences/preferences_network.cpp @@ -2,8 +2,8 @@ #include "preferences_network.h" #include "ui_preferences_network.h" #include "subsurfacewebservices.h" -#include "core/dive.h" #include "core/cloudstorage.h" +#include "core/dive.h" #include "core/subsurface-qt/SettingsObjectWrapper.h" #include -- cgit v1.2.3-70-g09d2