From a2c0a893c091355cd3cd6112cf0e26c75bdc8134 Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Wed, 12 Nov 2014 19:10:51 +0000
Subject: [PATCH] refs #247 Fixed mistakes.

---
 src/blackmisc/mathmatrixbase.h                   | 12 ++++++------
 src/blackmisc/pqphysicalquantity.cpp             |  2 +-
 src/blacksim/fscommon/aircraftcfgentrieslist.cpp |  4 ++--
 src/blacksim/fscommon/aircraftmapping.cpp        |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/blackmisc/mathmatrixbase.h b/src/blackmisc/mathmatrixbase.h
index 27574bc36..ab0ec8a1d 100644
--- a/src/blackmisc/mathmatrixbase.h
+++ b/src/blackmisc/mathmatrixbase.h
@@ -204,6 +204,12 @@ namespace BlackMisc
                 return this->getElement(row, column);
             }
 
+            //! \copydoc CValueObject::toJson
+            virtual QJsonObject toJson() const override;
+
+            //! \copydoc CValueObject::convertFromJson
+            virtual void convertFromJson(const QJsonObject &json) override;
+
         protected:
             // no bug, Qt expects columns rows
             QGenericMatrix<Columns, Rows, double> m_matrix; //!< backing data
@@ -217,12 +223,6 @@ namespace BlackMisc
             //! \copydoc CValueObject::unmarshallFromDbus
             virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
 
-            //! \copydoc CValueObject::toJson
-            virtual QJsonObject toJson() const override;
-
-            //! \copydoc CValueObject::convertFromJson
-            virtual void convertFromJson(const QJsonObject &json) override;
-
             //! \copydoc CValueObject::convertToQString
             virtual QString convertToQString(bool i18n = false) const override;
 
diff --git a/src/blackmisc/pqphysicalquantity.cpp b/src/blackmisc/pqphysicalquantity.cpp
index fe0ab54f1..b43fa329a 100644
--- a/src/blackmisc/pqphysicalquantity.cpp
+++ b/src/blackmisc/pqphysicalquantity.cpp
@@ -332,7 +332,7 @@ namespace BlackMisc
                 this->m_value = variant.toDouble();
                 break;
             case IndexUnit:
-                this->m_unit.fromQVariant(variant);
+                this->m_unit.convertFromQVariant(variant);
                 break;
             case IndexValueRounded0DigitsWithUnit:
             case IndexValueRounded1DigitsWithUnit:
diff --git a/src/blacksim/fscommon/aircraftcfgentrieslist.cpp b/src/blacksim/fscommon/aircraftcfgentrieslist.cpp
index 05770d829..3aeb931dc 100644
--- a/src/blacksim/fscommon/aircraftcfgentrieslist.cpp
+++ b/src/blacksim/fscommon/aircraftcfgentrieslist.cpp
@@ -103,8 +103,8 @@ namespace BlackSim
             qDBusRegisterMetaType<BlackMisc::CSequence<CAircraftCfgEntries>>();
             qRegisterMetaType<BlackMisc::CCollection<CAircraftCfgEntries>>();
             qDBusRegisterMetaType<BlackMisc::CCollection<CAircraftCfgEntries>>();
-            qRegisterMetaType<CAircraftCfgEntries>();
-            qDBusRegisterMetaType<CAircraftCfgEntries>();
+            qRegisterMetaType<CAircraftCfgEntriesList>();
+            qDBusRegisterMetaType<CAircraftCfgEntriesList>();
         }
 
     } // namespace
diff --git a/src/blacksim/fscommon/aircraftmapping.cpp b/src/blacksim/fscommon/aircraftmapping.cpp
index 5c7b0d4b9..e444bd946 100644
--- a/src/blacksim/fscommon/aircraftmapping.cpp
+++ b/src/blacksim/fscommon/aircraftmapping.cpp
@@ -142,7 +142,7 @@ namespace BlackSim
         {
             if (index.isMyself())
             {
-                this->setPropertyByIndex(variant, index);
+                this->convertFromQVariant(variant);
                 return;
             }
             ColumnIndex i = index.frontCasted<ColumnIndex>();