WinGui: Fix a large number of stylecop warnings.

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

8 files changed, 12 insertions, 28 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index 296b1faa4..ed619b010 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -9,7 +9,6 @@
 

 namespace HandBrakeWPF.ViewModels

 {

-    using System;

     using System.Collections.Generic;

     using System.Collections.ObjectModel;

     using System.Collections.Specialized;

@@ -20,7 +19,6 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Parsing;

-    using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop.Model.Encoding;

 

@@ -430,7 +428,6 @@ namespace HandBrakeWPF.ViewModels
         {

             List<Audio> trackList = new List<Audio>();

 

-

             List<string> isoCodes =

                 LanguageUtilities.GetLanguageCodes(

                     this.UserSettingService.GetUserSetting<StringCollection>(UserSettingConstants.SelectedLanguages));

diff --git a/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs
index ca8901c7c..0f92c18b8 100644
--- a/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs
@@ -10,7 +10,6 @@
 namespace HandBrakeWPF.ViewModels

 {

     using System;

-    using System.Windows.Forms.VisualStyles;

     using System.Windows.Threading;

 

     using HandBrakeWPF.ViewModels.Interfaces;

diff --git a/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
index f7968fcb4..42407aadf 100644
--- a/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
@@ -20,7 +20,7 @@ namespace HandBrakeWPF.ViewModels
     /// <summary>

     /// The Simple Encoder options screen

     /// </summary>

-    public class EncoderOptionsViewModel : ViewModelBase, IEncoderOptionsViewModel, ITabInterface

+    public class EncoderOptionsViewModel : ViewModelBase, IEncoderOptionsViewModel

     {

         /// <summary>

         /// The cached options.

@@ -30,12 +30,12 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>

         /// Initializes a new instance of the <see cref="EncoderOptionsViewModel"/> class.

         /// </summary>

-        public EncoderOptionsViewModel()
-        {
-            this.Task = new EncodeTask();
-        }
-
-        /// <summary>
+        public EncoderOptionsViewModel()

+        {

+            this.Task = new EncodeTask();

+        }

+

+        /// <summary>

         /// Gets or sets the task.

         /// </summary>

         public EncodeTask Task { get; set; }

diff --git a/win/CS/HandBrakeWPF/ViewModels/ErrorViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ErrorViewModel.cs
index e6bbfe6d4..78e4867ea 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ErrorViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ErrorViewModel.cs
@@ -120,7 +120,6 @@ namespace HandBrakeWPF.ViewModels
             {

                 Console.WriteLine(e);

             }

-

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index f8a86494e..dde54a5c6 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -2039,7 +2039,6 @@ namespace HandBrakeWPF.ViewModels
             this.userSettingService.SetUserSetting(UserSettingConstants.EnableDxva, this.EnableDxvaDecoding);

             this.userSettingService.SetUserSetting(UserSettingConstants.ScalingMode, this.SelectedScalingMode);

 

-

             /* System and Logging */

             userSettingService.SetUserSetting(UserSettingConstants.ProcessPriority, this.SelectedPriority);

             userSettingService.SetUserSetting(UserSettingConstants.PreventSleep, this.PreventSleep);

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index e89ecc4cd..3347cfddd 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -415,13 +415,10 @@ namespace HandBrakeWPF.ViewModels
         /// <param name="e">

         /// The EncodeProgressEventArgs.

         /// </param>

-        private void EncodeService_EncodeStatusChanged(

-            object sender, EncodeProgressEventArgs e)

+        private void EncodeService_EncodeStatusChanged(object sender, EncodeProgressEventArgs e)

         {

             Caliburn.Micro.Execute.OnUIThread(() =>

             {

-

-

                 this.JobStatus =

                     string.Format(

                         "Encoding: Pass {0} of {1},  {2:00.00}%, FPS: {3:000.0},  Avg FPS: {4:000.0},  Time Remaining: {5},  Elapsed: {6:hh\\:mm\\:ss}",

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index 4a28438b7..467535bc3 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -13,7 +13,6 @@ namespace HandBrakeWPF.ViewModels
     using System.Collections.Specialized;

     using System.IO;

     using System.Linq;

-    using System.Windows.Controls.Primitives;

 

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

@@ -34,14 +33,14 @@ namespace HandBrakeWPF.ViewModels
         #region Constants and Fields

 

         /// <summary>

-        /// Backing field for the source subtitle tracks.

+        /// The Foreign Audio Search Track

         /// </summary>

-        private IList<Subtitle> sourceTracks;

+        private readonly Subtitle ForeignAudioSearchTrack;

 

         /// <summary>

-        /// The Foreign Audio Search Track

+        /// Backing field for the source subtitle tracks.

         /// </summary>

-        private readonly Subtitle ForeignAudioSearchTrack;

+        private IList<Subtitle> sourceTracks;

 

         #endregion

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index d12798fef..5dd4b07aa 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -14,7 +14,6 @@ namespace HandBrakeWPF.ViewModels
     using System.ComponentModel;

     using System.Globalization;

     using System.Linq;

-    using System.ServiceModel.Channels;

     using System.Windows;

 

     using Caliburn.Micro;

@@ -22,7 +21,6 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Parsing;

-    using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.ApplicationServices.Utilities;

     using HandBrake.Interop;

     using HandBrake.Interop.Model.Encoding;

@@ -477,7 +475,6 @@ namespace HandBrakeWPF.ViewModels
             }

         }

 

-

         /// <summary>

         /// Gets or sets SelectedFramerate.

         /// </summary>

@@ -619,7 +616,6 @@ namespace HandBrakeWPF.ViewModels
             }

         }

 

-

         /// <summary>

         /// Gets or sets a value indicating whether display x 264 options.

         /// </summary>

@@ -637,7 +633,6 @@ namespace HandBrakeWPF.ViewModels
             }

         }

 

-

         /// <summary>

         /// Gets or sets a value indicating whether to display qsv options.

         /// </summary>

@@ -847,7 +842,6 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>

         public BindingList<QsvPreset> QsvPresets { get; set; }

 

-

         /// <summary>

         /// Gets or sets X264Profiles.

         /// </summary>