diff options
author | kwolekr <kwolekr@minetest.net> | 2016-06-11 00:10:25 -0400 |
---|---|---|
committer | kwolekr <kwolekr@minetest.net> | 2016-06-11 00:11:37 -0400 |
commit | 33b874fea3948dfcbcc2d6761c28b325ca4aa367 (patch) | |
tree | de69a885dbc0a0e78b9cc24eb493943c52a9108a /src/settings.cpp | |
parent | 817fea6330b9fceb4070b3ee83283140929b3ddc (diff) | |
download | minetest-33b874fea3948dfcbcc2d6761c28b325ca4aa367.tar.gz minetest-33b874fea3948dfcbcc2d6761c28b325ca4aa367.tar.bz2 minetest-33b874fea3948dfcbcc2d6761c28b325ca4aa367.zip |
Settings: Clean up settings changed callback code
Diffstat (limited to 'src/settings.cpp')
-rw-r--r-- | src/settings.cpp | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/src/settings.cpp b/src/settings.cpp index 56afa6133..91ea9c58b 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -985,39 +985,38 @@ void Settings::clearDefaultsNoLock() } -void Settings::registerChangedCallback(std::string name, - setting_changed_callback cbf, void *userdata) +void Settings::registerChangedCallback(const std::string &name, + SettingsChangedCallback cbf, void *userdata) { - MutexAutoLock lock(m_callbackMutex); + MutexAutoLock lock(m_callback_mutex); m_callbacks[name].push_back(std::make_pair(cbf, userdata)); } -void Settings::deregisterChangedCallback(std::string name, setting_changed_callback cbf, void *userdata) +void Settings::deregisterChangedCallback(const std::string &name, + SettingsChangedCallback cbf, void *userdata) { - MutexAutoLock lock(m_callbackMutex); - std::map<std::string, std::vector<std::pair<setting_changed_callback, void*> > >::iterator iterToVector = m_callbacks.find(name); - if (iterToVector != m_callbacks.end()) - { - std::vector<std::pair<setting_changed_callback, void*> > &vector = iterToVector->second; + MutexAutoLock lock(m_callback_mutex); + SettingsCallbackMap::iterator it_cbks = m_callbacks.find(name); + + if (it_cbks != m_callbacks.end()) { + SettingsCallbackList &cbks = it_cbks->second; - std::vector<std::pair<setting_changed_callback, void*> >::iterator position = - std::find(vector.begin(), vector.end(), std::make_pair(cbf, userdata)); + SettingsCallbackList::iterator position = + std::find(cbks.begin(), cbks.end(), std::make_pair(cbf, userdata)); - if (position != vector.end()) - vector.erase(position); + if (position != cbks.end()) + cbks.erase(position); } } -void Settings::doCallbacks(const std::string name) +void Settings::doCallbacks(const std::string &name) const { - MutexAutoLock lock(m_callbackMutex); - std::map<std::string, std::vector<std::pair<setting_changed_callback, void*> > >::iterator iterToVector = m_callbacks.find(name); - if (iterToVector != m_callbacks.end()) - { - std::vector<std::pair<setting_changed_callback, void*> >::iterator iter; - for (iter = iterToVector->second.begin(); iter != iterToVector->second.end(); ++iter) - { - (iter->first)(name, iter->second); - } + MutexAutoLock lock(m_callback_mutex); + + SettingsCallbackMap::const_iterator it_cbks = m_callbacks.find(name); + if (it_cbks != m_callbacks.end()) { + SettingsCallbackList::const_iterator it; + for (it = it_cbks->second.begin(); it != it_cbks->second.end(); ++it) + (it->first)(name, it->second); } } |