From 5da74faad0fa4b12d16cfe17fb6fef5f5f675307 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 16 Jun 2019 20:21:24 +0200
Subject: [PATCH] Ref T684, renamed to "getAirlinePrefix()", as airline comes
 first

---
 src/blackcore/aircraftmatcher.cpp              | 4 ++--
 src/blackmisc/aviation/airlineicaocode.cpp     | 2 +-
 src/blackmisc/aviation/airlineicaocodelist.cpp | 2 +-
 src/blackmisc/aviation/callsign.cpp            | 8 ++++----
 src/blackmisc/aviation/callsign.h              | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp
index 110806dbc..cd2af5e75 100644
--- a/src/blackcore/aircraftmatcher.cpp
+++ b/src/blackcore/aircraftmatcher.cpp
@@ -76,7 +76,7 @@ namespace BlackCore
     {
         CMatchingUtils::addLogDetailsToList(log, callsign,
                                             QStringLiteral("Find airline designator from 1st: '%1' 2nd: '%2' callsign: '%3', use airline callsign: %4, use web service: %5").
-                                            arg(primaryIcao, secondaryIcao, callsign.getAirlineSuffix(), boolToYesNo(airlineFromCallsign), boolToYesNo(useWebServices)), getLogCategories());
+                                            arg(primaryIcao, secondaryIcao, callsign.getAirlinePrefix(), boolToYesNo(airlineFromCallsign), boolToYesNo(useWebServices)), getLogCategories());
         CAirlineIcaoCode code;
         do
         {
@@ -95,7 +95,7 @@ namespace BlackCore
             CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Two invalid airline ICAO codes (primary/secondary) '%1', '%2'").arg(primaryIcao, secondaryIcao), getLogCategories());
             if (airlineFromCallsign)
             {
-                const QString airlineSuffix = callsign.getAirlineSuffix();
+                const QString airlineSuffix = callsign.getAirlinePrefix();
                 if (CAircraftMatcher::isValidAirlineIcaoDesignator(airlineSuffix, useWebServices))
                 {
                     CMatchingUtils::addLogDetailsToList(log, callsign, QStringLiteral("Using airline from callsign '%1', suffix: '%2'").arg(callsign.toQString(), airlineSuffix), getLogCategories());
diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp
index 42bf3201d..ac166cfc2 100644
--- a/src/blackmisc/aviation/airlineicaocode.cpp
+++ b/src/blackmisc/aviation/airlineicaocode.cpp
@@ -331,7 +331,7 @@ namespace BlackMisc
         {
             if (this->hasValidDbKey()) { return *this; }
             if (callsign.isEmpty()) { return *this; }
-            const QString callsignAirline = callsign.getAirlineSuffix();
+            const QString callsignAirline = callsign.getAirlinePrefix();
             if (callsignAirline.isEmpty()) { return *this; }
             if (callsignAirline == m_designator) { return *this; }
 
diff --git a/src/blackmisc/aviation/airlineicaocodelist.cpp b/src/blackmisc/aviation/airlineicaocodelist.cpp
index 91165577d..946e53a89 100644
--- a/src/blackmisc/aviation/airlineicaocodelist.cpp
+++ b/src/blackmisc/aviation/airlineicaocodelist.cpp
@@ -192,7 +192,7 @@ namespace BlackMisc
         CAirlineIcaoCode CAirlineIcaoCodeList::findBestMatchByCallsign(const CCallsign &callsign) const
         {
             if (this->isEmpty() || callsign.isEmpty()) { return CAirlineIcaoCode(); }
-            const QString airline = callsign.getAirlineSuffix().toUpper();
+            const QString airline = callsign.getAirlinePrefix().toUpper();
             if (airline.isEmpty()) { return CAirlineIcaoCode(); }
             const CAirlineIcaoCode airlineCode = (airline.length() == 3) ?
                                                  this->findFirstByOrDefault(&CAirlineIcaoCode::getDesignator, airline) :
diff --git a/src/blackmisc/aviation/callsign.cpp b/src/blackmisc/aviation/callsign.cpp
index 96af888d3..2e6cff670 100644
--- a/src/blackmisc/aviation/callsign.cpp
+++ b/src/blackmisc/aviation/callsign.cpp
@@ -176,13 +176,13 @@ namespace BlackMisc
             return s;
         }
 
-        QString CCallsign::getAirlineSuffix() const
+        QString CCallsign::getAirlinePrefix() const
         {
             QString flightNumber;
-            return this->getAirlineSuffix(flightNumber);
+            return this->getAirlinePrefix(flightNumber);
         }
 
-        QString CCallsign::getAirlineSuffix(QString &flightNumber) const
+        QString CCallsign::getAirlinePrefix(QString &flightNumber) const
         {
             flightNumber.clear();
             if (m_callsign.length() < 3) { return {}; }
@@ -209,7 +209,7 @@ namespace BlackMisc
         {
             if (this->isAtcCallsign()) { return {}; }
             QString flightNumber;
-            const QString airline = this->getAirlineSuffix(flightNumber);
+            const QString airline = this->getAirlinePrefix(flightNumber);
             return airline.isEmpty() ? QString() : flightNumber;
         }
 
diff --git a/src/blackmisc/aviation/callsign.h b/src/blackmisc/aviation/callsign.h
index 2144bfff2..8e1034493 100644
--- a/src/blackmisc/aviation/callsign.h
+++ b/src/blackmisc/aviation/callsign.h
@@ -108,8 +108,8 @@ namespace BlackMisc
             QString getSuffix() const;
 
             //! Airline suffix (e.g. DLH1234 -> DLH) if applicable @{
-            QString getAirlineSuffix() const;
-            QString getAirlineSuffix(QString &flightNumber) const;
+            QString getAirlinePrefix() const;
+            QString getAirlinePrefix(QString &flightNumber) const;
             // @}
 
             //! Flight number (e.g. DLH1234 -> 1234) if applicable