diff options
Diffstat (limited to 'src/crsm.hpp')
| -rw-r--r-- | src/crsm.hpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/crsm.hpp b/src/crsm.hpp index fca0d9b..cdce0d1 100644 --- a/src/crsm.hpp +++ b/src/crsm.hpp @@ -57,31 +57,31 @@ public: }; template<> -class CRSMConfigValue<ScenarioSettings> : public CRSMConfigValueBase { +class ConfigValue<ScenarioSettings> : public ConfigValueBase { ScenarioSettings& config; public: - CRSMConfigValue(ScenarioSettings& config) : config(config) { } + ConfigValue(ScenarioSettings& config) : config(config) { } void setValue(const QString& val) { QStringList parts = val.split(':', QString::KeepEmptyParts); if(parts.length() < 3) { - throw CRSMConfigException("Cannot read corrupt ScenarioSettings"); + throw ConfigException("Cannot read corrupt ScenarioSettings"); } else { - config.name = CRSMConfigValueBase::getValue<QString>(parts.first()); + config.name = ConfigValueBase::getValue<QString>(parts.first()); parts.removeFirst(); - config.league = CRSMConfigValueBase::getValue<bool>(parts.first()); + config.league = ConfigValueBase::getValue<bool>(parts.first()); parts.removeFirst(); config.randomLeague = false; - config.wishClient = CRSMConfigValueBase::getValue<ClientInfo>(parts.join(':')); + config.wishClient = ConfigValueBase::getValue<ClientInfo>(parts.join(':')); } } - QString value() { return CRSMConfigValueBase::getStringValue(config.name) + ":" + CRSMConfigValueBase::getStringValue(config.league) + ":" + CRSMConfigValueBase::getStringValue(config.wishClient); } + QString value() { return ConfigValueBase::getStringValue(config.name) + ":" + ConfigValueBase::getStringValue(config.league) + ":" + ConfigValueBase::getStringValue(config.wishClient); } }; class CRSM : public QObject @@ -140,7 +140,7 @@ private: CRSMConfig Config; - struct CRSMSession : public CRSMConfigBase { + struct CRSMSession : public ConfigBase { Boolean League = false; enum {None = -1, Lobby = 0, Loading = 1, Running = 2} State = None; Boolean UserWish = false; @@ -166,19 +166,19 @@ private: configValues = configVals; } - CRSMSession() : CRSMConfigBase::CRSMConfigBase({ - ConfigValue(League), - ConfigValue(State), - ConfigValue(UserWish), - ConfigValue(CountDown), - ConfigValue(ScenarioName), + CRSMSession() : ConfigBase::ConfigBase({ + ConfigVal(League), + ConfigVal(State), + ConfigVal(UserWish), + ConfigVal(CountDown), + ConfigVal(ScenarioName), - ConfigValue(Clonk.Admin), - ConfigValue(Clonk.Clients), - ConfigValue(Clonk.Clients), + ConfigVal(Clonk.Admin), + ConfigVal(Clonk.Clients), + ConfigVal(Clonk.Clients), - ConfigValue(IRC.Admin), - ConfigValue(IRC.UseIngameChat), + ConfigVal(IRC.Admin), + ConfigVal(IRC.UseIngameChat), }) {} CRSMSession(CRSM* crsm) : CRSMSession() |