From b65456b958f64dee6215962b11430f57f89dd5a8 Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Fri, 28 Aug 2020 13:14:19 -0400
Subject: [PATCH] applets/controller: Resolve several compiler warnings
Resolves -Wsign-compare and -Wunused-variable
---
src/core/frontend/applets/controller.cpp | 3 ++-
src/yuzu/applets/controller.cpp | 12 ++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cpp
index 31a5cb2cc6..4505da7580 100644
--- a/src/core/frontend/applets/controller.cpp
+++ b/src/core/frontend/applets/controller.cpp
@@ -29,7 +29,8 @@ void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callb
auto& players = Settings::values.players;
- const auto min_supported_players = parameters.enable_single_mode ? 1 : parameters.min_players;
+ const std::size_t min_supported_players =
+ parameters.enable_single_mode ? 1 : parameters.min_players;
// Disconnect Handheld first.
npad.DisconnectNPadAtIndex(8);
diff --git a/src/yuzu/applets/controller.cpp b/src/yuzu/applets/controller.cpp
index c960eb3dde..9d45f2a01e 100644
--- a/src/yuzu/applets/controller.cpp
+++ b/src/yuzu/applets/controller.cpp
@@ -289,11 +289,9 @@ void QtControllerSelectorDialog::CallConfigureInputDialog() {
void QtControllerSelectorDialog::CheckIfParametersMet() {
// Here, we check and validate the current configuration against all applicable parameters.
- const auto& players = Settings::values.players;
-
- const auto num_connected_players =
+ const auto num_connected_players = static_cast<int>(
std::count_if(player_groupboxes.begin(), player_groupboxes.end(),
- [this](const QGroupBox* player) { return player->isChecked(); });
+ [this](const QGroupBox* player) { return player->isChecked(); }));
const auto min_supported_players = parameters.enable_single_mode ? 1 : parameters.min_players;
const auto max_supported_players = parameters.enable_single_mode ? 1 : parameters.max_players;
@@ -489,7 +487,8 @@ void QtControllerSelectorDialog::UpdateLEDPattern(std::size_t player_index) {
}
void QtControllerSelectorDialog::UpdateBorderColor(std::size_t player_index) {
- if (!parameters.enable_border_color || player_index >= parameters.max_players ||
+ if (!parameters.enable_border_color ||
+ player_index >= static_cast<std::size_t>(parameters.max_players) ||
player_groupboxes[player_index]->styleSheet().contains(QStringLiteral("QGroupBox"))) {
return;
}
@@ -506,7 +505,8 @@ void QtControllerSelectorDialog::UpdateBorderColor(std::size_t player_index) {
}
void QtControllerSelectorDialog::SetExplainText(std::size_t player_index) {
- if (!parameters.enable_explain_text || player_index >= parameters.max_players) {
+ if (!parameters.enable_explain_text ||
+ player_index >= static_cast<std::size_t>(parameters.max_players)) {
return;
}