refs #937 Resolved clazy warnings: unnecessary detaching of containers.

This commit is contained in:
Mathew Sutcliffe
2017-04-15 01:19:26 +01:00
parent ce1730b453
commit fce1513dae
25 changed files with 108 additions and 63 deletions

View File

@@ -90,7 +90,7 @@ namespace BlackMisc
QStringList remove(toUpper(modelsToBeRemoved));
remove.sort();
QSet<QString> removeSet(knownModels.toSet().intersect(remove.toSet()));
QSet<QString> removeSet(knownModels.toSet() & remove.toSet());
int c = 0;
for (const QString &model : removeSet)
{

View File

@@ -132,10 +132,11 @@ namespace BlackMisc
const QString &CVPilotRulesReader::standardMappingsDirectory()
{
//! \fixme not threadsafe
static QString directory;
if (directory.isEmpty())
{
directory = QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation).first();
directory = QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation).constFirst();
if (!directory.endsWith('/')) { directory.append('/'); }
directory.append("vPilot Files/Model Matching Rule Sets");
}