diff options
| author |  jan Iversen <jani@apache.org> | 2018-06-16 10:08:34 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-07-04 05:32:30 +0800 |
| commit | 2f951413303e10a80e540cacd0c6c282f8ce82cc (patch) | |
| tree | d20a09bc203f93b65090727c2e3e68a42e985836 /desktop-widgets | |
| parent | d02a03983d91da1d10aac5b0a5d84d15e94e9291 (diff) | |
| download | subsurface-2f951413303e10a80e540cacd0c6c282f8ce82cc.tar.gz | |
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 <jani@apache.org>
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 1 | ||||
| -rw-r--r-- | desktop-widgets/preferences/preferences_network.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
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 <QNetworkProxy> |