refs #437 Removed toQVariant and convertFromQVariant.

samples/blackmiscdbus/testservice_interface.h

@@ -168,49 +168,49 @@ namespace BlackMiscTest
         inline QDBusPendingReply<BlackMisc::Aviation::CAircraftList> pingAircraftList(BlackMisc::Aviation::CAircraftList aircraftList)
         {
             QList<QVariant> argumentList;
-            argumentList << aircraftList.toQVariant();
+            argumentList << QVariant::fromValue(aircraftList);
             return asyncCallWithArgumentList(QLatin1String("pingAircraftList"), argumentList);
         }
 
         inline QDBusPendingReply<BlackMisc::Aviation::CAirportList> pingAirportList(BlackMisc::Aviation::CAirportList airportList)
         {
             QList<QVariant> argumentList;
-            argumentList << airportList.toQVariant();
+            argumentList << QVariant::fromValue(airportList);
             return asyncCallWithArgumentList(QLatin1String("pingAirportList"), argumentList);
         }
 
         inline QDBusPendingReply<BlackMisc::Network::CClientList> pingClientList(BlackMisc::Network::CClientList clientList)
         {
             QList<QVariant> argumentList;
-            argumentList << clientList.toQVariant();
+            argumentList << QVariant::fromValue(clientList);
             return asyncCallWithArgumentList(QLatin1String("pingClientList"), argumentList);
         }
 
         inline QDBusPendingReply<BlackMisc::Network::CClient> pingClient(BlackMisc::Network::CClient client)
         {
             QList<QVariant> argumentList;
-            argumentList << client.toQVariant();
+            argumentList << QVariant::fromValue(client);
             return asyncCallWithArgumentList(QLatin1String("pingClient"), argumentList);
         }
 
         inline QDBusPendingReply<BlackMisc::CVariant> pingCVariant(BlackMisc::Network::CClient client)
         {
             QList<QVariant> argumentList;
-            argumentList << client.toQVariant();
+            argumentList << QVariant::fromValue(client);
             return asyncCallWithArgumentList(QLatin1String("pingCVariant"), argumentList);
         }
 
         inline QDBusPendingReply<BlackMisc::CPropertyIndex> pingPropertyIndex(BlackMisc::CPropertyIndex index)
         {
             QList<QVariant> argumentList;
-            argumentList << index.toQVariant();
+            argumentList << QVariant::fromValue(index);
             return asyncCallWithArgumentList(QLatin1String("pingPropertyIndex"), argumentList);
         }
 
         inline QDBusPendingReply<BlackMisc::CPropertyIndexVariantMap> pingIndexVariantMap(BlackMisc::CPropertyIndexVariantMap indexVariantMap)
         {
             QList<QVariant> argumentList;
-            argumentList << indexVariantMap.toQVariant();
+            argumentList << QVariant::fromValue(indexVariantMap);
             return asyncCallWithArgumentList(QLatin1String("pingIndexVariantMap"), argumentList);
         }
 

src/blackgui/components/settingssimulatorcomponent.cpp

@@ -46,10 +46,10 @@ namespace BlackGui
             Q_ASSERT_X(this->getIContextSettings(), Q_FUNC_INFO, "missing settings");
 
             // set values
-            ui->cb_Plugins->addItem(tr("Auto"), CSimulatorPluginInfo().toQVariant());
+            ui->cb_Plugins->addItem(tr("Auto"), QVariant::fromValue(CSimulatorPluginInfo()));
             for (const auto &p : getIContextSimulator()->getAvailableSimulatorPlugins())
             {
-                ui->cb_Plugins->addItem(p.toQString(), p.toQVariant());
+                ui->cb_Plugins->addItem(p.toQString(), QVariant::fromValue(p));
             }
 
             // connects

src/blackgui/models/keyboardkeylistmodel.cpp

@@ -120,7 +120,7 @@ namespace BlackGui
             // otherwise (comboboxes) standard handling via QItemDelegate
             CKeyboardLineEdit *lineEdit = qobject_cast<CKeyboardLineEdit *>(editor);
             if (lineEdit)
-                model->setData(index, lineEdit->getKey().toQVariant() , Qt::EditRole);
+                model->setData(index, QVariant::fromValue(lineEdit->getKey()) , Qt::EditRole);
             else
                 QItemDelegate::setModelData(editor, model, index);
         }

src/blackgui/models/listmodelbase.cpp

@@ -150,7 +150,7 @@ namespace BlackGui
             //! Formatted data
             ObjectType obj = this->getContainerOrFilteredContainer()[index.row()];
             BlackMisc::CPropertyIndex propertyIndex = this->columnToPropertyIndex(index.column());
-            return formatter->data(role, obj.propertyByIndex(propertyIndex)).toQVariant();
+            return formatter->data(role, obj.propertyByIndex(propertyIndex)).getQVariant();
         }
 
         template <typename ObjectType, typename ContainerType>

src/blackmisc/aviation/callsignset.h

