Utility functions for livery

src/blackmisc/aviation/livery.cpp

@@ -71,8 +71,13 @@ namespace BlackMisc
             return this->getCombinedCode() % (
                        this->getDescription().isEmpty() ?
                        QString() :
-                       (u' ' % this->getDescription())
+                       (u' ' % this->getDescription()));
-                   );
+        }
+
+        QString CLivery::getCombinedCodePlusId() const
+        {
+            return this->getCombinedCode() %
+                   this->getDbKeyAsStringInParentheses(" ");
         }
 
         QString CLivery::getCombinedCodePlusInfoAndId() const

src/blackmisc/aviation/livery.h

@@ -77,6 +77,9 @@ namespace BlackMisc
             //! Combined code plus info
             QString getCombinedCodePlusInfo() const;
 
+            //! Combined code plus id
+            QString getCombinedCodePlusId() const;
+
             //! Combined code, info, plus id
             QString getCombinedCodePlusInfoAndId() const;
 

src/blackmisc/aviation/liverylist.cpp

@@ -141,6 +141,14 @@ namespace BlackMisc
             return codes;
         }
 
+        QStringList CLiveryList::getCombinedCodesPlusInfoAndId(bool sort) const
+        {
+            if (this->isEmpty()) { return QStringList(); }
+            QStringList codes = this->transform(Predicates::MemberTransform(&CLivery::getCombinedCodePlusInfoAndId));
+            if (sort) { codes.sort(); }
+            return codes;
+        }
+
         CAirlineIcaoCodeList CLiveryList::getAirlines() const
         {
             CAirlineIcaoCodeList icaos;

src/blackmisc/aviation/liverylist.h

@@ -75,6 +75,9 @@ namespace BlackMisc
             //! All combined codes plus more info
             QStringList getCombinedCodesPlusInfo(bool sort = false) const;
 
+            //! All combined codes plus more info
+            QStringList getCombinedCodesPlusInfoAndId(bool sort = false) const;
+
             //! All aircraft codes
             CAirlineIcaoCodeList getAirlines() const;