From 47cac09e81844c7e9fcc26a5cd6f7bfd658dbba7 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Sun, 31 May 2015 17:21:17 +0100 Subject: [PATCH] refs #437 Removed toQVariant and convertFromQVariant. --- samples/blackmiscdbus/testservice_interface.h | 14 +++++------ .../components/settingssimulatorcomponent.cpp | 4 ++-- src/blackgui/models/keyboardkeylistmodel.cpp | 2 +- src/blackgui/models/listmodelbase.cpp | 2 +- src/blackmisc/aviation/callsignset.h | 6 ----- src/blackmisc/dictionary.h | 6 ----- src/blackmisc/iconlist.h | 3 --- src/blackmisc/propertyindexvariantmap.h | 6 ----- src/blackmisc/valueobject.h | 6 ----- src/blackmisc/variant.h | 24 +------------------ 10 files changed, 12 insertions(+), 61 deletions(-) diff --git a/samples/blackmiscdbus/testservice_interface.h b/samples/blackmiscdbus/testservice_interface.h index a7df196b2..e81434079 100644 --- a/samples/blackmiscdbus/testservice_interface.h +++ b/samples/blackmiscdbus/testservice_interface.h @@ -168,49 +168,49 @@ namespace BlackMiscTest inline QDBusPendingReply pingAircraftList(BlackMisc::Aviation::CAircraftList aircraftList) { QList argumentList; - argumentList << aircraftList.toQVariant(); + argumentList << QVariant::fromValue(aircraftList); return asyncCallWithArgumentList(QLatin1String("pingAircraftList"), argumentList); } inline QDBusPendingReply pingAirportList(BlackMisc::Aviation::CAirportList airportList) { QList argumentList; - argumentList << airportList.toQVariant(); + argumentList << QVariant::fromValue(airportList); return asyncCallWithArgumentList(QLatin1String("pingAirportList"), argumentList); } inline QDBusPendingReply pingClientList(BlackMisc::Network::CClientList clientList) { QList argumentList; - argumentList << clientList.toQVariant(); + argumentList << QVariant::fromValue(clientList); return asyncCallWithArgumentList(QLatin1String("pingClientList"), argumentList); } inline QDBusPendingReply pingClient(BlackMisc::Network::CClient client) { QList argumentList; - argumentList << client.toQVariant(); + argumentList << QVariant::fromValue(client); return asyncCallWithArgumentList(QLatin1String("pingClient"), argumentList); } inline QDBusPendingReply pingCVariant(BlackMisc::Network::CClient client) { QList argumentList; - argumentList << client.toQVariant(); + argumentList << QVariant::fromValue(client); return asyncCallWithArgumentList(QLatin1String("pingCVariant"), argumentList); } inline QDBusPendingReply pingPropertyIndex(BlackMisc::CPropertyIndex index) { QList argumentList; - argumentList << index.toQVariant(); + argumentList << QVariant::fromValue(index); return asyncCallWithArgumentList(QLatin1String("pingPropertyIndex"), argumentList); } inline QDBusPendingReply pingIndexVariantMap(BlackMisc::CPropertyIndexVariantMap indexVariantMap) { QList argumentList; - argumentList << indexVariantMap.toQVariant(); + argumentList << QVariant::fromValue(indexVariantMap); return asyncCallWithArgumentList(QLatin1String("pingIndexVariantMap"), argumentList); } diff --git a/src/blackgui/components/settingssimulatorcomponent.cpp b/src/blackgui/components/settingssimulatorcomponent.cpp index ec2e05d93..8aaddbb2d 100644 --- a/src/blackgui/components/settingssimulatorcomponent.cpp +++ b/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 diff --git a/src/blackgui/models/keyboardkeylistmodel.cpp b/src/blackgui/models/keyboardkeylistmodel.cpp index 34c288e9f..1006e876d 100644 --- a/src/blackgui/models/keyboardkeylistmodel.cpp +++ b/src/blackgui/models/keyboardkeylistmodel.cpp @@ -120,7 +120,7 @@ namespace BlackGui // otherwise (comboboxes) standard handling via QItemDelegate CKeyboardLineEdit *lineEdit = qobject_cast(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); } diff --git a/src/blackgui/models/listmodelbase.cpp b/src/blackgui/models/listmodelbase.cpp index 9679b23f7..72f0dcd7e 100644 --- a/src/blackgui/models/listmodelbase.cpp +++ b/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 diff --git a/src/blackmisc/aviation/callsignset.h b/src/blackmisc/aviation/callsignset.h index b4c734b3b..0680c74af 100644 --- a/src/blackmisc/aviation/callsignset.h +++ b/src/blackmisc/aviation/callsignset.h @@ -32,12 +32,6 @@ namespace BlackMisc //! Construct from a base class object. CCallsignSet(const CCollection &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(); diff --git a/src/blackmisc/dictionary.h b/src/blackmisc/dictionary.h index be8544f19..244c498db 100644 --- a/src/blackmisc/dictionary.h +++ b/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 { diff --git a/src/blackmisc/iconlist.h b/src/blackmisc/iconlist.h index 3188f18bd..b0951e364 100644 --- a/src/blackmisc/iconlist.h +++ b/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(); diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h index de6afab51..c12321a7f 100644 --- a/src/blackmisc/propertyindexvariantmap.h +++ b/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; diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h index 18bd89c31..f9198ca59 100644 --- a/src/blackmisc/valueobject.h +++ b/src/blackmisc/valueobject.h @@ -115,12 +115,6 @@ namespace BlackMisc //! \copydoc BlackMisc::Mixin::JsonByTuple::convertFromJson using Mixin::JsonByTuple::convertFromJson; - //! \copydoc BlackMisc::Mixin::MetaType::toQVariant - using Mixin::MetaType::toQVariant; - - //! \copydoc BlackMisc::Mixin::MetaType::convertFromQVariant - using Mixin::MetaType::convertFromQVariant; - //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex using Mixin::Index::setPropertyByIndex; diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h index fa9debfdd..c8efce436 100644 --- a/src/blackmisc/variant.h +++ b/src/blackmisc/variant.h @@ -66,20 +66,6 @@ namespace BlackMisc return baseIsA(static_cast *>(derived()), metaTypeId); } - //! Return QVariant, used with DBus QVariant lists - //! \deprecated Use QVariant::fromValue() instead. - QVariant toQVariant() const - { - return Private::MetaTypeHelper::maybeToQVariant(*derived()); - } - - //! Set from QVariant - //! \deprecated Use QVariant::value() instead. - void convertFromQVariant(const QVariant &variant) - { - return Private::MetaTypeHelper::maybeConvertFromQVariant(*derived(), variant); - } - private: const Derived *derived() const { return static_cast(this); } Derived *derived() { return static_cast(this); } @@ -104,9 +90,7 @@ namespace BlackMisc # define BLACKMISC_DECLARE_USING_MIXIN_METATYPE(DERIVED) \ using ::BlackMisc::Mixin::MetaType::registerMetadata; \ using ::BlackMisc::Mixin::MetaType::getMetaTypeId; \ - using ::BlackMisc::Mixin::MetaType::isA; \ - using ::BlackMisc::Mixin::MetaType::toQVariant; \ - using ::BlackMisc::Mixin::MetaType::convertFromQVariant; + using ::BlackMisc::Mixin::MetaType::isA; /*! * 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); }