summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar jan Iversen <jani@apache.org>2018-08-15 11:58:42 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-08-15 16:11:39 -0700
commitda4ced9bdf51fe12ba43b223e6b977d908106637 (patch)
tree65ee246d862f66c1549947a5fa470a76aca6ba4b
parentc579af0a19d8259dc3cb72fa53a7af1856a0c06c (diff)
downloadsubsurface-da4ced9bdf51fe12ba43b223e6b977d908106637.tar.gz
core: remove SettingsObjectWrapper.*
remove unused files SettingsObjectWrapper.* Signed-off-by: Jan Iversen <jani@apache.org>
-rw-r--r--core/CMakeLists.txt1
-rw-r--r--core/subsurface-qt/SettingsObjectWrapper.cpp36
-rw-r--r--core/subsurface-qt/SettingsObjectWrapper.h58
-rw-r--r--packaging/ios/Subsurface-mobile.pro2
4 files changed, 0 insertions, 97 deletions
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 0f5cfd501..2a747e517 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -123,7 +123,6 @@ set(SUBSURFACE_CORE_LIB_SRCS
#Subsurface Qt have the Subsurface structs QObjectified for easy access via QML.
subsurface-qt/DiveObjectHelper.cpp
subsurface-qt/CylinderObjectHelper.cpp
- subsurface-qt/SettingsObjectWrapper.cpp
${SERIAL_FTDI}
${PLATFORM_SRC}
diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp
deleted file mode 100644
index 72f2ba44d..000000000
--- a/core/subsurface-qt/SettingsObjectWrapper.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include "SettingsObjectWrapper.h"
-#include <QSettings>
-#include <QApplication>
-#include <QFont>
-#include <QDate>
-
-#include "core/qthelper.h"
-#include "core/prefs-macros.h"
-
-
-SettingsObjectWrapper::SettingsObjectWrapper(QObject* parent):
-QObject(parent),
- techDetails(new qPrefTechnicalDetails(this)),
- pp_gas(new qPrefPartialPressureGas(this)),
- facebook(new qPrefFacebook(this)),
- geocoding(new qPrefGeocoding(this)),
- proxy(new qPrefProxy(this)),
- cloud_storage(new qPrefCloudStorage(this)),
- planner_settings(new qPrefDivePlanner(this)),
- unit_settings(new qPrefUnits(this)),
- general_settings(new qPrefGeneral(this)),
- display_settings(new qPrefDisplay(this)),
- language_settings(new qPrefLanguage(this)),
- animation_settings(new qPrefAnimations(this)),
- location_settings(new qPrefLocationService(this)),
- update_manager_settings(new qPrefUpdateManager(this)),
- dive_computer_settings(new qPrefDiveComputer(this))
-{
-}
-
-SettingsObjectWrapper* SettingsObjectWrapper::instance()
-{
- static SettingsObjectWrapper settings;
- return &settings;
-}
diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h
deleted file mode 100644
index 6147f6a2e..000000000
--- a/core/subsurface-qt/SettingsObjectWrapper.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#ifndef SETTINGSOBJECTWRAPPER_H
-#define SETTINGSOBJECTWRAPPER_H
-
-#include <QObject>
-#include <QDate>
-
-#include "core/pref.h"
-#include "core/settings/qPref.h"
-
-/* Wrapper class for the Settings. This will allow
- * seamlessy integration of the settings with the QML
- * and QWidget frontends. This class will be huge, since
- * I need tons of properties, one for each option. */
-
-class SettingsObjectWrapper : public QObject {
- Q_OBJECT
-
- Q_PROPERTY(qPrefTechnicalDetails* techical_details MEMBER techDetails CONSTANT)
- Q_PROPERTY(qPrefPartialPressureGas* pp_gas MEMBER pp_gas CONSTANT)
- Q_PROPERTY(qPrefFacebook* facebook MEMBER facebook CONSTANT)
- Q_PROPERTY(qPrefGeocoding* geocoding MEMBER geocoding CONSTANT)
- Q_PROPERTY(qPrefProxy* proxy MEMBER proxy CONSTANT)
- Q_PROPERTY(qPrefCloudStorage* cloud_storage MEMBER cloud_storage CONSTANT)
- Q_PROPERTY(qPrefDivePlanner* planner MEMBER planner_settings CONSTANT)
- Q_PROPERTY(qPrefUnits* units MEMBER unit_settings CONSTANT)
- Q_PROPERTY(qPrefGeneral* general MEMBER general_settings CONSTANT)
- Q_PROPERTY(qPrefDisplay* display MEMBER display_settings CONSTANT)
- Q_PROPERTY(qPrefLanguage* language MEMBER language_settings CONSTANT)
- Q_PROPERTY(qPrefAnimations* animation MEMBER animation_settings CONSTANT)
- Q_PROPERTY(qPrefLocationService* Location MEMBER location_settings CONSTANT)
-
- Q_PROPERTY(qPrefUpdateManager* update MEMBER update_manager_settings CONSTANT)
- Q_PROPERTY(qPrefDiveComputer* dive_computer MEMBER dive_computer_settings CONSTANT)
-public:
- static SettingsObjectWrapper *instance();
-
- qPrefTechnicalDetails *techDetails;
- qPrefPartialPressureGas *pp_gas;
- qPrefFacebook *facebook;
- qPrefGeocoding *geocoding;
- qPrefProxy *proxy;
- qPrefCloudStorage *cloud_storage;
- qPrefDivePlanner *planner_settings;
- qPrefUnits *unit_settings;
- qPrefGeneral *general_settings;
- qPrefDisplay *display_settings;
- qPrefLanguage *language_settings;
- qPrefAnimations *animation_settings;
- qPrefLocationService *location_settings;
- qPrefUpdateManager *update_manager_settings;
- qPrefDiveComputer *dive_computer_settings;
-
-private:
- SettingsObjectWrapper(QObject *parent = NULL);
-};
-
-#endif
diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro
index a97af7311..f065fcd7f 100644
--- a/packaging/ios/Subsurface-mobile.pro
+++ b/packaging/ios/Subsurface-mobile.pro
@@ -96,7 +96,6 @@ SOURCES += ../../subsurface-mobile-main.cpp \
../../core/settings/qPrefUpdateManager.cpp \
../../core/subsurface-qt/CylinderObjectHelper.cpp \
../../core/subsurface-qt/DiveObjectHelper.cpp \
- ../../core/subsurface-qt/SettingsObjectWrapper.cpp \
../../mobile-widgets/qmlmanager.cpp \
../../mobile-widgets/qmlprefs.cpp \
../../qt-models/divelistmodel.cpp \
@@ -219,7 +218,6 @@ HEADERS += \
../../core/settings/qPrefUpdateManager.h \
../../core/subsurface-qt/CylinderObjectHelper.h \
../../core/subsurface-qt/DiveObjectHelper.h \
- ../../core/subsurface-qt/SettingsObjectWrapper.h \
../../mobile-widgets/qmlmanager.h \
../../mobile-widgets/qmlprefs.h \
../../map-widget/qmlmapwidgethelper.h \