From 5f7842163b7105521288611d00c3ca78ad07b587 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 22 Jan 2018 04:59:24 +0100
Subject: [PATCH] Ref T231, Ref T232 utility functions

---
 src/blackmisc/aviation/callsignobjectlist.cpp        |  4 ++--
 src/blackmisc/aviation/callsignobjectlist.h          |  2 +-
 src/plugins/simulator/fsxcommon/simconnectobject.cpp | 10 ++++++++++
 src/plugins/simulator/fsxcommon/simconnectobject.h   |  7 +++++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/blackmisc/aviation/callsignobjectlist.cpp b/src/blackmisc/aviation/callsignobjectlist.cpp
index f692ce5e5..202e805df 100644
--- a/src/blackmisc/aviation/callsignobjectlist.cpp
+++ b/src/blackmisc/aviation/callsignobjectlist.cpp
@@ -62,9 +62,9 @@ namespace BlackMisc
         }
 
         template<class OBJ, class CONTAINER>
-        QStringList ICallsignObjectList<OBJ, CONTAINER>::getCallsignStrings() const
+        QStringList ICallsignObjectList<OBJ, CONTAINER>::getCallsignStrings(bool sorted) const
         {
-            return this->getCallsigns().getCallsignStrings();
+            return this->getCallsigns().getCallsignStrings(sorted);
         }
 
         template <class OBJ, class CONTAINER>
diff --git a/src/blackmisc/aviation/callsignobjectlist.h b/src/blackmisc/aviation/callsignobjectlist.h
index ffddb8745..f0a6b9eaf 100644
--- a/src/blackmisc/aviation/callsignobjectlist.h
+++ b/src/blackmisc/aviation/callsignobjectlist.h
@@ -58,7 +58,7 @@ namespace BlackMisc
             BlackMisc::Aviation::CCallsignSet getCallsigns() const;
 
             //! Get callsign string list
-            QStringList getCallsignStrings() const;
+            QStringList getCallsignStrings(bool sorted = false) const;
 
             //! Find 0..n stations by callsign
             CONTAINER findByCallsign(const CCallsign &callsign) const;
diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.cpp b/src/plugins/simulator/fsxcommon/simconnectobject.cpp
index e04141968..b08c86e66 100644
--- a/src/plugins/simulator/fsxcommon/simconnectobject.cpp
+++ b/src/plugins/simulator/fsxcommon/simconnectobject.cpp
@@ -199,6 +199,16 @@ namespace BlackSimPlugin
             return CCallsignSet(this->keys());
         }
 
+        QStringList CSimConnectObjects::getAllCallsignStrings(bool sorted) const
+        {
+            return this->getAllCallsigns().getCallsignStrings(sorted);
+        }
+
+        QString CSimConnectObjects::getAllCallsignStringsAsString(bool sorted, const QString &separator) const
+        {
+            return this->getAllCallsignStrings(sorted).join(separator);
+        }
+
         CSimConnectObject CSimConnectObjects::getSimObjectForObjectId(DWORD objectId) const
         {
             for (const CSimConnectObject &simObject : this->values())
diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.h b/src/plugins/simulator/fsxcommon/simconnectobject.h
index 1b58461d7..22fbee5f2 100644
--- a/src/plugins/simulator/fsxcommon/simconnectobject.h
+++ b/src/plugins/simulator/fsxcommon/simconnectobject.h
@@ -16,6 +16,7 @@
 #include "blackmisc/simulation/interpolatormulti.h"
 #include "simconnectdatadefinition.h"
 #include <QSharedPointer>
+#include <QStringList>
 
 namespace BlackSimPlugin
 {
@@ -225,6 +226,12 @@ namespace BlackSimPlugin
             //! Get all callsigns
             BlackMisc::Aviation::CCallsignSet getAllCallsigns() const;
 
+            //! Get all callsign strings
+            QStringList getAllCallsignStrings(bool sorted = false) const;
+
+            //! Get all callsign strings as string
+            QString getAllCallsignStringsAsString(bool sorted = false, const QString &separator = ", ") const;
+
             //! Callsigns of pending added callsigns
             BlackMisc::Aviation::CCallsignSet getPendingAddedCallsigns() const;