thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: Use Domain::const_iterator in EventRecorder code when possible.

Browse source
This commit is contained in:
Johannes Schickel 2013-08-08 03:12:02 +02:00
parent fffb2ee3ff
commit 11eb168582
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gui/EventRecorder.cpp
View file

@ -372,8 +372,8 @@ SdlMixerManager *EventRecorder::getMixerManager() {
} }
} }
void EventRecorder::getConfigFromDomain(Common::ConfigManager::Domain *domain) { void EventRecorder::getConfigFromDomain(const Common::ConfigManager::Domain *domain) {
for (Common::ConfigManager::Domain::iterator entry = domain->begin(); entry!= domain->end(); ++entry) { for (Common::ConfigManager::Domain::const_iterator entry = domain->begin(); entry!= domain->end(); ++entry) {
_playbackFile->getHeader().settingsRecords[entry->_key] = entry->_value; _playbackFile->getHeader().settingsRecords[entry->_key] = entry->_value;
} }
} }
@ -386,7 +386,7 @@ void EventRecorder::getConfig() {
void EventRecorder::applyPlaybackSettings() { void EventRecorder::applyPlaybackSettings() {
for (Common::StringMap::iterator i = _playbackFile->getHeader().settingsRecords.begin(); i != _playbackFile->getHeader().settingsRecords.end(); ++i) { for (Common::StringMap::const_iterator i = _playbackFile->getHeader().settingsRecords.begin(); i != _playbackFile->getHeader().settingsRecords.end(); ++i) {
Common::String currentValue = ConfMan.get(i->_key); Common::String currentValue = ConfMan.get(i->_key);
if (currentValue != i->_value) { if (currentValue != i->_value) {
ConfMan.set(i->_key, i->_value, ConfMan.kTransientDomain); ConfMan.set(i->_key, i->_value, ConfMan.kTransientDomain);
@ -400,7 +400,7 @@ void EventRecorder::applyPlaybackSettings() {
} }
void EventRecorder::removeDifferentEntriesInDomain(Common::ConfigManager::Domain *domain) { void EventRecorder::removeDifferentEntriesInDomain(Common::ConfigManager::Domain *domain) {
for (Common::ConfigManager::Domain::iterator entry = domain->begin(); entry!= domain->end(); ++entry) { for (Common::ConfigManager::Domain::const_iterator entry = domain->begin(); entry!= domain->end(); ++entry) {
if (_playbackFile->getHeader().settingsRecords.find(entry->_key) == _playbackFile->getHeader().settingsRecords.end()) { if (_playbackFile->getHeader().settingsRecords.find(entry->_key) == _playbackFile->getHeader().settingsRecords.end()) {
debugC(1, kDebugLevelEventRec, "playback:action=\"Apply settings\" checksettings:key=%s storedvalue=%s currentvalue="" result=different", entry->_key.c_str(), entry->_value.c_str()); debugC(1, kDebugLevelEventRec, "playback:action=\"Apply settings\" checksettings:key=%s storedvalue=%s currentvalue="" result=different", entry->_key.c_str(), entry->_value.c_str());
domain->erase(entry->_key); domain->erase(entry->_key);

2
gui/EventRecorder.h
View file

@ -199,7 +199,7 @@ private:
void setFileHeader(); void setFileHeader();
void setGameMd5(const ADGameDescription *gameDesc); void setGameMd5(const ADGameDescription *gameDesc);
void getConfig(); void getConfig();
void getConfigFromDomain(Common::ConfigManager::Domain *domain); void getConfigFromDomain(const Common::ConfigManager::Domain *domain);
void removeDifferentEntriesInDomain(Common::ConfigManager::Domain *domain); void removeDifferentEntriesInDomain(Common::ConfigManager::Domain *domain);
void applyPlaybackSettings(); void applyPlaybackSettings();