Full viewing range key message clarified

[dragonfireclient.git] / src / settings.cpp

diff --git a/src/settings.cpp b/src/settings.cpp
index e1e01e81a28518bfc61836273477138796a52a6c..1fa4ac52837aea4282702ea352acab5888c42623 100644 (file)
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_bloated.h"
 #include "exceptions.h"
 #include "threading/mutex_auto_lock.h"
-#include "strfnd.h"
+#include "util/strfnd.h"
 #include <iostream>
 #include <fstream>
 #include <sstream>
@@ -90,33 +90,6 @@ bool Settings::checkValueValid(const std::string &value)
        return true;
 }
 
-
-std::string Settings::sanitizeName(const std::string &name)
-{
-       std::string n = trim(name);
-
-       for (const char *s = "=\"{}#"; *s; s++)
-               n.erase(std::remove(n.begin(), n.end(), *s), n.end());
-
-       return n;
-}
-
-
-std::string Settings::sanitizeValue(const std::string &value)
-{
-       std::string v(value);
-       size_t p = 0;
-
-       if (v.substr(0, 3) == "\"\"\"")
-               v.erase(0, 3);
-
-       while ((p = v.find("\n\"\"\"")) != std::string::npos)
-               v.erase(p, 4);
-
-       return v;
-}
-
-
 std::string Settings::getMultiline(std::istream &is, size_t *num_lines)
 {
        size_t lines = 1;
@@ -196,9 +169,8 @@ void Settings::writeLines(std::ostream &os, u32 tab_depth) const
 {
        MutexAutoLock lock(m_mutex);
 
-       for (std::map<std::string, SettingsEntry>::const_iterator
-                       it = m_settings.begin();
-                       it != m_settings.end(); ++it)
+       for (SettingEntries::const_iterator it = m_settings.begin();
+                       it != m_settings.end(); ++it)
                printEntry(os, it->first, it->second, tab_depth);
 }
 
@@ -231,7 +203,7 @@ void Settings::printEntry(std::ostream &os, const std::string &name,
 bool Settings::updateConfigObject(std::istream &is, std::ostream &os,
        const std::string &end, u32 tab_depth)
 {
-       std::map<std::string, SettingsEntry>::const_iterator it;
+       SettingEntries::const_iterator it;
        std::set<std::string> present_entries;
        std::string line, name, value;
        bool was_modified = false;
@@ -381,7 +353,7 @@ const SettingsEntry &Settings::getEntry(const std::string &name) const
 {
        MutexAutoLock lock(m_mutex);
 
-       std::map<std::string, SettingsEntry>::const_iterator n;
+       SettingEntries::const_iterator n;
        if ((n = m_settings.find(name)) == m_settings.end()) {
                if ((n = m_defaults.find(name)) == m_defaults.end())
                        throw SettingNotFoundException("Setting [" + name + "] not found.");
@@ -399,7 +371,7 @@ Settings *Settings::getGroup(const std::string &name) const
 }
 
 
-std::string Settings::get(const std::string &name) const
+const std::string &Settings::get(const std::string &name) const
 {
        const SettingsEntry &entry = getEntry(name);
        if (entry.is_group)
@@ -426,6 +398,11 @@ s16 Settings::getS16(const std::string &name) const
 }
 
 
+u32 Settings::getU32(const std::string &name) const
+{
+       return (u32) stoi(get(name));
+}
+
 s32 Settings::getS32(const std::string &name) const
 {
        return stoi(get(name));
@@ -572,9 +549,8 @@ bool Settings::exists(const std::string &name) const
 std::vector<std::string> Settings::getNames() const
 {
        std::vector<std::string> names;
-       for (std::map<std::string, SettingsEntry>::const_iterator
-                       i = m_settings.begin();
-                       i != m_settings.end(); ++i) {
+       for (SettingEntries::const_iterator i = m_settings.begin();
+                       i != m_settings.end(); ++i) {
                names.push_back(i->first);
        }
        return names;
@@ -880,8 +856,14 @@ bool Settings::remove(const std::string &name)
 {
        MutexAutoLock lock(m_mutex);
 
-       delete m_settings[name].group;
-       return m_settings.erase(name);
+       SettingEntries::iterator it = m_settings.find(name);
+       if (it != m_settings.end()) {
+               delete it->second.group;
+               m_settings.erase(it);
+               return true;
+       } else {
+               return false;
+       }
 }
 
 
@@ -906,7 +888,6 @@ void Settings::updateValue(const Settings &other, const std::string &name)
 
        try {
                std::string val = other.get(name);
-
                m_settings[name] = val;
        } catch (SettingNotFoundException &e) {
        }
@@ -962,8 +943,9 @@ void Settings::updateNoLock(const Settings &other)
 
 void Settings::clearNoLock()
 {
-       std::map<std::string, SettingsEntry>::const_iterator it;
-       for (it = m_settings.begin(); it != m_settings.end(); ++it)
+
+       for (SettingEntries::const_iterator it = m_settings.begin();
+                       it != m_settings.end(); ++it)
                delete it->second.group;
        m_settings.clear();
 
@@ -972,46 +954,45 @@ void Settings::clearNoLock()
 
 void Settings::clearDefaultsNoLock()
 {
-       std::map<std::string, SettingsEntry>::const_iterator it;
-       for (it = m_defaults.begin(); it != m_defaults.end(); ++it)
+       for (SettingEntries::const_iterator it = m_defaults.begin();
+                       it != m_defaults.end(); ++it)
                delete it->second.group;
        m_defaults.clear();
 }
 
 
-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);
        }
 }