Fixed goof in config interface. All the functions are now named getValue(), since they have different signatures.
Marius Nita marius@cs.pdx.edu
4 files changed,
10 insertions(+),
10 deletions(-)
M
util/epist/config.cc
→
util/epist/config.cc
@@ -46,7 +46,7 @@ string_items.clear();
} -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 @@ return false;
} -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,7 +72,7 @@ return false;
} -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) {
M
util/epist/config.hh
→
util/epist/config.hh
@@ -63,9 +63,9 @@ public:
Config(); ~Config(); - bool getBoolValue(BoolType, bool &) const; - bool getStringValue(StringType, std::string &) const; - bool getNumberValue(NumberType, int &) const; + bool getValue(BoolType, bool &) const; + bool getValue(StringType, std::string &) const; + bool getValue(NumberType, int &) const; void addOption(const std::string &, const std::string &); };
M
util/epist/keytree.cc
→
util/epist/keytree.cc
@@ -222,7 +222,7 @@ void keytree::initialize(void)
{ int tval = 0; - _epist->getConfig()->getNumberValue(Config::chainTimeout, tval); + _epist->getConfig()->getValue(Config::chainTimeout, tval); _timer = new BTimer(_epist, this); if (tval <= 0)
M
util/epist/screen.cc
→
util/epist/screen.cc
@@ -64,7 +64,7 @@ _number = number;
_info = _epist->getScreenInfo(_number); _root = _info->getRootWindow(); - _config->getBoolValue(Config::stackedCycling, _stacked_cycling); + _config->getValue(Config::stackedCycling, _stacked_cycling); // find a window manager supporting NETWM, waiting for it to load if we must int count = 20; // try for 20 seconds@@ -672,7 +672,7 @@ int num_desktops = (signed)_num_desktops;
int active_desktop = (signed)_active_desktop; int wnum = 0; - _config->getNumberValue(Config::workspaceColumns, width); + _config->getValue(Config::workspaceColumns, width); if (width > num_desktops || width <= 0) return;@@ -704,7 +704,7 @@ int num_desktops = (signed)_num_desktops;
int active_desktop = (signed)_active_desktop; int wnum = 0; - _config->getNumberValue(Config::workspaceColumns, width); + _config->getValue(Config::workspaceColumns, width); if (width > num_desktops || width <= 0) return;