From c899bfbea7c8af71d82d1430ab194aac4e4bc103 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 9 Mar 2019 02:00:26 +0100
Subject: [PATCH] Minor tweak remove redundant "/' and string message
 improvements

---
 src/blackcore/aircraftmatcher.cpp             |  3 ++-
 .../simulation/aircraftmatchersetup.cpp       |  4 ++--
 src/blackmisc/stringutils.cpp                 | 21 +++++++++++++++++++
 src/blackmisc/stringutils.h                   |  6 ++++++
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp
index cad4f1b8f..bff19852d 100644
--- a/src/blackcore/aircraftmatcher.cpp
+++ b/src/blackcore/aircraftmatcher.cpp
@@ -126,8 +126,9 @@ namespace BlackCore
 
         const QDateTime startTime = QDateTime::currentDateTimeUtc();
         if (log) { log->clear(); }
+
         CMatchingUtils::addLogDetailsToList(log, remoteAircraft, m1.arg(startTime.toString(format)));
-        CMatchingUtils::addLogDetailsToList(log, remoteAircraft, m2.arg(remoteAircraft.getCallsignAsString(), remoteAircraft.getModel().toQString()));
+        CMatchingUtils::addLogDetailsToList(log, remoteAircraft, m2.arg(remoteAircraft.getCallsignAsString(), removeSurroundingApostrophes(remoteAircraft.getModel().toQString())));
         CMatchingUtils::addLogDetailsToList(log, remoteAircraft, m3.arg(modelSet.size()).arg(modelSet.coverageSummaryForModel(remoteAircraft.getModel())));
         CMatchingUtils::addLogDetailsToList(log, remoteAircraft, m4.arg(setup.toQString(true)));
 
diff --git a/src/blackmisc/simulation/aircraftmatchersetup.cpp b/src/blackmisc/simulation/aircraftmatchersetup.cpp
index 46f4af8ea..9e8d07e1e 100644
--- a/src/blackmisc/simulation/aircraftmatchersetup.cpp
+++ b/src/blackmisc/simulation/aircraftmatchersetup.cpp
@@ -137,8 +137,8 @@ namespace BlackMisc
         {
             static const QString ms("by model string");
             static const QString icao("by ICAO");
-            static const QString icaoAircraft("by ICAO, aircraft first");
-            static const QString icaoAirline("by ICAO, airline first");
+            static const QString icaoAircraft("by ICAO aircraft first");
+            static const QString icaoAirline("by ICAO airline first");
             static const QString family("by family");
             static const QString forceMil("force military");
             static const QString forceCiv("force civilian");
diff --git a/src/blackmisc/stringutils.cpp b/src/blackmisc/stringutils.cpp
index 9e4423880..7e9489ef2 100644
--- a/src/blackmisc/stringutils.cpp
+++ b/src/blackmisc/stringutils.cpp
@@ -412,6 +412,27 @@ namespace BlackMisc
         }
         return map;
     }
+
+    QString removeSurroundingApostrophes(const QString &in)
+    {
+        if (in.size() < 2) { return in; }
+        if (in.startsWith("'") && in.endsWith("'"))
+        {
+            return in.mid(1, in.length() - 2);
+        }
+        return in;
+    }
+
+    QString removeSurroundingQuotes(const QString &in)
+    {
+        if (in.size() < 2) { return in; }
+        if (in.startsWith("\"") && in.endsWith("\""))
+        {
+            return in.mid(1, in.length() - 2);
+        }
+        return in;
+    }
+
 } // ns
 
 //! \endcond
diff --git a/src/blackmisc/stringutils.h b/src/blackmisc/stringutils.h
index a7813af38..8efab6d8b 100644
--- a/src/blackmisc/stringutils.h
+++ b/src/blackmisc/stringutils.h
@@ -204,6 +204,12 @@ namespace BlackMisc
     //! Return string in quotes
     BLACKMISC_EXPORT QString inQuotes(const QString &in, bool ignoreEmpty = false);
 
+    //! Remove surrounding apostrophes 'foo' -> foo
+    BLACKMISC_EXPORT QString removeSurroundingApostrophes(const QString &in);
+
+    //! Remove surrounding quotes "foo" -> foo
+    BLACKMISC_EXPORT QString removeSurroundingQuotes(const QString &in);
+
     //! Bool to on/off
     BLACKMISC_EXPORT const QString &boolToOnOff(bool v);