From 06f57f29c4c61476ffa1b37bf9c844cc8910c853 Mon Sep 17 00:00:00 2001
From: triton <joao@tritao.eu>
Date: Thu, 25 Jun 2015 17:51:59 +0100
Subject: [PATCH] Formatting / code quality fixes.

---
 src/Core/Toolchains/MSVCToolchain.cs | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/Core/Toolchains/MSVCToolchain.cs b/src/Core/Toolchains/MSVCToolchain.cs
index 09e3b30d..1bede52c 100644
--- a/src/Core/Toolchains/MSVCToolchain.cs
+++ b/src/Core/Toolchains/MSVCToolchain.cs
@@ -81,7 +81,7 @@ namespace CppSharp
                 case VisualStudioVersion.Latest:
                     return 14;
                 default:
-                    throw new ArgumentOutOfRangeException("Unknown Visual Studio version");
+                    throw new Exception("Unknown Visual Studio version");
             }
         }
 
@@ -91,7 +91,7 @@ namespace CppSharp
             var includes = new List<string>();
 
             List<ToolchainVersion> vsSdks;
-            MSVCToolchain.GetVisualStudioSdks(out vsSdks);
+            GetVisualStudioSdks(out vsSdks);
 
             if (vsSdks.Count == 0)
                 throw new Exception("Could not find a valid Visual Studio toolchain");
@@ -124,7 +124,7 @@ namespace CppSharp
             }
 
             List<ToolchainVersion> windowSdks;
-            MSVCToolchain.GetWindowsSdks(out windowSdks);
+            GetWindowsSdks(out windowSdks);
 
             var windowSdk = (windowsSdkMajorVer != 0)
                 ? windowSdks.Find(version =>
@@ -264,19 +264,17 @@ namespace CppSharp
             string subKey;
             var hive = GetRegistryHive(keyPath, out subKey);
             using (var rootKey = RegistryKey.OpenBaseKey(hive, view))
+            using (var key = rootKey.OpenSubKey(subKey, writable: false))
             {
-                using (var key = rootKey.OpenSubKey(subKey, writable: false))
+                if (key == null)
+                    return false;
+
+                foreach (var subKeyName in key.GetSubKeyNames())
                 {
-                    if (key == null)
-                        return false;
-
-                    foreach (var subKeyName in key.GetSubKeyNames())
-                    {
-                        ToolchainVersion entry;
-                        if (HandleToolchainRegistrySubKey(out entry, key, valueName,
-                            subKeyName))
-                            entries.Add(entry);
-                    }
+                    ToolchainVersion entry;
+                    if (HandleToolchainRegistrySubKey(out entry, key, valueName,
+                        subKeyName))
+                        entries.Add(entry);
                 }
             }