Core, DolphinQt, UICommon: Fix all cases of -Wrange-loop-construct in gcc 11
This commit is contained in:
parent
db02b50d2e
commit
ab252aedfa
|
@ -546,8 +546,11 @@ void BluetoothRealDevice::SaveLinkKeys()
|
|||
oss << Common::MacAddressToString(address);
|
||||
oss << '=';
|
||||
oss << std::hex;
|
||||
for (const u16& data : entry.second)
|
||||
oss << std::setfill('0') << std::setw(2) << data;
|
||||
for (u8 data : entry.second)
|
||||
{
|
||||
// We cast to u16 here in order to have it displayed as two nibbles.
|
||||
oss << std::setfill('0') << std::setw(2) << static_cast<u16>(data);
|
||||
}
|
||||
oss << std::dec << ',';
|
||||
}
|
||||
std::string config_string = oss.str();
|
||||
|
|
|
@ -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"})
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
#include <QList>
|
||||
#include <QPixmap>
|
||||
#include <string_view>
|
||||
|
||||
namespace DiscIO
|
||||
{
|
||||
|
@ -30,16 +31,16 @@ public:
|
|||
|
||||
static QPixmap GetMisc(MiscID id);
|
||||
|
||||
static QIcon GetScaledIcon(const std::string& name);
|
||||
static QIcon GetScaledThemeIcon(const std::string& name);
|
||||
static QIcon GetScaledIcon(std::string_view name);
|
||||
static QIcon GetScaledThemeIcon(std::string_view name);
|
||||
static QIcon GetAppIcon();
|
||||
|
||||
static QPixmap GetScaledPixmap(const std::string& name);
|
||||
static QPixmap GetScaledPixmap(std::string_view name);
|
||||
|
||||
private:
|
||||
Resources() {}
|
||||
static QIcon GetIcon(const QString& name, const QString& dir);
|
||||
static QPixmap GetPixmap(const QString& name, const QString& dir);
|
||||
static QIcon GetIcon(std::string_view name, const QString& dir);
|
||||
static QPixmap GetPixmap(std::string_view name, const QString& dir);
|
||||
|
||||
static QList<QPixmap> m_platforms;
|
||||
static QList<QPixmap> m_countries;
|
||||
|
|
|
@ -440,7 +440,7 @@ void GameCubePane::LoadSettings()
|
|||
|
||||
bool have_menu = false;
|
||||
|
||||
for (const std::string& dir : {USA_DIR, JAP_DIR, EUR_DIR})
|
||||
for (const std::string dir : {USA_DIR, JAP_DIR, EUR_DIR})
|
||||
{
|
||||
const auto path = DIR_SEP + dir + DIR_SEP GC_IPL;
|
||||
if (File::Exists(File::GetUserPath(D_GCUSER_IDX) + path) ||
|
||||
|
|
|
@ -45,7 +45,7 @@ GameFileCache::GameFileCache() : m_path(File::GetUserPath(D_CACHE_IDX) + "gameli
|
|||
|
||||
void GameFileCache::ForEach(std::function<void(const std::shared_ptr<const GameFile>&)> f) const
|
||||
{
|
||||
for (const std::shared_ptr<const GameFile>& item : m_cached_files)
|
||||
for (const std::shared_ptr<GameFile>& item : m_cached_files)
|
||||
f(item);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue