XML: complete merge from 1.4.2

This commit is contained in:
Marian Krivos
2011-09-14 14:55:17 +00:00
parent 16ff8caf6b
commit 7e5c3a13d6
80 changed files with 9847 additions and 2282 deletions

View File

@@ -120,6 +120,19 @@ void LayeredConfiguration::add(AbstractConfiguration* pConfig, int priority, boo
}
void LayeredConfiguration::removeConfiguration(AbstractConfiguration* pConfig)
{
for (ConfigList::iterator it = _configs.begin(); it != _configs.end(); ++it)
{
if (it->pConfig == pConfig)
{
_configs.erase(it);
break;
}
}
}
bool LayeredConfiguration::getRaw(const std::string& key, std::string& value) const
{
for (ConfigList::const_iterator it = _configs.begin(); it != _configs.end(); ++it)
@@ -164,6 +177,19 @@ void LayeredConfiguration::enumerate(const std::string& key, Keys& range) const
}
void LayeredConfiguration::removeRaw(const std::string& key)
{
for (ConfigList::iterator it = _configs.begin(); it != _configs.end(); ++it)
{
if (it->writeable)
{
it->pConfig->remove(key);
return;
}
}
}
int LayeredConfiguration::lowest() const
{
if (_configs.empty())