diff options
author | Ulf Hermann <[email protected]> | 2020-09-16 12:59:31 +0200 |
---|---|---|
committer | Ulf Hermann <[email protected]> | 2020-09-16 14:55:27 +0200 |
commit | ae9bef00159fa3362309ccf3a9999f75bd45e81e (patch) | |
tree | ece223ac23956d44421579cd87e7b439ceba5220 /src | |
parent | 876408197b0b2fc8e11e82d318b8ea420206880e (diff) |
QQmlValueTypeProvider: Remove dead code
The more adventurous variant/string conversions are luckily unused.
Let's remove them before anyone gets ideas.
Change-Id: I6f95cbdf9ead12ab723cafdbb2b0f02a0ff461fa
Reviewed-by: Maximilian Goldstein <[email protected]>
Reviewed-by: Lars Knoll <[email protected]>
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/qml/qqmlglobal.cpp | 30 | ||||
-rw-r--r-- | src/qml/qml/qqmlglobal_p.h | 4 | ||||
-rw-r--r-- | src/quick/util/qquickglobal.cpp | 54 |
3 files changed, 0 insertions, 88 deletions
diff --git a/src/qml/qml/qqmlglobal.cpp b/src/qml/qml/qqmlglobal.cpp index b6a1075c67..1c0bb41804 100644 --- a/src/qml/qml/qqmlglobal.cpp +++ b/src/qml/qml/qqmlglobal.cpp @@ -105,34 +105,6 @@ bool QQmlValueTypeProvider::createValueFromString(int type, const QString &s, vo return false; } -bool QQmlValueTypeProvider::createStringFromValue(int type, const void *data, QString *s) -{ - Q_ASSERT(data); - Q_ASSERT(s); - - QQmlValueTypeProvider *p = this; - do { - if (p->createStringFrom(type, data, s)) - return true; - } while ((p = p->next)); - - return false; -} - -QVariant QQmlValueTypeProvider::createVariantFromString(const QString &s) -{ - QVariant v; - - QQmlValueTypeProvider *p = this; - do { - if (p->variantFromString(s, &v)) - return v; - } while ((p = p->next)); - - // Return a variant containing the string itself - return QVariant(s); -} - QVariant QQmlValueTypeProvider::createVariantFromString(int type, const QString &s, bool *ok) { QVariant v; @@ -223,8 +195,6 @@ const QMetaObject *QQmlValueTypeProvider::getMetaObjectForMetaType(int) { return bool QQmlValueTypeProvider::init(int, QVariant&) { return false; } bool QQmlValueTypeProvider::create(int, int, const void *[], QVariant *) { return false; } bool QQmlValueTypeProvider::createFromString(int, const QString &, void *, size_t) { return false; } -bool QQmlValueTypeProvider::createStringFrom(int, const void *, QString *) { return false; } -bool QQmlValueTypeProvider::variantFromString(const QString &, QVariant *) { return false; } bool QQmlValueTypeProvider::variantFromString(int, const QString &, QVariant *) { return false; } bool QQmlValueTypeProvider::variantFromJsObject(int, const QV4::Value &, QV4::ExecutionEngine *, QVariant *) { return false; } bool QQmlValueTypeProvider::equal(int, const void *, const QVariant&) { return false; } diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h index b0f239e398..f2a11e5456 100644 --- a/src/qml/qml/qqmlglobal_p.h +++ b/src/qml/qml/qqmlglobal_p.h @@ -228,9 +228,7 @@ public: QVariant createValueType(int, int, const void *[]); bool createValueFromString(int, const QString &, void *, size_t); - bool createStringFromValue(int, const void *, QString *); - QVariant createVariantFromString(const QString &); QVariant createVariantFromString(int, const QString &, bool *); QVariant createVariantFromJsObject(int, const QV4::Value &, QV4::ExecutionEngine *, bool *); @@ -245,9 +243,7 @@ private: virtual bool create(int, int, const void *[], QVariant *); virtual bool createFromString(int, const QString &, void *, size_t); - virtual bool createStringFrom(int, const void *, QString *); - virtual bool variantFromString(const QString &, QVariant *); virtual bool variantFromString(int, const QString &, QVariant *); virtual bool variantFromJsObject(int, const QV4::Value &, QV4::ExecutionEngine *, QVariant *); diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index 4d5b8e4a1c..e6000e352a 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -730,60 +730,6 @@ public: return false; } - bool createStringFrom(int type, const void *data, QString *s) override - { - if (type == QMetaType::QColor) { - const QColor *color = reinterpret_cast<const QColor *>(data); - new (s) QString(QVariant(*color).toString()); - return true; - } - - return false; - } - - bool variantFromString(const QString &s, QVariant *v) override - { - QColor c(s); - if (c.isValid()) { - *v = QVariant::fromValue(c); - return true; - } - - bool ok = false; - - QVector2D v2 = vector2DFromString(s, &ok); - if (ok) { - *v = QVariant::fromValue(v2); - return true; - } - - QVector3D v3 = vector3DFromString(s, &ok); - if (ok) { - *v = QVariant::fromValue(v3); - return true; - } - - QVector4D v4 = vector4DFromString(s, &ok); - if (ok) { - *v = QVariant::fromValue(v4); - return true; - } - - QQuaternion q = quaternionFromString(s, &ok); - if (ok) { - *v = QVariant::fromValue(q); - return true; - } - - QMatrix4x4 m = matrix4x4FromString(s, &ok); - if (ok) { - *v = QVariant::fromValue(m); - return true; - } - - return false; - } - bool variantFromString(int type, const QString &s, QVariant *v) override { bool ok = false; |