diff --git a/src/citra_qt/camera/qt_multimedia_camera.cpp b/src/citra_qt/camera/qt_multimedia_camera.cpp index 0e977cc6e..f7c3b14d8 100644 --- a/src/citra_qt/camera/qt_multimedia_camera.cpp +++ b/src/citra_qt/camera/qt_multimedia_camera.cpp @@ -12,9 +12,8 @@ namespace Camera { -QList QtCameraSurface::supportedPixelFormats( - QAbstractVideoBuffer::HandleType handleType) const { - Q_UNUSED(handleType); +QList QtCameraSurface::supportedPixelFormats([ + [maybe_unused]] QAbstractVideoBuffer::HandleType handleType) const { return QList() << QVideoFrame::Format_ARGB32 << QVideoFrame::Format_ARGB32_Premultiplied << QVideoFrame::Format_RGB32 << QVideoFrame::Format_RGB24 << QVideoFrame::Format_RGB565 diff --git a/src/citra_qt/configuration/configure_motion_touch.cpp b/src/citra_qt/configuration/configure_motion_touch.cpp index 9ba3ca2e0..b0398a77d 100644 --- a/src/citra_qt/configuration/configure_motion_touch.cpp +++ b/src/citra_qt/configuration/configure_motion_touch.cpp @@ -168,10 +168,10 @@ void ConfigureMotionTouch::UpdateUiDisplay() { void ConfigureMotionTouch::ConnectEvents() { connect(ui->motion_provider, static_cast(&QComboBox::currentIndexChanged), this, - [this](int index) { Q_UNUSED(index); UpdateUiDisplay(); }); + [this]([[maybe_unused]] int index) { UpdateUiDisplay(); }); connect(ui->touch_provider, static_cast(&QComboBox::currentIndexChanged), this, - [this](int index) { Q_UNUSED(index); UpdateUiDisplay(); }); + [this]([[maybe_unused]] int index) { UpdateUiDisplay(); }); connect(ui->udp_test, &QPushButton::clicked, this, &ConfigureMotionTouch::OnCemuhookUDPTest); connect(ui->touch_calibration_config, &QPushButton::clicked, this, &ConfigureMotionTouch::OnConfigureTouchCalibration); diff --git a/src/citra_qt/configuration/configure_touch_from_button.cpp b/src/citra_qt/configuration/configure_touch_from_button.cpp index db222fa75..376ab6ada 100644 --- a/src/citra_qt/configuration/configure_touch_from_button.cpp +++ b/src/citra_qt/configuration/configure_touch_from_button.cpp @@ -326,8 +326,8 @@ void ConfigureTouchFromButton::OnBindingChanged(QStandardItem* item) { } } -void ConfigureTouchFromButton::OnBindingDeleted(const QModelIndex& parent, int first, int last) { - Q_UNUSED(parent); +void ConfigureTouchFromButton::OnBindingDeleted([[maybe_unused]] const QModelIndex& parent, + int first, int last) { for (int i = first; i <= last; ++i) { auto ix = binding_list_model->index(i, 0); if (!ix.isValid()) { @@ -514,8 +514,7 @@ void TouchScreenPreview::mouseMoveEvent(QMouseEvent* event) { } } -void TouchScreenPreview::leaveEvent(QEvent* event) { - Q_UNUSED(event); +void TouchScreenPreview::leaveEvent([[maybe_unused]] QEvent* event) { if (coord_label) { coord_label->clear(); } diff --git a/src/citra_qt/debugger/graphics/graphics.cpp b/src/citra_qt/debugger/graphics/graphics.cpp index 6d0914fec..1a3c0157c 100644 --- a/src/citra_qt/debugger/graphics/graphics.cpp +++ b/src/citra_qt/debugger/graphics/graphics.cpp @@ -14,8 +14,7 @@ GPUCommandStreamItemModel::GPUCommandStreamItemModel(QObject* parent) &GPUCommandStreamItemModel::OnGXCommandFinishedInternal); } -int GPUCommandStreamItemModel::rowCount(const QModelIndex& parent) const { - Q_UNUSED(parent); +int GPUCommandStreamItemModel::rowCount([[maybe_unused]] const QModelIndex& parent) const { return command_count; } diff --git a/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp b/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp index ffd1bfbfc..55ab0a98e 100644 --- a/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp +++ b/src/citra_qt/debugger/graphics/graphics_breakpoints.cpp @@ -16,13 +16,11 @@ BreakPointModel::BreakPointModel(std::shared_ptr debug_conte at_breakpoint(debug_context->at_breakpoint), active_breakpoint(debug_context->active_breakpoint) {} -int BreakPointModel::columnCount(const QModelIndex& parent) const { - Q_UNUSED(parent); +int BreakPointModel::columnCount([[maybe_unused]] const QModelIndex& parent) const { return 1; } -int BreakPointModel::rowCount(const QModelIndex& parent) const { - Q_UNUSED(parent); +int BreakPointModel::rowCount([[maybe_unused]] const QModelIndex& parent) const { return static_cast(Pica::DebugContext::Event::NumEvents); } diff --git a/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp index 1396b3b0d..af99c111c 100644 --- a/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp +++ b/src/citra_qt/debugger/graphics/graphics_cmdlists.cpp @@ -57,13 +57,11 @@ public: GPUCommandListModel::GPUCommandListModel(QObject* parent) : QAbstractListModel(parent) {} -int GPUCommandListModel::rowCount(const QModelIndex& parent) const { - Q_UNUSED(parent); +int GPUCommandListModel::rowCount([[maybe_unused]] const QModelIndex& parent) const { return static_cast(pica_trace.writes.size()); } -int GPUCommandListModel::columnCount(const QModelIndex& parent) const { - Q_UNUSED(parent); +int GPUCommandListModel::columnCount([[maybe_unused]] const QModelIndex& parent) const { return 4; } @@ -91,8 +89,8 @@ QVariant GPUCommandListModel::data(const QModelIndex& index, int role) const { return QVariant(); } -QVariant GPUCommandListModel::headerData(int section, Qt::Orientation orientation, int role) const { - Q_UNUSED(orientation); +QVariant GPUCommandListModel::headerData(int section, [[maybe_unused]] Qt::Orientation orientation, + int role) const { switch (role) { case Qt::DisplayRole: { switch (section) { diff --git a/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp index 6241dacc2..5ce5d7996 100644 --- a/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp +++ b/src/citra_qt/debugger/graphics/graphics_vertex_shader.cpp @@ -29,19 +29,17 @@ using nihstro::SwizzlePattern; GraphicsVertexShaderModel::GraphicsVertexShaderModel(GraphicsVertexShaderWidget* parent) : QAbstractTableModel(parent), par(parent) {} -int GraphicsVertexShaderModel::columnCount(const QModelIndex& parent) const { - Q_UNUSED(parent); +int GraphicsVertexShaderModel::columnCount([[maybe_unused]] const QModelIndex& parent) const { return 3; } -int GraphicsVertexShaderModel::rowCount(const QModelIndex& parent) const { - Q_UNUSED(parent); +int GraphicsVertexShaderModel::rowCount([[maybe_unused]] const QModelIndex& parent) const { return static_cast(par->info.code.size()); } -QVariant GraphicsVertexShaderModel::headerData(int section, Qt::Orientation orientation, +QVariant GraphicsVertexShaderModel::headerData(int section, + [[maybe_unused]] Qt::Orientation orientation, int role) const { - Q_UNUSED(orientation); switch (role) { case Qt::DisplayRole: { if (section == 0) { diff --git a/src/citra_qt/debugger/profiler.cpp b/src/citra_qt/debugger/profiler.cpp index 712242466..e36bc5a6f 100644 --- a/src/citra_qt/debugger/profiler.cpp +++ b/src/citra_qt/debugger/profiler.cpp @@ -112,8 +112,7 @@ MicroProfileWidget::MicroProfileWidget(QWidget* parent) : QWidget(parent) { connect(&update_timer, &QTimer::timeout, this, qOverload<>(&MicroProfileWidget::update)); } -void MicroProfileWidget::paintEvent(QPaintEvent* ev) { - Q_UNUSED(ev); +void MicroProfileWidget::paintEvent([[maybe_unused]] QPaintEvent* ev) { QPainter painter(this); // The units used by Microprofile for drawing are based in pixels on a 96 dpi display. diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index cc0264c5e..41d6ffbdb 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp @@ -754,7 +754,6 @@ void GameListPlaceholder::onUpdateThemedIcons() { image->setPixmap(QIcon::fromTheme(QStringLiteral("plus_folder")).pixmap(200)); } -void GameListPlaceholder::mouseDoubleClickEvent(QMouseEvent* event) { - Q_UNUSED(event); +void GameListPlaceholder::mouseDoubleClickEvent([[maybe_unused]] QMouseEvent* event) { emit GameListPlaceholder::AddDirectory(); } diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 9a6825422..dd846e0bd 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -2096,18 +2096,15 @@ void GMainWindow::OnMouseActivity() { ShowMouseCursor(); } -void GMainWindow::mouseMoveEvent(QMouseEvent* event) { - Q_UNUSED(event); +void GMainWindow::mouseMoveEvent([[maybe_unused]] QMouseEvent* event) { OnMouseActivity(); } -void GMainWindow::mousePressEvent(QMouseEvent* event) { - Q_UNUSED(event); +void GMainWindow::mousePressEvent([[maybe_unused]] QMouseEvent* event) { OnMouseActivity(); } -void GMainWindow::mouseReleaseEvent(QMouseEvent* event) { - Q_UNUSED(event); +void GMainWindow::mouseReleaseEvent([[maybe_unused]] QMouseEvent* event) { OnMouseActivity(); } diff --git a/src/citra_qt/util/clickable_label.cpp b/src/citra_qt/util/clickable_label.cpp index 22b517c11..2a1ea5df1 100644 --- a/src/citra_qt/util/clickable_label.cpp +++ b/src/citra_qt/util/clickable_label.cpp @@ -4,11 +4,9 @@ #include "citra_qt/util/clickable_label.h" -ClickableLabel::ClickableLabel(QWidget* parent, Qt::WindowFlags f) : QLabel(parent) { - Q_UNUSED(f); -} +ClickableLabel::ClickableLabel(QWidget* parent, [[maybe_unused]] Qt::WindowFlags f) + : QLabel(parent) {} -void ClickableLabel::mouseReleaseEvent(QMouseEvent* event) { - Q_UNUSED(event); +void ClickableLabel::mouseReleaseEvent([[maybe_unused]] QMouseEvent* event) { emit clicked(); }