App Services Tidyup Contd

Moving all the helper and utility classes to the gui project

10 files changed, 14 insertions, 7 deletions

diff --git a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
index 8c60024f6..bf456c859 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
@@ -24,6 +24,8 @@ namespace HandBrakeWPF.Services.Encode.Factories
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Utilities;
 
+    using HandBrakeWPF.Utilities;
+
     using AudioEncoder = HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder;
     using AudioEncoderRateType = HandBrakeWPF.Services.Encode.Model.Models.AudioEncoderRateType;
     using AudioTrack = HandBrakeWPF.Services.Encode.Model.Models.AudioTrack;
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
index e40def17f..f4d5a988e 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
@@ -16,7 +16,8 @@ namespace HandBrakeWPF.Services.Encode.Model
 
     using HandBrake.ApplicationServices.Interop.Model;
     using HandBrake.ApplicationServices.Interop.Model.Encoding;
-    using HandBrake.ApplicationServices.Utilities;
+
+    using HandBrakeWPF.Utilities;
 
     using AllowedPassthru = HandBrakeWPF.Services.Encode.Model.Models.AllowedPassthru;
     using AudioEncoder = HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder;
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
index c435e88ec..dea5f41e6 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
@@ -21,6 +21,7 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
     using HandBrake.ApplicationServices.Utilities;
 
     using HandBrakeWPF.Services.Scan.Model;
+    using HandBrakeWPF.Utilities;
 
     using Newtonsoft.Json;
 
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/ChapterMarker.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/ChapterMarker.cs
index da6979a4a..e2fdb25e3 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/ChapterMarker.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/ChapterMarker.cs
@@ -11,7 +11,7 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
 {
     using System;
 
-    using HandBrake.ApplicationServices.Utilities;
+    using HandBrakeWPF.Utilities;
 
     /// <summary>
     /// A Movie Chapter
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs
index 9f2ea9ded..b4cb45d61 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs
@@ -11,9 +11,8 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
 {
     using System;
 
-    using HandBrake.ApplicationServices.Utilities;
-
     using HandBrakeWPF.Services.Scan.Model;
+    using HandBrakeWPF.Utilities;
 
     /// <summary>
     /// Subtitle Information
diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index 4be9cc038..b19cd9df3 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -24,6 +24,7 @@ namespace HandBrakeWPF.Services.Presets.Factories
     using HandBrakeWPF.Model.Picture;

     using HandBrakeWPF.Model.Subtitles;

     using HandBrakeWPF.Services.Presets.Model;

+    using HandBrakeWPF.Utilities;

 

     using AudioEncoder = HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder;

     using AudioTrack = HandBrakeWPF.Services.Encode.Model.Models.AudioTrack;

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
index 113e02e38..78ed92090 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
@@ -11,6 +11,7 @@ namespace HandBrakeWPF.Services.Presets.Model
 {

     using HandBrakeWPF.Model.Audio;

     using HandBrakeWPF.Model.Subtitles;

+    using HandBrakeWPF.Utilities;

 

     using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;

     using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode;

@@ -23,7 +24,7 @@ namespace HandBrakeWPF.Services.Presets.Model
     /// https://github.com/Caliburn-Micro/Caliburn.Micro/issues/89

     /// https://github.com/Caliburn-Micro/Caliburn.Micro/issues/96

     /// </remarks>

-    public class Preset : HandBrake.ApplicationServices.Utilities.PropertyChangedBase  // Delibery not 

+    public class Preset : PropertyChangedBase  // Delibery not 

     {

         #region Constants and Fields

 

diff --git a/win/CS/HandBrakeWPF/Services/Queue/Model/QueueItemStatus.cs b/win/CS/HandBrakeWPF/Services/Queue/Model/QueueItemStatus.cs
index c60945abd..92eab43e1 100644
--- a/win/CS/HandBrakeWPF/Services/Queue/Model/QueueItemStatus.cs
+++ b/win/CS/HandBrakeWPF/Services/Queue/Model/QueueItemStatus.cs
@@ -7,7 +7,7 @@
 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

-namespace HandBrake.ApplicationServices.Model

+namespace HandBrakeWPF.Services.Queue.Model

 {

     using System.ComponentModel;

     using System.ComponentModel.DataAnnotations;

diff --git a/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTask.cs b/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTask.cs
index 79de64c24..572300dd6 100644
--- a/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTask.cs
+++ b/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTask.cs
@@ -10,7 +10,8 @@
 namespace HandBrakeWPF.Services.Queue.Model

 {

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Utilities;

+

+    using HandBrakeWPF.Utilities;

 

     using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;

 

diff --git a/win/CS/HandBrakeWPF/Services/Scan/Model/Subtitle.cs b/win/CS/HandBrakeWPF/Services/Scan/Model/Subtitle.cs
index 920ef711e..3cca29ab7 100644
--- a/win/CS/HandBrakeWPF/Services/Scan/Model/Subtitle.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/Model/Subtitle.cs
@@ -15,6 +15,7 @@ namespace HandBrakeWPF.Services.Scan.Model
     using HandBrake.ApplicationServices.Utilities;
 
     using HandBrakeWPF.Services.Encode.Model.Models;
+    using HandBrakeWPF.Utilities;
 
     /// <summary>
     /// An object that represents a subtitle associated with a Title, in a DVD