aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml
diff options
context:
space:
mode:
authorFrank Meerkoetter <frank.meerkoetter@basyskom.com>2015-07-30 21:57:24 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-08-18 20:26:16 +0000
commit8049154bd57394118a3eefdd63ab00940161e785 (patch)
tree6a26d56bba219c8c1cf3850782706edd3a24da2e /src/qml
parenta9ef319e154c0a0b9a3455c3d10459ddc866b36d (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/qml')
-rw-r--r--src/qml/qml/qqmlglobal.cpp14
-rw-r--r--src/qml/qml/qqmlglobal_p.h2
2 files changed, 0 insertions, 16 deletions
diff --git a/src/qml/qml/qqmlglobal.cpp b/src/qml/qml/qqmlglobal.cpp
index 17de696af3..aa2b4b6aee 100644
--- a/src/qml/qml/qqmlglobal.cpp
+++ b/src/qml/qml/qqmlglobal.cpp
@@ -73,19 +73,6 @@ bool QQmlValueTypeProvider::initValueType(int type, QVariant& dst)
return false;
}
-bool QQmlValueTypeProvider::destroyValueType(int type, void *data, size_t n)
-{
- Q_ASSERT(data);
-
- QQmlValueTypeProvider *p = this;
- do {
- if (p->destroy(type, data, n))
- return true;
- } while ((p = p->next));
-
- return false;
-}
-
QVariant QQmlValueTypeProvider::createValueType(int type, int argc, const void *argv[])
{
QVariant v;
@@ -227,7 +214,6 @@ bool QQmlValueTypeProvider::writeValueType(int type, const void *src, QVariant&
const QMetaObject *QQmlValueTypeProvider::getMetaObjectForMetaType(int) { return 0; }
bool QQmlValueTypeProvider::init(int, QVariant&) { return false; }
-bool QQmlValueTypeProvider::destroy(int, void *, size_t) { 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; }
diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h
index c19f7dab64..d09ae21f56 100644
--- a/src/qml/qml/qqmlglobal_p.h
+++ b/src/qml/qml/qqmlglobal_p.h
@@ -225,7 +225,6 @@ public:
const QMetaObject *metaObjectForMetaType(int);
bool initValueType(int, QVariant&);
- bool destroyValueType(int, void *, size_t);
QVariant createValueType(int, int, const void *[]);
bool createValueFromString(int, const QString &, void *, size_t);
@@ -243,7 +242,6 @@ public:
private:
virtual const QMetaObject *getMetaObjectForMetaType(int);
virtual bool init(int, QVariant&);
- virtual bool destroy(int, void *, size_t);
virtual bool create(int, int, const void *[], QVariant *);
virtual bool createFromString(int, const QString &, void *, size_t);