From ff532fa61dfc59ea49e51ad427376ec30e58fc64 Mon Sep 17 00:00:00 2001
From: Michael Becker <alcexhim@gmail.com>
Date: Mon, 29 Jul 2019 21:28:08 -0400
Subject: [PATCH] No longer use generic types for Setting

---
 .../FileSystemEditorSettingsProvider.cs       |  8 ++++----
 .../SingingStyleDefaultsSettingsProvider.cs   | 20 +++++++++----------
 .../SyntaxEditorSettingsProvider.cs           |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditorSettingsProvider.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditorSettingsProvider.cs
index f68c7b66..fc141a09 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditorSettingsProvider.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditorSettingsProvider.cs
@@ -36,11 +36,11 @@ namespace UniversalEditor.Editors.FileSystem
 			{
 				new BooleanSetting ("_Single-click to open items"),
 				new BooleanSetting ("Show action to create symbolic _links"),
-				new ChoiceSetting<int> ("Default option for _executable text files", null, new ChoiceSetting<int>.ChoiceSettingValue[]
+				new ChoiceSetting ("Default option for _executable text files", null, new ChoiceSetting.ChoiceSettingValue[]
 				{
-					new ChoiceSetting<int>.ChoiceSettingValue ("Display them in text editor", 1),
-					new ChoiceSetting<int>.ChoiceSettingValue ("Run them as executable", 2),
-					new ChoiceSetting<int>.ChoiceSettingValue ("Ask me what to do", 3)
+					new ChoiceSetting.ChoiceSettingValue ("Display them in text editor", 1),
+					new ChoiceSetting.ChoiceSettingValue ("Run them as executable", 2),
+					new ChoiceSetting.ChoiceSettingValue ("Ask me what to do", 3)
 				}),
 				new BooleanSetting ("Ask before _emptying the Trash/Recycle Bin"),
 				new BooleanSetting ("Show action to _permanently delete files and folders")
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/SettingsProviders/SingingStyleDefaultsSettingsProvider.cs b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/SettingsProviders/SingingStyleDefaultsSettingsProvider.cs
index 52904b93..e6c36bcc 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/SettingsProviders/SingingStyleDefaultsSettingsProvider.cs
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/SettingsProviders/SingingStyleDefaultsSettingsProvider.cs
@@ -39,12 +39,12 @@ namespace UniversalEditor.Plugins.Multimedia.UserInterface.SettingsProviders
 			{
 				new GroupSetting("MIDI Devices", new Setting[]
 				{
-					new ChoiceSetting<int>("_Input device"),
-					new ChoiceSetting<int>("_Output device")
+					new ChoiceSetting("_Input device"),
+					new ChoiceSetting("_Output device")
 				}),
 				new BooleanSetting("Play notes through MIDI output upon _selection"),
 				new BooleanSetting("Send _Program Change for the following program before continuing"),
-				new ChoiceSetting<int>(String.Empty)
+				new ChoiceSetting(String.Empty)
 			});
 			SettingsGroups.Add ("Editors:Synthesized Audio:Phoneme Dictionary", new Setting[]
 			{
@@ -56,14 +56,14 @@ namespace UniversalEditor.Plugins.Multimedia.UserInterface.SettingsProviders
 			{
 				// new CommandOption("_Load settings from VOCALOID2"),
 				// 2q22wnew CommandOption("_Save settings from VOCALOID2"),
-				new ChoiceSetting<string>("_Template", null, new ChoiceSetting<string>.ChoiceSettingValue[]
+				new ChoiceSetting("_Template", null, new ChoiceSetting.ChoiceSettingValue[]
 				{
-					new ChoiceSetting<string>.ChoiceSettingValue("(Custom)", "custom"),
-					new ChoiceSetting<string>.ChoiceSettingValue("Normal", "normal"),
-					new ChoiceSetting<string>.ChoiceSettingValue("Accent", "accent"),
-					new ChoiceSetting<string>.ChoiceSettingValue("Strong Accent", "strongaccent"),
-					new ChoiceSetting<string>.ChoiceSettingValue("Legato", "legato"),
-					new ChoiceSetting<string>.ChoiceSettingValue("Slow Legato", "slowlegato"),
+					new ChoiceSetting.ChoiceSettingValue("(Custom)", "custom"),
+					new ChoiceSetting.ChoiceSettingValue("Normal", "normal"),
+					new ChoiceSetting.ChoiceSettingValue("Accent", "accent"),
+					new ChoiceSetting.ChoiceSettingValue("Strong Accent", "strongaccent"),
+					new ChoiceSetting.ChoiceSettingValue("Legato", "legato"),
+					new ChoiceSetting.ChoiceSettingValue("Slow Legato", "slowlegato"),
 				}),
 				new GroupSetting("Pitch control", new Setting[]
 				{
diff --git a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/SettingsProviders/SyntaxEditorSettingsProvider.cs b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/SettingsProviders/SyntaxEditorSettingsProvider.cs
index 35296c38..0d43381e 100644
--- a/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/SettingsProviders/SyntaxEditorSettingsProvider.cs
+++ b/CSharp/Plugins.UserInterface/UniversalEditor.Plugins.SoftwareDevelopment.UserInterface/SettingsProviders/SyntaxEditorSettingsProvider.cs
@@ -41,7 +41,7 @@ namespace UniversalEditor.SettingsProviders
 			SettingsGroups.Add(new SettingsGroup("Editors:Syntax:Languages", new Setting[]
 			{
 				new BooleanSetting("_Map extensionless files to"),
-				new ChoiceSetting<string>("Default language"),
+				new ChoiceSetting("Default language"),
 			}));
 
 			// for each language...