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

dive-planner: removed unused QML interface

Browse source 
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>
This commit is contained in:
jan Iversen 2020-01-23 16:20:27 +01:00 • committed by Dirk Hohndel
parent 6584cd82d5
commit 14931db0a9
3 changed files with 0 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
backend-shared/plannershared.cpp
View file

@ -69,7 +69,6 @@ void plannerShared::set_surface_segment(int value)
{ {
// NO conversion, this is done in the planner model. // NO conversion, this is done in the planner model.
DivePlannerPointsModel::instance()->setSurfaceSegment(value); DivePlannerPointsModel::instance()->setSurfaceSegment(value);
emit instance()->surface_segmentChanged(surface_segment());
} }
double plannerShared::bottomsac() double plannerShared::bottomsac()

35
backend-shared/plannershared.h
View file

@ -15,23 +15,6 @@
class plannerShared: public QObject { class plannerShared: public QObject {
Q_OBJECT 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: public:
static plannerShared *instance(); static plannerShared *instance();
@ -71,24 +54,6 @@ public slots:
static void set_decopo2(double value); static void set_decopo2(double value);
static void set_bestmixend(int 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: private:
plannerShared() {} plannerShared() {}
}; };

4
subsurface-helper.cpp
View file

@ -20,7 +20,6 @@
#include "qt-models/messagehandlermodel.h" #include "qt-models/messagehandlermodel.h"
#include "profile-widget/qmlprofile.h" #include "profile-widget/qmlprofile.h"
#include "core/downloadfromdcthread.h" #include "core/downloadfromdcthread.h"
#include "backend-shared/plannershared.h"
#include "qt-models/diveimportedmodel.h" #include "qt-models/diveimportedmodel.h"
#include "mobile-widgets/qml/kirigami/src/kirigamiplugin.h" #include "mobile-widgets/qml/kirigami/src/kirigamiplugin.h"
#else #else
@ -184,12 +183,9 @@ void register_qml_types(QQmlEngine *engine)
int rc; int rc;
#ifdef SUBSURFACE_MOBILE #ifdef SUBSURFACE_MOBILE
// register shared diveplanner class
if (engine != NULL) { if (engine != NULL) {
QQmlContext *ct = engine->rootContext(); QQmlContext *ct = engine->rootContext();
ct->setContextProperty("Planner", plannerShared::instance());
// Register qml interface class // Register qml interface class
QMLInterface::setup(ct); QMLInterface::setup(ct);
} }