WinGui: Move some stuff around in the services library and refactor out some legacy code.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4868 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 3 insertions, 2 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 7e1c0bf41..4b5071984 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -15,7 +15,8 @@ namespace HandBrake.ApplicationServices.Utilities
     using System.Globalization;

     using System.IO;

 

-    using HandBrake.ApplicationServices.Functions;

+    using Caliburn.Micro;

+

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Interfaces;

@@ -30,7 +31,7 @@ namespace HandBrake.ApplicationServices.Utilities
         /// <summary>

         /// Backing field for the user settings service.

         /// </summary>

-        private static readonly IUserSettingService UserSettingService = ServiceManager.UserSettingService;

+        private static readonly IUserSettingService UserSettingService = IoC.Get<IUserSettingService>();

 

         /// <summary>

         /// Generate a CLI Query for an EncodeTask Model object