Fixed most Qt 5.14 deprecation warnings

This commit is contained in:
Mat Sutcliffe
2019-12-31 00:38:59 +00:00
parent 010aaf58b5
commit 4a0d8e9864
40 changed files with 110 additions and 107 deletions

View File

@@ -91,7 +91,8 @@ namespace BlackMisc
QStringList remove(toUpper(modelsToBeRemoved));
remove.sort();
QSet<QString> removeSet(knownModels.toSet() & remove.toSet());
QSet<QString> removeSet(knownModels.begin(), knownModels.end());
removeSet &= QSet<QString>(remove.begin(), remove.end());
int c = 0;
for (const QString &model : removeSet)
{
@@ -108,7 +109,8 @@ namespace BlackMisc
QStringList keep(toUpper(modelsToBeKept));
keep.sort();
QSet<QString> removeSet(knownModels.toSet().subtract(keep.toSet()));
QSet<QString> removeSet(knownModels.begin(), knownModels.end());
removeSet.subtract(QSet<QString>(keep.begin(), keep.end()));
int c = 0;
for (const QString &model : removeSet)
{