From d62e19be818c7fab952bad861d7e8a98ce346d2f Mon Sep 17 00:00:00 2001 From: Markus Mittendrein Date: Sat, 10 Oct 2015 20:22:06 +0200 Subject: Remove CRSM-prefix from Config(Base)-Classes --- src/ConfigBase.hpp | 96 +++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'src/ConfigBase.hpp') diff --git a/src/ConfigBase.hpp b/src/ConfigBase.hpp index 5e2a50f..d25861c 100644 --- a/src/ConfigBase.hpp +++ b/src/ConfigBase.hpp @@ -10,9 +10,9 @@ #include #include -using CRSMConfigException = std::logic_error; +using ConfigException = std::logic_error; -namespace CRSMConfigValueType { +namespace ConfigValueType { enum Type { None, String, @@ -23,12 +23,12 @@ enum Type { }; } -class CRSMConfigValueBase { +class ConfigValueBase { public: virtual void setValue(const QString&) { } virtual QString value() { return ""; } - virtual CRSMConfigValueType::Type type() { return CRSMConfigValueType::Type::None; } + virtual ConfigValueType::Type type() { return ConfigValueType::Type::None; } @@ -40,12 +40,12 @@ public: }; template -class CRSMConfigValue : public CRSMConfigValueBase { +class ConfigValue : public ConfigValueBase { public: // CRSMConfigValue(Type&) { } - virtual void setValue(const QString&) { throw CRSMConfigException("Cannot assign"); } - virtual QString value() { throw CRSMConfigException("Cannot get the value"); } + virtual void setValue(const QString&) { throw ConfigException("Cannot assign"); } + virtual QString value() { throw ConfigException("Cannot get the value"); } }; using String = QString; @@ -56,16 +56,16 @@ using Boolean = bool; #define Map(KeyType, ValueType) QMap -#define ConfigValue(Value) {#Value, mkConfigValue(Value)} -#define ConfigValueEx(Value, ...) {#Value, mkConfigValue(Value, __VA_ARGS__)} +#define ConfigVal(Value) {#Value, mkConfigValue(Value)} +#define ConfigValEx(Value, ...) {#Value, mkConfigValue(Value, __VA_ARGS__)} template<> -class CRSMConfigValue : public CRSMConfigValueBase { +class ConfigValue : public ConfigValueBase { String& config; bool trimmedQuotes = false; public: - CRSMConfigValue(String& config) : config(config) { } + ConfigValue(String& config) : config(config) { } virtual void setValue(const QString& value) { config = trimQuotes(QString(value), trimmedQuotes); } virtual QString value() @@ -79,7 +79,7 @@ public: return config; } } - virtual CRSMConfigValueType::Type type() { return CRSMConfigValueType::Type::String; } + virtual ConfigValueType::Type type() { return ConfigValueType::Type::String; } private: QString& trimQuotes(QString&& string, bool& trimmed) @@ -97,30 +97,30 @@ private: }; template -class CRSMConfigValue::value>::type> : public CRSMConfigValueBase { +class ConfigValue::value>::type> : public ConfigValueBase { Type& config; public: - CRSMConfigValue(Type& config) : config(config) { } + ConfigValue(Type& config) : config(config) { } virtual void setValue(const QString& value) { bool ok = true; long long longLongVal = value.toLongLong(&ok, 0); - if(!ok) throw CRSMConfigException("\"" + value.toStdString() + "\" could not be parsed as an Integer"); - if(longLongVal < std::numeric_limits::min() || longLongVal > std::numeric_limits::max()) throw CRSMConfigException((QString::number(longLongVal) + " is out of range (" + QString::number(std::numeric_limits::min()) + " - " + QString::number(std::numeric_limits::max()) + ")").toStdString()); + if(!ok) throw ConfigException("\"" + value.toStdString() + "\" could not be parsed as an Integer"); + if(longLongVal < std::numeric_limits::min() || longLongVal > std::numeric_limits::max()) throw ConfigException((QString::number(longLongVal) + " is out of range (" + QString::number(std::numeric_limits::min()) + " - " + QString::number(std::numeric_limits::max()) + ")").toStdString()); config = static_cast(longLongVal); } virtual QString value() { return QString::number(config); } - virtual CRSMConfigValueType::Type type() { return CRSMConfigValueType::Type::Integer; } + virtual ConfigValueType::Type type() { return ConfigValueType::Type::Integer; } }; template<> -class CRSMConfigValue : public CRSMConfigValueBase { +class ConfigValue : public ConfigValueBase { Boolean& config; public: - CRSMConfigValue(Boolean& config) : config(config) { } + ConfigValue(Boolean& config) : config(config) { } virtual void setValue(const QString& value) { @@ -134,21 +134,21 @@ public: } else { - throw CRSMConfigException("\"" + value.toStdString() + "\" could not be parsed as a Boolean"); + throw ConfigException("\"" + value.toStdString() + "\" could not be parsed as a Boolean"); } } virtual QString value() { return config ? "true" : "false"; } - virtual CRSMConfigValueType::Type type() { return CRSMConfigValueType::Type::Boolean; } + virtual ConfigValueType::Type type() { return ConfigValueType::Type::Boolean; } }; -class CRSMConfigValueList : public CRSMConfigValueBase { +class ConfigValueList : public ConfigValueBase { public: virtual void append(const QString& entry) = 0; virtual void remove(const QString& entry) = 0; virtual QStringList getValues() = 0; }; -class CRSMConfigValueMap : public CRSMConfigValueBase { +class ConfigValueMap : public ConfigValueBase { public: virtual void setKeyValue(const QString& key, const QString& value) = 0; virtual void remove(const QString& key) = 0; @@ -156,28 +156,28 @@ public: }; template -class CRSMConfigValue> : public CRSMConfigValueList { +class ConfigValue> : public ConfigValueList { using ListType = QList; ListType& config; const bool deduplicate; public: - CRSMConfigValue(ListType& config, bool deduplicate = true) : config(config), deduplicate(deduplicate) {} + ConfigValue(ListType& config, bool deduplicate = true) : config(config), deduplicate(deduplicate) {} virtual ListType& list() { return config; } - virtual CRSMConfigValueType::Type type() { return CRSMConfigValueType::Type::List; } + virtual ConfigValueType::Type type() { return ConfigValueType::Type::List; } virtual void append(const QString &entry) { - Type val = CRSMConfigValueBase::getValue(entry); + Type val = ConfigValueBase::getValue(entry); if(!deduplicate || !config.contains(val)) { config.append(val); } } - virtual void remove(const QString &entry) { config.removeAll(CRSMConfigValueBase::getValue(entry)); } + virtual void remove(const QString &entry) { config.removeAll(ConfigValueBase::getValue(entry)); } virtual QStringList getValues() { @@ -185,7 +185,7 @@ public: foreach(Type val, config) { - ret.append(CRSMConfigValueBase::getStringValue(val)); + ret.append(ConfigValueBase::getStringValue(val)); } return ret; @@ -193,20 +193,20 @@ public: }; template -class CRSMConfigValue> : public CRSMConfigValueMap { +class ConfigValue> : public ConfigValueMap { using MapType = QMap; MapType& config; public: - CRSMConfigValue(MapType& config) : config(config) {} + ConfigValue(MapType& config) : config(config) {} virtual MapType& map() { return config; } - virtual CRSMConfigValueType::Type type() { return CRSMConfigValueType::Type::Map; } + virtual ConfigValueType::Type type() { return ConfigValueType::Type::Map; } virtual void setKeyValue(const QString& key, const QString& value) { - config[CRSMConfigValueBase::getValue(key)] = CRSMConfigValueBase::getValue(value); + config[ConfigValueBase::getValue(key)] = ConfigValueBase::getValue(value); } virtual QMap getValues() @@ -215,7 +215,7 @@ public: foreach(KeyType key, config.keys()) { - ret[CRSMConfigValueBase::getStringValue(key)] = CRSMConfigValueBase::getStringValue(config[key]); + ret[ConfigValueBase::getStringValue(key)] = ConfigValueBase::getStringValue(config[key]); } return ret; @@ -223,43 +223,43 @@ public: virtual void remove(const QString &key) { - config.remove(CRSMConfigValueBase::getValue(key)); + config.remove(ConfigValueBase::getValue(key)); } }; template -class CRSMConfigValue::value>::type> : public CRSMConfigValue::type> { +class ConfigValue::value>::type> : public ConfigValue::type> { using UndType = typename std::underlying_type::type; public: - CRSMConfigValue(Type& config) : CRSMConfigValue::CRSMConfigValue((UndType&)config) {} + ConfigValue(Type& config) : ConfigValue::ConfigValue((UndType&)config) {} }; template -CRSMConfigValue* mkConfigValue(Type& Value, Types... values) +ConfigValue* mkConfigValue(Type& Value, Types... values) { - return new CRSMConfigValue(Value, values...); + return new ConfigValue(Value, values...); } template -Type CRSMConfigValueBase::getValue(const QString& value) +Type ConfigValueBase::getValue(const QString& value) { Type ret; - CRSMConfigValue val(ret); + ConfigValue val(ret); val.setValue(value); return ret; } template -QString CRSMConfigValueBase::getStringValue(Type value) +QString ConfigValueBase::getStringValue(Type value) { - CRSMConfigValue val(value); + ConfigValue val(value); return val.value(); } -class CRSMConfigBase +class ConfigBase { public: - explicit CRSMConfigBase(QMap configValues) : configValues(configValues) {} + explicit ConfigBase(QMap configValues) : configValues(configValues) {} void setConfigValue(const QString& name, const QString& value); QString getConfigValueLine(const QString& name); @@ -273,10 +273,10 @@ public: void setConfigLine(const QString& line); protected: - void addConfigValue(QString name, CRSMConfigValueBase *value); - CRSMConfigValueBase& getConfigValue(const QString &name); + void addConfigValue(QString name, ConfigValueBase *value); + ConfigValueBase& getConfigValue(const QString &name); - QMap configValues; + QMap configValues; }; #endif // CONFIGBASE -- cgit v1.2.3-54-g00ecf