aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml
diff options
context:
space:
mode:
authorOleg Shparber <trollixx@gmail.com>2014-12-31 10:34:52 -0800
committerOleg Shparber <trollixx@gmail.com>2015-01-02 21:29:09 +0100
commit29c0102adb8b800f4947e4e7962ca414fe576866 (patch)
tree7e5e35bc688f05337f080315336cd80864144620 /src/qml/qml
parentd0db6dc2b7ceb04f2bc1815ac3216a09add8fd3d (diff)
Use QV4::ScopedString typedef instead of actual type
Change-Id: I64ecbf6cea463387a70e909ecc5f9165d22a7b0f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml')
-rw-r--r--src/qml/qml/qqmlcontextwrapper.cpp2
-rw-r--r--src/qml/qml/qqmlvaluetypewrapper.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp
index 0b63849e54..712cba74ec 100644
--- a/src/qml/qml/qqmlcontextwrapper.cpp
+++ b/src/qml/qml/qqmlcontextwrapper.cpp
@@ -288,7 +288,7 @@ void QmlContextWrapper::put(Managed *m, String *name, const ValueRef value)
if (wrapper && wrapper->d()->readOnly) {
QString error = QLatin1String("Invalid write to global property \"") + name->toQString() +
QLatin1Char('"');
- Scoped<String> e(scope, v4->currentContext()->engine->newString(error));
+ ScopedString e(scope, v4->currentContext()->engine->newString(error));
v4->throwError(e);
return;
}
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index a7c4d6ca15..222ab0aa31 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -363,7 +363,7 @@ void QQmlValueTypeWrapper::put(Managed *m, String *name, const ValueRef value)
if (!f->bindingKeyFlag()) {
// assigning a JS function to a non-var-property is not allowed.
QString error = QStringLiteral("Cannot assign JavaScript function to value-type property");
- Scoped<String> e(scope, v4->newString(error));
+ ScopedString e(scope, v4->newString(error));
v4->throwError(e);
return;
}