From ec7ea4ae960e6944d794585d3ad78ca5d7998d1f Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 27 Nov 2018 05:00:56 -0500
Subject: yuzu/configure_input: Remove unnecessary includes

---
 src/yuzu/configuration/configure_mouse_advanced.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/yuzu/configuration/configure_mouse_advanced.h')

diff --git a/src/yuzu/configuration/configure_mouse_advanced.h b/src/yuzu/configuration/configure_mouse_advanced.h
index 218df2bda..057b3aa72 100644
--- a/src/yuzu/configuration/configure_mouse_advanced.h
+++ b/src/yuzu/configuration/configure_mouse_advanced.h
@@ -7,7 +7,7 @@
 #include <memory>
 #include <optional>
 #include <QDialog>
-#include <QWidget>
+
 #include "core/settings.h"
 
 class QCheckBox;
-- 
cgit v1.2.3


From d67e88e59c1a2f1ac8099e5c5684de2dcaf583eb Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 27 Nov 2018 05:02:12 -0500
Subject: yuzu/configure_input*: Move data members after function declarations

The common pattern is to put the data members after the function
interface where applicable.
---
 src/yuzu/configuration/configure_mouse_advanced.h | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/yuzu/configuration/configure_mouse_advanced.h')

diff --git a/src/yuzu/configuration/configure_mouse_advanced.h b/src/yuzu/configuration/configure_mouse_advanced.h
index 057b3aa72..e04da4bf2 100644
--- a/src/yuzu/configuration/configure_mouse_advanced.h
+++ b/src/yuzu/configuration/configure_mouse_advanced.h
@@ -28,23 +28,6 @@ public:
     void applyConfiguration();
 
 private:
-    std::unique_ptr<Ui::ConfigureMouseAdvanced> ui;
-
-    /// This will be the the setting function when an input is awaiting configuration.
-    std::optional<std::function<void(const Common::ParamPackage&)>> input_setter;
-
-    std::array<QPushButton*, Settings::NativeMouseButton::NumMouseButtons> button_map;
-    std::array<Common::ParamPackage, Settings::NativeMouseButton::NumMouseButtons> buttons_param;
-
-    std::vector<std::unique_ptr<InputCommon::Polling::DevicePoller>> device_pollers;
-
-    std::unique_ptr<QTimer> timeout_timer;
-    std::unique_ptr<QTimer> poll_timer;
-
-    /// A flag to indicate if keyboard keys are okay when configuring an input. If this is false,
-    /// keyboard events are ignored.
-    bool want_keyboard_keys = false;
-
     /// Load configuration settings.
     void loadConfiguration();
     /// Restore all buttons to their default values.
@@ -65,4 +48,21 @@ private:
 
     /// Handle key press events.
     void keyPressEvent(QKeyEvent* event) override;
+
+    std::unique_ptr<Ui::ConfigureMouseAdvanced> ui;
+
+    /// This will be the the setting function when an input is awaiting configuration.
+    std::optional<std::function<void(const Common::ParamPackage&)>> input_setter;
+
+    std::array<QPushButton*, Settings::NativeMouseButton::NumMouseButtons> button_map;
+    std::array<Common::ParamPackage, Settings::NativeMouseButton::NumMouseButtons> buttons_param;
+
+    std::vector<std::unique_ptr<InputCommon::Polling::DevicePoller>> device_pollers;
+
+    std::unique_ptr<QTimer> timeout_timer;
+    std::unique_ptr<QTimer> poll_timer;
+
+    /// A flag to indicate if keyboard keys are okay when configuring an input. If this is false,
+    /// keyboard events are ignored.
+    bool want_keyboard_keys = false;
 };
-- 
cgit v1.2.3