QSM: Reintroduce guard argument evaluation

Implements the suggestion from Simon Hausmann (codereview 89716
from 08-05 14:46) to use QQmlScriptString rather then the previous
used MetaObject-manipulation.

This also introduces comparison operators for QQmlScriptString
to be able to determinate if a QQmlScriptString changed what
is needed cause there is otherwise no way to access (all) the
needed details within QQmlScriptStringPrivate.

Change-Id: I198479eac8fd37cbdd98a99aacdd8eebf7b75d21
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 38 insertions, 0 deletions

diff --git a/src/qml/qml/qqmlscriptstring.cpp b/src/qml/qml/qqmlscriptstring.cpp
index b18bd4d420..c8227070c5 100644
--- a/src/qml/qml/qqmlscriptstring.cpp
+++ b/src/qml/qml/qqmlscriptstring.cpp
@@ -114,6 +114,44 @@ QQmlScriptString &QQmlScriptString::operator=(const QQmlScriptString &other)
 }
 
 /*!
+Returns \c true if this and the \a other QQmlScriptString objects are equal.
+
+\sa operator!=()
+*/
+bool QQmlScriptString::operator==(const QQmlScriptString &other) const
+{
+    if (d == other.d)
+        return true;
+
+    if (d->isNumberLiteral || other.d->isNumberLiteral)
+        return d->isNumberLiteral && other.d->isNumberLiteral && d->numberValue == other.d->numberValue;
+
+    if (d->isStringLiteral || other.d->isStringLiteral)
+        return d->isStringLiteral && other.d->isStringLiteral && d->script == other.d->script;
+
+    if (d->script == QStringLiteral("true") ||
+        d->script == QStringLiteral("false") ||
+        d->script == QStringLiteral("undefined") ||
+        d->script == QStringLiteral("null"))
+        return d->script == other.d->script;
+
+    return d->context == other.d->context &&
+           d->scope == other.d->scope &&
+           d->script == other.d->script &&
+           d->bindingId == other.d->bindingId;
+}
+
+/*!
+Returns \c true if this and the \a other QQmlScriptString objects are different.
+
+\sa operator==()
+*/
+bool QQmlScriptString::operator!=(const QQmlScriptString &other) const
+{
+    return !operator==(other);
+}
+
+/*!
 Returns whether the QQmlScriptString is empty.
 */
 bool QQmlScriptString::isEmpty() const