diff options
| author |  jan Iversen <jani@apache.org> | 2018-08-04 19:29:07 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-12 07:36:10 -0700 |
| commit | 3c69c8299b88ab8f3ce9212e5d10d81f9f687702 (patch) | |
| tree | a5cf6765c3dc34a42fd6d0d15d0243d91d890155 /core/subsurface-qt | |
| parent | 26be37fe58114dad5f5c7769f6b9d1909b602f2b (diff) | |
| download | subsurface-3c69c8299b88ab8f3ce9212e5d10d81f9f687702.tar.gz | |
core: SettingsObjectWrapper remove buehlmann property
remove buehlmann(), setBuehlmann(bool)
buehlmann() is really planner_deco_mode == BUEHLMANN, so no need for a function
setBuehlmann is dangerous, because buehlmann is saved on disk, but not in prefs.* and thus can lead to inconsistency between bool buehlmann and planner_deco_moce.
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'core/subsurface-qt')
| -rw-r--r-- | core/subsurface-qt/SettingsObjectWrapper.cpp | 16 | ||||
| -rw-r--r-- | core/subsurface-qt/SettingsObjectWrapper.h | 4 |
2 files changed, 0 insertions, 20 deletions
diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index cb6ab49d9..dcc2427c9 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -198,11 +198,6 @@ bool TechnicalDetailsSettings::calcndltts() const return prefs.calcndltts; } -bool TechnicalDetailsSettings::buehlmann() const -{ - return prefs.planner_deco_mode == BUEHLMANN; -} - int TechnicalDetailsSettings::gflow() const { return prefs.gflow; @@ -408,17 +403,6 @@ void TechnicalDetailsSettings::setCalcndltts(bool value) emit calcndlttsChanged(value); } -void TechnicalDetailsSettings::setBuehlmann(bool value) -{ - if (value == (prefs.planner_deco_mode == BUEHLMANN)) - return; - QSettings s; - s.beginGroup(group); - s.setValue("buehlmann", value); - prefs.planner_deco_mode = value ? BUEHLMANN : VPMB; - emit buehlmannChanged(value); -} - void TechnicalDetailsSettings::setGflow(int value) { if (value == prefs.gflow) diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h index a648658f1..95c5b8592 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.h +++ b/core/subsurface-qt/SettingsObjectWrapper.h @@ -67,7 +67,6 @@ class TechnicalDetailsSettings : public QObject { Q_PROPERTY(bool calcceiling3m READ calcceiling3m WRITE setCalcceiling3m NOTIFY calcceiling3mChanged) Q_PROPERTY(bool calcalltissues READ calcalltissues WRITE setCalcalltissues NOTIFY calcalltissuesChanged) Q_PROPERTY(bool calcndltts READ calcndltts WRITE setCalcndltts NOTIFY calcndlttsChanged) - Q_PROPERTY(bool buehlmann READ buehlmann WRITE setBuehlmann NOTIFY buehlmannChanged) Q_PROPERTY(int gflow READ gflow WRITE setGflow NOTIFY gflowChanged) Q_PROPERTY(int gfhigh READ gfhigh WRITE setGfhigh NOTIFY gfhighChanged) Q_PROPERTY(short vpmb_conservatism READ vpmbConservatism WRITE setVpmbConservatism NOTIFY vpmbConservatismChanged) @@ -98,7 +97,6 @@ public: bool calcceiling3m() const; bool calcalltissues() const; bool calcndltts() const; - bool buehlmann() const; int gflow() const; int gfhigh() const; short vpmbConservatism() const; @@ -127,7 +125,6 @@ public slots: void setCalcceiling3m(bool value); void setCalcalltissues(bool value); void setCalcndltts(bool value); - void setBuehlmann(bool value); void setGflow(int value); void setGfhigh(int value); void setVpmbConservatism(short); @@ -156,7 +153,6 @@ signals: void calcceiling3mChanged(bool value); void calcalltissuesChanged(bool value); void calcndlttsChanged(bool value); - void buehlmannChanged(bool value); void gflowChanged(int value); void gfhighChanged(int value); void vpmbConservatismChanged(short value); |