From 6a4cabba1e403150b2349d928b653ad498952f7a Mon Sep 17 00:00:00 2001
From: John Clemis <dudejoe870@gmail.com>
Date: Thu, 28 Jun 2018 17:47:05 -0500
Subject: [PATCH] Changes in compliance with review

---
 Ryujinx/Config.cs                             |  2 +-
 Ryujinx/Ui/GLScreen.cs                        | 32 +++++++++----------
 .../Hid => Ryujinx/Ui}/JoyConController.cs    |  2 +-
 .../Hid => Ryujinx/Ui}/JoyConKeyboard.cs      |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)
 rename {Ryujinx.HLE/Hid => Ryujinx/Ui}/JoyConController.cs (96%)
 rename {Ryujinx.HLE/Hid => Ryujinx/Ui}/JoyConKeyboard.cs (97%)

diff --git a/Ryujinx/Config.cs b/Ryujinx/Config.cs
index 3fb4504b5..7aeaeed06 100644
--- a/Ryujinx/Config.cs
+++ b/Ryujinx/Config.cs
@@ -1,5 +1,5 @@
 using OpenTK.Input;
-using Ryujinx.HLE.Input;
+using Ryujinx.UI.Input;
 using Ryujinx.HLE.Logging;
 using System;
 using System.Collections.Generic;
diff --git a/Ryujinx/Ui/GLScreen.cs b/Ryujinx/Ui/GLScreen.cs
index fde197119..6698ad40f 100644
--- a/Ryujinx/Ui/GLScreen.cs
+++ b/Ryujinx/Ui/GLScreen.cs
@@ -59,58 +59,58 @@ namespace Ryujinx
 
         private ButtonState GetGamePadButtonFromString(GamePadState GamePad, string Button) //Please make this prettier if you can.
         {
-            ButtonState result = GamePad.Buttons.A;
+            ButtonState Result = GamePad.Buttons.A;
 
             switch (Button)
             {
                 case "A":
-                    result = GamePad.Buttons.A;
+                    Result = GamePad.Buttons.A;
                     break;
                 case "B":
-                    result = GamePad.Buttons.B;
+                    Result = GamePad.Buttons.B;
                     break;
                 case "X":
-                    result = GamePad.Buttons.X;
+                    Result = GamePad.Buttons.X;
                     break;
                 case "Y":
-                    result = GamePad.Buttons.Y;
+                    Result = GamePad.Buttons.Y;
                     break;
                 case "LStick":
-                    result = GamePad.Buttons.LeftStick;
+                    Result = GamePad.Buttons.LeftStick;
                     break;
                 case "RStick":
-                    result = GamePad.Buttons.RightStick;
+                    Result = GamePad.Buttons.RightStick;
                     break;
                 case "LShoulder":
-                    result = GamePad.Buttons.LeftShoulder;
+                    Result = GamePad.Buttons.LeftShoulder;
                     break;
                 case "RShoulder":
-                    result = GamePad.Buttons.RightShoulder;
+                    Result = GamePad.Buttons.RightShoulder;
                     break;
                 case "DPadUp":
-                    result = GamePad.DPad.Up;
+                    Result = GamePad.DPad.Up;
                     break;
                 case "DPadDown":
-                    result = GamePad.DPad.Down;
+                    Result = GamePad.DPad.Down;
                     break;
                 case "DPadLeft":
-                    result = GamePad.DPad.Left;
+                    Result = GamePad.DPad.Left;
                     break;
                 case "DPadRight":
-                    result = GamePad.DPad.Right;
+                    Result = GamePad.DPad.Right;
                     break;
                 case "Start":
-                    result = GamePad.Buttons.Start;
+                    Result = GamePad.Buttons.Start;
                     break;
                 case "Back":
-                    result = GamePad.Buttons.Back;
+                    Result = GamePad.Buttons.Back;
                     break;
                 default:
                     Console.Error.WriteLine("Invalid Button Mapping \"" + Button + "\"!  Defaulting to Button A.");
                     break;
             }
 
-            return result;
+            return Result;
         }
 
         private float GetGamePadTriggerFromString(GamePadState GamePad, string Trigger)
diff --git a/Ryujinx.HLE/Hid/JoyConController.cs b/Ryujinx/Ui/JoyConController.cs
similarity index 96%
rename from Ryujinx.HLE/Hid/JoyConController.cs
rename to Ryujinx/Ui/JoyConController.cs
index 9f8f6ddd9..e525017d3 100644
--- a/Ryujinx.HLE/Hid/JoyConController.cs
+++ b/Ryujinx/Ui/JoyConController.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Ryujinx.HLE.Input
+namespace Ryujinx.UI.Input
 {
     public struct JoyConControllerLeft
     {
diff --git a/Ryujinx.HLE/Hid/JoyConKeyboard.cs b/Ryujinx/Ui/JoyConKeyboard.cs
similarity index 97%
rename from Ryujinx.HLE/Hid/JoyConKeyboard.cs
rename to Ryujinx/Ui/JoyConKeyboard.cs
index 78e76e7f0..b329d9ecd 100644
--- a/Ryujinx.HLE/Hid/JoyConKeyboard.cs
+++ b/Ryujinx/Ui/JoyConKeyboard.cs
@@ -1,4 +1,4 @@
-namespace Ryujinx.HLE.Input
+namespace Ryujinx.UI.Input
 {
     public struct JoyConKeyboardLeft
     {