Settings: pass name to callbacks by reference

est31 · est31 · commit cb8978fb1d65 · 2015-07-09T08:25:17.000+02:00
Spare some copies.
diff --git a/src/clouds.cpp b/src/clouds.cpp
@@ -30,7 +30,7 @@ class Clouds;
 Clouds *g_menuclouds = NULL;
 irr::scene::ISceneManager *g_menucloudsmgr = NULL;
 
-static void cloud_3d_setting_changed(const std::string settingname, void *data)
+static void cloud_3d_setting_changed(const std::string &settingname, void *data)
 {
 	((Clouds *)data)->readSettings();
 }
diff --git a/src/fontengine.cpp b/src/fontengine.cpp
@@ -35,7 +35,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 FontEngine* g_fontengine = NULL;
 
 /** callback to be used on change of font size setting */
-static void font_setting_changed(const std::string, void *userdata) {
+static void font_setting_changed(const std::string &name, void *userdata)
+{
 	g_fontengine->readSettings();
 }
 
diff --git a/src/game.cpp b/src/game.cpp
@@ -806,7 +806,7 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter
 			m_fogEnabled = g_settings->getBool("enable_fog");
 	}
 
-	static void SettingsCallback(const std::string name, void *userdata)
+	static void SettingsCallback(const std::string &name, void *userdata)
 	{
 		reinterpret_cast<GameGlobalShaderConstantSetter*>(userdata)->onSettingsChange(name);
 	}
diff --git a/src/settings.h b/src/settings.h
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class Clouds;`
`30`	`30`	`Clouds *g_menuclouds = NULL;`
`31`	`31`	`irr::scene::ISceneManager *g_menucloudsmgr = NULL;`
`32`	`32`
`33`		`-static void cloud_3d_setting_changed(const std::string settingname, void *data)`
	`33`	`+static void cloud_3d_setting_changed(const std::string &settingname, void *data)`
`34`	`34`	`{`
`35`	`35`	`((Clouds *)data)->readSettings();`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,`
`35`	`35`	`FontEngine* g_fontengine = NULL;`
`36`	`36`
`37`	`37`	`/** callback to be used on change of font size setting */`
`38`		`-static void font_setting_changed(const std::string, void *userdata) {`
	`38`	`+static void font_setting_changed(const std::string &name, void *userdata)`
	`39`	`+{`
`39`	`40`	`g_fontengine->readSettings();`
`40`	`41`	`}`
`41`	`42`
Original file line number	Diff line number	Diff line change
`@@ -806,7 +806,7 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter`
`806`	`806`	`m_fogEnabled = g_settings->getBool("enable_fog");`
`807`	`807`	`}`
`808`	`808`
`809`		`- static void SettingsCallback(const std::string name, void *userdata)`
	`809`	`+ static void SettingsCallback(const std::string &name, void *userdata)`
`810`	`810`	`{`
`811`	`811`	`reinterpret_cast<GameGlobalShaderConstantSetter*>(userdata)->onSettingsChange(name);`
`812`	`812`	`}`