From 2f10e60dbfb3bf52d6a0f9c835425a988eafffb6 Mon Sep 17 00:00:00 2001
From: Sean Kaim <sean.kaim@gmail.com>
Date: Fri, 9 Sep 2016 16:39:24 -0400
Subject: [PATCH] code clean up

---
 .../UI/Controls/CustomListViewTests.cs        | 25 +++++++--------
 mRemoteV1/UI/Controls/ListView.cs             | 32 ++++++++-----------
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/mRemoteNGTests/UI/Controls/CustomListViewTests.cs b/mRemoteNGTests/UI/Controls/CustomListViewTests.cs
index 1edf9eb9..7527da8e 100644
--- a/mRemoteNGTests/UI/Controls/CustomListViewTests.cs
+++ b/mRemoteNGTests/UI/Controls/CustomListViewTests.cs
@@ -1,32 +1,29 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using mRemoteNG.Controls;
-using NUnit.Framework;
-using NUnit.Extensions.Forms;
-using System.Windows.Forms;
+using NUnit.Framework;
+using ListView = mRemoteNG.UI.Controls.ListView;
 
 namespace mRemoteNGTests.UI.Controls
 {
     public class CustomListViewTests
     {
-        mRemoteNG.Controls.ListView _listView;
+        ListView _listView;
 
         [SetUp]
         public void Setup()
         {
-            _listView = new mRemoteNG.Controls.ListView();
-            _listView.Name = "myTestListView";
-            _listView.View = System.Windows.Forms.View.Tile;
+            _listView = new ListView
+            {
+                Name = "myTestListView",
+                View = System.Windows.Forms.View.Tile
+            };
         }
 
         [TearDown]
         public void Teardown()
         {
             _listView.Dispose();
-            while (_listView.Disposing) ;
+            while (_listView.Disposing)
+            {
+            }
             _listView = null;
         }
     }
diff --git a/mRemoteV1/UI/Controls/ListView.cs b/mRemoteV1/UI/Controls/ListView.cs
index 564fd556..aa3fcddb 100644
--- a/mRemoteV1/UI/Controls/ListView.cs
+++ b/mRemoteV1/UI/Controls/ListView.cs
@@ -1,15 +1,14 @@
+using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
-using System.ComponentModel;
 
-
-namespace mRemoteNG.Controls
+namespace mRemoteNG.UI.Controls
 {
 	public class ListView : System.Windows.Forms.ListView
     {
-        Brush foreColorBrush = null;
-        Brush backColorBrush = null;
-        Pen borderPen = null;
+        Brush foreColorBrush;
+        Brush backColorBrush;
+        Pen borderPen;
 
         #region Public Properties
         [Category("Appearance"), DefaultValue(typeof(Color), "HighlightText")]
@@ -172,12 +171,9 @@ namespace mRemoteNG.Controls
 
         private void DisposeBrushesAndPens()
         {
-            if (foreColorBrush != null)
-                foreColorBrush.Dispose();
-            if (backColorBrush != null)
-                backColorBrush.Dispose();
-            if (borderPen != null)
-                borderPen.Dispose();
+            foreColorBrush?.Dispose();
+            backColorBrush?.Dispose();
+            borderPen?.Dispose();
         }
         #endregion
 			
@@ -210,14 +206,14 @@ namespace mRemoteNG.Controls
 					format.Alignment = StringAlignment.Far;
 					break;
 			}
-            
-			if (RightToLeft.ToString() != null)
-				format.FormatFlags = (StringFormatFlags) (format.FormatFlags | StringFormatFlags.DirectionRightToLeft);
+
+			if (RightToLeftLayout)
+				format.FormatFlags = format.FormatFlags | StringFormatFlags.DirectionRightToLeft;
 				
 			if (LabelWrap)
-				format.FormatFlags = (StringFormatFlags) (format.FormatFlags & ~StringFormatFlags.NoWrap);
+				format.FormatFlags = format.FormatFlags & ~StringFormatFlags.NoWrap;
 			else
-				format.FormatFlags = (StringFormatFlags) (format.FormatFlags | StringFormatFlags.NoWrap);
+				format.FormatFlags = format.FormatFlags | StringFormatFlags.NoWrap;
 			
 			return format;
 		}
@@ -258,7 +254,7 @@ namespace mRemoteNG.Controls
 
         public override string ToString()
 		{
-			return string.Format("{0}, {1}", Vertical, Horizontal);
+			return $"{Vertical}, {Horizontal}";
         }
     }