[OMPT-svn-commit] SF.net SVN: modplug:[4855] trunk/OpenMPT

[<man...@us...>]

Revision: 4855
          http://sourceforge.net/p/modplug/code/4855
Author:   manxorist
Date:     2015-03-10 19:20:54 +0000 (Tue, 10 Mar 2015)
Log Message:
-----------
[Ref] Kill SettingMetadata which remained unused.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Settings.cpp
    trunk/OpenMPT/mptrack/Settings.h
    trunk/OpenMPT/test/test.cpp

Modified: trunk/OpenMPT/mptrack/Settings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Settings.cpp	2015-03-10 18:24:07 UTC (rev 4854)
+++ trunk/OpenMPT/mptrack/Settings.cpp	2015-03-10 19:20:54 UTC (rev 4855)
@@ -140,7 +140,7 @@
 	backend->RemoveSetting(path);
 }
 
-SettingValue SettingsContainer::ReadSetting(const SettingPath &path, const SettingValue &def, const SettingMetadata &metadata) const
+SettingValue SettingsContainer::ReadSetting(const SettingPath &path, const SettingValue &def) const
 {
 	ASSERT(theApp.InGuiThread());
 	ASSERT(!CMainFrame::GetMainFrame() || (CMainFrame::GetMainFrame() && !CMainFrame::GetMainFrame()->InNotifyHandler())); // This is a slow path, use CachedSetting for stuff that is accessed in notify handler.
@@ -148,7 +148,6 @@
 	if(entry == map.end())
 	{
 		entry = map.insert(map.begin(), std::make_pair(path, SettingState(def).assign(BackendsReadSetting(path, def), false)));
-		mapMetadata[path] = metadata;
 	}
 	return entry->second;
 }
@@ -250,7 +249,7 @@
 
 #else // !MPT_SETTINGS_CACHE
 
-SettingValue SettingsContainer::ReadSetting(const SettingPath &path, const SettingValue &def, const SettingMetadata & /*metadata*/ ) const
+SettingValue SettingsContainer::ReadSetting(const SettingPath &path, const SettingValue &def) const
 {
 	return backend->ReadSetting(path, def);
 }

Modified: trunk/OpenMPT/mptrack/Settings.h
===================================================================
--- trunk/OpenMPT/mptrack/Settings.h	2015-03-10 18:24:07 UTC (rev 4854)
+++ trunk/OpenMPT/mptrack/Settings.h	2015-03-10 19:20:54 UTC (rev 4855)
@@ -469,27 +469,6 @@
 };
 
 
-#if defined(MPT_SETTINGS_CACHE)
-
-struct SettingMetadata
-{
-	mpt::ustring description;
-	SettingMetadata() {}
-	SettingMetadata(const AnyStringLocale &description)
-		: description(description)
-	{
-		return;
-	}
-};
-
-#else // !MPT_SETTINGS_CACHE
-
-struct SettingMetadata
-{
-};
-
-#endif // MPT_SETTINGS_CACHE
-
 class ISettingChanged
 {
 public:
@@ -511,11 +490,9 @@
 
 		public:
 			typedef std::map<SettingPath,SettingState> SettingsMap;
-			typedef std::map<SettingPath,SettingMetadata> SettingsMetaMap;
 			typedef std::map<SettingPath,std::set<ISettingChanged*> > SettingsListenerMap;
 		private:
 			mutable SettingsMap map;
-			mutable SettingsMetaMap mapMetadata;
 			mutable SettingsListenerMap mapListeners;
 			void WriteSettings();
 
@@ -529,7 +506,7 @@
 	void BackendsWriteSetting(const SettingPath &path, const SettingValue &val);
 	void BackendsRemoveSetting(const SettingPath &path);
 	void NotifyListeners(const SettingPath &path);
-	SettingValue ReadSetting(const SettingPath &path, const SettingValue &def, const SettingMetadata &metadata) const;
+	SettingValue ReadSetting(const SettingPath &path, const SettingValue &def) const;
 	void WriteSetting(const SettingPath &path, const SettingValue &val, SettingFlushMode flushMode);
 	void ForgetSetting(const SettingPath &path);
 	void RemoveSetting(const SettingPath &path);
@@ -540,14 +517,14 @@
 	SettingsContainer(ISettingsBackend *backend);
 	void SetImmediateFlush(bool newImmediateFlush);
 	template <typename T>
-	T Read(const SettingPath &path, const T &def = T(), const SettingMetadata &metadata = SettingMetadata()) const
+	T Read(const SettingPath &path, const T &def = T()) const
 	{
-		return FromSettingValue<T>(ReadSetting(path, ToSettingValue<T>(def), metadata));
+		return FromSettingValue<T>(ReadSetting(path, ToSettingValue<T>(def)));
 	}
 	template <typename T>
-	T Read(const AnyStringLocale &section, const AnyStringLocale &key, const T &def = T(), const SettingMetadata &metadata = SettingMetadata()) const
+	T Read(const AnyStringLocale &section, const AnyStringLocale &key, const T &def = T()) const
 	{
-		return FromSettingValue<T>(ReadSetting(SettingPath(section, key), ToSettingValue<T>(def), metadata));
+		return FromSettingValue<T>(ReadSetting(SettingPath(section, key), ToSettingValue<T>(def)));
 	}
 	template <typename T>
 	void Write(const SettingPath &path, const T &val, SettingFlushMode flushMode = SettingWriteBack)
@@ -623,17 +600,17 @@
 		return;
 	}
 public:
