From d67e88e59c1a2f1ac8099e5c5684de2dcaf583eb Mon Sep 17 00:00:00 2001 From: Lioncash 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_input_player.h | 49 +++++++++++++------------ 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'src/yuzu/configuration/configure_input_player.h') diff --git a/src/yuzu/configuration/configure_input_player.h b/src/yuzu/configuration/configure_input_player.h index b0e5550c5..937f77998 100644 --- a/src/yuzu/configuration/configure_input_player.h +++ b/src/yuzu/configuration/configure_input_player.h @@ -9,9 +9,10 @@ #include #include #include -#include + #include #include + #include "common/param_package.h" #include "core/settings.h" #include "input_common/main.h" @@ -36,6 +37,29 @@ public: void applyConfiguration(); private: + void OnControllerButtonClick(int i); + + /// Load configuration settings. + void loadConfiguration(); + /// Restore all buttons to their default values. + void restoreDefaults(); + /// Clear all input configuration + void ClearAll(); + + /// Update UI to reflect current configuration. + void updateButtonLabels(); + + /// Called when the button was pressed. + void handleClick(QPushButton* button, + std::function new_input_setter, + InputCommon::Polling::DeviceType type); + + /// Finish polling and configure input using the input_setter + void setPollingResult(const Common::ParamPackage& params, bool abort); + + /// Handle key press events. + void keyPressEvent(QKeyEvent* event) override; + std::unique_ptr ui; u8 player_index; @@ -77,27 +101,4 @@ private: std::array controller_color_buttons; std::array controller_colors; - - void OnControllerButtonClick(int i); - - /// Load configuration settings. - void loadConfiguration(); - /// Restore all buttons to their default values. - void restoreDefaults(); - /// Clear all input configuration - void ClearAll(); - - /// Update UI to reflect current configuration. - void updateButtonLabels(); - - /// Called when the button was pressed. - void handleClick(QPushButton* button, - std::function new_input_setter, - InputCommon::Polling::DeviceType type); - - /// Finish polling and configure input using the input_setter - void setPollingResult(const Common::ParamPackage& params, bool abort); - - /// Handle key press events. - void keyPressEvent(QKeyEvent* event) override; }; -- cgit v1.2.3