refs #922, refs #911, JSON cut/copy/paste

* utility function for CVariant
* use CVariant for cut/copy/paste

src/blackgui/editors/aircrafticaoform.cpp

@@ -94,8 +94,10 @@ namespace BlackGui
         {
             try
             {
-                CAircraftIcaoCodeList icaos;
+                CVariant jsonVariant;
-                icaos.convertFromJson(Json::jsonObjectFromString(json));
+                jsonVariant.convertFromJson(Json::jsonObjectFromString(json));
+                if (!jsonVariant.canConvert<CAircraftIcaoCodeList>()) { return; }
+                const CAircraftIcaoCodeList icaos = jsonVariant.value<CAircraftIcaoCodeList>();
                 if (!icaos.isEmpty())
                 {
                     this->setValue(icaos.front());

src/blackgui/editors/airlineicaoform.cpp

@@ -159,8 +159,10 @@ namespace BlackGui
         {
             try
             {
-                CAirlineIcaoCodeList icaos;
+                CVariant jsonVariant;
-                icaos.convertFromJson(Json::jsonObjectFromString(json));
+                jsonVariant.convertFromJson(Json::jsonObjectFromString(json));
+                if (!jsonVariant.canConvert<CAirlineIcaoCodeList>()) { return; }
+                const CAirlineIcaoCodeList icaos = jsonVariant.value<CAirlineIcaoCodeList>();
                 if (!icaos.isEmpty())
                 {
                     this->setValue(icaos.front());

src/blackgui/editors/liveryform.cpp

@@ -117,8 +117,10 @@ namespace BlackGui
         {
             try
             {
-                CLiveryList liveries;
+                CVariant jsonVariant;
-                liveries.convertFromJson(Json::jsonObjectFromString(json));
+                jsonVariant.convertFromJson(Json::jsonObjectFromString(json));
+                if (!jsonVariant.canConvert<CLiveryList>()) { return; }
+                const CLiveryList liveries = jsonVariant.value<CLiveryList>();
                 if (!liveries.isEmpty())
                 {
                     this->setValue(liveries.front());

src/blackgui/views/viewbase.cpp

@@ -1454,7 +1454,8 @@ namespace BlackGui
             if (!this->hasSelection()) { return; }
             const ContainerType selection = this->selectedObjects();
             if (selection.isEmpty()) { return; }
-            const QString json = selection.toJsonString();
+            const CVariant copyJson = CVariant::from(selection);
+            const QString json = copyJson.toJsonString();
             clipboard->setText(json);
         }
 

src/blackmisc/variant.cpp

@@ -91,7 +91,7 @@ namespace BlackMisc
                 else
                 {
                     CLogMessage(&a).warning("Comparing two CVariants containing unrelated value objects: %1 (%2) and %3 (%4)")
-                        << a.typeName() << a.userType() << b.typeName() << b.userType();
+                            << a.typeName() << a.userType() << b.typeName() << b.userType();
                     return 0;
                 }
             }
@@ -152,6 +152,12 @@ namespace BlackMisc
         return json;
     }
 
+    QString CVariant::toJsonString(QJsonDocument::JsonFormat format) const
+    {
+        QJsonDocument jsonDoc(toJson());
+        return jsonDoc.toJson(format);
+    }
+
     void CVariant::convertFromJson(const QJsonObject &json)
     {
         // Remark: Names "type" and "value" are also used for drag and drop

src/blackmisc/variant.h

@@ -273,6 +273,9 @@ namespace BlackMisc
         //! \copydoc BlackMisc::Mixin::JsonByMetaClass::toJson
         QJsonObject toJson() const;
 
+        //! Convenience function JSON as string
+        QString toJsonString(QJsonDocument::JsonFormat format = QJsonDocument::Indented) const;
+
         //! \copydoc BlackMisc::Mixin::JsonByMetaClass::convertFromJson
         void convertFromJson(const QJsonObject &json);