ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13265 from Sintendo/warnings 

Fix several minor warnings
This commit is contained in:
Tilka 2025-01-08 21:44:24 +00:00 committed by GitHub
parent ffa312f8e8 532e25be12
commit e24e107b3c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp
View File

@ -74,7 +74,7 @@ void ConfigStringChoice::OnConfigChanged()
ConfigComplexChoice::ConfigComplexChoice(const InfoVariant setting1, const InfoVariant setting2,
Config::Layer* layer)
: m_setting1(setting1), m_setting2(setting2), m_layer(layer)
: m_layer(layer), m_setting1(setting1), m_setting2(setting2)
{
connect(&Settings::Instance(), &Settings::ConfigChanged, this, &ConfigComplexChoice::Refresh);
connect(this, &QComboBox::currentIndexChanged, this, &ConfigComplexChoice::SaveValue);
@ -115,7 +115,7 @@ void ConfigComplexChoice::Reset()
void ConfigComplexChoice::SaveValue(int choice)
{
auto Set = [this, choice](auto& setting, auto& value) {
auto Set = [this](auto& setting, auto& value) {
if (m_layer != nullptr)
{
m_layer->Set(setting.GetLocation(), value);

4
Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp
View File

@ -36,7 +36,7 @@ AdvancedWidget::AdvancedWidget(GraphicsWindow* parent)
OnEmulationStateChanged(state != Core::State::Uninitialized);
});
connect(m_manual_texture_sampling, &QCheckBox::toggled,
[this, parent] { emit parent->UseFastTextureSamplingChanged(); });
[parent] { emit parent->UseFastTextureSamplingChanged(); });
OnBackendChanged();
OnEmulationStateChanged(!Core::IsUninitialized(Core::System::GetInstance()));
@ -262,7 +262,7 @@ void AdvancedWidget::ConnectWidgets()
m_dump_base_textures->setEnabled(checked);
});
connect(m_enable_graphics_mods, &QCheckBox::toggled, this,
[this](bool checked) { emit Settings::Instance().EnableGfxModsChanged(checked); });
[](bool checked) { emit Settings::Instance().EnableGfxModsChanged(checked); });
#if defined(HAVE_FFMPEG)
connect(m_dump_use_lossless, &QCheckBox::toggled, this,
[this](bool checked) { m_dump_bitrate->setEnabled(!checked); });

2
Source/UnitTests/Common/FileUtilTest.cpp
View File

@ -24,7 +24,7 @@ protected:
}
}
void SetUp()
void SetUp() override
{
if (m_parent_directory.empty())
{

2
Source/UnitTests/Core/IOS/ES/FormatsTest.cpp
View File

@ -44,7 +44,7 @@ TEST(TMDReader, Validity)
class TMDReaderTest : public ::testing::Test
{
protected:
virtual void SetUp() = 0;
void SetUp() override = 0;
// Common tests.
void TestGeneralInfo();

2
Source/UnitTests/Core/IOS/FS/FileSystemTest.cpp
View File

@ -41,7 +41,7 @@ protected:
m_fs.reset();
File::DeleteDirRecursively(m_profile_path);
}
void SetUp()
void SetUp() override
{
if (UserDirectoryCreationFailed())
{