diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index 4e2066ba3..6bdc4ecee 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -142,7 +142,7 @@ namespace BlackMisc const ModelType t = this->getModelType(); if (t == TypeOwnSimulatorModel || t == TypeManuallySet || t == TypeDatabaseEntry) { - if (!this->existsCorrespondingFile()) + if (!this->hasExistingCorrespondingFile()) { const CStatusMessage m = CStatusMessage(this).validationError("File '%1' not readable") << this->getFileName(); msgs.push_back(m); @@ -631,7 +631,7 @@ namespace BlackMisc return true; } - bool CAircraftModel::existsCorrespondingFile() const + bool CAircraftModel::hasExistingCorrespondingFile() const { if (!this->hasFileName()) { return false; } const QFileInfo fi(this->getFileName()); diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h index 9d416ac50..e58cdf75d 100644 --- a/src/blackmisc/simulation/aircraftmodel.h +++ b/src/blackmisc/simulation/aircraftmodel.h @@ -374,11 +374,14 @@ namespace BlackMisc // ---------------- simulator file related functions ------------------- //! File name (corresponding data for simulator, only available if representing simulator model - QString getFileName() const { return m_fileName; } + const QString &getFileName() const { return m_fileName; } //! File name? bool hasFileName() const { return !m_fileName.isEmpty(); } + //! Does the corresponding file exist? + bool hasExistingCorrespondingFile() const; + //! File name void setFileName(const QString &fileName) { m_fileName = fileName; } @@ -419,9 +422,6 @@ namespace BlackMisc //! Adjust file names to a new directory bool adjustLocalFileNames(const QString &newModelDir, const QString &stripModelDirIndicator = {}); - //! Does the corresponding file exist? - bool existsCorrespondingFile() const; - // ---------------- end file related functions -------------- //! Verify the model data diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp index d9780ad5d..74f9331e4 100644 --- a/src/blackmisc/simulation/aircraftmodellist.cpp +++ b/src/blackmisc/simulation/aircraftmodellist.cpp @@ -349,7 +349,7 @@ namespace BlackMisc { return this->findBy([](const CAircraftModel & model) { - return !model.existsCorrespondingFile(); + return !model.hasExistingCorrespondingFile(); }); } @@ -357,7 +357,7 @@ namespace BlackMisc { return this->findBy([](const CAircraftModel & model) { - return model.existsCorrespondingFile(); + return model.hasExistingCorrespondingFile(); }); }