Formatting, minor tweaks

src/blackmisc/aviation/aircrafticaocode.cpp

@@ -72,14 +72,9 @@ namespace BlackMisc
 
         QString CAircraftIcaoCode::getDesignatorDbKey() const
         {
-            if (this->isLoadedFromDb())
-            {
-                return this->getDesignator() + " " + this->getDbKeyAsStringInParentheses();
-            }
-            else
-            {
-                return this->getDesignator();
-            }
+            return (this->isLoadedFromDb()) ?
+                   this->getDesignator() % QStringLiteral(" ") % this->getDbKeyAsStringInParentheses() :
+                   this->getDesignator();
         }
 
         QString CAircraftIcaoCode::convertToQString(bool i18n) const

src/blackmisc/aviation/aircrafticaocode.h

@@ -80,8 +80,11 @@ namespace BlackMisc
             //! Designator and DB key
             QString getDesignatorDbKey() const;
 
+            //! Designator + Manufacturer
+            QString getDesignatorManufacturer() const;
+
             //! Set ICAO designator, e.g. "B737"
-            void setDesignator(const QString &icaoDesignator) { this->m_designator = icaoDesignator.trimmed().toUpper(); }
+            void setDesignator(const QString &icaoDesignator) { m_designator = icaoDesignator.trimmed().toUpper(); }
 
             //! Aircraft designator?
             bool hasDesignator() const;
@@ -99,10 +102,10 @@ namespace BlackMisc
             const QString &getIataCode() const { return m_iataCode; }
 
             //! Set IATA code
-            void setIataCode(const QString &iata) { this->m_iataCode = iata.toUpper().trimmed(); }
+            void setIataCode(const QString &iata) { m_iataCode = iata.toUpper().trimmed(); }
 
             //! Has IATA code?
-            bool hasIataCode() const { return !this->m_iataCode.isEmpty(); }
+            bool hasIataCode() const { return !m_iataCode.isEmpty(); }
 
             //! IATA code same as designator?
             bool isIataSameAsDesignator() const;
@@ -111,16 +114,16 @@ namespace BlackMisc
             const QString &getFamily() const { return m_family; }
 
             //! Set family
-            void setFamily(const QString &family) { this->m_family = family.toUpper().trimmed(); }
+            void setFamily(const QString &family) { m_family = family.toUpper().trimmed(); }
 
             //! Has family?
-            bool hasFamily() const { return !this->m_family.isEmpty(); }
+            bool hasFamily() const { return !m_family.isEmpty(); }
 
             //! Family same as designator?
             bool isFamilySameAsDesignator() const;
 
             //! Get type, e.g. "L2J"
-            const QString &getCombinedType() const { return this->m_combinedType; }
+            const QString &getCombinedType() const { return m_combinedType; }
 
             //! Combined type available?
             bool hasValidCombinedType() const;
@@ -138,7 +141,7 @@ namespace BlackMisc
             QString getAircraftType() const;
 
             //! Set type
-            void setCombinedType(const QString &type) { this->m_combinedType = type.trimmed().toUpper(); }
+            void setCombinedType(const QString &type) { m_combinedType = type.trimmed().toUpper(); }
 
             //! Get IACO model description, e.g. "A-330-200"
             const QString &getModelDescription() const { return m_modelDescription; }
@@ -159,9 +162,6 @@ namespace BlackMisc
             //! \remark * can be used as wildcard, e.g. L*J, L**
             bool matchesCombinedType(const QString &combinedType) const;
 
-            //! Designator + Manufacturer
-            QString getDesignatorManufacturer() const;
-
             //! Set the model description (ICAO description)
             void setModelDescription(const QString &modelDescription) { m_modelDescription = modelDescription.trimmed(); }
 
@@ -172,13 +172,13 @@ namespace BlackMisc
             void setModelSwiftDescription(const QString &modelDescription) { m_modelSwiftDescription = modelDescription.trimmed(); }
 
             //! Has model description?
-            bool hasModelDescription() const { return !this->m_modelDescription.isEmpty(); }
+            bool hasModelDescription() const { return !m_modelDescription.isEmpty(); }
 
             //! Has IATA model description?
-            bool hasModelIataDescription() const { return !this->m_modelIataDescription.isEmpty(); }
+            bool hasModelIataDescription() const { return !m_modelIataDescription.isEmpty(); }
 
             //! Has swift model description?
-            bool hasModelSwiftDescription() const { return !this->m_modelSwiftDescription.isEmpty(); }
+            bool hasModelSwiftDescription() const { return !m_modelSwiftDescription.isEmpty(); }
 
             //! Get manufacturer, e.g. "Airbus"
             const QString &getManufacturer() const { return m_manufacturer; }

src/blackmisc/aviation/airlineicaocode.cpp

@@ -411,23 +411,23 @@ namespace BlackMisc
                 return CAirlineIcaoCode();
             }
 
-            QString designator(json.value(prefix % QLatin1String("designator")).toString());
+            QString designator(json.value(prefix % QStringLiteral("designator")).toString());
             if (!CAirlineIcaoCode::isValidAirlineDesignator(designator))
             {
                 designator = CAirlineIcaoCode::normalizeDesignator(designator);
             }
 
-            const QString iata(json.value(prefix % QLatin1String("iata")).toString());
-            const QString telephony(json.value(prefix % QLatin1String("callsign")).toString());
-            const QString name(json.value(prefix % QLatin1String("name")).toString());
-            const QString countryIso(json.value(prefix % QLatin1String("country")).toString());
-            const QString countryName(json.value(prefix % QLatin1String("countryname")).toString());
-            const QString groupName(json.value(prefix % QLatin1String("groupname")).toString());
-            const QString groupDesignator(json.value(prefix % QLatin1String("groupdesignator")).toString());
-            const int groupId(json.value(prefix % QLatin1String("groupid")).toInt(-1));
-            const bool va = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QLatin1String("va")).toString());
-            const bool operating = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QLatin1String("operating")).toString());
-            const bool military = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QLatin1String("military")).toString());
+            const QString iata(json.value(prefix % QStringLiteral("iata")).toString());
+            const QString telephony(json.value(prefix % QStringLiteral("callsign")).toString());
+            const QString name(json.value(prefix % QStringLiteral("name")).toString());
+            const QString countryIso(json.value(prefix % QStringLiteral("country")).toString());
+            const QString countryName(json.value(prefix % QStringLiteral("countryname")).toString());
+            const QString groupName(json.value(prefix % QStringLiteral("groupname")).toString());
+            const QString groupDesignator(json.value(prefix % QStringLiteral("groupdesignator")).toString());
+            const int groupId(json.value(prefix % QStringLiteral("groupid")).toInt(-1));
+            const bool va = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QStringLiteral("va")).toString());
+            const bool operating = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QStringLiteral("operating")).toString());
+            const bool military = CDatastoreUtility::dbBoolStringToBool(json.value(prefix % QStringLiteral("military")).toString());
 
             CAirlineIcaoCode code(
                 designator, name,