@@ -32,12 +32,6 @@ namespace BlackMisc
             //! Construct from a base class object.
             CCallsignSet(const CCollection<CCallsign> &other);
 
-            //! \copydoc CValueObject::toQVariant
-            QVariant toQVariant() const { return QVariant::fromValue(*this); }
-
-            //! \copydoc CValueObject::convertFromQVariant
-            void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
-
             //! Register metadata
             static void registerMetadata();
 

src/blackmisc/dictionary.h

@@ -220,12 +220,6 @@ namespace BlackMisc
             removeByValueIf(BlackMisc::Predicates::MemberEqual(membFunc, returnValue));
         }
 
-        //! \copydoc CValueObject::toQVariant()
-        QVariant toQVariant() const { return QVariant::fromValue(*this); }
-
-        //! \copydoc CValueObject::convertFromQVariant
-        void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
-
         //! \copydoc CValueObject::toJson
         QJsonObject toJson() const
         {

src/blackmisc/iconlist.h

@@ -36,9 +36,6 @@ namespace BlackMisc
         //! Find by index
         CIcon findByIndex(CIcons::IconIndex index) const;
 
-        //! \copydoc CValueObject::asQVariant
-        QVariant toQVariant() const { return QVariant::fromValue(*this); }
-
         //! Register metadata of unit and quantity
         static void registerMetadata();
 

src/blackmisc/propertyindexvariantmap.h

@@ -219,12 +219,6 @@ namespace BlackMisc
         //! \copydoc CValueObject::qHash
         friend uint qHash(const CPropertyIndexVariantMap &vm) { return vm.getValueHash(); }
 
-        //! \copydoc CValueObject::toQVariant
-        QVariant toQVariant() const { return QVariant::fromValue(*this); }
-
-        //! \copydoc CValueObject::convertFromQVariant
-        void convertFromQVariant(const QVariant &variant) { BlackMisc::setFromQVariant(this, variant); }
-
         //! \copydoc CValueObject::convertToQString
         QString convertToQString(bool i18n = false) const;
 

src/blackmisc/valueobject.h

@@ -115,12 +115,6 @@ namespace BlackMisc
         //! \copydoc BlackMisc::Mixin::JsonByTuple::convertFromJson
         using Mixin::JsonByTuple<Derived>::convertFromJson;
 
-        //! \copydoc BlackMisc::Mixin::MetaType::toQVariant
-        using Mixin::MetaType<Derived>::toQVariant;
-
-        //! \copydoc BlackMisc::Mixin::MetaType::convertFromQVariant
-        using Mixin::MetaType<Derived>::convertFromQVariant;
-
         //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
         using Mixin::Index<Derived>::setPropertyByIndex;
 

src/blackmisc/variant.h

@@ -66,20 +66,6 @@ namespace BlackMisc
                 return baseIsA(static_cast<const MetaBaseOfT<Derived> *>(derived()), metaTypeId);
             }
 
-            //! Return QVariant, used with DBus QVariant lists
-            //! \deprecated Use QVariant::fromValue() instead.
-            QVariant toQVariant() const
-            {
-                return Private::MetaTypeHelper<Derived>::maybeToQVariant(*derived());
-            }
-
-            //! Set from QVariant
-            //! \deprecated Use QVariant::value() instead.
-            void convertFromQVariant(const QVariant &variant)
-            {
-                return Private::MetaTypeHelper<Derived>::maybeConvertFromQVariant(*derived(), variant);
-            }
-
         private:
             const Derived *derived() const { return static_cast<const Derived *>(this); }
             Derived *derived() { return static_cast<Derived *>(this); }
@@ -104,9 +90,7 @@ namespace BlackMisc
 #       define BLACKMISC_DECLARE_USING_MIXIN_METATYPE(DERIVED)                  \
             using ::BlackMisc::Mixin::MetaType<DERIVED>::registerMetadata;      \
             using ::BlackMisc::Mixin::MetaType<DERIVED>::getMetaTypeId;         \
-            using ::BlackMisc::Mixin::MetaType<DERIVED>::isA;                   \
+            using ::BlackMisc::Mixin::MetaType<DERIVED>::isA;
-            using ::BlackMisc::Mixin::MetaType<DERIVED>::toQVariant;            \
-            using ::BlackMisc::Mixin::MetaType<DERIVED>::convertFromQVariant;
 
         /*!
          * When a derived class and a base class both inherit from Mixin::MetaType,
@@ -243,12 +227,6 @@ namespace BlackMisc
         //! Return the internal QVariant.
         const QVariant &getQVariant() const { return m_v; }
 
-        //! \copydoc CValueObject::toQVariant
-        QVariant toQVariant() const { return getQVariant(); }
-
-        //! \copydoc CValueObject::convertFromQVariant
-        void convertFromQVariant(const QVariant &v) { m_v = v; }
-
         //! True if this variant can be converted to the type with the given metatype ID.
         bool canConvert(int typeId) const { return m_v.canConvert(typeId); }