Translated using Weblate (Japanese)

[oweals/minetest.git] / src / settings.h

diff --git a/src/settings.h b/src/settings.h
index d43ad6a205e28c75a23f7e11449b679db32385d5..80d41fd790f18b5c66a387a577c5ea0e2702f04f 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "irrlichttypes_bloated.h"
 #include "util/string.h"
-#include "jthread/jmutex.h"
+#include "threading/mutex.h"
 #include <string>
 #include <map>
 #include <list>
@@ -36,7 +36,7 @@ extern Settings *g_settings;
 extern std::string g_settings_path;
 
 /** function type to register a changed callback */
-typedef void (*setting_changed_callback)(const std::string, void*);
+typedef void (*setting_changed_callback)(const std::string &name, void *data);
 
 enum ValueType {
        VALUETYPE_STRING,
@@ -225,8 +225,8 @@ private:
 
        std::map<std::string, std::vector<std::pair<setting_changed_callback,void*> > > m_callbacks;
 
-       mutable JMutex m_callbackMutex;
-       mutable JMutex m_mutex; // All methods that access m_settings/m_defaults directly should lock this.
+       mutable Mutex m_callbackMutex;
+       mutable Mutex m_mutex; // All methods that access m_settings/m_defaults directly should lock this.
 
 };