mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Devirtualize OptionValue::GetName

Browse source
This commit is contained in:
Thomas Goyne 2013-09-19 16:38:06 -07:00
parent bd88cde436
commit ac09590389
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
aegisub/libaegisub/include/libaegisub/option_value.h
View file

@ -17,8 +17,6 @@
/// @ingroup libaegisub /// @ingroup libaegisub
#include <cstdint> #include <cstdint>
#include <fstream>
#include <vector> #include <vector>
#include <libaegisub/color.h> #include <libaegisub/color.h>
@ -26,8 +24,6 @@
#include <libaegisub/signal.h> #include <libaegisub/signal.h>
namespace agi { namespace agi {
DEFINE_BASE_EXCEPTION_NOINNER(OptionValueError, Exception) DEFINE_BASE_EXCEPTION_NOINNER(OptionValueError, Exception)
DEFINE_SIMPLE_EXCEPTION_NOINNER(OptionValueErrorNotFound, OptionValueError, "options/not_found") DEFINE_SIMPLE_EXCEPTION_NOINNER(OptionValueErrorNotFound, OptionValueError, "options/not_found")
DEFINE_SIMPLE_EXCEPTION_NOINNER(OptionValueErrorInvalidType, OptionValueError, "options/invalid_type") DEFINE_SIMPLE_EXCEPTION_NOINNER(OptionValueErrorInvalidType, OptionValueError, "options/invalid_type")
@ -37,6 +33,7 @@ DEFINE_SIMPLE_EXCEPTION_NOINNER(OptionValueErrorInvalidListType, OptionValueErro
/// Holds an actual option. /// Holds an actual option.
class OptionValue { class OptionValue {
agi::signal::Signal<OptionValue const&> ValueChanged; agi::signal::Signal<OptionValue const&> ValueChanged;
std::string name;
protected: protected:
void NotifyChanged() { ValueChanged(*this); } void NotifyChanged() { ValueChanged(*this); }
@ -47,10 +44,11 @@ protected:
return OptionValueErrorInvalidListType("Attempt to" + op + type + " with non-" + type + " list " + GetName()); return OptionValueErrorInvalidListType("Attempt to" + op + type + " with non-" + type + " list " + GetName());
} }
OptionValue(std::string name) : name(std::move(name)) { }
public: public:
virtual ~OptionValue() {}; virtual ~OptionValue() {};
/// Option type /// Option type
/// No bitsets here. /// No bitsets here.
enum OptionType { enum OptionType {
@ -66,8 +64,8 @@ public:
Type_List_Bool = 104 ///< List of Bools Type_List_Bool = 104 ///< List of Bools
}; };
std::string GetName() const { return name; }
virtual OptionType GetType() const = 0; virtual OptionType GetType() const = 0;
virtual std::string GetName() const = 0;
virtual bool IsDefault() const = 0; virtual bool IsDefault() const = 0;
virtual void Reset() = 0; virtual void Reset() = 0;
@ -104,14 +102,13 @@ public:
class OptionValue##type_name : public OptionValue { \ class OptionValue##type_name : public OptionValue { \
type value; \ type value; \
type value_default; \ type value_default; \
std::string name; \
public: \ public: \
OptionValue##type_name(std::string member_name, type member_value) \ OptionValue##type_name(std::string member_name, type member_value) \
: value(member_value), value_default(member_value), name(member_name) {} \ : OptionValue(std::move(member_name)) \
, value(member_value), value_default(member_value) { } \
type Get##type_name() const { return value; } \ type Get##type_name() const { return value; } \
void Set##type_name(const type new_val) { value = new_val; NotifyChanged(); } \ void Set##type_name(const type new_val) { value = new_val; NotifyChanged(); } \
OptionType GetType() const { return OptionValue::Type_##type_name; } \ OptionType GetType() const { return OptionValue::Type_##type_name; } \
std::string GetName() const { return name; } \
void Reset() { value = value_default; NotifyChanged(); } \ void Reset() { value = value_default; NotifyChanged(); } \
bool IsDefault() const { return value == value_default; } \ bool IsDefault() const { return value == value_default; } \
void Set(const OptionValue *new_val) { Set##type_name(new_val->Get##type_name()); } \ void Set(const OptionValue *new_val) { Set##type_name(new_val->Get##type_name()); } \
@ -129,18 +126,17 @@ CONFIG_OPTIONVALUE(Bool, bool)
std::vector<type> array_default; \ std::vector<type> array_default; \
std::string name; \ std::string name; \
public: \ public: \
OptionValueList##type_name(std::string const& name, std::vector<type> const& value = std::vector<type>()) \ OptionValueList##type_name(std::string name, std::vector<type> const& value = std::vector<type>()) \
: array(value), array_default(value), name(name) { } \ : OptionValue(std::move(name)) \
, array(value), array_default(value) { } \
std::vector<type> const& GetList##type_name() const { return array; } \ std::vector<type> const& GetList##type_name() const { return array; } \
void SetList##type_name(const std::vector<type>& val) { array = val; NotifyChanged(); } \ void SetList##type_name(const std::vector<type>& val) { array = val; NotifyChanged(); } \
OptionType GetType() const { return OptionValue::Type_List_##type_name; } \ OptionType GetType() const { return OptionValue::Type_List_##type_name; } \
std::string GetName() const { return name; } \
void Reset() { array = array_default; NotifyChanged(); } \ void Reset() { array = array_default; NotifyChanged(); } \
bool IsDefault() const { return array == array_default; } \ bool IsDefault() const { return array == array_default; } \
void Set(const OptionValue *nv) { SetList##type_name(nv->GetList##type_name()); } \ void Set(const OptionValue *nv) { SetList##type_name(nv->GetList##type_name()); } \
}; };
CONFIG_OPTIONVALUE_LIST(String, std::string) CONFIG_OPTIONVALUE_LIST(String, std::string)
CONFIG_OPTIONVALUE_LIST(Int, int64_t) CONFIG_OPTIONVALUE_LIST(Int, int64_t)
CONFIG_OPTIONVALUE_LIST(Double, double) CONFIG_OPTIONVALUE_LIST(Double, double)