Fixed clazy warnings: unnecessary containers and containers being detached in range-for loops.

This commit is contained in:
Mat Sutcliffe
2018-12-17 17:42:44 +00:00
parent 684ffeb671
commit 462172a87f
18 changed files with 114 additions and 139 deletions

View File

@@ -420,12 +420,12 @@ namespace BlackGui
{
ui->cb_OtherVersions->clear();
const QMap<QString, CApplicationInfo> otherVersions = CDirectoryUtils::currentApplicationDataDirectoryMapWithoutCurrentVersion();
for (const QString &directory : otherVersions.keys())
for (const auto &pair : makePairsRange(otherVersions))
{
const CApplicationInfo info(otherVersions.value(directory));
const CApplicationInfo &info(pair.second);
if (info.isNull())
{
const QString infoString = CDirectoryUtils::decodeNormalizedDirectory(directory);
const QString infoString = CDirectoryUtils::decodeNormalizedDirectory(pair.first);
ui->cb_OtherVersions->addItem(infoString);
}
else
@@ -433,7 +433,7 @@ namespace BlackGui
static const QString item("swift %1 (%2)");
ui->cb_OtherVersions->addItem(item.arg(info.getVersionString(), info.getPlatform()));
}
m_otherVersionDirs.push_back(directory);
m_otherVersionDirs.push_back(pair.first);
}
}