piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Core, DolphinQt, UICommon: Fix all cases of -Wrange-loop-construct in gcc 11

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot
2021-05-17 21:00:13 +02:00
parent db02b50d2e
commit ab252aedfa
5 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/DolphinQt/Resources.cpp
View File

@ -21,9 +21,10 @@ QList<QPixmap> Resources::m_platforms;
QList<QPixmap> Resources::m_countries;
QList<QPixmap> Resources::m_misc;
QIcon Resources::GetIcon(const QString& name, const QString& dir)
QIcon Resources::GetIcon(std::string_view name, const QString& dir)
{
QString base_path = dir + QLatin1Char{'/'} + name;
QString name_owned = QString::fromLatin1(name.data(), static_cast<int>(name.size()));
QString base_path = dir + QLatin1Char{'/'} + name_owned;
const auto dpr = QGuiApplication::primaryScreen()->devicePixelRatio();
@ -42,7 +43,7 @@ QIcon Resources::GetIcon(const QString& name, const QString& dir)
return icon;
}
QPixmap Resources::GetPixmap(const QString& name, const QString& dir)
QPixmap Resources::GetPixmap(std::string_view name, const QString& dir)
{
const auto icon = GetIcon(name, dir);
return icon.pixmap(icon.availableSizes()[0]);
@ -58,30 +59,30 @@ static QString GetResourcesDir()
return QString::fromStdString(File::GetSysDirectory() + "Resources");
}
QIcon Resources::GetScaledIcon(const std::string& name)
QIcon Resources::GetScaledIcon(std::string_view name)
{
return GetIcon(QString::fromStdString(name), GetResourcesDir());
return GetIcon(name, GetResourcesDir());
}
QIcon Resources::GetScaledThemeIcon(const std::string& name)
QIcon Resources::GetScaledThemeIcon(std::string_view name)
{
return GetIcon(QString::fromStdString(name), GetCurrentThemeDir());
return GetIcon(name, GetCurrentThemeDir());
}
QPixmap Resources::GetScaledPixmap(const std::string& name)
QPixmap Resources::GetScaledPixmap(std::string_view name)
{
return GetPixmap(QString::fromStdString(name), GetResourcesDir());
return GetPixmap(name, GetResourcesDir());
}
void Resources::Init()
{
for (const std::string& platform :
for (std::string_view platform :
{"Platform_Gamecube", "Platform_Wii", "Platform_Wad", "Platform_File"})
{
m_platforms.append(GetScaledPixmap(platform));
}
for (const std::string& country :
for (std::string_view country :
{"Flag_Europe", "Flag_Japan", "Flag_USA", "Flag_Australia", "Flag_France", "Flag_Germany",
"Flag_Italy", "Flag_Korea", "Flag_Netherlands", "Flag_Russia", "Flag_Spain", "Flag_Taiwan",
"Flag_International", "Flag_Unknown"})