Optimized QDeclarativeScriptString constructor for QDeclarativeExpression.

When the compiler sees a script string, it will attempt to rewrite it
and store the id for the rewrite in the script string. We can then
create a QDeclarativeExpression using the id, which saves us a rewrite
at runtime.

Reviewed-by: Aaron Kennedy

1 files changed, 3 insertions, 12 deletions

diff --git a/src/declarative/qml/qdeclarativescriptstring.cpp b/src/declarative/qml/qdeclarativescriptstring.cpp
index f544393b9b..02d6e5603e 100644
--- a/src/declarative/qml/qdeclarativescriptstring.cpp
+++ b/src/declarative/qml/qdeclarativescriptstring.cpp
@@ -40,19 +40,10 @@
 ****************************************************************************/
 
 #include "qdeclarativescriptstring.h"
+#include "qdeclarativescriptstring_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeScriptStringPrivate : public QSharedData
-{
-public:
-    QDeclarativeScriptStringPrivate() : context(0), scope(0) {}
-
-    QDeclarativeContext *context;
-    QObject *scope;
-    QString script;
-};
-
 /*!
 \class QDeclarativeScriptString
 \since 4.7
@@ -75,8 +66,8 @@ and the class could choose how to handle it. Typically, the class will evaluate
 the script at some later time using a QDeclarativeExpression.
 
 \code
-QDeclarativeExpression expr(scriptString.context(), scriptString.script(), scriptStr.scopeObject());
-expr.value();
+QDeclarativeExpression expr(scriptString);
+expr.evaluate();
 \endcode
 
 \sa QDeclarativeExpression