From 001d5791e5d6f0beefcc84cb53be0ddf09ea692c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sat, 29 Mar 2014 14:15:54 +0100 Subject: Remove object index parameter from QQmlCustomParser::compile There is no need anymore to pass through the object index of the object being "custom compiled". Change-Id: I8ef8e578b27523d9e7190503fbf95d1eb863a149 Reviewed-by: Lars Knoll --- tests/auto/qml/qqmllanguage/testtypes.cpp | 8 +++----- tests/auto/qml/qqmllanguage/testtypes.h | 8 ++++---- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/qml/qqmllanguage/testtypes.cpp b/tests/auto/qml/qqmllanguage/testtypes.cpp index 6dd7fca77e..8dd788869b 100644 --- a/tests/auto/qml/qqmllanguage/testtypes.cpp +++ b/tests/auto/qml/qqmllanguage/testtypes.cpp @@ -105,9 +105,8 @@ QVariant myCustomVariantTypeConverter(const QString &data) } -QByteArray CustomBindingParser::compile(const QV4::CompiledData::QmlUnit *qmlUnit, int objectIndex, const QList &bindings) +QByteArray CustomBindingParser::compile(const QV4::CompiledData::QmlUnit *qmlUnit, const QList &bindings) { - Q_UNUSED(objectIndex) QByteArray result; QDataStream ds(&result, QIODevice::WriteOnly); @@ -158,10 +157,9 @@ void CustomBinding::componentComplete() } } -QByteArray EnumSupportingCustomParser::compile(const QV4::CompiledData::QmlUnit *qmlUnit, int objectIndex, const QList &bindings) +QByteArray EnumSupportingCustomParser::compile(const QV4::CompiledData::QmlUnit *qmlUnit, const QList &bindings) { Q_UNUSED(qmlUnit) - Q_UNUSED(objectIndex) if (bindings.count() != 1) { error(bindings.first(), QStringLiteral("Custom parser invoked incorrectly for unit test")); @@ -194,7 +192,7 @@ QByteArray EnumSupportingCustomParser::compile(const QV4::CompiledData::QmlUnit } -QByteArray SimpleObjectCustomParser::compile(const QV4::CompiledData::QmlUnit *, int, const QList &bindings) +QByteArray SimpleObjectCustomParser::compile(const QV4::CompiledData::QmlUnit *, const QList &bindings) { return QByteArray::number(bindings.count()); } diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h index a8605da651..1a4cca2e8d 100644 --- a/tests/auto/qml/qqmllanguage/testtypes.h +++ b/tests/auto/qml/qqmllanguage/testtypes.h @@ -722,14 +722,14 @@ class MyCustomParserType : public QObject class MyCustomParserTypeParser : public QQmlCustomParser { public: - QByteArray compile(const QV4::CompiledData::QmlUnit *, int, const QList &) { return QByteArray(); } + QByteArray compile(const QV4::CompiledData::QmlUnit *, const QList &) { return QByteArray(); } void setCustomData(QObject *, const QByteArray &) {} }; class EnumSupportingCustomParser : public QQmlCustomParser { public: - QByteArray compile(const QV4::CompiledData::QmlUnit *qmlUnit, int objectIndex, const QList &bindings); + QByteArray compile(const QV4::CompiledData::QmlUnit *qmlUnit, const QList &bindings); void setCustomData(QObject *, const QByteArray &) {} }; @@ -1100,7 +1100,7 @@ public: class CustomBindingParser : public QQmlCustomParser { - virtual QByteArray compile(const QV4::CompiledData::QmlUnit *qmlUnit, int objectIndex, const QList &bindings); + virtual QByteArray compile(const QV4::CompiledData::QmlUnit *qmlUnit, const QList &bindings); virtual void setCustomData(QObject *object, const QByteArray &data); }; @@ -1127,7 +1127,7 @@ private: class SimpleObjectCustomParser : public QQmlCustomParser { - virtual QByteArray compile(const QV4::CompiledData::QmlUnit *, int, const QList &bindings); + virtual QByteArray compile(const QV4::CompiledData::QmlUnit *, const QList &bindings); virtual void setCustomData(QObject *object, const QByteArray &data); }; -- cgit v1.2.3