From dada05801f8198da2d5c920bfa15ee9dd6eaa0fb Mon Sep 17 00:00:00 2001 From: GPUCode Date: Sun, 2 Oct 2022 23:25:23 +0300 Subject: [PATCH] citra_qt: Fix more warnings/deprecated functions --- src/citra_qt/applets/swkbd.cpp | 6 ++-- src/citra_qt/bootmanager.cpp | 2 +- .../configuration/configure_camera.cpp | 14 ++++---- .../configuration/configure_input.cpp | 36 +++++++++---------- .../configuration/configure_motion_touch.cpp | 11 +++--- .../graphics/graphics_breakpoints.cpp | 10 +++--- .../debugger/graphics/graphics_cmdlists.cpp | 3 +- src/citra_qt/debugger/ipc/recorder.cpp | 1 + src/citra_qt/debugger/profiler.cpp | 2 +- src/citra_qt/game_list.cpp | 2 +- .../rasterizer_cache/rasterizer_cache.h | 18 +++++----- 11 files changed, 54 insertions(+), 51 deletions(-) diff --git a/src/citra_qt/applets/swkbd.cpp b/src/citra_qt/applets/swkbd.cpp index 6cfd2e5b7..ce01a8496 100644 --- a/src/citra_qt/applets/swkbd.cpp +++ b/src/citra_qt/applets/swkbd.cpp @@ -54,12 +54,12 @@ QtKeyboardDialog::QtKeyboardDialog(QWidget* parent, QtKeyboard* keyboard_) case ButtonConfig::None: break; } - connect(buttons, &QDialogButtonBox::accepted, this, [=] { Submit(); }); - connect(buttons, &QDialogButtonBox::rejected, this, [=] { + connect(buttons, &QDialogButtonBox::accepted, this, [this] { Submit(); }); + connect(buttons, &QDialogButtonBox::rejected, this, [this] { button = QtKeyboard::cancel_id; accept(); }); - connect(buttons, &QDialogButtonBox::helpRequested, this, [=] { + connect(buttons, &QDialogButtonBox::helpRequested, this, [this] { button = QtKeyboard::forgot_id; accept(); }); diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index b88b10322..79eba388d 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -617,7 +617,7 @@ void GRenderWindow::CaptureScreenshot(u32 res_scale, const QString& screenshot_p screenshot_image = QImage(QSize(layout.width, layout.height), QImage::Format_RGB32); VideoCore::RequestScreenshot( screenshot_image.bits(), - [=] { + [this, &screenshot_path] { const std::string std_screenshot_path = screenshot_path.toStdString(); if (screenshot_image.mirrored(false, true).save(screenshot_path)) { LOG_INFO(Frontend, "Screenshot saved to \"{}\"", std_screenshot_path); diff --git a/src/citra_qt/configuration/configure_camera.cpp b/src/citra_qt/configuration/configure_camera.cpp index b58ea95d3..036959e60 100644 --- a/src/citra_qt/configuration/configure_camera.cpp +++ b/src/citra_qt/configuration/configure_camera.cpp @@ -9,8 +9,6 @@ #include #include #include "citra_qt/configuration/configure_camera.h" -#include "citra_qt/uisettings.h" -#include "core/core.h" #include "core/frontend/camera/factory.h" #include "core/frontend/camera/interface.h" #include "core/hle/service/cam/cam.h" @@ -91,7 +89,7 @@ void ConfigureCamera::ConnectEvents() { SetConfiguration(); }); connect(ui->toolButton, &QToolButton::clicked, this, &ConfigureCamera::OnToolButtonClicked); - connect(ui->preview_button, &QPushButton::clicked, this, [=] { StartPreviewing(); }); + connect(ui->preview_button, &QPushButton::clicked, this, [this] { StartPreviewing(); }); connect(ui->prompt_before_load, &QCheckBox::stateChanged, this, [this](int state) { ui->camera_file->setDisabled(state == Qt::Checked); ui->toolButton->setDisabled(state == Qt::Checked); @@ -99,12 +97,12 @@ void ConfigureCamera::ConnectEvents() { ui->camera_file->setText(QString{}); } }); - connect(ui->camera_file, &QLineEdit::textChanged, this, [=] { StopPreviewing(); }); + connect(ui->camera_file, &QLineEdit::textChanged, this, [this] { StopPreviewing(); }); connect(ui->system_camera, - static_cast(&QComboBox::currentIndexChanged), this, - [=] { StopPreviewing(); }); - connect(ui->camera_flip, static_cast(&QComboBox::currentIndexChanged), - this, [=] { StopPreviewing(); }); + qOverload(&QComboBox::currentIndexChanged), this, + [this] { StopPreviewing(); }); + connect(ui->camera_flip, qOverload(&QComboBox::currentIndexChanged), + this, [this] { StopPreviewing(); }); } void ConfigureCamera::UpdateCameraMode() { diff --git a/src/citra_qt/configuration/configure_input.cpp b/src/citra_qt/configuration/configure_input.cpp index 0422c11d2..71561a3c1 100644 --- a/src/citra_qt/configuration/configure_input.cpp +++ b/src/citra_qt/configuration/configure_input.cpp @@ -204,16 +204,16 @@ ConfigureInput::ConfigureInput(QWidget* parent) }, InputCommon::Polling::DeviceType::Button); }); - connect(button_map[button_id], &QPushButton::customContextMenuRequested, + connect(button_map[button_id], &QPushButton::customContextMenuRequested, this, [=](const QPoint& menu_location) { QMenu context_menu; - context_menu.addAction(tr("Clear"), [&] { + context_menu.addAction(tr("Clear"), this, [&] { buttons_param[button_id].Clear(); button_map[button_id]->setText(tr("[not set]")); ApplyConfiguration(); Settings::SaveProfile(ui->profile->currentIndex()); }); - context_menu.addAction(tr("Restore Default"), [&] { + context_menu.addAction(tr("Restore Default"), this, [&] { buttons_param[button_id] = Common::ParamPackage{ InputCommon::GenerateKeyboardParam(Config::default_buttons[button_id])}; button_map[button_id]->setText(ButtonToText(buttons_param[button_id])); @@ -230,7 +230,7 @@ ConfigureInput::ConfigureInput(QWidget* parent) continue; analog_map_buttons[analog_id][sub_button_id]->setContextMenuPolicy( Qt::CustomContextMenu); - connect(analog_map_buttons[analog_id][sub_button_id], &QPushButton::clicked, [=]() { + connect(analog_map_buttons[analog_id][sub_button_id], &QPushButton::clicked, this, [=]() { HandleClick( analog_map_buttons[analog_id][sub_button_id], [=](const Common::ParamPackage& params) { @@ -242,15 +242,15 @@ ConfigureInput::ConfigureInput(QWidget* parent) InputCommon::Polling::DeviceType::Button); }); connect(analog_map_buttons[analog_id][sub_button_id], - &QPushButton::customContextMenuRequested, [=](const QPoint& menu_location) { + &QPushButton::customContextMenuRequested, this, [=](const QPoint& menu_location) { QMenu context_menu; - context_menu.addAction(tr("Clear"), [&] { + context_menu.addAction(tr("Clear"), this, [&] { analogs_param[analog_id].Erase(analog_sub_buttons[sub_button_id]); analog_map_buttons[analog_id][sub_button_id]->setText(tr("[not set]")); ApplyConfiguration(); Settings::SaveProfile(ui->profile->currentIndex()); }); - context_menu.addAction(tr("Restore Default"), [&] { + context_menu.addAction(tr("Restore Default"), this, [&] { Common::ParamPackage params{InputCommon::GenerateKeyboardParam( Config::default_analogs[analog_id][sub_button_id])}; SetAnalogButton(params, analogs_param[analog_id], @@ -264,7 +264,7 @@ ConfigureInput::ConfigureInput(QWidget* parent) menu_location)); }); } - connect(analog_map_stick[analog_id], &QPushButton::clicked, [=]() { + connect(analog_map_stick[analog_id], &QPushButton::clicked, this, [=]() { if (QMessageBox::information( this, tr("Information"), tr("After pressing OK, first move your joystick horizontally, " @@ -280,7 +280,7 @@ ConfigureInput::ConfigureInput(QWidget* parent) InputCommon::Polling::DeviceType::Analog); } }); - connect(analog_map_deadzone_and_modifier_slider[analog_id], &QSlider::valueChanged, [=] { + connect(analog_map_deadzone_and_modifier_slider[analog_id], &QSlider::valueChanged, this, [=] { const int slider_value = analog_map_deadzone_and_modifier_slider[analog_id]->value(); const auto engine = analogs_param[analog_id].Get("engine", ""); if (engine == "sdl" || engine == "gcpad") { @@ -299,7 +299,7 @@ ConfigureInput::ConfigureInput(QWidget* parent) // The Circle Mod button is common for both the sticks, so update the modifier settings // for both the sticks. - connect(ui->buttonCircleMod, &QPushButton::clicked, [=]() { + connect(ui->buttonCircleMod, &QPushButton::clicked, this, [=]() { HandleClick( ui->buttonCircleMod, [=](const Common::ParamPackage& params) { @@ -312,10 +312,10 @@ ConfigureInput::ConfigureInput(QWidget* parent) }, InputCommon::Polling::DeviceType::Button); }); - connect(ui->buttonCircleMod, &QPushButton::customContextMenuRequested, + connect(ui->buttonCircleMod, &QPushButton::customContextMenuRequested, this, [&](const QPoint& menu_location) { QMenu context_menu; - context_menu.addAction(tr("Clear"), [&] { + context_menu.addAction(tr("Clear"), this, [&] { for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs; analog_id++) { analogs_param[analog_id].Erase("modifier"); @@ -325,7 +325,7 @@ ConfigureInput::ConfigureInput(QWidget* parent) Settings::SaveProfile(ui->profile->currentIndex()); }); - context_menu.addAction(tr("Restore Default"), [&] { + context_menu.addAction(tr("Restore Default"), this, [&] { for (int analog_id = 0; analog_id < Settings::NativeAnalog::NumAnalogs; analog_id++) { Common::ParamPackage params{InputCommon::GenerateKeyboardParam( @@ -341,7 +341,7 @@ ConfigureInput::ConfigureInput(QWidget* parent) context_menu.exec(ui->buttonCircleMod->mapToGlobal(menu_location)); }); - connect(ui->buttonMotionTouch, &QPushButton::clicked, [this] { + connect(ui->buttonMotionTouch, &QPushButton::clicked, this, [this] { QDialog* motion_touch_dialog = new ConfigureMotionTouch(this); return motion_touch_dialog->exec(); }); @@ -356,7 +356,7 @@ ConfigureInput::ConfigureInput(QWidget* parent) connect(ui->buttonDelete, &QPushButton::clicked, this, &ConfigureInput::DeleteProfile); connect(ui->buttonRename, &QPushButton::clicked, this, &ConfigureInput::RenameProfile); - connect(ui->profile, static_cast(&QComboBox::currentIndexChanged), + connect(ui->profile, qOverload(&QComboBox::currentIndexChanged), this, [this](int i) { ApplyConfiguration(); Settings::SaveProfile(Settings::values.current_input_profile_index); @@ -365,9 +365,9 @@ ConfigureInput::ConfigureInput(QWidget* parent) }); timeout_timer->setSingleShot(true); - connect(timeout_timer.get(), &QTimer::timeout, [this]() { SetPollingResult({}, true); }); + connect(timeout_timer.get(), &QTimer::timeout, this, [this]() { SetPollingResult({}, true); }); - connect(poll_timer.get(), &QTimer::timeout, [this]() { + connect(poll_timer.get(), &QTimer::timeout, this, [this]() { Common::ParamPackage params; for (auto& poller : device_pollers) { params = poller->GetNextInput(); @@ -554,7 +554,7 @@ void ConfigureInput::AutoMap() { QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Cancel) { return; } - input_setter = [=](const Common::ParamPackage& params) { + input_setter = [this](const Common::ParamPackage& params) { MapFromButton(params); ApplyConfiguration(); Settings::SaveProfile(ui->profile->currentIndex()); diff --git a/src/citra_qt/configuration/configure_motion_touch.cpp b/src/citra_qt/configuration/configure_motion_touch.cpp index b0e8bef5b..d51d2ad4e 100644 --- a/src/citra_qt/configuration/configure_motion_touch.cpp +++ b/src/citra_qt/configuration/configure_motion_touch.cpp @@ -46,6 +46,9 @@ CalibrationConfigurationDialog::CalibrationConfigurationDialog(QWidget* parent, case CalibrationConfigurationJob::Status::Completed: text = tr("Configuration completed!"); break; + default: + LOG_ERROR(Frontend, "Unknown calibration status {}", status); + break; } QMetaObject::invokeMethod(this, "UpdateLabelText", Q_ARG(QString, text)); if (status == CalibrationConfigurationJob::Status::Completed) { @@ -99,9 +102,9 @@ ConfigureMotionTouch::ConfigureMotionTouch(QWidget* parent) "style=\"text-decoration: underline; color:#039be5;\">Learn More")); timeout_timer->setSingleShot(true); - connect(timeout_timer.get(), &QTimer::timeout, [this]() { SetPollingResult({}, true); }); + connect(timeout_timer.get(), &QTimer::timeout, this, [this]() { SetPollingResult({}, true); }); - connect(poll_timer.get(), &QTimer::timeout, [this]() { + connect(poll_timer.get(), &QTimer::timeout, this, [this]() { Common::ParamPackage params; for (auto& poller : device_pollers) { params = poller->GetNextInput(); @@ -202,7 +205,7 @@ void ConfigureMotionTouch::ConnectEvents() { connect(ui->touch_provider, static_cast(&QComboBox::currentIndexChanged), this, [this]([[maybe_unused]] int index) { UpdateUiDisplay(); }); - connect(ui->motion_controller_button, &QPushButton::clicked, [=]() { + connect(ui->motion_controller_button, &QPushButton::clicked, this, [=]() { if (QMessageBox::information(this, tr("Information"), tr("After pressing OK, press a button on the controller whose " "motion you want to track."), @@ -210,7 +213,7 @@ void ConfigureMotionTouch::ConnectEvents() { ui->motion_controller_button->setText(tr("[press button]")); ui->motion_controller_button->setFocus(); - input_setter = [=](const Common::ParamPackage& params) { + input_setter = [this](const Common::ParamPackage& params) { guid = params.Get("guid", "0"); port = params.Get("port", 0); }; diff --git a/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp b/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp index 55ab0a98e..081547ef1 100644 --- a/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp +++ b/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp @@ -9,7 +9,6 @@ #include #include "citra_qt/debugger/graphics/graphics_breakpoints.h" #include "citra_qt/debugger/graphics/graphics_breakpoints_p.h" -#include "common/assert.h" BreakPointModel::BreakPointModel(std::shared_ptr debug_context, QObject* parent) : QAbstractListModel(parent), context_weak(debug_context), @@ -60,12 +59,15 @@ QVariant BreakPointModel::data(const QModelIndex& index, int role) const { } Qt::ItemFlags BreakPointModel::flags(const QModelIndex& index) const { - if (!index.isValid()) - return 0; + if (!index.isValid()) { + return {}; + } Qt::ItemFlags flags = Qt::ItemIsEnabled; - if (index.column() == 0) + if (index.column() == 0) { flags |= Qt::ItemIsUserCheckable; + } + return flags; } diff --git a/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp index af99c111c..c34a5d153 100644 --- a/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp +++ b/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp @@ -14,7 +14,6 @@ #include #include #include "citra_qt/debugger/graphics/graphics_cmdlists.h" -#include "citra_qt/util/spinbox.h" #include "citra_qt/util/util.h" #include "common/vector_math.h" #include "core/core.h" @@ -130,7 +129,7 @@ void GPUCommandListWidget::OnCommandDoubleClicked(const QModelIndex& index) { COMMAND_IN_RANGE(command_id, texturing.texture1) || COMMAND_IN_RANGE(command_id, texturing.texture2)) { - unsigned texture_index; + [[maybe_unused]] u32 texture_index; if (COMMAND_IN_RANGE(command_id, texturing.texture0)) { texture_index = 0; } else if (COMMAND_IN_RANGE(command_id, texturing.texture1)) { diff --git a/src/citra_qt/debugger/ipc/recorder.cpp b/src/citra_qt/debugger/ipc/recorder.cpp index 1ec281ae2..b9ba70446 100644 --- a/src/citra_qt/debugger/ipc/recorder.cpp +++ b/src/citra_qt/debugger/ipc/recorder.cpp @@ -57,6 +57,7 @@ QString IPCRecorderWidget::GetStatusStr(const IPCDebugger::RequestRecord& record return tr("HLE Unimplemented"); default: UNREACHABLE(); + return QLatin1String{}; } } diff --git a/src/citra_qt/debugger/profiler.cpp b/src/citra_qt/debugger/profiler.cpp index be51e61c1..45e3aacb9 100644 --- a/src/citra_qt/debugger/profiler.cpp +++ b/src/citra_qt/debugger/profiler.cpp @@ -160,7 +160,7 @@ void MicroProfileWidget::mouseReleaseEvent(QMouseEvent* event) { } void MicroProfileWidget::wheelEvent(QWheelEvent* event) { - MicroProfileMousePosition(event->x() / x_scale, event->y() / y_scale, event->delta() / 120); + MicroProfileMousePosition(event->position().x() / x_scale, event->position().y() / y_scale, event->angleDelta().y() / 120); event->accept(); } diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index bb1ca1a59..f01e49b1f 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp @@ -170,7 +170,7 @@ GameListSearchField::GameListSearchField(GameList* parent) : QWidget{parent} { */ static bool ContainsAllWords(const QString& haystack, const QString& userinput) { const QStringList userinput_split = - userinput.split(QLatin1Char{' '}, QString::SplitBehavior::SkipEmptyParts); + userinput.split(QLatin1Char{' '}, Qt::SkipEmptyParts); return std::all_of(userinput_split.begin(), userinput_split.end(), [&haystack](const QString& s) { return haystack.contains(s); }); diff --git a/src/video_core/rasterizer_cache/rasterizer_cache.h b/src/video_core/rasterizer_cache/rasterizer_cache.h index 1a20892fc..ed592a839 100644 --- a/src/video_core/rasterizer_cache/rasterizer_cache.h +++ b/src/video_core/rasterizer_cache/rasterizer_cache.h @@ -504,12 +504,12 @@ auto RasterizerCache::GetTextureSurface(const Pica::Texture::TextureInfo& inf u32 min_width = info.width >> max_level; u32 min_height = info.height >> max_level; if (min_width % 8 != 0 || min_height % 8 != 0) { - LOG_CRITICAL(Render_OpenGL, "Texture size ({}x{}) is not multiple of 8", min_width, + LOG_CRITICAL(HW_GPU, "Texture size ({}x{}) is not multiple of 8", min_width, min_height); return nullptr; } if (info.width != (min_width << max_level) || info.height != (min_height << max_level)) { - LOG_CRITICAL(Render_OpenGL, + LOG_CRITICAL(HW_GPU, "Texture size ({}x{}) does not support required mipmap level ({})", params.width, params.height, max_level); return nullptr; @@ -524,7 +524,7 @@ auto RasterizerCache::GetTextureSurface(const Pica::Texture::TextureInfo& inf if (max_level >= 8) { // since PICA only supports texture size between 8 and 1024, there are at most eight // possible mipmap levels including the base. - LOG_CRITICAL(Render_OpenGL, "Unsupported mipmap level {}", max_level); + LOG_CRITICAL(HW_GPU, "Unsupported mipmap level {}", max_level); return nullptr; } @@ -715,8 +715,8 @@ auto RasterizerCache::GetFramebufferSurfaces(bool using_color_fb, bool using_ // Make sure that framebuffers don't overlap if both color and depth are being used if (using_color_fb && using_depth_fb && boost::icl::length(color_vp_interval & depth_vp_interval)) { - LOG_CRITICAL(Render_OpenGL, "Color and depth framebuffer memory regions overlap; " - "overlapping framebuffers not supported!"); + LOG_CRITICAL(HW_GPU, "Color and depth framebuffer memory regions overlap; " + "overlapping framebuffers not supported!"); using_depth_fb = false; } @@ -887,8 +887,8 @@ void RasterizerCache::ValidateSurface(const Surface& surface, PAddr addr, u32 // If the region was created entirely on the GPU, // assume it was a developer mistake and skip flushing. if (boost::icl::contains(dirty_regions, interval)) { - LOG_INFO(Render_OpenGL, "Region created fully on GPU and reinterpretation is " - "invalid. Skipping validation"); + LOG_INFO(HW_GPU, "Region created fully on GPU and reinterpretation is " + "invalid. Skipping validation"); validate_regions.erase(interval); continue; } @@ -1022,7 +1022,7 @@ bool RasterizerCache::NoUnimplementedReinterpretations(const Surface& surface Surface test_surface = FindMatch(surface_cache, params, ScaleMatch::Ignore, interval); if (test_surface != nullptr) { - LOG_WARNING(Render_OpenGL, "Missing pixel_format reinterpreter: {} -> {}", + LOG_WARNING(HW_GPU, "Missing pixel_format reinterpreter: {} -> {}", PixelFormatAsString(format), PixelFormatAsString(surface->pixel_format)); implemented = false; @@ -1038,7 +1038,7 @@ bool RasterizerCache::IntervalHasInvalidPixelFormat(SurfaceParams& params, Su for (const auto& set : RangeFromInterval(surface_cache, interval)) { for (const auto& surface : set.second) { if (surface->pixel_format == PixelFormat::Invalid) { - LOG_DEBUG(Render_OpenGL, "Surface {:#x} found with invalid pixel format", + LOG_DEBUG(HW_GPU, "Surface {:#x} found with invalid pixel format", surface->addr); return true; }