Remove editable property from models

This patch move logic connected with editable property
to presenters

Change-Id: I529de8fa3c67a15e8733b6094ce36ddcaaaaaae7

diff --git a/src/model/AutoMoveIntervalModel.hpp b/src/model/AutoMoveIntervalModel.hpp
index 80fc5b4..531bed5 100644 (file)
--- a/src/model/AutoMoveIntervalModel.hpp
+++ b/src/model/AutoMoveIntervalModel.hpp
@@ -17,7 +17,6 @@ class AutoMoveIntervalModel
        const double step_ = 0.1;
        const double defaultValue_ = 1.0;
 
-       const bool editable_ = true;
        const bool defaultState_ = false;
 
        private:

diff --git a/src/model/AutoScanIntervalModel.hpp b/src/model/AutoScanIntervalModel.hpp
index 44bb1f0..85b5312 100644 (file)
--- a/src/model/AutoScanIntervalModel.hpp
+++ b/src/model/AutoScanIntervalModel.hpp
@@ -13,7 +13,6 @@ class AutoScanIntervalModel
 
        const utils::Range<double> range_ = {0.5, 9.9};
        const double step_ = 0.1;
-       const bool editable_ = true;
 
        private:
        VConfInterface::CallbackHandle autoScanIntervalValueHandle_;

diff --git a/src/model/AutoTapModel.hpp b/src/model/AutoTapModel.hpp
index 9ac0ba1..7d250b3 100644 (file)
--- a/src/model/AutoTapModel.hpp
+++ b/src/model/AutoTapModel.hpp
@@ -17,7 +17,6 @@ class AutoTapModel
        const double step_ = 0.1;
        const double defaultValue_ = 1.0;
 
-       const bool editable_ = true;
        const bool defaultState_ = false;
 
        private:

diff --git a/src/model/NumberOfAutoScanLoopsModel.hpp b/src/model/NumberOfAutoScanLoopsModel.hpp
index 9314ace..605451d 100644 (file)
--- a/src/model/NumberOfAutoScanLoopsModel.hpp
+++ b/src/model/NumberOfAutoScanLoopsModel.hpp
@@ -2,9 +2,9 @@
 #define NUMBER_OF_AUTO_SCAN_LOOPS_MODEL_HPP_
 
 #include "ObservableProperty.hpp"
+#include "UniversalSwitchConstants.hpp"
 #include "VConf.hpp"
 #include "utils.hpp"
-#include "UniversalSwitchConstants.hpp"
 
 class NumberOfAutoScanLoopsModel
 {
@@ -15,11 +15,9 @@ class NumberOfAutoScanLoopsModel
        const utils::Range<double> range_ = {RANGE_MIN_SCANS_NUM, RANGE_MAX_SCANS_NUM};
        const double step_ = STEP_SCANS_NUM;
        const double defaultValue_ = DEFAULT_AUTO_SCAN_NUMBER;
-       const bool editable_ = true;
 
        private:
        VConfInterface::CallbackHandle valueHandle_;
-
 };
 
 #endif

diff --git a/src/model/PauseOnFirstModel.hpp b/src/model/PauseOnFirstModel.hpp
index 70445c8..49da590 100644 (file)
--- a/src/model/PauseOnFirstModel.hpp
+++ b/src/model/PauseOnFirstModel.hpp
@@ -14,7 +14,6 @@ class PauseOnFirstModel
 
        const utils::Range<double> range_ = {0.1, 5.0};
        const double step_ = 0.1;
-       const bool editable_ = true;
 
        private:
        VConfInterface::CallbackHandle stateHandle_;

diff --git a/src/model/PointScanSpeedModel.hpp b/src/model/PointScanSpeedModel.hpp
index adaf1f1..27b2b23 100644 (file)
--- a/src/model/PointScanSpeedModel.hpp
+++ b/src/model/PointScanSpeedModel.hpp
@@ -2,9 +2,9 @@
 #define POINT_SCAN_SPEED_MODEL_HPP_
 
 #include "ObservableProperty.hpp"
+#include "UniversalSwitchConstants.hpp"
 #include "VConf.hpp"
 #include "utils.hpp"
-#include "UniversalSwitchConstants.hpp"
 
 class PointScanSpeedModel
 {
@@ -15,11 +15,9 @@ class PointScanSpeedModel
        const utils::Range<double> range_ = {RANGE_MIN_SCAN_SPEED, RANGE_MAX_SCAN_SPEED};
        const double step_ = STEP_SCAN_SPEED;
        const double defaultValue_ = DEFAULT_SCAN_PT_SPEED;
-       const bool editable_ = true;
 
        private:
        VConfInterface::CallbackHandle valueHandle_;
-
 };
 
 #endif

