iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove unused things from VariableData

This commit is contained in:
Thomas Goyne 2012-12-09 07:58:25 -08:00
parent 7e38ad6ec7
commit 482d31299b
2 changed files with 1 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
aegisub/src/variable_data.cpp
View File

@ -105,36 +105,6 @@ template void VariableData::Set(wxString param);
template void VariableData::Set<agi::Color>(agi::Color param); template void VariableData::Set<agi::Color>(agi::Color param);
template void VariableData::Set<AssDialogueBlockOverride *>(AssDialogueBlockOverride * param); template void VariableData::Set<AssDialogueBlockOverride *>(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<int>(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<int>() const { template<> int VariableData::Get<int>() const {
if (!value) throw "Null parameter"; if (!value) throw "Null parameter";
if (type == VARDATA_BOOL) return !!(*value_bool); if (type == VARDATA_BOOL) return !!(*value_bool);
@ -200,19 +170,3 @@ template<> wxString VariableData::Get<wxString>() const {
} }
return *value_text; return *value_text;
} }
VariableDataType VariableData::GetType() const {
return type;
}
void VariableData::operator= (const VariableData &param) {
switch(param.GetType()) {
case VARDATA_INT: Set(param.Get<int>()); break;
case VARDATA_FLOAT: Set(param.Get<double>()); break;
case VARDATA_TEXT: Set(param.Get<wxString>()); break;
case VARDATA_BOOL: Set(param.Get<bool>()); break;
case VARDATA_COLOUR: Set(param.Get<agi::Color>()); break;
case VARDATA_BLOCK: Set(param.Get<AssDialogueBlockOverride*>()); break;
default: DeleteValue();
}
}

5
aegisub/src/variable_data.h
View File

@ -70,13 +70,10 @@ public:
VariableData(); VariableData();
virtual ~VariableData(); virtual ~VariableData();
VariableDataType GetType() const; VariableDataType GetType() const { return type; }
template<class T> void Set(T param); template<class T> void Set(T param);
void ResetWith(wxString value);
template<class T> T Get() const; template<class T> T Get() const;
template<class T> T Get(T def) const { template<class T> T Get(T def) const {
return value ? Get<T>() : def; return value ? Get<T>() : def;
} }
void operator= (const VariableData &param);
}; };