diff options
author | Erik Verbruggen <erik.verbruggen@digia.com> | 2016-03-22 15:08:07 +0100 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2016-03-31 09:01:55 +0000 |
commit | bac1268ab00011f901602072277f1a02ebf5b35b (patch) | |
tree | 2cd76d631ccd680d6e12ced307e1d54ad2ee52a0 | |
parent | 84b72c51382ae861b5815f174cb482d0461c7955 (diff) |
QQuick: remove property index from the accessor functions.
This parameter was not used.
Change-Id: I1e8c0994cad37fc24105e354a80a4fb0131d58ee
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/qqmlaccessors_p.h | 6 | ||||
-rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 1 | ||||
-rw-r--r-- | src/qml/qml/qqmlpropertycache_p.h | 1 | ||||
-rw-r--r-- | src/quick/items/qquickitem.cpp | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index f529b4bc7d..5fb44307a9 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -140,8 +140,8 @@ struct ReadAccessor { { Q_ASSERT(property.accessors); - property.accessors->read(object, property.accessorData, output); - if (n) property.accessors->notifier(object, property.accessorData, n); + property.accessors->read(object, output); + if (n) property.accessors->notifier(object, n); } }; diff --git a/src/qml/qml/qqmlaccessors_p.h b/src/qml/qml/qqmlaccessors_p.h index cae4e2c2ff..55562a5307 100644 --- a/src/qml/qml/qqmlaccessors_p.h +++ b/src/qml/qml/qqmlaccessors_p.h @@ -103,7 +103,7 @@ class QQmlNotifier; } while (false); #define QML_PRIVATE_ACCESSOR(clazz, cpptype, name, variable) \ - static void clazz ## _ ## name ## Read(QObject *o, qintptr, void *rv) \ + static void clazz ## _ ## name ## Read(QObject *o, void *rv) \ { \ clazz ## Private *d = clazz ## Private::get(static_cast<clazz *>(o)); \ *static_cast<cpptype *>(rv) = d->variable; \ @@ -114,8 +114,8 @@ class QQmlNotifier; class QQmlAccessors { public: - void (*read)(QObject *object, qintptr property, void *output); - void (*notifier)(QObject *object, qintptr property, QQmlNotifier **notifier); + void (*read)(QObject *object, void *output); + void (*notifier)(QObject *object, QQmlNotifier **notifier); }; namespace QQmlAccessorProperties { diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 357b5ae577..3be52cf461 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -698,7 +698,6 @@ void QQmlPropertyCache::append(const QMetaObject *metaObject, if (accessorProperty) { data->flags |= QQmlPropertyData::HasAccessors; data->accessors = accessorProperty->accessors; - data->accessorData = accessorProperty->data; } else if (old) { data->markAsOverrideOf(old); } diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h index 0b3573c58c..4ff5ee89f9 100644 --- a/src/qml/qml/qqmlpropertycache_p.h +++ b/src/qml/qml/qqmlpropertycache_p.h @@ -209,7 +209,6 @@ public: }; struct { // When HasAccessors QQmlAccessors *accessors; - qintptr accessorData; }; }; int coreIndex; diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index f2a6e570c0..0c5c6e6c30 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -107,7 +107,7 @@ void debugFocusTree(QQuickItem *item, QQuickItem *scope = 0, int depth = 1) } } -static void QQuickItem_parentNotifier(QObject *o, qintptr, QQmlNotifier **n) +static void QQuickItem_parentNotifier(QObject *o, QQmlNotifier **n) { QQuickItemPrivate *d = QQuickItemPrivate::get(static_cast<QQuickItem *>(o)); *n = &d->parentNotifier; |