From edc4bf05528c5ebf2dca3bdeb54b5fb91fb544c2 Mon Sep 17 00:00:00 2001 From: sr55 Date: Mon, 5 Jan 2015 20:35:52 +0000 Subject: WinGui: Correcting namespaces. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6687 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs | 4 ++-- .../Services/Encode/Model/Models/AllowedPassthru.cs | 2 +- .../Services/Encode/Model/Models/AudioTrack.cs | 2 +- .../Services/Encode/Model/Models/ChapterMarker.cs | 2 +- .../Services/Encode/Model/Models/DenoisePreset.cs | 2 +- .../Services/Encode/Model/Models/DenoiseTune.cs | 2 +- .../Services/Encode/Model/Models/FramerateMode.cs | 2 +- .../Services/Encode/Model/Models/OutputFormat.cs | 2 +- .../Services/Encode/Model/Models/PointToPointMode.cs | 2 +- .../Services/Encode/Model/Models/SubtitleTrack.cs | 2 +- .../Services/Encode/Model/Models/SubtitleType.cs | 2 +- win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs | 2 +- win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Subtitle.cs | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) (limited to 'win/CS/HandBrake.ApplicationServices/Services') diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs index 8748ddbc6..d5c62794d 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs @@ -15,13 +15,13 @@ namespace HandBrake.ApplicationServices.Services.Encode.Model using Caliburn.Micro; - using HandBrake.ApplicationServices.Model.Encoding; + using HandBrake.ApplicationServices.Services.Encode.Model.Models; using HandBrake.Interop.Model; using HandBrake.Interop.Model.Encoding; using HandBrake.Interop.Model.Encoding.x264; using HandBrake.Interop.Model.Encoding.x265; - using OutputFormat = HandBrake.ApplicationServices.Model.Encoding.OutputFormat; + using OutputFormat = HandBrake.ApplicationServices.Services.Encode.Model.Models.OutputFormat; /// /// An Encode Task diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs index 36c4febab..7c973328c 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs @@ -7,7 +7,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.ApplicationServices.Model.Encoding +namespace HandBrake.ApplicationServices.Services.Encode.Model.Models { using HandBrake.Interop.Model.Encoding; diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs index 992d15a8a..91c9c3564 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs @@ -7,7 +7,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.ApplicationServices.Model.Encoding +namespace HandBrake.ApplicationServices.Services.Encode.Model.Models { using System; using System.ComponentModel; diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/ChapterMarker.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/ChapterMarker.cs index 1a20379f4..7f20ac6da 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/ChapterMarker.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/ChapterMarker.cs @@ -7,7 +7,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.ApplicationServices.Model.Encoding +namespace HandBrake.ApplicationServices.Services.Encode.Model.Models { using System; diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoisePreset.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoisePreset.cs index a411d19ae..1b83f0d40 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoisePreset.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoisePreset.cs @@ -7,7 +7,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.ApplicationServices.Model.Encoding +namespace HandBrake.ApplicationServices.Services.Encode.Model.Models { using System.ComponentModel.DataAnnotations; diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoiseTune.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoiseTune.cs index 2fd13cfca..745039a35 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoiseTune.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoiseTune.cs @@ -7,7 +7,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.ApplicationServices.Model.Encoding +namespace HandBrake.ApplicationServices.Services.Encode.Model.Models { using System.ComponentModel.DataAnnotations; diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/FramerateMode.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/FramerateMode.cs index 6392578a6..542fb6b4e 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/FramerateMode.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/FramerateMode.cs @@ -7,7 +7,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.ApplicationServices.Model.Encoding +namespace HandBrake.ApplicationServices.Services.Encode.Model.Models { /// /// The Mode of Video Encoding. CFR, VFR, PFR diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/OutputFormat.cs index 828746f17..d36071b73 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/OutputFormat.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/OutputFormat.cs @@ -7,7 +7,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.ApplicationServices.Model.Encoding +namespace HandBrake.ApplicationServices.Services.Encode.Model.Models { using System.ComponentModel; using System.ComponentModel.DataAnnotations; diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/PointToPointMode.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/PointToPointMode.cs index df0bc437c..17d2316cb 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/PointToPointMode.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/PointToPointMode.cs @@ -7,7 +7,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.ApplicationServices.Model.Encoding +namespace HandBrake.ApplicationServices.Services.Encode.Model.Models { using System.ComponentModel.DataAnnotations; diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleTrack.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleTrack.cs index 7be5dd3b9..e37bf26c5 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleTrack.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleTrack.cs @@ -7,7 +7,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.ApplicationServices.Model.Encoding +namespace HandBrake.ApplicationServices.Services.Encode.Model.Models { using System; diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleType.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleType.cs index a249060b5..1262220e0 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleType.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleType.cs @@ -7,7 +7,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -namespace HandBrake.ApplicationServices.Model.Encoding +namespace HandBrake.ApplicationServices.Services.Encode.Model.Models { using System.ComponentModel; diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs index 45851c76f..972924a50 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs @@ -31,7 +31,7 @@ namespace HandBrake.ApplicationServices.Services.Scan using ScanProgressEventArgs = HandBrake.Interop.EventArgs.ScanProgressEventArgs; using Size = System.Drawing.Size; using Subtitle = HandBrake.ApplicationServices.Services.Scan.Model.Subtitle; - using SubtitleType = HandBrake.ApplicationServices.Model.Encoding.SubtitleType; + using SubtitleType = HandBrake.ApplicationServices.Services.Encode.Model.Models.SubtitleType; using Title = HandBrake.ApplicationServices.Services.Scan.Model.Title; /// diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Subtitle.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Subtitle.cs index 3da9e4a2e..187ac682a 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Subtitle.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/Model/Subtitle.cs @@ -12,7 +12,7 @@ namespace HandBrake.ApplicationServices.Services.Scan.Model using System; using System.Xml.Serialization; - using HandBrake.ApplicationServices.Model.Encoding; + using HandBrake.ApplicationServices.Services.Encode.Model.Models; using HandBrake.ApplicationServices.Utilities; /// -- cgit v1.2.3