flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-06 01:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed most Qt 5.14 deprecation warnings

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackmisc/aviation/aircraftcategorylist.cpp
View File

@@ -61,7 +61,7 @@ namespace BlackMisc
{
const QSet<QString> levels = this->getLevelStrings();
if (levels.isEmpty()) {return {}; }
return levels.toList().join(separator);
return levels.values().join(separator);
}
QList<int> CAircraftCategoryList::getFirstLevels() const
@@ -72,7 +72,7 @@ namespace BlackMisc
levels.insert(category.getFirstLevel());
}
levels.remove(0);
QList<int> ll = levels.toList();
QList<int> ll = levels.values();
std::sort(ll.begin(), ll.end());
return ll;
}
@@ -85,7 +85,7 @@ namespace BlackMisc
levels.insert(category.getSecondLevel());
}
levels.remove(0);
QList<int> ll = levels.toList();
QList<int> ll = levels.values();
std::sort(ll.begin(), ll.end());
return ll;
}

2
src/blackmisc/aviation/airportlist.cpp
View File

@@ -110,7 +110,7 @@ namespace BlackMisc
locations.insert(airport.getLocation());
}
QStringList locs = locations.toList();
QStringList locs = locations.values();
if (sorted) { locs.sort(); }
return locs;
}

6
src/blackmisc/aviation/flightplan.cpp
View File

@@ -906,9 +906,9 @@ namespace BlackMisc
{
static const QStringList e = []
{
QSet<QString> el(CFlightPlan::faaEquipmentCodes().toSet());
el.unite(CFlightPlan::squawkBoxEquipmentCodes().toSet());
return el.toList();
QSet<QString> el(CFlightPlan::faaEquipmentCodes().begin(), CFlightPlan::faaEquipmentCodes().end());
el.unite(QSet<QString>(CFlightPlan::squawkBoxEquipmentCodes().begin(), CFlightPlan::squawkBoxEquipmentCodes().end()));
return el.values();
}();
return e;
}

4
src/blackmisc/datacache.cpp
View File

@@ -420,7 +420,7 @@ namespace BlackMisc
auto deferrals = fromJson(json.value("deferrals").toArray());
m_admittedValues.unite(m_admittedQueue);
if (updateUuid) { m_admittedQueue.clear(); }
else if (! m_admittedQueue.isEmpty()) { m_admittedQueue.intersect(QSet<QString>::fromList(m_timestamps.keys())); }
else if (! m_admittedQueue.isEmpty()) { m_admittedQueue.intersect(QSet<QString>(m_timestamps.keyBegin(), m_timestamps.keyEnd())); }
for (const auto &key : m_timestamps.keys()) // clazy:exclude=container-anti-pattern,range-loop
{
@@ -548,7 +548,7 @@ namespace BlackMisc
QMutexLocker lock(&m_mutex);
Q_ASSERT(m_updateInProgress);
return QSet<QString>::fromList(m_timestamps.keys());
return QSet<QString>(m_timestamps.keyBegin(), m_timestamps.keyEnd());
}
const QMap<QString, qint64> &CDataCacheRevision::newerTimestamps() const

2
src/blackmisc/fileutils.cpp
View File

@@ -407,7 +407,7 @@ namespace BlackMisc
auto it = std::max_element(files.cbegin(), files.cend(), [](const QFileInfo & a, const QFileInfo & b)
{
return a.created() < b.created();
return a.birthTime() < b.birthTime();
});
return *it;
}

16
src/blackmisc/logpattern.cpp
View File

