From 29dad51ff7dd9595eaa2409ccf66189a26394996 Mon Sep 17 00:00:00 2001
From: Sean Kaim <sean.kaim@gmail.com>
Date: Tue, 24 Jan 2017 20:28:29 -0500
Subject: [PATCH] Remove unneccessary Converts

---
 mRemoteV1/App/Runtime.cs | 58 +++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/mRemoteV1/App/Runtime.cs b/mRemoteV1/App/Runtime.cs
index f17259b38..6cb4dfb1a 100644
--- a/mRemoteV1/App/Runtime.cs
+++ b/mRemoteV1/App/Runtime.cs
@@ -173,22 +173,20 @@ namespace mRemoteNG.App
             try
             {
                 var tagEnumeration = (IEnumerable)((ToolStripMenuItem)sender).Tag;
-                if (tagEnumeration != null)
+                if (tagEnumeration == null) return;
+                foreach (var obj in tagEnumeration)
                 {
-                    foreach (var obj in tagEnumeration)
+                    var screen1 = obj as Screen;
+                    if (screen1 != null)
                     {
-                        var screen1 = obj as Screen;
-                        if (screen1 != null)
-                        {
-                            screen = screen1;
-                        }
-                        else if (obj is DockContent)
-                        {
-                            panel = (DockContent)obj;
-                        }
+                        screen = screen1;
+                    }
+                    else if (obj is DockContent)
+                    {
+                        panel = (DockContent)obj;
                     }
-                    Screens.SendPanelToScreen(panel, screen);
                 }
+                Screens.SendPanelToScreen(panel, screen);
             }
             catch (Exception ex)
             {
@@ -283,7 +281,7 @@ namespace mRemoteNG.App
                         connectionsLoader.ConnectionFileName = GetStartupConnectionFileName();
                     }
 
-                    CreateBackupFile(Convert.ToString(connectionsLoader.ConnectionFileName));
+                    CreateBackupFile(connectionsLoader.ConnectionFileName);
                 }
 
                 connectionsLoader.UseDatabase = Settings.Default.UseSQLServer;
@@ -334,7 +332,7 @@ namespace mRemoteNG.App
                 if (ex is FileNotFoundException && !withDialog)
                 {
                     MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoadedNew, connectionsLoader.ConnectionFileName), ex, MessageClass.InformationMsg);
-                    NewConnections(Convert.ToString(connectionsLoader.ConnectionFileName));
+                    NewConnections(connectionsLoader.ConnectionFileName);
                     return;
                 }
 
@@ -389,18 +387,12 @@ namespace mRemoteNG.App
             var fileName = GetFileName(baseName);
             var directoryName = GetDirectoryName(baseName);
 
-            if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(directoryName))
-            {
-                return;
-            }
+            if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(directoryName)) return;
 
             var searchPattern = string.Format(Settings.Default.BackupFileNameFormat, fileName, "*");
             var files = Directory.GetFiles(directoryName, searchPattern);
 
-            if (files.Length <= Settings.Default.BackupFileKeepCount)
-            {
-                return;
-            }
+            if (files.Length <= Settings.Default.BackupFileKeepCount) return;
 
             Array.Sort(files);
             Array.Resize(ref files, files.Length - Settings.Default.BackupFileKeepCount);
@@ -416,10 +408,8 @@ namespace mRemoteNG.App
             var newPath = ConnectionsFileInfo.DefaultConnectionsPath + "\\" + ConnectionsFileInfo.DefaultConnectionsFile;
 #if !PORTABLE
 			var oldPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\" + Application.ProductName + "\\" + ConnectionsFileInfo.DefaultConnectionsFile;
-			if (File.Exists(oldPath))
-			{
-				return oldPath;
-			}
+            // ReSharper disable once ConvertIfStatementToReturnStatement
+			if (File.Exists(oldPath)) return oldPath;
 #endif
             return newPath;
         }
@@ -465,11 +455,11 @@ namespace mRemoteNG.App
                 if (Settings.Default.UseSQLServer)
                 {
                     connectionsSaver.SaveFormat = ConnectionsSaver.Format.SQL;
-                    connectionsSaver.SQLHost = Convert.ToString(Settings.Default.SQLHost);
-                    connectionsSaver.SQLDatabaseName = Convert.ToString(Settings.Default.SQLDatabaseName);
-                    connectionsSaver.SQLUsername = Convert.ToString(Settings.Default.SQLUser);
+                    connectionsSaver.SQLHost = Settings.Default.SQLHost;
+                    connectionsSaver.SQLDatabaseName = Settings.Default.SQLDatabaseName;
+                    connectionsSaver.SQLUsername = Settings.Default.SQLUser;
                     var cryptographyProvider = new LegacyRijndaelCryptographyProvider();
-                    connectionsSaver.SQLPassword = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.SQLPass), EncryptionKey);
+                    connectionsSaver.SQLPassword = cryptographyProvider.Decrypt(Settings.Default.SQLPass, EncryptionKey);
                 }
 
                 connectionsSaver.SaveConnections();
@@ -508,8 +498,7 @@ namespace mRemoteNG.App
 
                     saveFileDialog.Filter = string.Join("|", fileTypes.ToArray());
 
-                    if (saveFileDialog.ShowDialog(frmMain.Default) != DialogResult.OK)
-                        return;
+                    if (saveFileDialog.ShowDialog(frmMain.Default) != DialogResult.OK) return;
 
                     connectionsSave.SaveFormat = ConnectionsSaver.Format.mRXML;
                     connectionsSave.ConnectionFileName = saveFileDialog.FileName;
@@ -548,10 +537,7 @@ namespace mRemoteNG.App
             try
             {
                 var uri = new Uri("dummyscheme" + Uri.SchemeDelimiter + connectionString);
-                if (string.IsNullOrEmpty(uri.Host))
-                {
-                    return null;
-                }
+                if (string.IsNullOrEmpty(uri.Host)) return null;
 
                 var newConnectionInfo = new ConnectionInfo();
                 newConnectionInfo.CopyFrom(DefaultConnectionInfo.Instance);