diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-05-24 12:10:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-24 12:42:45 +0200 |
| commit | be4f0622f8c0d89371e9314e2d53c246dd77871b (patch) | |
| tree | 55417377038c0a859703f4c5821c53df81e77be7 /src/qml/qml/qqmlbinding.cpp | |
| parent | 1eb41200948ab414f1c47d93123b41c547a993df (diff) | |
Remove the remaining dependencies onto the binding rewriter
Remove the remaining places that were rewriting bindings. Remove the
binding rewriter class.
Change-Id: Ib1e9121dc10f4526ddb7cf0ae32fecd8ce2d4993
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlbinding.cpp')
| -rw-r--r-- | src/qml/qml/qqmlbinding.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index 936c63f35e..209fac531d 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -49,7 +49,6 @@ #include <private/qqmlprofilerservice_p.h> #include <private/qqmltrace_p.h> #include <private/qqmlexpression_p.h> -#include <private/qqmlrewrite_p.h> #include <private/qqmlscriptstring_p.h> #include <QVariant> @@ -86,7 +85,7 @@ QQmlBinding::createBinding(Identifier id, QObject *obj, QQmlContext *ctxt, Q_ASSERT(typeData); if (QQmlCompiledData *cdata = typeData->compiledData()) { - rv = new QQmlBinding(cdata->primitives.at(id), true, obj, ctxtdata, url, lineNumber, 0); + rv = new QQmlBinding(cdata->primitives.at(id), obj, ctxtdata, url, lineNumber, 0); } typeData->release(); @@ -134,7 +133,7 @@ QQmlBinding::QQmlBinding(const QQmlScriptString &script, QObject *obj, QQmlConte Q_ASSERT(typeData); if (QQmlCompiledData *cdata = typeData->compiledData()) { - needRewrite = false; + needRewrite = true; code = cdata->primitives.at(id); m_url = cdata->name; } @@ -169,7 +168,7 @@ QQmlBinding::QQmlBinding(const QString &str, QObject *obj, QQmlContextData *ctxt v4function = qmlBinding(ctxt, obj, str, QString(), 0); } -QQmlBinding::QQmlBinding(const QString &str, bool isRewritten, QObject *obj, +QQmlBinding::QQmlBinding(const QString &str, QObject *obj, QQmlContextData *ctxt, const QString &url, quint16 lineNumber, quint16 columnNumber) : QQmlJavaScriptExpression(&QQmlBinding_jsvtable), QQmlAbstractBinding(Binding), @@ -181,10 +180,7 @@ QQmlBinding::QQmlBinding(const QString &str, bool isRewritten, QObject *obj, m_expression = str.toUtf8(); - if (isRewritten) - v4function = evalFunction(ctxt, obj, str, url, m_lineNumber); - else - v4function = qmlBinding(ctxt, obj, str, url, m_lineNumber); + v4function = qmlBinding(ctxt, obj, str, url, m_lineNumber); } /*! |