From 53bff5379144c22532affdfa8952690a5f0d5fd1 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 27 Nov 2018 05:03:26 -0500 Subject: yuzu/configure_input: Remove unused function MoveGridElement --- src/yuzu/configuration/configure_input_player.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/yuzu/configuration/configure_input_player.cpp') diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index ba6e09368..5898a065e 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -25,13 +25,6 @@ const std::array "modifier", }}; -static void MoveGridElement(QGridLayout* grid, int row_old, int column_old, int row_new, - int column_new) { - const auto item = grid->itemAtPosition(row_old, column_old); - // grid->removeItem(item); - grid->addItem(item, row_new, column_new); -} - static void LayerGridElements(QGridLayout* grid, QWidget* item, QWidget* onTopOf) { const int index1 = grid->indexOf(item); const int index2 = grid->indexOf(onTopOf); -- cgit v1.2.3 From 73a48d6523d2105854f836f70b900448ae03cd91 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 27 Nov 2018 05:04:49 -0500 Subject: yuzu/configure_input_player: Amend constructor initializer list order Orders the elements the way they would actually be initialized in. Resolves compiler warnings with gcc and clang --- src/yuzu/configuration/configure_input_player.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/yuzu/configuration/configure_input_player.cpp') diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 5898a065e..44d3d1a56 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -105,10 +105,9 @@ static QString AnalogToText(const Common::ParamPackage& param, const std::string }; ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, u8 player_index, bool debug) - : QDialog(parent), ui(std::make_unique()), - timeout_timer(std::make_unique()), poll_timer(std::make_unique()), - player_index(player_index), debug(debug) { - + : QDialog(parent), ui(std::make_unique()), player_index(player_index), + debug(debug), timeout_timer(std::make_unique()), + poll_timer(std::make_unique()) { ui->setupUi(this); setFocusPolicy(Qt::ClickFocus); -- cgit v1.2.3 From 11cf13a6e10e36714dd1a0df7365d93f3a5b5b73 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 27 Nov 2018 05:08:09 -0500 Subject: yuzu/configure_input_player: Use a lambda expression instead of std::bind std::bind is the pre-C++11 way of doing this. --- src/yuzu/configuration/configure_input_player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/yuzu/configuration/configure_input_player.cpp') diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 44d3d1a56..4a26684d8 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -307,7 +307,7 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, u8 player_index, boo for (std::size_t i = 0; i < controller_color_buttons.size(); ++i) { connect(controller_color_buttons[i], &QPushButton::clicked, this, - std::bind(&ConfigureInputPlayer::OnControllerButtonClick, this, i)); + [this, i] { OnControllerButtonClick(static_cast(i)); }); } this->loadConfiguration(); -- cgit v1.2.3 From 2a22c1b27e01f43395d035ebc017df4ba088a67c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 27 Nov 2018 05:17:11 -0500 Subject: yuzu/configure_input_player: Use std::size_t to represent the player index instead of u8 Prevents compiler warnings related to truncation when invoking the dialog. It's also extremely suspect to use a u8 value here instead of a more general type to begin with. --- src/yuzu/configuration/configure_input_player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/yuzu/configuration/configure_input_player.cpp') diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 4a26684d8..7dadd83c1 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -104,7 +104,7 @@ static QString AnalogToText(const Common::ParamPackage& param, const std::string } }; -ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, u8 player_index, bool debug) +ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_index, bool debug) : QDialog(parent), ui(std::make_unique()), player_index(player_index), debug(debug), timeout_timer(std::make_unique()), poll_timer(std::make_unique()) { -- cgit v1.2.3