flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-03 15:45:46 +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

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)
{