From 2838e90e75d75eaf50d9006432d7963b268a25d1 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 26 Jul 2018 02:21:13 +0200 Subject: [PATCH] Ref T292, Ref T285 XPlane loader to set file timestamp correctly --- .../xplane/aircraftmodelloaderxplane.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp index ed012b211..b09135cc0 100644 --- a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp +++ b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp @@ -217,13 +217,10 @@ namespace BlackMisc aircraftIt.next(); if (CFileUtils::isExcludedDirectory(aircraftIt.fileInfo(), excludeDirectories, Qt::CaseInsensitive)) { continue; } - CAircraftModel model = extractAcfProperties(aircraftIt.filePath(), aircraftIt.fileInfo()); + CAircraftModel model = this->extractAcfProperties(aircraftIt.filePath(), aircraftIt.fileInfo()); model.setModelType(CAircraftModel::TypeOwnSimulatorModel); model.setSimulator(CSimulatorInfo::xplane()); - model.setFileName(aircraftIt.filePath()); - const QDateTime lastModifiedTs(aircraftIt.fileInfo().lastModified()); - model.setUtcTimestamp(lastModifiedTs); - model.setFileTimestamp(lastModifiedTs); + model.setFileDetailsAndTimestamp(aircraftIt.fileInfo()); model.setModelMode(CAircraftModel::Exclude); addUniqueModel(model, installedModels); @@ -345,10 +342,9 @@ namespace BlackMisc } CAircraftModel model(plane.getModelName(), CAircraftModel::TypeOwnSimulatorModel); - model.setFileName(plane.filePath); - model.setUtcTimestamp(QFileInfo(plane.filePath).lastModified()); - - CAircraftIcaoCode icao(plane.icao); + const CAircraftIcaoCode icao(plane.icao); + const QFileInfo modelFileInfo(plane.filePath); + model.setFileDetailsAndTimestamp(modelFileInfo); model.setAircraftIcaoCode(icao); CLivery livery; @@ -357,7 +353,7 @@ namespace BlackMisc livery.setAirlineIcaoCode(airline); model.setLivery(livery); - CDistributor distributor(package.name); + const CDistributor distributor(package.name); model.setDistributor(distributor); model.setSimulator(CSimulatorInfo::xplane());