From 482d31299b4cb1fd68c5c70c9ea716bb0955ab79 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sun, 9 Dec 2012 07:58:25 -0800 Subject: [PATCH] Remove unused things from VariableData --- aegisub/src/variable_data.cpp | 46 ----------------------------------- aegisub/src/variable_data.h | 5 +--- 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/aegisub/src/variable_data.cpp b/aegisub/src/variable_data.cpp index 15c4fef75..c1873fb03 100644 --- a/aegisub/src/variable_data.cpp +++ b/aegisub/src/variable_data.cpp @@ -105,36 +105,6 @@ template void VariableData::Set(wxString param); template void VariableData::Set(agi::Color param); template void VariableData::Set(AssDialogueBlockOverride * param); -/// @brief Resets a value with a string, preserving current type -/// @param value -void VariableData::ResetWith(wxString value) { - switch (type) { - case VARDATA_INT: { - long temp = 0; - value.ToLong(&temp); - Set(temp); - break; - } - case VARDATA_FLOAT: { - double temp = 0; - value.ToDouble(&temp); - Set(temp); - break; - } - case VARDATA_BOOL: - if (value == "1") Set(true); - else Set(false); - break; - case VARDATA_COLOUR: { - Set(agi::Color(from_wx(value))); - break; - } - default: - Set(value); - break; - } -} - template<> int VariableData::Get() const { if (!value) throw "Null parameter"; if (type == VARDATA_BOOL) return !!(*value_bool); @@ -200,19 +170,3 @@ template<> wxString VariableData::Get() const { } return *value_text; } - -VariableDataType VariableData::GetType() const { - return type; -} - -void VariableData::operator= (const VariableData ¶m) { - switch(param.GetType()) { - case VARDATA_INT: Set(param.Get()); break; - case VARDATA_FLOAT: Set(param.Get()); break; - case VARDATA_TEXT: Set(param.Get()); break; - case VARDATA_BOOL: Set(param.Get()); break; - case VARDATA_COLOUR: Set(param.Get()); break; - case VARDATA_BLOCK: Set(param.Get()); break; - default: DeleteValue(); - } -} diff --git a/aegisub/src/variable_data.h b/aegisub/src/variable_data.h index 46eb2ed1d..ec91da2ce 100644 --- a/aegisub/src/variable_data.h +++ b/aegisub/src/variable_data.h @@ -70,13 +70,10 @@ public: VariableData(); virtual ~VariableData(); - VariableDataType GetType() const; + VariableDataType GetType() const { return type; } template void Set(T param); - void ResetWith(wxString value); template T Get() const; template T Get(T def) const { return value ? Get() : def; } - - void operator= (const VariableData ¶m); };