Browse Source
Merge pull request #8940 from german77/silence
yuzu: Silence some clang warnings
pull/15/merge
bunnei
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
8 additions and
8 deletions
-
src/core/hle/service/hid/irs.cpp
-
src/yuzu/applets/qt_controller.cpp
-
src/yuzu/configuration/configure_input.cpp
-
src/yuzu/main.cpp
|
|
|
@ -542,7 +542,8 @@ Result IRS::IsIrCameraHandleValid(const Core::IrSensor::IrCameraHandle& camera_h |
|
|
|
|
|
|
|
Core::IrSensor::DeviceFormat& IRS::GetIrCameraSharedMemoryDeviceEntry( |
|
|
|
const Core::IrSensor::IrCameraHandle& camera_handle) { |
|
|
|
ASSERT_MSG(sizeof(StatusManager::device) > camera_handle.npad_id, "invalid npad_id"); |
|
|
|
const auto npad_id_max_index = static_cast<u8>(sizeof(StatusManager::device)); |
|
|
|
ASSERT_MSG(camera_handle.npad_id < npad_id_max_index, "invalid npad_id"); |
|
|
|
return shared_memory->device[camera_handle.npad_id]; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -291,7 +291,7 @@ bool QtControllerSelectorDialog::CheckIfParametersMet() { |
|
|
|
// Here, we check and validate the current configuration against all applicable parameters.
|
|
|
|
const auto num_connected_players = static_cast<int>( |
|
|
|
std::count_if(player_groupboxes.begin(), player_groupboxes.end(), |
|
|
|
[this](const QGroupBox* player) { return player->isChecked(); })); |
|
|
|
[](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; |
|
|
|
|
|
|
|
@ -163,8 +163,7 @@ void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem, |
|
|
|
[this, input_subsystem, &hid_core] { |
|
|
|
CallConfigureDialog<ConfigureRingController>(*this, input_subsystem, hid_core); |
|
|
|
}); |
|
|
|
connect(advanced, &ConfigureInputAdvanced::CallCameraDialog, |
|
|
|
[this, input_subsystem, &hid_core] { |
|
|
|
connect(advanced, &ConfigureInputAdvanced::CallCameraDialog, [this, input_subsystem] { |
|
|
|
CallConfigureDialog<ConfigureCamera>(*this, input_subsystem); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
@ -2000,7 +2000,7 @@ static bool RomFSRawCopy(QProgressDialog& dialog, const FileSys::VirtualDir& src |
|
|
|
} |
|
|
|
|
|
|
|
void GMainWindow::OnGameListRemoveInstalledEntry(u64 program_id, InstalledEntryType type) { |
|
|
|
const QString entry_type = [this, type] { |
|
|
|
const QString entry_type = [type] { |
|
|
|
switch (type) { |
|
|
|
case InstalledEntryType::Game: |
|
|
|
return tr("Contents"); |
|
|
|
@ -2097,7 +2097,7 @@ void GMainWindow::RemoveAddOnContent(u64 program_id, const QString& entry_type) |
|
|
|
|
|
|
|
void GMainWindow::OnGameListRemoveFile(u64 program_id, GameListRemoveTarget target, |
|
|
|
const std::string& game_path) { |
|
|
|
const QString question = [this, target] { |
|
|
|
const QString question = [target] { |
|
|
|
switch (target) { |
|
|
|
case GameListRemoveTarget::GlShaderCache: |
|
|
|
return tr("Delete OpenGL Transferable Shader Cache?"); |
|
|
|
|