From 35c685b3444e0861fd20147e6d5a584d47faa069 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 8 Mar 2017 01:17:50 +0100
Subject: [PATCH] Formatting, #825 (matching)

---
 src/blackcore/aircraftmatcher.cpp           | 24 ++++++++++-----------
 src/blackmisc/aviation/aircrafticaocode.cpp |  2 +-
 src/blackmisc/aviation/aircrafticaocode.h   |  2 +-
 src/blackmisc/aviation/livery.cpp           |  2 +-
 src/blackmisc/simulation/aircraftmodel.cpp  |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp
index 6f085dace..de68395c7 100644
--- a/src/blackcore/aircraftmatcher.cpp
+++ b/src/blackcore/aircraftmatcher.cpp
@@ -24,6 +24,7 @@
 #include <QList>
 #include <QStringList>
 #include <QtGlobal>
+#include <QStringBuilder>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
@@ -239,8 +240,7 @@ namespace BlackCore
             CMatchingUtils::addLogDetailsToList(log, callsign, QString("Using model: ICAO '%1', livery '%2', model '%3', type '%4'").
                                                 arg(model.getAircraftIcaoCode().getCombinedIcaoStringWithKey(),
                                                     model.getLivery().getCombinedCodePlusInfo(),
-                                                    model.getModelString(), model.getModelTypeAsString())
-                                               );
+                                                    model.getModelString(), model.getModelTypeAsString()));
         }
         return model;
     }
@@ -852,16 +852,16 @@ namespace BlackCore
             {
                 str += '\n';
             }
-            str += QString::number(c);
-            str += ": score: ";
-            str += QString::number(i.key());
-            str += " model: '";
-            str += m.getModelString();
-            str += "' aircraft: '";
-            str += m.getAircraftIcaoCodeDesignator();
-            str += "' livery: '";
-            str += m.getLivery().getCombinedCodePlusInfo();
-            str += "'";
+            str += QString::number(c) %
+                   QLatin1String(": score: ") %
+                   QString::number(i.key()) %
+                   QLatin1String(" model: '") %
+                   m.getModelString() %
+                   QLatin1String("' aircraft: '") %
+                   m.getAircraftIcaoCodeDesignator() %
+                   QLatin1String("' livery: '") %
+                   m.getLivery().getCombinedCodePlusInfo() %
+                   QLatin1Char('\'');
         }
         return str;
     }
diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp
index 89d48610b..cd5fb6cd3 100644
--- a/src/blackmisc/aviation/aircrafticaocode.cpp
+++ b/src/blackmisc/aviation/aircrafticaocode.cpp
@@ -116,7 +116,7 @@ namespace BlackMisc
             int score = 0;
             if (this->hasValidDesignator() && this->getDesignator() == otherCode.getDesignator())
             {
-                score += 50;
+                score += 50; // same designator
 
                 if (this->getRank() == 0) { score += 15; }
                 else if (this->getRank() == 1) { score += 12; }
diff --git a/src/blackmisc/aviation/aircrafticaocode.h b/src/blackmisc/aviation/aircrafticaocode.h
index a880eb9e9..8e4ad803d 100644
--- a/src/blackmisc/aviation/aircrafticaocode.h
+++ b/src/blackmisc/aviation/aircrafticaocode.h
@@ -251,7 +251,7 @@ namespace BlackMisc
             //! As a brief HTML summary (e.g. used in tooltips)
             QString asHtmlSummary() const;
 
-            //! Considers rank, manufacturer and family 0..90
+            //! Considers rank, manufacturer and family 0..100
             //! \remark normally used with a selected set of ICAO codes or combined types
             int calculateScore(const CAircraftIcaoCode &otherCode) const;
 
diff --git a/src/blackmisc/aviation/livery.cpp b/src/blackmisc/aviation/livery.cpp
index e204b255c..ff1347d12 100644
--- a/src/blackmisc/aviation/livery.cpp
+++ b/src/blackmisc/aviation/livery.cpp
@@ -405,7 +405,7 @@ namespace BlackMisc
             if (score == 0) { return 0; }
             if (this->isAirlineStandardLivery() && !preferColorLiveries) { score += 10; }
 
-            // overrate non airline liveries
+            // overrate non airline liveries / color liveries
             if (preferColorLiveries)
             {
                 if (this->isColorLivery() || !this->hasValidAirlineDesignator())
diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp
index 1dd602c0d..0e328cf60 100644
--- a/src/blackmisc/simulation/aircraftmodel.cpp
+++ b/src/blackmisc/simulation/aircraftmodel.cpp
@@ -126,7 +126,7 @@ namespace BlackMisc
 
         QString CAircraftModel::asHtmlSummary(const QString &separator) const
         {
-            const QString html = "Model: %1%2Aircraft ICAO: %3%4Livery: %5";
+            static const QString html = "Model: %1%2Aircraft ICAO: %3%4Livery: %5";
             return html.arg(this->getModelStringAndDbKey(), separator,
                             this->getAircraftIcaoCode().asHtmlSummary(), separator,
                             this->getLivery().asHtmlSummary());