diff --git a/src/model/SingleInteractionIntervalModel.hpp b/src/model/SingleInteractionIntervalModel.hpp
index 0889429..219e3cf 100644 (file)
--- a/src/model/SingleInteractionIntervalModel.hpp
+++ b/src/model/SingleInteractionIntervalModel.hpp
@@ -17,7 +17,6 @@ class SingleInteractionIntervalModel
        const double step_ = 0.1;
        const double defaultValue_ = 1.0;
 
-       const bool editable_ = true;
        const bool defaultState_ = false;
 
        private:

diff --git a/src/model/TapDurationModel.hpp b/src/model/TapDurationModel.hpp
index 4465b00..9427f55 100644 (file)
--- a/src/model/TapDurationModel.hpp
+++ b/src/model/TapDurationModel.hpp
@@ -17,7 +17,6 @@ class TapDurationModel
        const double step_ = 0.1;
        const double defaultValue_ = 1.0;
 
-       const bool editable_ = true;
        const bool defaultState_ = false;
 
        private:

diff --git a/src/presenter/AutoMoveIntervalPresenter.cpp b/src/presenter/AutoMoveIntervalPresenter.cpp
index bf37a28..d8f3f5c 100644 (file)
--- a/src/presenter/AutoMoveIntervalPresenter.cpp
+++ b/src/presenter/AutoMoveIntervalPresenter.cpp
@@ -19,11 +19,6 @@ utils::Range<double> AutoMoveIntervalPresenter::getRange()
        return model_.range_;
 }
 
