diff options
author | Frank Meerkoetter <frank.meerkoetter@basyskom.com> | 2015-07-30 21:57:24 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-08-18 20:26:16 +0000 |
commit | 8049154bd57394118a3eefdd63ab00940161e785 (patch) | |
tree | 6a26d56bba219c8c1cf3850782706edd3a24da2e /src/quick | |
parent | a9ef319e154c0a0b9a3455c3d10459ddc866b36d (diff) |
Also remove the QQmlValueTypeProvider::destroyValueType interface
After the removeal of the QQmlVMEVariant there is no user left.
Change-Id: I97224127aac57aba9a80827f9292018d03609b85
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/util/qquickglobal.cpp | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index adf3a68e92..d7f1158a6b 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -427,47 +427,6 @@ public: return false; } - template<typename T> - bool typedDestroy(void *data, size_t dataSize) - { - ASSERT_VALID_SIZE(dataSize, sizeof(T)); - T *t = reinterpret_cast<T *>(data); - t->~T(); - return true; - } - - bool destroy(int type, void *data, size_t dataSize) - { - switch (type) { - case QMetaType::QColor: - return typedDestroy<QColor>(data, dataSize); - case QMetaType::QFont: - return typedDestroy<QFont>(data, dataSize); - case QMetaType::QVector2D: - return typedDestroy<QVector2D>(data, dataSize); - case QMetaType::QVector3D: - return typedDestroy<QVector3D>(data, dataSize); - case QMetaType::QVector4D: - return typedDestroy<QVector4D>(data, dataSize); - case QMetaType::QQuaternion: - return typedDestroy<QQuaternion>(data, dataSize); - case QMetaType::QMatrix4x4: - { - if (dataSize >= sizeof(QMatrix4x4)) - return typedDestroy<QMatrix4x4>(data, dataSize); - - // special case: destroying matrix-containing qvariant. - Q_ASSERT(dataSize >= sizeof(QVariant)); - QVariant *matvar = reinterpret_cast<QVariant *>(data); - matvar->~QVariant(); - return true; - } - default: break; - } - - return false; - } - bool create(int type, int argc, const void *argv[], QVariant *v) { switch (type) { |