diff --git a/src/blackgui/models/columnformatters.cpp b/src/blackgui/models/columnformatters.cpp
index 6e1bd4b76..94acf91fe 100644
--- a/src/blackgui/models/columnformatters.cpp
+++ b/src/blackgui/models/columnformatters.cpp
@@ -361,8 +361,7 @@ namespace BlackGui
 
         CVariant CAltitudeFormatter::displayRole(const CVariant &altitude) const
         {
-            CAltitude alt;
-            alt.convertFromCVariant(altitude);
+            CAltitude alt(altitude.to<CAltitude>());
             if (m_flightLevel) { alt.toFlightLevel(); }
             return alt.toQString(this->m_useI18n);
         }
diff --git a/src/blackgui/models/listmodelbase.cpp b/src/blackgui/models/listmodelbase.cpp
index d51266a14..9679b23f7 100644
--- a/src/blackgui/models/listmodelbase.cpp
+++ b/src/blackgui/models/listmodelbase.cpp
@@ -374,8 +374,7 @@ namespace BlackGui
         template <typename ObjectType, typename ContainerType>
         int CListModelBase<ObjectType, ContainerType>::performUpdateContainer(const BlackMisc::CVariant &variant, bool sort)
         {
-            ContainerType c;
-            c.convertFromCVariant(variant);
+            ContainerType c(variant.to<ContainerType>());
             return this->update(c, sort);
         }
 
diff --git a/src/blackgui/views/viewbase.cpp b/src/blackgui/views/viewbase.cpp
index ec00fdc09..86f1dd69e 100644
--- a/src/blackgui/views/viewbase.cpp
+++ b/src/blackgui/views/viewbase.cpp
@@ -376,8 +376,7 @@ namespace BlackGui
         template <class ModelClass, class ContainerType, class ObjectType>
         int CViewBase<ModelClass, ContainerType, ObjectType>::performUpdateContainer(const BlackMisc::CVariant &variant, bool sort, bool resize)
         {
-            ContainerType c;
-            c.convertFromCVariant(variant);
+            ContainerType c(variant.to<ContainerType>());
             return this->updateContainer(c, sort, resize);
         }
 
diff --git a/src/blackmisc/audio/voiceroom.cpp b/src/blackmisc/audio/voiceroom.cpp
index 1e2095669..f334e05c9 100644
--- a/src/blackmisc/audio/voiceroom.cpp
+++ b/src/blackmisc/audio/voiceroom.cpp
@@ -49,12 +49,7 @@ namespace BlackMisc
 
         void CVoiceRoom::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
