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/ClientInfo.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/ClientInfo.hpp') diff --git a/src/ClientInfo.hpp b/src/ClientInfo.hpp index d223932..1334e71 100644 --- a/src/ClientInfo.hpp +++ b/src/ClientInfo.hpp @@ -134,11 +134,11 @@ public: }; template<> -class CRSMConfigValue : public CRSMConfigValueBase { +class ConfigValue : public ConfigValueBase { ClientInfo& info; public: - CRSMConfigValue(ClientInfo& info) : info(info) {} + ConfigValue(ClientInfo& info) : info(info) {} void setValue(const QString& string) { @@ -148,29 +148,29 @@ public: ClientInterface interface = static_cast(parts.first().toUInt(0, 36)); if(interface > ClientInterface::Last || interface < ClientInterface::First) { - throw CRSMConfigException("Cannot read ClientInfo with unknown ClientInterface: " + string.toStdString()); + throw ConfigException("Cannot read ClientInfo with unknown ClientInterface: " + string.toStdString()); } switch(interface) { case Auto: break; case Clonk: { - if(parts.length() != 5) throw CRSMConfigException("Cannot read corrupt ClientInfo with Clonk-ClientInterface: " + string.toStdString()); + if(parts.length() != 5) throw ConfigException("Cannot read corrupt ClientInfo with Clonk-ClientInterface: " + string.toStdString()); info.pcName = parts.at(1); info.CUID = parts.at(2).toUInt(); info.nick = parts.at(3); - info.activated = CRSMConfigValueBase::getValue(parts.at(4)); + info.activated = ConfigValueBase::getValue(parts.at(4)); break; } case IRC: { - if(parts.length() != 2) throw CRSMConfigException("Cannot read corrupt ClientInfo with IRC-ClientInterface: " + string.toStdString()); + if(parts.length() != 2) throw ConfigException("Cannot read corrupt ClientInfo with IRC-ClientInterface: " + string.toStdString()); info.nick = parts.at(1); break; } case Management: { - if(parts.length() != 2) throw CRSMConfigException("Cannot read corrupt ClientInfo with Management-ClientInterface: " + string.toStdString()); + if(parts.length() != 2) throw ConfigException("Cannot read corrupt ClientInfo with Management-ClientInterface: " + string.toStdString()); info.management.name = parts.at(1); break; } @@ -186,7 +186,7 @@ public: switch(info.interface) { case Auto: break; - case Clonk: ret.append(info.pcName); ret.append(QString::number(info.CUID)); ret.append(info.nick); ret.append(CRSMConfigValueBase::getStringValue(info.activated)); break; + case Clonk: ret.append(info.pcName); ret.append(QString::number(info.CUID)); ret.append(info.nick); ret.append(ConfigValueBase::getStringValue(info.activated)); break; case IRC: ret.append(info.nick); break; case Management: ret.append(info.management.name); break; } -- cgit v1.2.3-54-g00ecf