-bool AutoMoveIntervalPresenter::isEditable()
-{
-       return model_.editable_;
-}
-
 double AutoMoveIntervalPresenter::getStep()
 {
        return model_.step_;

diff --git a/src/presenter/AutoMoveIntervalPresenter.hpp b/src/presenter/AutoMoveIntervalPresenter.hpp
index 0d6566e..111fd8a 100644 (file)
--- a/src/presenter/AutoMoveIntervalPresenter.hpp
+++ b/src/presenter/AutoMoveIntervalPresenter.hpp
@@ -1,8 +1,8 @@
 #ifndef AUTO_MOVE_INTERVAL_PRESENTER_HPP_
 #define AUTO_MOVE_INTERVAL_PRESENTER_HPP_
 
-#include "SpinnerPresenterWithToggle.hpp"
 #include "AutoMoveIntervalModel.hpp"
+#include "SpinnerPresenterWithToggle.hpp"
 
 class AutoMoveIntervalPresenter : public SpinnerPresenterWithToggle
 {
@@ -11,7 +11,6 @@ class AutoMoveIntervalPresenter : public SpinnerPresenterWithToggle
 
        utils::Range<double> getRange() override;
        double getStep() override;
-       bool isEditable() override;
        std::string getLabel() override;
        std::string getFormat() override;
 

diff --git a/src/presenter/AutoScanIntervalPresenter.cpp b/src/presenter/AutoScanIntervalPresenter.cpp
index 8164bfe..20bebd6 100644 (file)
--- a/src/presenter/AutoScanIntervalPresenter.cpp
+++ b/src/presenter/AutoScanIntervalPresenter.cpp
@@ -19,11 +19,6 @@ double AutoScanIntervalPresenter::getStep()
        return model_.step_;
 }
 
-bool AutoScanIntervalPresenter::isEditable()
-{
-       return model_.editable_;
-}
-
 std::string AutoScanIntervalPresenter::getLabel()
 {
        return "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_SET_VALUE_DESC_AUTO_SCAN_INT";

diff --git a/src/presenter/AutoScanIntervalPresenter.hpp b/src/presenter/AutoScanIntervalPresenter.hpp
index 89fa916..19ce512 100644 (file)
--- a/src/presenter/AutoScanIntervalPresenter.hpp
+++ b/src/presenter/AutoScanIntervalPresenter.hpp
@@ -10,7 +10,6 @@ class AutoScanIntervalPresenter : public SpinnerPresenter
        AutoScanIntervalPresenter();
        utils::Range<double> getRange() override;
        double getStep() override;
-       bool isEditable() override;
        std::string getLabel() override;
        std::string getFormat() override;
 

diff --git a/src/presenter/AutoTapPresenter.cpp b/src/presenter/AutoTapPresenter.cpp
index c03727e..781cbb6 100644 (file)
--- a/src/presenter/AutoTapPresenter.cpp
+++ b/src/presenter/AutoTapPresenter.cpp
@@ -19,11 +19,6 @@ utils::Range<double> AutoTapPresenter::getRange()
        return model_.range_;
 }
 
-bool AutoTapPresenter::isEditable()
-{
-       return model_.editable_;
-}
-
 double AutoTapPresenter::getStep()
 {
        return model_.step_;

diff --git a/src/presenter/AutoTapPresenter.hpp b/src/presenter/AutoTapPresenter.hpp
index c3b36d4..cb6df59 100644 (file)
--- a/src/presenter/AutoTapPresenter.hpp
+++ b/src/presenter/AutoTapPresenter.hpp
@@ -1,8 +1,8 @@
 #ifndef AUTO_TAP_PRESENTER_HPP_
 #define AUTO_TAP_PRESENTER_HPP_
 
-#include "SpinnerPresenterWithToggle.hpp"
 #include "AutoTapModel.hpp"
+#include "SpinnerPresenterWithToggle.hpp"
 
 class AutoTapPresenter : public SpinnerPresenterWithToggle
 {
@@ -11,7 +11,6 @@ class AutoTapPresenter : public SpinnerPresenterWithToggle
 
        utils::Range<double> getRange() override;
        double getStep() override;
-       bool isEditable() override;
        std::string getLabel() override;
        std::string getFormat() override;
 

diff --git a/src/presenter/NumberOfAutoScanLoopsPresenter.cpp b/src/presenter/NumberOfAutoScanLoopsPresenter.cpp
index 45a28b5..b2a3200 100644 (file)
--- a/src/presenter/NumberOfAutoScanLoopsPresenter.cpp
+++ b/src/presenter/NumberOfAutoScanLoopsPresenter.cpp
@@ -7,8 +7,6 @@ NumberOfAutoScanLoopsPresenter::NumberOfAutoScanLoopsPresenter()
        value_.attach([this](auto val) {
                model_.value_ = val;
        });
-
-
 }
 
 utils::Range<double> NumberOfAutoScanLoopsPresenter::getRange()
@@ -16,11 +14,6 @@ utils::Range<double> NumberOfAutoScanLoopsPresenter::getRange()
        return model_.range_;
 }
 
-bool NumberOfAutoScanLoopsPresenter::isEditable()
-{
-       return model_.editable_;
-}
-
 double NumberOfAutoScanLoopsPresenter::getStep()
 {
        return model_.step_;

diff --git a/src/presenter/NumberOfAutoScanLoopsPresenter.hpp b/src/presenter/NumberOfAutoScanLoopsPresenter.hpp
index 4b0df8d..16ce831 100644 (file)
--- a/src/presenter/NumberOfAutoScanLoopsPresenter.hpp
+++ b/src/presenter/NumberOfAutoScanLoopsPresenter.hpp
@@ -10,7 +10,6 @@ class NumberOfAutoScanLoopsPresenter : public SpinnerPresenter
        NumberOfAutoScanLoopsPresenter();
 
        utils::Range<double> getRange();
-       bool isEditable();
        double getStep();
        std::string getFormat();
        std::string getLabel();

diff --git a/src/presenter/PauseOnFirstPresenter.cpp b/src/presenter/PauseOnFirstPresenter.cpp
index 2955044..5e88c5d 100644 (file)
--- a/src/presenter/PauseOnFirstPresenter.cpp
+++ b/src/presenter/PauseOnFirstPresenter.cpp
@@ -24,11 +24,6 @@ double PauseOnFirstPresenter::getStep()
        return model_.step_;
 }
 
-bool PauseOnFirstPresenter::isEditable()
-{
-       return model_.editable_;
-}
-
 std::string PauseOnFirstPresenter::getLabel()
 {
        return "IDS_ACCS_UNIVERSAL_SWITCH_SETTINGS_GROUP_ADD_SETTINGS_PAUSE_ON_FIRST";

diff --git a/src/presenter/PauseOnFirstPresenter.hpp b/src/presenter/PauseOnFirstPresenter.hpp
index 4ae723b..2a57e5f 100644 (file)
--- a/src/presenter/PauseOnFirstPresenter.hpp
+++ b/src/presenter/PauseOnFirstPresenter.hpp
@@ -11,7 +11,6 @@ class PauseOnFirstPresenter : public SpinnerPresenterWithToggle
 
        utils::Range<double> getRange() override;
        double getStep() override;
-       bool isEditable() override;
        std::string getLabel() override;
        std::string getFormat() override;
 

diff --git a/src/presenter/PointScanSpeedPresenter.cpp b/src/presenter/PointScanSpeedPresenter.cpp
index 006bd46..df73041 100644 (file)
--- a/src/presenter/PointScanSpeedPresenter.cpp
+++ b/src/presenter/PointScanSpeedPresenter.cpp
@@ -7,8 +7,6 @@ PointScanSpeedPresenter::PointScanSpeedPresenter()
        value_.attach([this](auto val) {
                model_.value_ = val;
        });
-
-
 }
 
 utils::Range<double> PointScanSpeedPresenter::getRange()
@@ -16,11 +14,6 @@ utils::Range<double> PointScanSpeedPresenter::getRange()
        return model_.range_;
 }
 
