From 0f659508eadd010dbffb1e0cb7f7826971b4b66e Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sat, 22 Jun 2024 18:19:27 +0100 Subject: [PATCH 1/3] DolphinQt: fix two -Wunused-lambda-capture warnings Also clean up signals a bit. --- Source/Core/DolphinQt/Settings.cpp | 5 ----- Source/Core/DolphinQt/Settings.h | 1 - Source/Core/DolphinQt/Settings/InterfacePane.cpp | 10 +++++----- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Source/Core/DolphinQt/Settings.cpp b/Source/Core/DolphinQt/Settings.cpp index 9cc1a1a5ab..4ab29c3e0f 100644 --- a/Source/Core/DolphinQt/Settings.cpp +++ b/Source/Core/DolphinQt/Settings.cpp @@ -354,11 +354,6 @@ void Settings::NotifyRefreshGameListComplete() emit GameListRefreshCompleted(); } -void Settings::RefreshMetadata() -{ - emit MetadataRefreshRequested(); -} - void Settings::NotifyMetadataRefreshComplete() { emit MetadataRefreshCompleted(); diff --git a/Source/Core/DolphinQt/Settings.h b/Source/Core/DolphinQt/Settings.h index 479d723e59..a99e8c7dca 100644 --- a/Source/Core/DolphinQt/Settings.h +++ b/Source/Core/DolphinQt/Settings.h @@ -104,7 +104,6 @@ public: void RefreshGameList(); void NotifyRefreshGameListStarted(); void NotifyRefreshGameListComplete(); - void RefreshMetadata(); void NotifyMetadataRefreshComplete(); void ReloadTitleDB(); bool IsAutoRefreshEnabled() const; diff --git a/Source/Core/DolphinQt/Settings/InterfacePane.cpp b/Source/Core/DolphinQt/Settings/InterfacePane.cpp index c375214bd3..42f186abee 100644 --- a/Source/Core/DolphinQt/Settings/InterfacePane.cpp +++ b/Source/Core/DolphinQt/Settings/InterfacePane.cpp @@ -235,15 +235,15 @@ void InterfacePane::ConnectLayout() connect(m_checkbox_use_builtin_title_database, &QCheckBox::toggled, &Settings::Instance(), &Settings::GameListRefreshRequested); connect(m_checkbox_use_covers, &QCheckBox::toggled, &Settings::Instance(), - &Settings::RefreshMetadata); + &Settings::MetadataRefreshRequested); connect(m_checkbox_show_debugging_ui, &QCheckBox::toggled, &Settings::Instance(), &Settings::SetDebugModeEnabled); - connect(m_combobox_theme, &QComboBox::currentIndexChanged, this, - [this](int index) { Settings::Instance().TriggerThemeChanged(); }); + connect(m_combobox_theme, &QComboBox::currentIndexChanged, &Settings::Instance(), + &Settings::ThemeChanged); connect(m_combobox_userstyle, &QComboBox::currentIndexChanged, this, &InterfacePane::OnUserStyleChanged); connect(m_combobox_language, &QComboBox::currentIndexChanged, this, - [this]() { OnLanguageChanged(); }); + &InterfacePane::OnLanguageChanged); connect(m_checkbox_top_window, &QCheckBox::toggled, &Settings::Instance(), &Settings::KeepWindowOnTopChanged); connect(m_radio_cursor_visible_movement, &ConfigRadioInt::OnSelected, &Settings::Instance(), @@ -253,7 +253,7 @@ void InterfacePane::ConnectLayout() connect(m_radio_cursor_visible_always, &ConfigRadioInt::OnSelected, &Settings::Instance(), &Settings::CursorVisibilityChanged); connect(m_checkbox_lock_mouse, &QCheckBox::toggled, &Settings::Instance(), - [this]() { Settings::Instance().LockCursorChanged(); }); + &Settings::LockCursorChanged); } void InterfacePane::UpdateShowDebuggingCheckbox() From 5c46716d28056dc41de4097efd33c89f45ae7a37 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 23 Jun 2024 01:15:59 +0100 Subject: [PATCH 2/3] DolphinQt: fix two -Wshadow-uncaptured-local warnings --- Source/Core/DolphinQt/GameList/GameList.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Source/Core/DolphinQt/GameList/GameList.cpp b/Source/Core/DolphinQt/GameList/GameList.cpp index 1003cff599..97c596b969 100644 --- a/Source/Core/DolphinQt/GameList/GameList.cpp +++ b/Source/Core/DolphinQt/GameList/GameList.cpp @@ -299,16 +299,14 @@ void GameList::MakeEmptyView() size_policy.setRetainSizeWhenHidden(true); m_empty->setSizePolicy(size_policy); - connect(&Settings::Instance(), &Settings::GameListRefreshRequested, this, - [this, refreshing_msg = refreshing_msg] { - m_empty->setText(refreshing_msg); - m_empty->setEnabled(false); - }); - connect(&Settings::Instance(), &Settings::GameListRefreshCompleted, this, - [this, empty_msg = empty_msg] { - m_empty->setText(empty_msg); - m_empty->setEnabled(true); - }); + connect(&Settings::Instance(), &Settings::GameListRefreshRequested, this, [this, refreshing_msg] { + m_empty->setText(refreshing_msg); + m_empty->setEnabled(false); + }); + connect(&Settings::Instance(), &Settings::GameListRefreshCompleted, this, [this, empty_msg] { + m_empty->setText(empty_msg); + m_empty->setEnabled(true); + }); } void GameList::resizeEvent(QResizeEvent* event) From 8e7d11d1a1c421b9c89105a33a71924c7d619ff9 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 23 Jun 2024 01:32:18 +0100 Subject: [PATCH 3/3] DolphinQt: fix -Wunused-const-variable warning --- Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp index 6c815e4a15..ad7305ac15 100644 --- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp +++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp @@ -59,8 +59,6 @@ #include "InputCommon/ControllerInterface/CoreDevice.h" #include "InputCommon/InputConfig.h" -constexpr const char* PROFILES_DIR = "Profiles/"; - MappingWindow::MappingWindow(QWidget* parent, Type type, int port_num) : QDialog(parent), m_port(port_num) {