@@ -101,14 +101,16 @@ namespace BlackMisc
{
if (categories.size() == 0) { return empty(); }
if (categories.size() == 1) { return exactMatch(categories[0]); }
return { AnyOf, QSet<QString>::fromList(categories.toQStringList()) };
const QStringList strList = categories.toQStringList();
return { AnyOf, QSet<QString>(strList.begin(), strList.end()) };
}
CLogPattern CLogPattern::allOf(const CLogCategoryList &categories)
{
if (categories.size() == 0) { return {}; }
if (categories.size() == 1) { return exactMatch(categories[0]); }
return { AllOf, QSet<QString>::fromList(categories.toQStringList()) };
const QStringList strList = categories.toQStringList();
return { AnyOf, QSet<QString>(strList.begin(), strList.end()) };
}
CLogPattern CLogPattern::startsWith(const QString &prefix)
@@ -321,7 +323,7 @@ namespace BlackMisc
{
Q_UNUSED(i18n);
QString strategy;
QString categories = QStringList(m_strings.toList()).join("|"); // clazy:exclude=container-anti-pattern
QString categories = m_strings.values().join("|"); // clazy:exclude=container-anti-pattern
switch (m_strategy)
{
case Everything: strategy = "none"; break;
@@ -343,7 +345,7 @@ namespace BlackMisc
quint8 severities = 0;
for (auto s : m_severities) { severities |= (1 << static_cast<int>(s)); }
argument << severities << m_strategy << m_strings.toList();
argument << severities << m_strategy << m_strings.values();
}
void CLogPattern::unmarshallFromDbus(const QDBusArgument &argument)
@@ -351,7 +353,7 @@ namespace BlackMisc
quint8 severities;
QStringList strings;
argument >> severities >> m_strategy >> strings;
m_strings = strings.toSet();
m_strings = QSet<QString>(strings.begin(), strings.end());
m_severities.clear();
for (int s : { 0, 1, 2, 3 })
@@ -365,7 +367,7 @@ namespace BlackMisc
quint8 severities = 0;
for (auto s : m_severities) { severities |= (1 << static_cast<int>(s)); }
stream << severities << m_strategy << m_strings.toList();
stream << severities << m_strategy << m_strings.values();
}
void CLogPattern::unmarshalFromDataStream(QDataStream &stream)
@@ -373,7 +375,7 @@ namespace BlackMisc
quint8 severities;
QStringList strings;
stream >> severities >> m_strategy >> strings;
m_strings = strings.toSet();
m_strings = QSet<QString>(strings.begin(), strings.end());
m_severities.clear();
for (int s : { 0, 1, 2, 3 })

4
src/blackmisc/network/external/qjsonwebtoken.cpp vendored
View File

@@ -188,9 +188,9 @@ bool QJsonWebToken::setAlgorithmStr(const QString &strAlgorithm)
// set algorithm
m_strAlgorithm = strAlgorithm;
// modify header
m_jdocHeader = QJsonDocument::fromJson(QObject::trUtf8("{\"typ\": \"JWT\", \"alg\" : \"").toUtf8()
m_jdocHeader = QJsonDocument::fromJson(QObject::tr("{\"typ\": \"JWT\", \"alg\" : \"").toUtf8()
+ m_strAlgorithm.toUtf8()
+ QObject::trUtf8("\"}").toUtf8());
+ QObject::tr("\"}").toUtf8());
return true;
}

2
src/blackmisc/pq/measurementunit.h
View File

@@ -427,7 +427,7 @@ namespace BlackMisc
{
s.insert(symbol.toLower());
}
return s.toList();
return s.values();
}();
return symbols;
}

2
src/blackmisc/simulation/aircraftmodellist.cpp
View File

