From fad7d4b8c98f5cbf3508fc6c5790d296bc4f7112 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 23 Apr 2017 22:24:12 +0200
Subject: [PATCH] Ref T35, optional model description when mapping

---
 src/blackgui/editors/modelmappingform.h    | 3 +--
 src/blackmisc/simulation/aircraftmodel.cpp | 3 ++-
 src/blackmisc/simulation/aircraftmodel.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/blackgui/editors/modelmappingform.h b/src/blackgui/editors/modelmappingform.h
index 8a53eec3c..a515c736a 100644
--- a/src/blackgui/editors/modelmappingform.h
+++ b/src/blackgui/editors/modelmappingform.h
@@ -23,7 +23,6 @@
 class QWidget;
 
 namespace Ui { class CModelMappingForm; }
-
 namespace BlackGui
 {
     namespace Editors
@@ -40,7 +39,7 @@ namespace BlackGui
             explicit CModelMappingForm(QWidget *parent = nullptr);
 
             //! Destructor
-            ~CModelMappingForm();
+            virtual ~CModelMappingForm();
 
             //! Value
             BlackMisc::Simulation::CAircraftModel getValue() const;
diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp
index ed963c5d5..8da1e2fc1 100644
--- a/src/blackmisc/simulation/aircraftmodel.cpp
+++ b/src/blackmisc/simulation/aircraftmodel.cpp
@@ -636,7 +636,8 @@ namespace BlackMisc
             CStatusMessageList msgs;
             if (!hasModelString()) { msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Model: missing model string (aka key)")); }
             if (!hasValidSimulator()) {msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityError, "Model: no simulator set")); }
-            if (!hasDescription()) {msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityWarning, "Model: no description")); }
+            // as of T34 made description optional, lines can be removed after 6/2017
+            // if (!hasDescription()) {msgs.push_back(CStatusMessage(cats, CStatusMessage::SeverityWarning, "Model: no description")); }
             if (withNestedObjects)
             {
                 msgs.push_back(m_aircraftIcao.validate());
diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h
index 42ab7a10e..d69bed090 100644
--- a/src/blackmisc/simulation/aircraftmodel.h
+++ b/src/blackmisc/simulation/aircraftmodel.h
@@ -164,7 +164,7 @@ namespace BlackMisc
             const QString &getDescription() const { return this->m_description; }
 
             //! Descriptive text
-            void setDescription(const QString &description) { this->m_description = description; }
+            void setDescription(const QString &description) { this->m_description = description.trimmed(); }
 
             //! Set queried model string
             void setQueriedModelString(const QString &model) { this->m_modelString = model; this->m_modelType = TypeQueriedFromNetwork; }