From 3be2cd6c5fe58be007e649180108c6584b2bfdd5 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 16 Feb 2019 01:03:06 +0100 Subject: [PATCH] Ref T472, style --- src/blackmisc/aviation/aircraftcategory.h | 6 +++--- src/blackmisc/aviation/aircrafticaocode.cpp | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/blackmisc/aviation/aircraftcategory.h b/src/blackmisc/aviation/aircraftcategory.h index cbc28edf7..b0cb60f19 100644 --- a/src/blackmisc/aviation/aircraftcategory.h +++ b/src/blackmisc/aviation/aircraftcategory.h @@ -13,12 +13,12 @@ #define BLACKMISC_AVIATION_AIRCRAFTCATEGORY_H #include "blackmisc/db/datastore.h" -#include "blackmisc/blackmiscexport.h" +#include "blackmisc/statusmessagelist.h" #include "blackmisc/metaclass.h" #include "blackmisc/propertyindex.h" -#include "blackmisc/statusmessagelist.h" #include "blackmisc/valueobject.h" #include "blackmisc/variant.h" +#include "blackmisc/blackmiscexport.h" #include #include @@ -117,7 +117,7 @@ namespace BlackMisc //! Validate data BlackMisc::CStatusMessageList validate() const; - //! Null ICAO? + //! Null category? bool isNull() const; //! Level compare diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp index 12ec8a1d8..7e5220073 100644 --- a/src/blackmisc/aviation/aircrafticaocode.cpp +++ b/src/blackmisc/aviation/aircrafticaocode.cpp @@ -113,11 +113,11 @@ namespace BlackMisc if (this->getDesignator() == this->getUnassignedDesignator()) { return msg; } // DB ZZZZ } - if (!hasKnownDesignator()) { msg.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"Aircraft ICAO: unknown designator")); } + if (!hasKnownDesignator()) { msg.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"Aircraft ICAO: unknown designator")); } if (!hasValidCombinedType()) { msg.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"Aircraft ICAO: invalid combined type")); } - if (!hasValidWtc()) { msg.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"Aircraft ICAO: wrong WTC")); } - if (!hasManufacturer()) { msg.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"Aircraft ICAO: missing manufacturer")); } - if (!hasModelDescription()) { msg.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"Aircraft ICAO: no description")); } + if (!hasValidWtc()) { msg.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"Aircraft ICAO: wrong WTC")); } + if (!hasManufacturer()) { msg.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"Aircraft ICAO: missing manufacturer")); } + if (!hasModelDescription()) { msg.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, u"Aircraft ICAO: no description")); } return msg; } @@ -168,7 +168,7 @@ namespace BlackMisc else if (this->hasValidCombinedType()) { if (this->getEnginesCount() == otherCode.getEnginesCount()) { score += 2; } - if (this->getEngineType() == otherCode.getEngineType()) { score += 2; } + if (this->getEngineType() == otherCode.getEngineType()) { score += 2; } if (this->getAircraftType() == otherCode.getAircraftType()) { score += 2; } CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Added combined code parts: %1").arg(score)); } @@ -339,7 +339,7 @@ namespace BlackMisc if (!this->hasModelIataDescription() && !this->hasModelSwiftDescription()) { return this->getModelDescription(); } QStringList combined({ this->getModelDescription() }); - if (this->hasModelIataDescription()) { combined.append(this->getModelIataDescription()); } + if (this->hasModelIataDescription()) { combined.append(this->getModelIataDescription()); } if (this->hasModelSwiftDescription()) { combined.append(this->getModelSwiftDescription()); } combined.removeDuplicates(); return combined.join(", ");