diff --git a/src/blackmisc/variantprivate.h b/src/blackmisc/variantprivate.h index 4494be829..f8709ff0a 100644 --- a/src/blackmisc/variantprivate.h +++ b/src/blackmisc/variantprivate.h @@ -31,23 +31,6 @@ namespace BlackMisc template void registerMetaValueType(); - //! Checked version from QVariant - template void setFromQVariant(T *value, const QVariant &variant) - { - if (variant.canConvert()) - { - (*value) = variant.value(); - } - else - { - const QString m = QString("Target type: %1 Variant type: %2 %3 %4"). - arg(qMetaTypeId()). - arg(static_cast(variant.type())).arg(variant.userType()).arg(variant.typeName()); - Q_ASSERT_X(false, "setFromQVariant", m.toLocal8Bit().constData()); - Q_UNUSED(m); - } - } - namespace Private { //! \private Needed so we can copy forward-declared CVariant. @@ -237,8 +220,6 @@ namespace BlackMisc { static constexpr int maybeGetMetaTypeId() { return qMetaTypeId(); } static void maybeRegisterMetaType() { qRegisterMetaType(); qDBusRegisterMetaType(); registerMetaValueType(); } - static QVariant maybeToQVariant(const T &obj) { return QVariant::fromValue(obj); } - static void maybeConvertFromQVariant(T &obj, const QVariant &var) { BlackMisc::setFromQVariant(&obj, var); } }; template @@ -246,8 +227,6 @@ namespace BlackMisc { static constexpr int maybeGetMetaTypeId() { return QMetaType::UnknownType; } static void maybeRegisterMetaType() {} - static QVariant maybeToQVariant(const T &) { return {}; } - static void maybeConvertFromQVariant(T &, const QVariant &) {} }; template