-	Setting(SettingsContainer &conf_, const AnyStringLocale &section, const AnyStringLocale &key, const T&def, const SettingMetadata &metadata = SettingMetadata())
+	Setting(SettingsContainer &conf_, const AnyStringLocale &section, const AnyStringLocale &key, const T&def)
 		: conf(conf_)
 		, path(section, key)
 	{
-		conf.Read(path, def, metadata); // set default value
+		conf.Read(path, def); // set default value
 	}
-	Setting(SettingsContainer &conf_, const SettingPath &path_, const T&def, const SettingMetadata &metadata = SettingMetadata())
+	Setting(SettingsContainer &conf_, const SettingPath &path_, const T&def)
 		: conf(conf_)
 		, path(path_)
 	{
-		conf.Read(path, def, metadata); // set default value
+		conf.Read(path, def); // set default value
 	}
 	SettingPath GetPath() const
 	{
@@ -679,20 +656,20 @@
 		conf.Register(this, path);
 	}
 public:
-	CachedSetting(SettingsContainer &conf_, const AnyStringLocale &section, const AnyStringLocale &key, const T&def, const SettingMetadata &metadata = SettingMetadata())
+	CachedSetting(SettingsContainer &conf_, const AnyStringLocale &section, const AnyStringLocale &key, const T&def)
 		: value(def)
 		, conf(conf_)
 		, path(section, key)
 	{
-		value = conf.Read(path, def, metadata);
+		value = conf.Read(path, def);
 		conf.Register(this, path);
 	}
-	CachedSetting(SettingsContainer &conf_, const SettingPath &path_, const T&def, const SettingMetadata &metadata = SettingMetadata())
+	CachedSetting(SettingsContainer &conf_, const SettingPath &path_, const T&def)
 		: value(def)
 		, conf(conf_)
 		, path(path_)
 	{
-		value = conf.Read(path, def, metadata);
+		value = conf.Read(path, def);
 		conf.Register(this, path);
 	}
 	~CachedSetting()
@@ -755,19 +732,19 @@
 		return;
 	}
 public:
-	Setting(SettingsContainer &conf_, const AnyStringLocale &section, const AnyStringLocale &key, const T&def, const SettingMetadata &metadata = SettingMetadata())
+	Setting(SettingsContainer &conf_, const AnyStringLocale &section, const AnyStringLocale &key, const T&def)
 		: value(def)
 		, conf(conf_)
 		, path(section, key)
 	{
-		value = conf.Read(path, def, metadata);
+		value = conf.Read(path, def);
 	}
-	Setting(SettingsContainer &conf_, const SettingPath &path_, const T&def, const SettingMetadata &metadata = SettingMetadata())
+	Setting(SettingsContainer &conf_, const SettingPath &path_, const T&def)
 		: value(def)
 		, conf(conf_)
 		, path(path_)
 	{
-		value = conf.Read(path, def, metadata);
+		value = conf.Read(path, def);
 	}
 	~Setting()
 	{

Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp	2015-03-10 18:24:07 UTC (rev 4854)
+++ trunk/OpenMPT/test/test.cpp	2015-03-10 19:20:54 UTC (rev 4855)
@@ -941,7 +941,7 @@
 	{
 		DefaultSettingsContainer conf;
 
-		int32 foobar = conf.Read("Test", "bar", 23, SettingMetadata("foobar"));
+		int32 foobar = conf.Read("Test", "bar", 23);
 		conf.Write("Test", "bar", 64);
 		conf.Write("Test", "bar", 42);
 		conf.Read("Test", "baz", 4711);
@@ -951,7 +951,7 @@
 	{
 		DefaultSettingsContainer conf;
 
-		int32 foobar = conf.Read("Test", "bar", 28, SettingMetadata("foobar"));
+		int32 foobar = conf.Read("Test", "bar", 28);
 		VERIFY_EQUAL(foobar, 42);
 		conf.Write("Test", "bar", 43);
 	}
@@ -959,7 +959,7 @@
 	{
 		DefaultSettingsContainer conf;
 
-		int32 foobar = conf.Read("Test", "bar", 123, SettingMetadata("foobar"));
+		int32 foobar = conf.Read("Test", "bar", 123);
 		VERIFY_EQUAL(foobar, 43);
 		conf.Write("Test", "bar", 88);
 	}
@@ -967,7 +967,7 @@
 	{
 		DefaultSettingsContainer conf;
 
-		Setting<int> foo(conf, "Test", "bar", 99, SettingMetadata("something"));
+		Setting<int> foo(conf, "Test", "bar", 99);
 
 		VERIFY_EQUAL(foo, 88);
 
@@ -977,7 +977,7 @@
 
 	{
 		DefaultSettingsContainer conf;
-		Setting<int> foo(conf, "Test", "bar", 99, SettingMetadata("something"));
+		Setting<int> foo(conf, "Test", "bar", 99);
 		VERIFY_EQUAL(foo, 7);
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.