IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-20 11:48:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move the SCM option value conversion from the GncOptionValue classes to GncOption.

Browse Source
This commit is contained in:
John Ralls 2019-10-12 18:12:46 -07:00
parent e51faff3e3
commit 935ce6db99
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libgnucash/app-utils/gnc-option.hpp
View File

@ -192,14 +192,6 @@ public:
m_value{value}, m_default_value{value} {} m_value{value}, m_default_value{value} {}
ValueType get_value() const { return m_value; } ValueType get_value() const { return m_value; }
ValueType get_default_value() const { return m_default_value; } ValueType get_default_value() const { return m_default_value; }
SCM get_scm_value() const
{
return scm_from_value(m_value);
}
SCM get_scm_default_value() const
{
return scm_from_value(m_default_value);
}
void set_value(ValueType new_value) { m_value = new_value; } void set_value(ValueType new_value) { m_value = new_value; }
private: private:
ValueType m_value; ValueType m_value;
@ -237,14 +229,6 @@ public:
} }
ValueType get_value() const { return m_value; } ValueType get_value() const { return m_value; }
ValueType get_default_value() const { return m_default_value; } ValueType get_default_value() const { return m_default_value; }
SCM get_scm_value() const
{
return scm_from_value(m_value);
}
SCM get_scm_default_value() const
{
return scm_from_value(m_default_value);
}
bool validate(ValueType value) { return m_validator(value); } bool validate(ValueType value) { return m_validator(value); }
void set_value(ValueType value) void set_value(ValueType value)
{ {
@ -277,14 +261,6 @@ public:
ValueType get_value() const { return m_value; } ValueType get_value() const { return m_value; }
ValueType get_default_value() const { return m_default_value; } ValueType get_default_value() const { return m_default_value; }
SCM get_scm_value() const
{
return scm_from_value(m_value);
}
SCM get_scm_default_value() const
{
return scm_from_value(m_default_value);
}
bool validate(ValueType value) { return value >= m_min && value <= m_max; } bool validate(ValueType value) { return value >= m_min && value <= m_max; }
void set_value(ValueType value) void set_value(ValueType value)
{ {
@ -431,14 +407,16 @@ private:
{ {
template <class OptionType> template <class OptionType>
SCM operator()(OptionType& option) const { SCM operator()(OptionType& option) const {
return option.get_scm_value(); auto value{option.get_value()};
return scm_from_value<decltype(value)>(value);
} }
}; };
struct GetSCMDefaultVisitor : public boost::static_visitor<SCM> struct GetSCMDefaultVisitor : public boost::static_visitor<SCM>
{ {
template <class OptionType> template <class OptionType>
SCM operator()(OptionType& option) const { SCM operator()(OptionType& option) const {
return option.get_scm_default_value(); auto value{option.get_value()};
return scm_from_value<decltype(value)>(value);
} }
}; };
struct GetSectionVisitor : public boost::static_visitor<const std::string&> struct GetSectionVisitor : public boost::static_visitor<const std::string&>