-
+            if (index.isMyself()) { (*this) = variant.to<CVoiceRoom>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/aircraft.cpp b/src/blackmisc/aviation/aircraft.cpp
index 1f5a05602..d591ae845 100644
--- a/src/blackmisc/aviation/aircraft.cpp
+++ b/src/blackmisc/aviation/aircraft.cpp
@@ -225,11 +225,7 @@ namespace BlackMisc
 
         void CAircraft::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CAircraft>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp
index 2aeeef916..9d6f9fc4d 100644
--- a/src/blackmisc/aviation/aircrafticaocode.cpp
+++ b/src/blackmisc/aviation/aircrafticaocode.cpp
@@ -108,12 +108,7 @@ namespace BlackMisc
 
         void CAircraftIcaoCode::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
-
+            if (index.isMyself()) { (*this) = variant.to<CAircraftIcaoCode>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/aircrafticaodata.cpp b/src/blackmisc/aviation/aircrafticaodata.cpp
index 4f562f925..921494d23 100644
--- a/src/blackmisc/aviation/aircrafticaodata.cpp
+++ b/src/blackmisc/aviation/aircrafticaodata.cpp
@@ -96,12 +96,7 @@ namespace BlackMisc
 
         void CAircraftIcaoData::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
-
+            if (index.isMyself()) { (*this) = variant.to<CAircraftIcaoData>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/aircraftlights.cpp b/src/blackmisc/aviation/aircraftlights.cpp
index 4395f296d..047a9856c 100644
--- a/src/blackmisc/aviation/aircraftlights.cpp
+++ b/src/blackmisc/aviation/aircraftlights.cpp
@@ -75,12 +75,7 @@ namespace BlackMisc
 
         void CAircraftLights::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
-
+            if (index.isMyself()) { (*this) = variant.to<CAircraftLights>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/aircraftparts.cpp b/src/blackmisc/aviation/aircraftparts.cpp
index cd00cf025..69bb3bc7b 100644
--- a/src/blackmisc/aviation/aircraftparts.cpp
+++ b/src/blackmisc/aviation/aircraftparts.cpp
@@ -61,11 +61,7 @@ namespace BlackMisc
 
         void CAircraftParts::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CAircraftParts>(); return; }
             if (ITimestampBased::canHandleIndex(index))
             {
                 ITimestampBased::setPropertyByIndex(variant, index);
@@ -76,7 +72,7 @@ namespace BlackMisc
             switch (i)
             {
             case IndexEngines:
-                this->m_engines = variant.to<decltype(this->m_engines)>();
+                this->m_engines = variant.to < decltype(this->m_engines) > ();
                 break;
             case IndexFlapsPercentage:
                 this->m_flapsPercentage = variant.toInt();
diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp
index 90f94dbc4..c600603b8 100644
--- a/src/blackmisc/aviation/aircraftsituation.cpp
+++ b/src/blackmisc/aviation/aircraftsituation.cpp
@@ -81,11 +81,7 @@ namespace BlackMisc
 
         void CAircraftSituation::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CAircraftSituation>(); return; }
             if (ITimestampBased::canHandleIndex(index))
             {
                 ITimestampBased::setPropertyByIndex(variant, index);
diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp
index 7c08fbfa4..099311420 100644
--- a/src/blackmisc/aviation/airlineicaocode.cpp
+++ b/src/blackmisc/aviation/airlineicaocode.cpp
@@ -58,12 +58,7 @@ namespace BlackMisc
 
         void CAirlineIcaoCode::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
-
+            if (index.isMyself()) { (*this) = variant.to<CAirlineIcaoCode>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/airport.cpp b/src/blackmisc/aviation/airport.cpp
index b8c06607c..801ed680f 100644
--- a/src/blackmisc/aviation/airport.cpp
+++ b/src/blackmisc/aviation/airport.cpp
@@ -78,11 +78,7 @@ namespace BlackMisc
 
         void CAirport::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CAirport>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/atcstation.cpp b/src/blackmisc/aviation/atcstation.cpp
index 9ff85f3a0..127f0432f 100644
--- a/src/blackmisc/aviation/atcstation.cpp
+++ b/src/blackmisc/aviation/atcstation.cpp
@@ -377,7 +377,7 @@ namespace BlackMisc
 
         void CAtcStation::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself()) { this->convertFromCVariant(variant); return; }
+            if (index.isMyself()) { (*this) = variant.to<CAtcStation>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/callsign.cpp b/src/blackmisc/aviation/callsign.cpp
index 07b37ab07..73fd4c572 100644
--- a/src/blackmisc/aviation/callsign.cpp
+++ b/src/blackmisc/aviation/callsign.cpp
@@ -147,11 +147,7 @@ namespace BlackMisc
 
         void CCallsign::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CCallsign>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/modulator.cpp b/src/blackmisc/aviation/modulator.cpp
index a7852ba58..788de1309 100644
--- a/src/blackmisc/aviation/modulator.cpp
+++ b/src/blackmisc/aviation/modulator.cpp
@@ -128,11 +128,7 @@ namespace BlackMisc
         template <class AVIO>
         void CModulator<AVIO>::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { Q_ASSERT_X(false, Q_FUNC_INFO, "Wrong index to base template"); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/aviation/transponder.cpp b/src/blackmisc/aviation/transponder.cpp
index 9c66aeb1d..a4db75cd6 100644
--- a/src/blackmisc/aviation/transponder.cpp
+++ b/src/blackmisc/aviation/transponder.cpp
@@ -171,11 +171,7 @@ namespace BlackMisc
 
         void CTransponder::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CTransponder>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp
index 4c003934c..ad2e6b7bf 100644
--- a/src/blackmisc/geo/coordinategeodetic.cpp
+++ b/src/blackmisc/geo/coordinategeodetic.cpp
@@ -139,11 +139,7 @@ namespace BlackMisc
 
         void CCoordinateGeodetic::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CCoordinateGeodetic>(); return; }
             ICoordinateGeodetic::ColumnIndex i = index.frontCasted<ICoordinateGeodetic::ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/hardware/joystickbutton.cpp b/src/blackmisc/hardware/joystickbutton.cpp
index c15b1753b..d7c03a63f 100644
--- a/src/blackmisc/hardware/joystickbutton.cpp
+++ b/src/blackmisc/hardware/joystickbutton.cpp
@@ -32,13 +32,8 @@ namespace BlackMisc
 
         void CJoystickButton::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CJoystickButton>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
-
             switch (i)
             {
             case IndexButton:
diff --git a/src/blackmisc/hardware/keyboardkey.cpp b/src/blackmisc/hardware/keyboardkey.cpp
index ef7e7987b..5af5c5665 100644
--- a/src/blackmisc/hardware/keyboardkey.cpp
+++ b/src/blackmisc/hardware/keyboardkey.cpp
@@ -277,11 +277,7 @@ namespace BlackMisc
 
         void CKeyboardKey::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CKeyboardKey>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/namevariantpair.cpp b/src/blackmisc/namevariantpair.cpp
index a88bdacd2..4867c7271 100644
--- a/src/blackmisc/namevariantpair.cpp
+++ b/src/blackmisc/namevariantpair.cpp
@@ -49,11 +49,7 @@ namespace BlackMisc
 
     void CNameVariantPair::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
     {
-        if (index.isMyself())
-        {
-            this->convertFromCVariant(variant);
-            return;
-        }
+        if (index.isMyself()) { (*this) = variant.to<CNameVariantPair>(); return; }
         ColumnIndex i = index.frontCasted<ColumnIndex>();
 
         // special case, handle icon and allow to set it
diff --git a/src/blackmisc/network/aircraftmapping.cpp b/src/blackmisc/network/aircraftmapping.cpp
index e61aac252..b19229751 100644
--- a/src/blackmisc/network/aircraftmapping.cpp
+++ b/src/blackmisc/network/aircraftmapping.cpp
@@ -55,11 +55,7 @@ namespace BlackMisc
 
         void CAircraftMapping::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CAircraftMapping>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/network/client.cpp b/src/blackmisc/network/client.cpp
index fb83e6b36..0203d51eb 100644
--- a/src/blackmisc/network/client.cpp
+++ b/src/blackmisc/network/client.cpp
@@ -101,11 +101,7 @@ namespace BlackMisc
 
         void CClient::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CClient>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/network/server.cpp b/src/blackmisc/network/server.cpp
index ce5db21eb..419f7efbf 100644
--- a/src/blackmisc/network/server.cpp
+++ b/src/blackmisc/network/server.cpp
@@ -70,12 +70,7 @@ namespace BlackMisc
 
         void CServer::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
-
+            if (index.isMyself()) { (*this) = variant.to<CServer>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/network/textmessage.cpp b/src/blackmisc/network/textmessage.cpp
index 60f1a5f30..2770bd3a8 100644
--- a/src/blackmisc/network/textmessage.cpp
+++ b/src/blackmisc/network/textmessage.cpp
@@ -207,11 +207,7 @@ namespace BlackMisc
 
         void CTextMessage::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CTextMessage>(); return; }
             if (ITimestampBased::canHandleIndex(index)) { ITimestampBased::setPropertyByIndex(variant, index); return; }
 
             ColumnIndex i = index.frontCasted<ColumnIndex>();
diff --git a/src/blackmisc/network/user.cpp b/src/blackmisc/network/user.cpp
index f84b5df46..bae41ff7d 100644
--- a/src/blackmisc/network/user.cpp
+++ b/src/blackmisc/network/user.cpp
@@ -216,11 +216,7 @@ namespace BlackMisc
 
         void CUser::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CUser>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/notificationsounds.h b/src/blackmisc/notificationsounds.h
index 2e1448418..782f265b1 100644
--- a/src/blackmisc/notificationsounds.h
+++ b/src/blackmisc/notificationsounds.h
@@ -1,3 +1,14 @@
+/* Copyright (C) 2013
+ * swift Project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+//! \file
+
 #ifndef BLACKMISC_NOTIFICATIONSOUNDS_H
 #define BLACKMISC_NOTIFICATIONSOUNDS_H
 
@@ -7,7 +18,7 @@ namespace BlackSound
     /*!
      * Simplified enums to play sounds.
      * \remarks Currently located in project BlackMisc (i.e. outside project BlackSound)
-     * as this allows to trigger sounds without using Multimedia libraries.
+     *          as this allows to trigger sounds without using Multimedia libraries.
      */
     struct CNotificationSounds
     {
@@ -31,6 +42,6 @@ namespace BlackSound
             NotificationsLoadSounds //!< end marker and force loading of sounds, keep as last element
         };
     };
-}
+} // ns
 
 #endif // guard
diff --git a/src/blackmisc/pq/physicalquantity.cpp b/src/blackmisc/pq/physicalquantity.cpp
index 1875eaf9f..3ec880204 100644
--- a/src/blackmisc/pq/physicalquantity.cpp
+++ b/src/blackmisc/pq/physicalquantity.cpp
@@ -371,11 +371,7 @@ namespace BlackMisc
         template <class MU, class PQ>
         void CPhysicalQuantity<MU, PQ>::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<PQ>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
@@ -383,7 +379,7 @@ namespace BlackMisc
                 this->m_value = variant.toDouble();
                 break;
             case IndexUnit:
-                this->m_unit.convertFromCVariant(variant);
+                this->m_unit = variant.to<MU>();
                 break;
             case IndexValueRounded0DigitsWithUnit:
             case IndexValueRounded1DigitsWithUnit:
diff --git a/src/blackmisc/pq/physicalquantity.h b/src/blackmisc/pq/physicalquantity.h
index fa711307b..defcc2d5e 100644
--- a/src/blackmisc/pq/physicalquantity.h
+++ b/src/blackmisc/pq/physicalquantity.h
@@ -191,7 +191,7 @@ namespace BlackMisc
             uint getValueHash() const;
 
             //! \copydoc CValueObject::qHash
-            friend uint qHash(const PQ &pq) { return pq.getValueHash(); };
+            friend uint qHash(const PQ &pq) { return pq.getValueHash(); }
 
             //! \copydoc CValueObject::toJson
             QJsonObject toJson() const;
diff --git a/src/blackmisc/setkeyboardhotkey.cpp b/src/blackmisc/setkeyboardhotkey.cpp
index 749f5e013..519540656 100644
--- a/src/blackmisc/setkeyboardhotkey.cpp
+++ b/src/blackmisc/setkeyboardhotkey.cpp
@@ -71,11 +71,7 @@ namespace BlackMisc
 
         void CSettingKeyboardHotkey::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CSettingKeyboardHotkey>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp
index 8e2f801ea..8628cf697 100644
--- a/src/blackmisc/simulation/aircraftmodel.cpp
+++ b/src/blackmisc/simulation/aircraftmodel.cpp
@@ -62,11 +62,7 @@ namespace BlackMisc
 
         void CAircraftModel::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CAircraftModel>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp b/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
index bb42eb2f9..5c1dfc133 100644
--- a/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
+++ b/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
@@ -107,11 +107,7 @@ namespace BlackMisc
 
         void CAirspaceAircraftSnapshot::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CAirspaceAircraftSnapshot>(); return; }
             CValueObject::setPropertyByIndex(variant, index);
         }
 
diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
index fce878d3c..5f2f119bc 100644
--- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
@@ -128,7 +128,7 @@ namespace BlackMisc
 
             void CAircraftCfgEntries::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
             {
-                if (index.isMyself()) { this->convertFromCVariant(variant); return; }
+                if (index.isMyself()) { (*this) = variant.to<CAircraftCfgEntries>(); return; }
                 ColumnIndex i = index.frontCasted<ColumnIndex>();
                 switch (i)
                 {
diff --git a/src/blackmisc/simulation/simulatedaircraft.cpp b/src/blackmisc/simulation/simulatedaircraft.cpp
index b430856f8..35007d056 100644
--- a/src/blackmisc/simulation/simulatedaircraft.cpp
+++ b/src/blackmisc/simulation/simulatedaircraft.cpp
@@ -64,11 +64,7 @@ namespace BlackMisc
 
         void CSimulatedAircraft::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
+            if (index.isMyself()) { (*this) = variant.to<CSimulatedAircraft>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
diff --git a/src/blackmisc/simulation/simulatorsetup.cpp b/src/blackmisc/simulation/simulatorsetup.cpp
index 6ffb3c344..9b09e75fe 100644
--- a/src/blackmisc/simulation/simulatorsetup.cpp
+++ b/src/blackmisc/simulation/simulatorsetup.cpp
@@ -70,17 +70,12 @@ namespace BlackMisc
 
         void CSimulatorSetup::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
         {
-            if (index.isMyself())
-            {
-                this->convertFromCVariant(variant);
-                return;
-            }
-
+            if (index.isMyself()) { (*this) = variant.to<CSimulatorSetup>(); return; }
             ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
             case IndexData:
-                this->m_data.convertFromCVariant(variant.value<QString>());
+                this->m_data = variant.to<CNameVariantPairList>();
                 break;
             default:
                 CValueObject::setPropertyByIndex(variant, index);
diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp
index 298950e61..bba716fe4 100644
--- a/src/blackmisc/statusmessage.cpp
+++ b/src/blackmisc/statusmessage.cpp
@@ -271,7 +271,7 @@ namespace BlackMisc
      */
     void CStatusMessage::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
     {
-        if (index.isMyself()) { this->convertFromCVariant(variant); return; }
+        if (index.isMyself()) { (*this) = variant.to<CStatusMessage>(); return; }
         if (ITimestampBased::canHandleIndex(index)) { ITimestampBased::setPropertyByIndex(variant, index); return; }
         ColumnIndex i = index.frontCasted<ColumnIndex>();
         switch (i)
diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h
index b2c5adace..18bd89c31 100644
--- a/src/blackmisc/valueobject.h
+++ b/src/blackmisc/valueobject.h
@@ -109,12 +109,6 @@ namespace BlackMisc
         //! \copydoc BlackMisc::Mixin::Index::apply
         using Mixin::Index<Derived>::apply;
 
-        //! \copydoc BlackMisc::Mixin::MetaType::toCVariant
-//        using Mixin::MetaType<Derived>::toCVariant;
-
-        //! \copydoc BlackMisc::Mixin::MetaType::convertFromCVariant
-        using Mixin::MetaType<Derived>::convertFromCVariant;
-
         //! \copydoc BlackMisc::Mixin::JsonByTuple::toJson
         using Mixin::JsonByTuple<Derived>::toJson;
 
diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h
index 88969ab47..fa9debfdd 100644
--- a/src/blackmisc/variant.h
+++ b/src/blackmisc/variant.h
@@ -66,10 +66,6 @@ namespace BlackMisc
                 return baseIsA(static_cast<const MetaBaseOfT<Derived> *>(derived()), metaTypeId);
             }
 
-            //! Set from CVariant
-            //! \deprecated Use CVariant::to() instead.
-            void convertFromCVariant(const CVariant &variant);
-
             //! Return QVariant, used with DBus QVariant lists
             //! \deprecated Use QVariant::fromValue() instead.
             QVariant toQVariant() const
@@ -110,7 +106,6 @@ namespace BlackMisc
             using ::BlackMisc::Mixin::MetaType<DERIVED>::getMetaTypeId;         \
             using ::BlackMisc::Mixin::MetaType<DERIVED>::isA;                   \
             using ::BlackMisc::Mixin::MetaType<DERIVED>::toQVariant;            \
-            using ::BlackMisc::Mixin::MetaType<DERIVED>::convertFromCVariant;   \
             using ::BlackMisc::Mixin::MetaType<DERIVED>::convertFromQVariant;
 
         /*!
@@ -122,7 +117,6 @@ namespace BlackMisc
             using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::getMetaTypeId;         \
             using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::isA;                   \
             using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::toQVariant;            \
-            using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::convertFromCVariant;   \
             using ::BlackMisc::Mixin::MetaTypeAndQList<DERIVED>::convertFromQVariant;
 
     } // Mixin
@@ -375,16 +369,6 @@ namespace BlackMisc
         //! \private Needed so we can copy forward-declared CVariant.
         inline void assign(CVariant &a, const CVariant &b) { a = b; }
     }
-
-    namespace Mixin
-    {
-        template <class Derived, class... AdditionalTypes>
-        void MetaType<Derived, AdditionalTypes...>::convertFromCVariant(const CVariant &variant)
-        {
-            derived()->convertFromQVariant(variant.getQVariant());
-        }
-    }
-
 } // namespace
 
 Q_DECLARE_METATYPE(BlackMisc::CVariant)
diff --git a/tests/blackmisc/testvalueobject.cpp b/tests/blackmisc/testvalueobject.cpp
index aa145437f..6cb7f9027 100644
--- a/tests/blackmisc/testvalueobject.cpp
+++ b/tests/blackmisc/testvalueobject.cpp
@@ -46,11 +46,7 @@ namespace BlackMisc
      */
     void CTestValueObject::setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index)
     {
-        if (index.isMyself())
-        {
-            this->convertFromCVariant(variant);
-            return;
-        }
+        if (index.isMyself()) { (*this) = variant.to<CTestValueObject>(); return; }
         ColumnIndex i = index.frontCasted<ColumnIndex>();
         switch (i)
         {