diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/array.h | 4 | ||||
| -rw-r--r-- | common/config-manager.cpp | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/common/array.h b/common/array.h index eb6b0cddb6..ff98ec4307 100644 --- a/common/array.h +++ b/common/array.h @@ -140,10 +140,6 @@ public: return _data + _size; } - bool contains(const T &key) const { - return find(begin(), end(), key) != end(); - } - void reserve(uint newCapacity) { if (newCapacity <= _capacity) return; diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 0f3bc51579..5afbbad4ae 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -270,7 +270,6 @@ void ConfigManager::flushToDisk() { if (!cfg_file.open(_filename, File::kFileWriteMode)) { warning("Unable to write configuration file: %s", _filename.c_str()); } else { - // First write the domains in _domainSaveOrder, in that order. // Note: It's possible for _domainSaveOrder to list domains which // are not present anymore. @@ -285,11 +284,12 @@ void ConfigManager::flushToDisk() { DomainMap::const_iterator d; + // Now write the domains which haven't been written yet - if (!_domainSaveOrder.contains(kApplicationDomain)) + if (find(_domainSaveOrder.begin(), _domainSaveOrder.end(), kApplicationDomain) == _domainSaveOrder.end()) writeDomain(cfg_file, kApplicationDomain, _appDomain); for (d = _gameDomains.begin(); d != _gameDomains.end(); ++d) { - if (!_domainSaveOrder.contains(d->_key)) + if (find(_domainSaveOrder.begin(), _domainSaveOrder.end(), d->_key) == _domainSaveOrder.end()) writeDomain(cfg_file, d->_key, d->_value); } } |