summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar jan Iversen <jan@casacondor.com>2020-01-23 16:20:27 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-01-25 17:26:33 -0800
commit14931db0a9ca53956afdb162f8818a5ed61060a4 (patch)
tree42408ef1891fa1fc2c200b3b08364454c8e86a71
parent6584cd82d5ecbfb4a2b2097f15a8e481c05e0cd4 (diff)
downloadsubsurface-14931db0a9ca53956afdb162f8818a5ed61060a4.tar.gz
dive-planner: removed unused QML interface
Remove Q_PROPERTY and signals from plannershared, since they are no longer used (transferred to qmlinterface). Unregister object plannershared, since it is no longer used in QML. Signed-off-by: jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--backend-shared/plannershared.cpp1
-rw-r--r--backend-shared/plannershared.h35
-rw-r--r--subsurface-helper.cpp4
3 files changed, 0 insertions, 40 deletions
diff --git a/backend-shared/plannershared.cpp b/backend-shared/plannershared.cpp
index 9c2305e42..c2eb88ea3 100644
--- a/backend-shared/plannershared.cpp
+++ b/backend-shared/plannershared.cpp
@@ -69,7 +69,6 @@ void plannerShared::set_surface_segment(int value)
{
// NO conversion, this is done in the planner model.
DivePlannerPointsModel::instance()->setSurfaceSegment(value);
- emit instance()->surface_segmentChanged(surface_segment());
}
double plannerShared::bottomsac()
diff --git a/backend-shared/plannershared.h b/backend-shared/plannershared.h
index 912c09b9b..39acf98db 100644
--- a/backend-shared/plannershared.h
+++ b/backend-shared/plannershared.h
@@ -15,23 +15,6 @@
class plannerShared: public QObject {
Q_OBJECT
- // Planning data
- Q_PROPERTY(deco_mode planner_deco_mode READ planner_deco_mode WRITE set_planner_deco_mode NOTIFY planner_deco_modeChanged);
- Q_PROPERTY(int reserve_gas READ reserve_gas WRITE set_reserve_gas NOTIFY reserve_gasChanged);
- Q_PROPERTY(bool dobailout READ dobailout WRITE set_dobailout NOTIFY dobailoutChanged);
- Q_PROPERTY(bool doo2breaks READ doo2breaks WRITE set_doo2breaks NOTIFY doo2breaksChanged);
- Q_PROPERTY(int min_switch_duration READ min_switch_duration WRITE set_min_switch_duration NOTIFY min_switch_durationChanged);
- Q_PROPERTY(int surface_segment READ surface_segment WRITE set_surface_segment NOTIFY surface_segmentChanged);
-
- // Gas data
- Q_PROPERTY(double bottomsac READ bottomsac WRITE set_bottomsac NOTIFY bottomsacChanged);
- Q_PROPERTY(double decosac READ decosac WRITE set_decosac NOTIFY decosacChanged);
- Q_PROPERTY(double sacfactor READ sacfactor WRITE set_sacfactor NOTIFY sacfactorChanged);
- Q_PROPERTY(bool o2narcotic READ o2narcotic WRITE set_o2narcotic NOTIFY o2narcoticChanged);
- Q_PROPERTY(double bottompo2 READ bottompo2 WRITE set_bottompo2 NOTIFY bottompo2Changed);
- Q_PROPERTY(double decopo2 READ decopo2 WRITE set_decopo2 NOTIFY decopo2Changed);
- Q_PROPERTY(int bestmixend READ bestmixend WRITE set_bestmixend NOTIFY bestmixendChanged);
-
public:
static plannerShared *instance();
@@ -71,24 +54,6 @@ public slots:
static void set_decopo2(double value);
static void set_bestmixend(int value);
-signals:
- // Planning data
- void planner_deco_modeChanged(deco_mode value);
- void reserve_gasChanged(int value);
- void dobailoutChanged(bool value);
- void doo2breaksChanged(bool value);
- void min_switch_durationChanged(int value);
- void surface_segmentChanged(int value);
-
- // Gas data
- void bottomsacChanged(double value);
- void decosacChanged(double value);
- void sacfactorChanged(double value);
- void o2narcoticChanged(bool value);
- void bottompo2Changed(double value);
- void decopo2Changed(double value);
- void bestmixendChanged(int value);
-
private:
plannerShared() {}
};
diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp
index dc6f1855f..0ecc998ea 100644
--- a/subsurface-helper.cpp
+++ b/subsurface-helper.cpp
@@ -20,7 +20,6 @@
#include "qt-models/messagehandlermodel.h"
#include "profile-widget/qmlprofile.h"
#include "core/downloadfromdcthread.h"
-#include "backend-shared/plannershared.h"
#include "qt-models/diveimportedmodel.h"
#include "mobile-widgets/qml/kirigami/src/kirigamiplugin.h"
#else
@@ -184,12 +183,9 @@ void register_qml_types(QQmlEngine *engine)
int rc;
#ifdef SUBSURFACE_MOBILE
- // register shared diveplanner class
if (engine != NULL) {
QQmlContext *ct = engine->rootContext();
- ct->setContextProperty("Planner", plannerShared::instance());
-
// Register qml interface class
QMLInterface::setup(ct);
}