X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fconfig.cc;h=f4f0bac6e6c49c19bf58215d95909ed6f7999c7f;hb=572acce581f4b8799db661ed7ab0007de0393a09;hp=db9ecdddcf09aa174c8eff9ad4300891b4d0ddfc;hpb=11e643f4b885ee1f96112fcf531739a339691272;p=chaz%2Fopenbox diff --git a/util/epist/config.cc b/util/epist/config.cc index db9ecddd..f4f0bac6 100644 --- a/util/epist/config.cc +++ b/util/epist/config.cc @@ -46,7 +46,7 @@ Config::~Config() } -bool Config::getStringValue(Config::StringType type, string &ret) const +bool Config::getValue(Config::StringType type, string &ret) const { StringItemList::const_iterator it = string_items.begin(), end = string_items.end(); for (; it != end; ++it) { @@ -59,7 +59,7 @@ bool Config::getStringValue(Config::StringType type, string &ret) const } -bool Config::getNumberValue(Config::NumberType type, int &ret) const +bool Config::getValue(Config::NumberType type, int &ret) const { NumberItemList::const_iterator it = number_items.begin(), end = number_items.end(); for (; it != end; ++it) { @@ -72,12 +72,12 @@ bool Config::getNumberValue(Config::NumberType type, int &ret) const } -bool Config::getBoolValue(Config::BoolType type, bool &ret) const +bool Config::getValue(Config::BoolType type, bool &ret) const { BoolItemList::const_iterator it = bool_items.begin(), end = bool_items.end(); for (; it != end; ++it) { if ((*it)->type == type) { - ret = (*it)->type; + ret = (*it)->value; return true; } } @@ -123,7 +123,8 @@ void Config::addOption(const std::string &name, const std::string &value) item->type = bool_options[i].type; - if (strcasecmp(tmp, "true") == 0 || strcasecmp(tmp, "1")) + if (strcasecmp(tmp, "true") == 0 || strcasecmp(tmp, "1") == 0 || + strcasecmp(tmp, "on") == 0) item->value = true; else item->value = false;