Merge pull request #458 from EraYaN/code-cleanup

Clean up several minor issues and add TODOs

3 files changed, 10 insertions, 10 deletions

diff --git a/MediaBrowser.Model/Dlna/SearchCriteria.cs b/MediaBrowser.Model/Dlna/SearchCriteria.cs
index 4f931d1b1..50ee4a378 100644
--- a/MediaBrowser.Model/Dlna/SearchCriteria.cs
+++ b/MediaBrowser.Model/Dlna/SearchCriteria.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Extensions;
 using System;
 using System.Text.RegularExpressions;
 
@@ -15,7 +15,7 @@ namespace MediaBrowser.Model.Dlna
         /// <param name="term">The term.</param>
         /// <param name="limit">The limit.</param>
         /// <returns>System.String[].</returns>
-        private string[] RegexSplit(string str, string term, int limit)
+        private static string[] RegexSplit(string str, string term, int limit)
         {
             return new Regex(term).Split(str, limit);
         }
@@ -26,7 +26,7 @@ namespace MediaBrowser.Model.Dlna
         /// <param name="str">The string.</param>
         /// <param name="term">The term.</param>
         /// <returns>System.String[].</returns>
-        private string[] RegexSplit(string str, string term)
+        private static string[] RegexSplit(string str, string term)
         {
             return Regex.Split(str, term, RegexOptions.IgnoreCase);
         }
@@ -35,15 +35,15 @@ namespace MediaBrowser.Model.Dlna
         {
             if (string.IsNullOrEmpty(search))
             {
-                throw new ArgumentNullException("search");
+                throw new ArgumentNullException(nameof(search));
             }
 
             SearchType = SearchType.Unknown;
 
-            String[] factors = RegexSplit(search, "(and|or)");
-            foreach (String factor in factors)
+            string[] factors = RegexSplit(search, "(and|or)");
+            foreach (string factor in factors)
             {
-                String[] subFactors = RegexSplit(factor.Trim().Trim('(').Trim(')').Trim(), "\\s", 3);
+                string[] subFactors = RegexSplit(factor.Trim().Trim('(').Trim(')').Trim(), "\\s", 3);
 
                 if (subFactors.Length == 3)
                 {
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index b4021e999..c571d8384 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -700,7 +700,7 @@ namespace MediaBrowser.Model.Dlna
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
 
             var transcodeReasons = new List<TranscodeReason>();
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index ba0ac0486..ec76d93f0 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -153,7 +153,7 @@ namespace MediaBrowser.Model.Dlna
 
             if (string.IsNullOrEmpty(baseUrl))
             {
-                throw new ArgumentNullException(baseUrl);
+                throw new ArgumentNullException(nameof(baseUrl));
             }
 
             List<string> list = new List<string>();
@@ -195,7 +195,7 @@ namespace MediaBrowser.Model.Dlna
         {
             if (string.IsNullOrEmpty(baseUrl))
             {
-                throw new ArgumentNullException(baseUrl);
+                throw new ArgumentNullException(nameof(baseUrl));
             }
 
             string extension = string.IsNullOrEmpty(Container) ? string.Empty : "." + Container;