diff options
| author |  jan Iversen <jani@apache.org> | 2018-09-08 16:44:51 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-09-11 17:25:00 -0700 |
| commit | a03757801583ee8fa637b1a236b70554a033bfde (patch) | |
| tree | 73c715369de377a49753422e58841f34d7ec52ec /core/settings | |
| parent | c0b78d69d9860d1169d43db594f5fb242a5876a5 (diff) | |
| download | subsurface-a03757801583ee8fa637b1a236b70554a033bfde.tar.gz | |
core/settings: change bestmixend to int, to allow qml to work
depth_t is a good struct in C, but bad in QML.
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'core/settings')
| -rw-r--r-- | core/settings/qPrefDivePlanner.cpp | 2 | ||||
| -rw-r--r-- | core/settings/qPrefDivePlanner.h | 8 | ||||
| -rw-r--r-- | core/settings/qPrefGeneral.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/settings/qPrefDivePlanner.cpp b/core/settings/qPrefDivePlanner.cpp index ecb8fcf3b..ce15a081e 100644 --- a/core/settings/qPrefDivePlanner.cpp +++ b/core/settings/qPrefDivePlanner.cpp @@ -54,7 +54,7 @@ HANDLE_PREFERENCE_INT(DivePlanner, "ascrate50", ascrate50); HANDLE_PREFERENCE_INT(DivePlanner, "ascrate75", ascrate75); -HANDLE_PREFERENCE_STRUCT(DivePlanner, depth_t, "bestmixend", bestmixend, mm); +HANDLE_PREFERENCE_STRUCT(DivePlanner, "bestmixend", bestmixend, mm); HANDLE_PREFERENCE_INT(DivePlanner, "bottompo2", bottompo2); diff --git a/core/settings/qPrefDivePlanner.h b/core/settings/qPrefDivePlanner.h index 35d519fb9..1e282eaa1 100644 --- a/core/settings/qPrefDivePlanner.h +++ b/core/settings/qPrefDivePlanner.h @@ -11,7 +11,7 @@ class qPrefDivePlanner : public QObject { Q_PROPERTY(int ascratestops READ ascratestops WRITE set_ascratestops NOTIFY ascratestopsChanged); Q_PROPERTY(int ascrate50 READ ascrate50 WRITE set_ascrate50 NOTIFY ascrate50Changed); Q_PROPERTY(int ascrate75 READ ascrate75 WRITE set_ascrate75 NOTIFY ascrate75Changed); - Q_PROPERTY(depth_t bestmixend READ bestmixend WRITE set_bestmixend NOTIFY bestmixendChanged); + Q_PROPERTY(int bestmixend READ bestmixend WRITE set_bestmixend NOTIFY bestmixendChanged); Q_PROPERTY(int bottompo2 READ bottompo2 WRITE set_bottompo2 NOTIFY bottompo2Changed); Q_PROPERTY(int bottomsac READ bottomsac WRITE set_bottomsac NOTIFY bottomsacChanged); Q_PROPERTY(int decopo2 READ decopo2 WRITE set_decopo2 NOTIFY decopo2Changed); @@ -47,7 +47,7 @@ public: static int ascratestops() { return prefs.ascratestops; } static int ascrate50() { return prefs.ascrate50; } static int ascrate75() { return prefs.ascrate75; } - static depth_t bestmixend() { return prefs.bestmixend; } + static int bestmixend() { return prefs.bestmixend.mm; } static int bottompo2() { return prefs.bottompo2; } static int bottomsac() { return prefs.bottomsac; } static int decopo2() { return prefs.decopo2; } @@ -74,7 +74,7 @@ public slots: static void set_ascratestops(int value); static void set_ascrate50(int value); static void set_ascrate75(int value); - static void set_bestmixend(depth_t value); + static void set_bestmixend(int value); static void set_bottompo2(int value); static void set_bottomsac(int value); static void set_decopo2(int value); @@ -101,7 +101,7 @@ signals: void ascratestopsChanged(int value); void ascrate50Changed(int value); void ascrate75Changed(int value); - void bestmixendChanged(depth_t value); + void bestmixendChanged(int value); void bottompo2Changed(int value); void bottomsacChanged(int value); void decopo2Changed(int value); diff --git a/core/settings/qPrefGeneral.cpp b/core/settings/qPrefGeneral.cpp index 14868abcd..3f18b496a 100644 --- a/core/settings/qPrefGeneral.cpp +++ b/core/settings/qPrefGeneral.cpp @@ -62,7 +62,7 @@ void qPrefGeneral::set_default_file_behavior(enum def_file_behavior value) prefs.default_file_behavior = value; } disk_default_file_behavior(true); - emit qPrefGeneral::instance()->default_file_behaviorChanged(value); + emit instance()->default_file_behaviorChanged(value); } } void qPrefGeneral::disk_default_file_behavior(bool doSync) |