Get rid of asStringObject()

Change-Id: Iad3afd00d2fdbd04efa4f3b841f11269ab496826
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

6 files changed, 9 insertions, 16 deletions

diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp
index e826261010..8c6bdb7a2a 100644
--- a/src/qml/jsruntime/qv4jsonobject.cpp
+++ b/src/qml/jsruntime/qv4jsonobject.cpp
@@ -702,7 +702,7 @@ QString Stringify::Str(const QString &key, const Value &v)
     if (o) {
         if (NumberObject *n = o->asNumberObject())
             value = Encode(n->value());
-        else if (StringObject *so = o->asStringObject())
+        else if (StringObject *so = o->as<StringObject>())
             value = so->d()->value;
         else if (BooleanObject *b =o->asBooleanObject())
             value = Encode(b->value());
@@ -893,7 +893,7 @@ ReturnedValue JsonObject::method_stringify(CallContext *ctx)
             ScopedValue v(scope);
             for (uint i = 0; i < arrayLen; ++i) {
                 v = o->getIndexed(i);
-                if (v->asNumberObject() || v->asStringObject() || v->isNumber())
+                if (v->asNumberObject() || v->as<StringObject>() || v->isNumber())
                     v = RuntimeHelpers::toString(scope.engine, v);
                 if (v->isString()) {
                     String *s = v->stringValue();
@@ -907,7 +907,7 @@ ReturnedValue JsonObject::method_stringify(CallContext *ctx)
     ScopedValue s(scope, ctx->argument(2));
     if (NumberObject *n = s->asNumberObject())
         s = Encode(n->value());
-    else if (StringObject *so = s->asStringObject())
+    else if (StringObject *so = s->as<StringObject>())
         s = so->d()->value;
 
     if (s->isNumber()) {
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h
index e883886bf2..4a6f750d0c 100644
--- a/src/qml/jsruntime/qv4managed_p.h
+++ b/src/qml/jsruntime/qv4managed_p.h
@@ -155,7 +155,6 @@ public:
     FunctionObject *asFunctionObject() { return d()->vtable->isFunctionObject ? reinterpret_cast<FunctionObject *>(this) : 0; }
     BooleanObject *asBooleanObject() { return d()->vtable->type == Type_BooleanObject ? reinterpret_cast<BooleanObject *>(this) : 0; }
     NumberObject *asNumberObject() { return d()->vtable->type == Type_NumberObject ? reinterpret_cast<NumberObject *>(this) : 0; }
-    StringObject *asStringObject() { return d()->vtable->type == Type_StringObject ? reinterpret_cast<StringObject *>(this) : 0; }
     ArgumentsObject *asArgumentsObject() { return d()->vtable->type == Type_ArgumentsObject ? reinterpret_cast<ArgumentsObject *>(this) : 0; }
 
     bool isListType() const { return d()->vtable->type == Type_QmlSequence; }
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp
index 91d5bc3d78..f79abc8375 100644
--- a/src/qml/jsruntime/qv4stringobject.cpp
+++ b/src/qml/jsruntime/qv4stringobject.cpp
@@ -104,7 +104,7 @@ bool StringObject::deleteIndexedProperty(Managed *m, uint index)
 {
     ExecutionEngine *v4 = static_cast<StringObject *>(m)->engine();
     Scope scope(v4);
-    Scoped<StringObject> o(scope, m->asStringObject());
+    Scoped<StringObject> o(scope, m->as<StringObject>());
     Q_ASSERT(!!o);
 
     if (index < static_cast<uint>(o->d()->value.stringValue()->toQString().length())) {
@@ -220,7 +220,7 @@ static QString getThisString(ExecutionContext *ctx)
     ScopedValue t(scope, ctx->thisObject());
     if (t->isString())
         return t->stringValue()->toQString();
-    if (StringObject *thisString = t->asStringObject())
+    if (StringObject *thisString = t->as<StringObject>())
         return thisString->d()->value.stringValue()->toQString();
     if (t->isUndefined() || t->isNull()) {
         scope.engine->throwTypeError();
@@ -234,7 +234,7 @@ ReturnedValue StringPrototype::method_toString(CallContext *context)
     if (context->thisObject().isString())
         return context->thisObject().asReturnedValue();
 
-    StringObject *o = context->thisObject().asStringObject();
+    StringObject *o = context->thisObject().as<StringObject>();
     if (!o)
         return context->engine()->throwTypeError();
     return o->d()->value.asReturnedValue();
@@ -470,7 +470,7 @@ ReturnedValue StringPrototype::method_replace(CallContext *ctx)
 {
     Scope scope(ctx);
     QString string;
-    if (StringObject *thisString = ctx->thisObject().asStringObject())
+    if (StringObject *thisString = ctx->thisObject().as<StringObject>())
         string = thisString->d()->value.stringValue()->toQString();
     else
         string = ctx->thisObject().toQString();
diff --git a/src/qml/jsruntime/qv4value_inl_p.h b/src/qml/jsruntime/qv4value_inl_p.h
index 5b08a2c8f3..dea510e625 100644
--- a/src/qml/jsruntime/qv4value_inl_p.h
+++ b/src/qml/jsruntime/qv4value_inl_p.h
@@ -253,11 +253,6 @@ inline NumberObject *Value::asNumberObject() const
     return isObject() ? managed()->asNumberObject() : 0;
 }
 
-inline StringObject *Value::asStringObject() const
-{
-    return isObject() ? managed()->asStringObject() : 0;
-}
-
 template<>
 inline ReturnedValue value_convert<String>(ExecutionEngine *e, const Value &v)
 {
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index d479a7918f..29781cd909 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -309,7 +309,6 @@ struct Q_QML_PRIVATE_EXPORT Value
     inline Object *asObject() const;
     inline FunctionObject *asFunctionObject() const;
     inline NumberObject *asNumberObject() const;
-    inline StringObject *asStringObject() const;
 
     template <typename T>
     const T *as() const {
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index 1bbe769318..950f2c25a3 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -820,10 +820,10 @@ void QQmlLocale::registerStringLocaleCompare(QV4::ExecutionEngine *engine)
 
 QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::CallContext *ctx)
 {
-    if (ctx->argc() != 1 || (!ctx->args()[0].isString() && !ctx->args()[0].asStringObject()))
+    if (ctx->argc() != 1 || (!ctx->args()[0].isString() && !ctx->args()[0].as<StringObject>()))
         return QV4::StringPrototype::method_localeCompare(ctx);
 
-    if (!ctx->thisObject().isString() && !ctx->thisObject().asStringObject())
+    if (!ctx->thisObject().isString() && !ctx->thisObject().as<StringObject>())
         return QV4::StringPrototype::method_localeCompare(ctx);
 
     QString thisString = ctx->thisObject().toQStringNoThrow();