Rename QDeclarativeExpression::value() to evaluate().

QDeclarativeExpression can be used to evaluate any sort of expression,
not just those returning a value.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp
index 8b5a62f..238beb8 100644
--- a/src/declarative/qml/qdeclarativeexpression.cpp
+++ b/src/declarative/qml/qdeclarativeexpression.cpp
@@ -479,18 +479,18 @@ QVariant QDeclarativeExpressionPrivate::value(QObject *secondaryScope, bool *isU
 }
 
 /*!
-    Returns the value of the expression, or an invalid QVariant if the
-    expression is invalid or has an error.
+    Evaulates the expression, returning the result of the evaluation,
+    or an invalid QVariant if the expression is invalid or has an error.
 
-    \a isUndefined is set to true if the expression resulted in an
+    \a valueIsUndefined is set to true if the expression resulted in an
     undefined value.
 
     \sa hasError(), error()
 */
-QVariant QDeclarativeExpression::value(bool *isUndefined)
+QVariant QDeclarativeExpression::evaluate(bool *valueIsUndefined)
 {
     Q_D(QDeclarativeExpression);
-    return d->value(0, isUndefined);
+    return d->value(0, valueIsUndefined);
 }
 
 /*!
@@ -569,7 +569,7 @@ QObject *QDeclarativeExpression::scopeObject() const
 }
 
 /*!
-    Returns true if the last call to value() resulted in an error, 
+    Returns true if the last call to evaluate() resulted in an error,
     otherwise false.
     
     \sa error(), clearError()
@@ -593,7 +593,7 @@ void QDeclarativeExpression::clearError()
 }
 
 /*!
-    Return any error from the last call to value().  If there was no error,
+    Return any error from the last call to evaluate().  If there was no error,
     this returns an invalid QDeclarativeError instance.
 
     \sa hasError(), clearError()
@@ -711,7 +711,7 @@ void QDeclarativeExpressionPrivate::updateGuards(const QPODVector<QDeclarativeEn
 
     Emitted each time the expression value changes from the last time it was
     evaluated.  The expression must have been evaluated at least once (by
-    calling QDeclarativeExpression::value()) before this signal will be emitted.
+    calling QDeclarativeExpression::evaluate()) before this signal will be emitted.
 */
 
 void QDeclarativeExpressionPrivate::emitValueChanged()