}
if (!watcher.wasDeleted() && notifyOnValueChanged()) {
- guardList.updateGuards(m_notifyObject, m_notifyIndex, expressionString(),
- ep->capturedProperties);
+ guardList.updateGuards(m_notifyObject, m_notifyIndex, this, ep->capturedProperties);
}
if (lastCapturedProperties.count())
}
void QDeclarativeJavaScriptExpression::GuardList::updateGuards(QObject *notifyObject, int notifyIndex,
- const QStringRef &expression,
+ QDeclarativeJavaScriptExpression *expression,
const CapturedProperties &properties)
{
Q_ASSERT(notifyObject);
}
}
- } else if (!expression.isEmpty()) {
+ } else {
if (!outputWarningHeader) {
+ QString e = expression->expressionIdentifier();
outputWarningHeader = true;
- qWarning() << "QDeclarativeExpression: Expression" << expression
+ qWarning() << "QDeclarativeExpression: Expression" << qPrintable(e)
<< "depends on non-NOTIFYable properties:";
}
inline void setScopeObject(QObject *v);
protected:
- inline virtual QStringRef expressionString();
+ inline virtual QString expressionIdentifier();
private:
quint32 m_requiresThisObject:1;
typedef QPODVector<QDeclarativeEnginePrivate::CapturedProperty> CapturedProperties;
void updateGuards(QObject *guardObject, int guardObjectNotifyIndex,
- const QStringRef &expression, const CapturedProperties &properties);
+ QDeclarativeJavaScriptExpression *, const CapturedProperties &properties);
private:
QDeclarativeNotifierEndpoint *endpoints;
bool expressionFunctionValid:1;
bool extractExpressionFromFunction:1;
- inline virtual QStringRef expressionString();
+ inline virtual QString expressionIdentifier();
QString expression;
m_scopeObject = v;
}
-QStringRef QDeclarativeJavaScriptExpression::expressionString()
+QString QDeclarativeJavaScriptExpression::expressionIdentifier()
{
- return QStringRef();
+ return QString();
}
QDeclarativeJavaScriptExpression::GuardList::GuardList()
return expr->q_func();
}
-QStringRef QDeclarativeExpressionPrivate::expressionString()
+QString QDeclarativeExpressionPrivate::expressionIdentifier()
{
- return QStringRef(&expression);
+ return QLatin1String("\"") + expression + QLatin1String("\"");
}
QT_END_NAMESPACE
void update() { QDeclarativeAbstractBinding::update(); }
+ // Inherited from QDeclarativeJavaScriptExpression
+ inline virtual QString expressionIdentifier();
+
// Inherited from QDeclarativeAbstractBinding
virtual void setEnabled(bool, QDeclarativePropertyPrivate::WriteFlags flags);
virtual void update(QDeclarativePropertyPrivate::WriteFlags flags);
}
}
+QString QV8BindingsPrivate::Binding::expressionIdentifier()
+{
+ return parent->url.toString() + QLatin1String(":") + QString::number(line);
+}
+
void QV8BindingsPrivate::Binding::destroy()
{
enabled = false;