From ac744a1e6d603f2cae8733abfd8cc6bc3bfe418d Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 23 May 2024 14:26:16 -0400 Subject: [PATCH] Move OptionsLoader to Core.Frontend --- CHANGELIST.md | 1 + MPF.Check/Program.cs | 1 - MPF.Core/{Utilities => Frontend}/OptionsLoader.cs | 4 ++-- MPF.Core/Frontend/ViewModels/CheckDumpViewModel.cs | 1 - MPF.Core/Frontend/ViewModels/CreateIRDViewModel.cs | 4 ++-- 5 files changed, 5 insertions(+), 6 deletions(-) rename MPF.Core/{Utilities => Frontend}/OptionsLoader.cs (99%) diff --git a/CHANGELIST.md b/CHANGELIST.md index 61fa2435..efc0c617 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -92,6 +92,7 @@ - Move DumpEnvironment to Core.Frontend - Move Options to Core.Frontend - Remove useless using statement +- Move OptionsLoader to Core.Frontend ### 3.1.9a (2024-05-21) diff --git a/MPF.Check/Program.cs b/MPF.Check/Program.cs index 4e3c3081..ded75f02 100644 --- a/MPF.Check/Program.cs +++ b/MPF.Check/Program.cs @@ -3,7 +3,6 @@ using System.IO; using BinaryObjectScanner; using MPF.Core; using MPF.Core.Frontend; -using MPF.Core.Utilities; using SabreTools.RedumpLib.Data; using SabreTools.RedumpLib.Web; diff --git a/MPF.Core/Utilities/OptionsLoader.cs b/MPF.Core/Frontend/OptionsLoader.cs similarity index 99% rename from MPF.Core/Utilities/OptionsLoader.cs rename to MPF.Core/Frontend/OptionsLoader.cs index a8eddca1..c647f33c 100644 --- a/MPF.Core/Utilities/OptionsLoader.cs +++ b/MPF.Core/Frontend/OptionsLoader.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using System.IO; -using MPF.Core.Frontend; +using MPF.Core.Utilities; using Newtonsoft.Json; using SabreTools.RedumpLib; using SabreTools.RedumpLib.Data; -namespace MPF.Core.Utilities +namespace MPF.Core.Frontend { public static class OptionsLoader { diff --git a/MPF.Core/Frontend/ViewModels/CheckDumpViewModel.cs b/MPF.Core/Frontend/ViewModels/CheckDumpViewModel.cs index 8f93db3e..340e13d3 100644 --- a/MPF.Core/Frontend/ViewModels/CheckDumpViewModel.cs +++ b/MPF.Core/Frontend/ViewModels/CheckDumpViewModel.cs @@ -6,7 +6,6 @@ using System.Linq; using System.Threading.Tasks; using BinaryObjectScanner; using MPF.Core.Frontend.ComboBoxItems; -using MPF.Core.Utilities; using SabreTools.RedumpLib.Data; namespace MPF.Core.Frontend.ViewModels diff --git a/MPF.Core/Frontend/ViewModels/CreateIRDViewModel.cs b/MPF.Core/Frontend/ViewModels/CreateIRDViewModel.cs index 1ed1fc55..5830c09a 100644 --- a/MPF.Core/Frontend/ViewModels/CreateIRDViewModel.cs +++ b/MPF.Core/Frontend/ViewModels/CreateIRDViewModel.cs @@ -15,11 +15,11 @@ namespace MPF.Core.Frontend.ViewModels /// /// Access to the current options /// - public Frontend.Options Options + public Options Options { get => _options; } - private readonly Frontend.Options _options; + private readonly Options _options; /// /// Indicates if SelectionChanged events can be executed