From 2a22c1b27e01f43395d035ebc017df4ba088a67c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 27 Nov 2018 05:17:11 -0500 Subject: [PATCH] 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 +- src/yuzu/configuration/configure_input_player.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 4a26684d86..7dadd83c1a 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()) { diff --git a/src/yuzu/configuration/configure_input_player.h b/src/yuzu/configuration/configure_input_player.h index 937f779982..7a53f6715c 100644 --- a/src/yuzu/configuration/configure_input_player.h +++ b/src/yuzu/configuration/configure_input_player.h @@ -30,7 +30,7 @@ class ConfigureInputPlayer : public QDialog { Q_OBJECT public: - explicit ConfigureInputPlayer(QWidget* parent, u8 player_index, bool debug = false); + explicit ConfigureInputPlayer(QWidget* parent, std::size_t player_index, bool debug = false); ~ConfigureInputPlayer() override; /// Save all button configurations to settings file @@ -62,7 +62,7 @@ private: std::unique_ptr ui; - u8 player_index; + std::size_t player_index; bool debug; std::unique_ptr timeout_timer;