-bool PointScanSpeedPresenter::isEditable()
-{
-       return model_.editable_;
-}
-
 double PointScanSpeedPresenter::getStep()
 {
        return model_.step_;

diff --git a/src/presenter/PointScanSpeedPresenter.hpp b/src/presenter/PointScanSpeedPresenter.hpp
index 0c82529..42352e2 100644 (file)
--- a/src/presenter/PointScanSpeedPresenter.hpp
+++ b/src/presenter/PointScanSpeedPresenter.hpp
@@ -9,11 +9,10 @@ class PointScanSpeedPresenter : public SpinnerPresenter
        public:
        PointScanSpeedPresenter();
 
-       utils::Range<double> getRange();
-       bool isEditable();
-       double getStep();
-       std::string getFormat();
-       std::string getLabel();
+       utils::Range<double> getRange() override;
+       double getStep() override;
+       std::string getFormat() override;
+       std::string getLabel() override;
 
        private:
        PointScanSpeedModel model_;

diff --git a/src/presenter/SingleInteractionIntervalPresenter.cpp b/src/presenter/SingleInteractionIntervalPresenter.cpp
index 5edc583..bc7ce71 100644 (file)
--- a/src/presenter/SingleInteractionIntervalPresenter.cpp
+++ b/src/presenter/SingleInteractionIntervalPresenter.cpp
@@ -18,12 +18,6 @@ utils::Range<double> SingleInteractionIntervalPresenter::getRange()
 {
        return model_.range_;
 }
-
-bool SingleInteractionIntervalPresenter::isEditable()
-{
-       return model_.editable_;
-}
-
 double SingleInteractionIntervalPresenter::getStep()
 {
        return model_.step_;

diff --git a/src/presenter/SingleInteractionIntervalPresenter.hpp b/src/presenter/SingleInteractionIntervalPresenter.hpp
index 11a9f8a..8257b17 100644 (file)
--- a/src/presenter/SingleInteractionIntervalPresenter.hpp
+++ b/src/presenter/SingleInteractionIntervalPresenter.hpp
@@ -11,7 +11,6 @@ class SingleInteractionIntervalPresenter : public SpinnerPresenterWithToggle
 
        utils::Range<double> getRange() override;
        double getStep() override;
-       bool isEditable() override;
        std::string getLabel() override;
        std::string getFormat() override;
 

diff --git a/src/presenter/SpinnerPresenter.cpp b/src/presenter/SpinnerPresenter.cpp
index bfbe067..e1c0475 100644 (file)
--- a/src/presenter/SpinnerPresenter.cpp
+++ b/src/presenter/SpinnerPresenter.cpp
@@ -18,3 +18,8 @@ std::string SpinnerPresenter::getRangeDescription()
 
        return out.str();
 }
+
+bool SpinnerPresenter::isEditable()
+{
+       return true;
+}
\ No newline at end of file

diff --git a/src/presenter/SpinnerPresenter.hpp b/src/presenter/SpinnerPresenter.hpp
index 78ed3ae..75c087e 100644 (file)
--- a/src/presenter/SpinnerPresenter.hpp
+++ b/src/presenter/SpinnerPresenter.hpp
@@ -16,7 +16,7 @@ class SpinnerPresenter : public Presenter
 
        virtual utils::Range<double> getRange() = 0;
        virtual double getStep() = 0;
-       virtual bool isEditable() = 0;
+       virtual bool isEditable();
        virtual std::string getLabel() = 0;
        virtual std::string getFormat() = 0;
 

diff --git a/src/presenter/TapDurationPresenter.cpp b/src/presenter/TapDurationPresenter.cpp
index 16303b0..f1bea75 100644 (file)
--- a/src/presenter/TapDurationPresenter.cpp
+++ b/src/presenter/TapDurationPresenter.cpp
@@ -19,11 +19,6 @@ utils::Range<double> TapDurationPresenter::getRange()
        return model_.range_;
 }
 
-bool TapDurationPresenter::isEditable()
-{
-       return model_.editable_;
-}
-
 double TapDurationPresenter::getStep()
 {
        return model_.step_;

diff --git a/src/presenter/TapDurationPresenter.hpp b/src/presenter/TapDurationPresenter.hpp
index d8698ee..4be31cf 100644 (file)
--- a/src/presenter/TapDurationPresenter.hpp
+++ b/src/presenter/TapDurationPresenter.hpp
@@ -11,7 +11,6 @@ class TapDurationPresenter : public SpinnerPresenterWithToggle
 
        utils::Range<double> getRange() override;
        double getStep() override;
-       bool isEditable() override;
        std::string getLabel() override;
        std::string getFormat() override;