@@ -1762,7 +1762,7 @@ namespace BlackMisc
if (aircraftStats)
{
const CAircraftIcaoCodeList icaos = this->getAircraftIcaoCodesFromDb();
QStringList designators(icaos.allDesignators().toList());
QStringList designators(icaos.allDesignators().values());
designators.sort();
stats += sep % sep %
u"Aircraft ICAOs from DB: " % sep %

2
src/blackmisc/simulation/aircraftmodelutils.cpp
View File

@@ -70,7 +70,7 @@ namespace BlackMisc
// to HTML
QString html("<table>\n");
QStringList airlineIcaos = models.getAirlineVDesignators().toList();
QStringList airlineIcaos = models.getAirlineVDesignators().values();
airlineIcaos.sort();
airlineIcaos.push_front(colorLiveryDesignator);
airlineIcaos.push_back(emptyDesignator);

6
src/blackmisc/simulation/autopublishdata.cpp
View File

@@ -209,8 +209,8 @@ namespace BlackMisc
QSet<QString> CAutoPublishData::allModelStrings() const
{
QSet<QString> allStrings(m_modelStringVsCG.keys().toSet());
allStrings.unite(m_modelStringVsSimulatorInfo.keys().toSet());
QSet<QString> allStrings(m_modelStringVsCG.keyBegin(), m_modelStringVsCG.keyEnd());
allStrings.unite(QSet<QString>(m_modelStringVsSimulatorInfo.keyBegin(), m_modelStringVsSimulatorInfo.keyEnd()));
return allStrings;
}
@@ -287,7 +287,7 @@ namespace BlackMisc
{
const QFileInfo fi(fn.contains(dir.absolutePath()) ? fn : CFileUtils::appendFilePathsAndFixUnc(dir.absolutePath(), fn));
if (!fi.exists()) { continue; }
const QDateTime created = fi.created().toUTC();
const QDateTime created = fi.birthTime().toUTC();
if (deadline < created)
{
correctedList << fn;

4
src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
View File

@@ -371,9 +371,9 @@ namespace BlackMisc
// store all entries
const QFileInfo fileInfo(fnFixed);
QDateTime fileTimestamp(fileInfo.lastModified());
if (!fileTimestamp.isValid() || fileInfo.created() > fileTimestamp)
if (!fileTimestamp.isValid() || fileInfo.birthTime() > fileTimestamp)
{
fileTimestamp = fileInfo.created();
fileTimestamp = fileInfo.birthTime();
}
Q_ASSERT_X(fileTimestamp.isValid(), Q_FUNC_INFO, "Missing file timestamp");

16
src/blackmisc/simulation/fscommon/fscommonutil.cpp
View File

@@ -225,7 +225,7 @@ namespace BlackMisc
QStringList CFsCommonUtil::fsxSimObjectsDirPlusAddOnXmlSimObjectsPaths(const QString &simObjectsDir)
{
// finding the user settings only works on P3D machine
QStringList allPaths = CFsCommonUtil::allFsxSimObjectPaths().toList();
QStringList allPaths = CFsCommonUtil::allFsxSimObjectPaths().values();
const QString sod = CFileUtils::normalizeFilePathToQtStandard(simObjectsDir.isEmpty() ? CFsCommonUtil::fsxSimObjectsDir() : simObjectsDir);
if (!sod.isEmpty() && !allPaths.contains(sod, Qt::CaseInsensitive))
{
@@ -242,7 +242,7 @@ namespace BlackMisc
QStringList CFsCommonUtil::p3dSimObjectsDirPlusAddOnXmlSimObjectsPaths(const QString &simObjectsDir, const QString &versionHint)
{
// finding the user settings only works on P3D machine
QStringList allPaths = CFsCommonUtil::allP3dAddOnXmlSimObjectPaths(versionHint).toList();
QStringList allPaths = CFsCommonUtil::allP3dAddOnXmlSimObjectPaths(versionHint).values();
const QString sod = CFileUtils::normalizeFilePathToQtStandard(simObjectsDir.isEmpty() ? CFsCommonUtil::p3dSimObjectsDir() : simObjectsDir);
if (!sod.isEmpty() && !allPaths.contains(sod, Qt::CaseInsensitive))
{
@@ -549,10 +549,10 @@ namespace BlackMisc
QSet<QString> CFsCommonUtil::allP3dAddOnXmlSimObjectPaths(const QString &versionHint)
{
// all add-ons.cfg files
const QStringList addOnConfigFiles = CFsCommonUtil::findP3dAddOnConfigFiles(versionHint).toList();
const QStringList addOnConfigFiles = CFsCommonUtil::findP3dAddOnConfigFiles(versionHint).values();
// all PATH values in those files
const QStringList addOnPaths = CFsCommonUtil::allConfigFilesPathValues(addOnConfigFiles, true, {}).toList();
const QStringList addOnPaths = CFsCommonUtil::allConfigFilesPathValues(addOnConfigFiles, true, {}).values();
// based on all paths of all config files search the XML files
const QSet<QString> all = CFsCommonUtil::allP3dAddOnXmlSimObjectPaths(addOnPaths, true);
@@ -704,15 +704,15 @@ namespace BlackMisc
CStatusMessageList CFsCommonUtil::validateP3DSimObjectsPath(const CAircraftModelList &models, CAircraftModelList &validModels, CAircraftModelList &invalidModels, bool ignoreEmptyFileNames, int stopAtFailedFiles, bool &stopped, const QString &simulatorDir)
{
const QString simObjectsDir = simulatorDir.isEmpty() ? CFsCommonUtil::p3dSimObjectsDir() : CFsCommonUtil::p3dSimObjectsDirFromSimDir(simulatorDir);
const QSet<QString> simObjectPaths = CFsCommonUtil::p3dSimObjectsDirPlusAddOnXmlSimObjectsPaths(simObjectsDir, "v4").toSet();
return CFsCommonUtil::validateSimObjectsPath(simObjectPaths, models, validModels, invalidModels, ignoreEmptyFileNames, stopAtFailedFiles, stopped);
const QStringList simObjectPaths = CFsCommonUtil::p3dSimObjectsDirPlusAddOnXmlSimObjectsPaths(simObjectsDir, "v4");
return CFsCommonUtil::validateSimObjectsPath(QSet<QString>(simObjectPaths.begin(), simObjectPaths.end()), models, validModels, invalidModels, ignoreEmptyFileNames, stopAtFailedFiles, stopped);
}
CStatusMessageList CFsCommonUtil::validateFSXSimObjectsPath(const CAircraftModelList &models, CAircraftModelList &validModels, CAircraftModelList &invalidModels, bool ignoreEmptyFileNames, int stopAtFailedFiles, bool &stopped, const QString &simulatorDir)
{
Q_UNUSED(simulatorDir);
const QSet<QString> simObjectPaths = CFsCommonUtil::fsxSimObjectsDirPlusAddOnXmlSimObjectsPaths().toSet();
return CFsCommonUtil::validateSimObjectsPath(simObjectPaths, models, validModels, invalidModels, ignoreEmptyFileNames, stopAtFailedFiles, stopped);
const QStringList simObjectPaths = CFsCommonUtil::fsxSimObjectsDirPlusAddOnXmlSimObjectsPaths();
return CFsCommonUtil::validateSimObjectsPath(QSet<QString>(simObjectPaths.begin(), simObjectPaths.end()), models, validModels, invalidModels, ignoreEmptyFileNames, stopAtFailedFiles, stopped);
}
const QString CFsCommonUtil::airFileFilter()

6
src/blackmisc/simulation/fscommon/vpilotmodelruleset.cpp
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)
{

2
src/blackmisc/statusmessage.cpp
View File

@@ -406,7 +406,7 @@ namespace BlackMisc
if (min == SeverityDebug && max == SeverityError) { static const QString all("all severities"); return all; }
if (min == SeverityDebug) { return u"at or below " % severityToString(max); }
if (max == SeverityError) { return u"at or above " % severityToString(min); }
auto list = severities.toList();
auto list = severities.values();
std::sort(list.begin(), list.end());
QStringList ret;
std::transform(list.cbegin(), list.cend(), std::back_inserter(ret), severityToString);

2
src/blackmisc/stringutils.cpp
View File

@@ -414,7 +414,7 @@ namespace BlackMisc
{
if (set.isEmpty()) { return {}; }
if (set.size() == 1) { return *set.begin(); }
return set.toList().join(separator);
return set.values().join(separator);
}
QMap<QString, QString> parseIniValues(const QString &data)

2
src/blackmisc/valuecache.cpp
View File

@@ -527,7 +527,7 @@ namespace BlackMisc
auto values = getAllValues();
QSet<QString> files;
for (auto it = values.begin(); it != values.end(); ++it) { files.insert(dir + "/" + filenameForKey(it.key())); }
return files.toList();
return files.values();
}
void CValueCache::clearAllValues(const QString &keyPrefix)