Get rid of StringRef

Remove the Ref classes, as they won't be required
anymore once Managed and Managed::Data are separated.

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

1 files changed, 25 insertions, 25 deletions

diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h
index f4b23d8cb3..3be5039548 100644
--- a/src/qml/jsruntime/qv4object_p.h
+++ b/src/qml/jsruntime/qv4object_p.h
@@ -133,20 +133,20 @@ struct Q_QML_EXPORT Object: Managed {
     Object *prototype() const { return internalClass()->prototype; }
     bool setPrototype(Object *proto);
 
-    Property *__getOwnProperty__(const StringRef name, PropertyAttributes *attrs = 0);
+    Property *__getOwnProperty__(String *name, PropertyAttributes *attrs = 0);
     Property *__getOwnProperty__(uint index, PropertyAttributes *attrs = 0);
 
-    Property *__getPropertyDescriptor__(const StringRef name, PropertyAttributes *attrs = 0) const;
+    Property *__getPropertyDescriptor__(String *name, PropertyAttributes *attrs = 0) const;
     Property *__getPropertyDescriptor__(uint index, PropertyAttributes *attrs = 0) const;
 
-    bool hasProperty(const StringRef name) const;
+    bool hasProperty(String *name) const;
     bool hasProperty(uint index) const;
 
-    bool hasOwnProperty(const StringRef name) const;
+    bool hasOwnProperty(String *name) const;
     bool hasOwnProperty(uint index) const;
 
-    bool __defineOwnProperty__(ExecutionContext *ctx, uint index, const StringRef member, const Property &p, PropertyAttributes attrs);
-    bool __defineOwnProperty__(ExecutionContext *ctx, const StringRef name, const Property &p, PropertyAttributes attrs);
+    bool __defineOwnProperty__(ExecutionContext *ctx, uint index, String *member, const Property &p, PropertyAttributes attrs);
+    bool __defineOwnProperty__(ExecutionContext *ctx, String *name, const Property &p, PropertyAttributes attrs);
     bool __defineOwnProperty__(ExecutionContext *ctx, uint index, const Property &p, PropertyAttributes attrs);
     bool __defineOwnProperty__(ExecutionContext *ctx, const QString &name, const Property &p, PropertyAttributes attrs);
     bool defineOwnProperty2(ExecutionContext *ctx, uint index, const Property &p, PropertyAttributes attrs);
@@ -166,23 +166,23 @@ struct Q_QML_EXPORT Object: Managed {
     void putValue(Property *pd, PropertyAttributes attrs, const ValueRef value);
 
     /* The spec default: Writable: true, Enumerable: false, Configurable: true */
-    void defineDefaultProperty(const StringRef name, ValueRef value) {
+    void defineDefaultProperty(String *name, ValueRef value) {
         insertMember(name, value, Attr_Data|Attr_NotEnumerable);
     }
     void defineDefaultProperty(const QString &name, ValueRef value);
     void defineDefaultProperty(const QString &name, ReturnedValue (*code)(CallContext *), int argumentCount = 0);
-    void defineDefaultProperty(const StringRef name, ReturnedValue (*code)(CallContext *), int argumentCount = 0);
+    void defineDefaultProperty(String *name, ReturnedValue (*code)(CallContext *), int argumentCount = 0);
     void defineAccessorProperty(const QString &name, ReturnedValue (*getter)(CallContext *), ReturnedValue (*setter)(CallContext *));
-    void defineAccessorProperty(const StringRef name, ReturnedValue (*getter)(CallContext *), ReturnedValue (*setter)(CallContext *));
+    void defineAccessorProperty(String *name, ReturnedValue (*getter)(CallContext *), ReturnedValue (*setter)(CallContext *));
     /* Fixed: Writable: false, Enumerable: false, Configurable: false */
     void defineReadonlyProperty(const QString &name, ValueRef value);
-    void defineReadonlyProperty(const StringRef name, ValueRef value);
+    void defineReadonlyProperty(String *name, ValueRef value);
 
-    void insertMember(const StringRef s, const ValueRef v, PropertyAttributes attributes = Attr_Data) {
+    void insertMember(String *s, const ValueRef v, PropertyAttributes attributes = Attr_Data) {
         Property p(*v);
         insertMember(s, p, attributes);
     }
-    void insertMember(const StringRef s, const Property &p, PropertyAttributes attributes);
+    void insertMember(String *s, const Property &p, PropertyAttributes attributes);
 
     inline ExecutionEngine *engine() const { return internalClass()->engine; }
 
@@ -258,19 +258,19 @@ public:
     }
     void ensureMemberIndex(uint idx);
 
-    inline ReturnedValue get(const StringRef name, bool *hasProperty = 0)
+    inline ReturnedValue get(String *name, bool *hasProperty = 0)
     { return vtable()->get(this, name, hasProperty); }
     inline ReturnedValue getIndexed(uint idx, bool *hasProperty = 0)
     { return vtable()->getIndexed(this, idx, hasProperty); }
-    inline void put(const StringRef name, const ValueRef v)
+    inline void put(String *name, const ValueRef v)
     { vtable()->put(this, name, v); }
     inline void putIndexed(uint idx, const ValueRef v)
     { vtable()->putIndexed(this, idx, v); }
-    PropertyAttributes query(StringRef name) const
+    PropertyAttributes query(String *name) const
     { return vtable()->query(this, name); }
     PropertyAttributes queryIndexed(uint index) const
     { return vtable()->queryIndexed(this, index); }
-    bool deleteProperty(const StringRef name)
+    bool deleteProperty(String *name)
     { return vtable()->deleteProperty(this, name); }
     bool deleteIndexedProperty(uint index)
     { return vtable()->deleteIndexedProperty(this, index); }
@@ -278,7 +278,7 @@ public:
     { return vtable()->getLookup(this, l); }
     void setLookup(Lookup *l, const ValueRef v)
     { vtable()->setLookup(this, l, v); }
-    void advanceIterator(ObjectIterator *it, StringRef name, uint *index, Property *p, PropertyAttributes *attributes)
+    void advanceIterator(ObjectIterator *it, String *&name, uint *index, Property *p, PropertyAttributes *attributes)
     { vtable()->advanceIterator(this, it, name, index, p, attributes); }
     uint getLength() const { return vtable()->getLength(this); }
 
@@ -290,25 +290,25 @@ protected:
     static void markObjects(Managed *that, ExecutionEngine *e);
     static ReturnedValue construct(Managed *m, CallData *);
     static ReturnedValue call(Managed *m, CallData *);
-    static ReturnedValue get(Managed *m, const StringRef name, bool *hasProperty);
+    static ReturnedValue get(Managed *m, String *name, bool *hasProperty);
     static ReturnedValue getIndexed(Managed *m, uint index, bool *hasProperty);
-    static void put(Managed *m, const StringRef name, const ValueRef value);
+    static void put(Managed *m, String *name, const ValueRef value);
     static void putIndexed(Managed *m, uint index, const ValueRef value);
-    static PropertyAttributes query(const Managed *m, StringRef name);
+    static PropertyAttributes query(const Managed *m, String *name);
     static PropertyAttributes queryIndexed(const Managed *m, uint index);
-    static bool deleteProperty(Managed *m, const StringRef name);
+    static bool deleteProperty(Managed *m, String *name);
     static bool deleteIndexedProperty(Managed *m, uint index);
     static ReturnedValue getLookup(Managed *m, Lookup *l);
     static void setLookup(Managed *m, Lookup *l, const ValueRef v);
-    static void advanceIterator(Managed *m, ObjectIterator *it, StringRef name, uint *index, Property *p, PropertyAttributes *attributes);
+    static void advanceIterator(Managed *m, ObjectIterator *it, String *&name, uint *index, Property *p, PropertyAttributes *attributes);
     static uint getLength(const Managed *m);
 
 private:
-    ReturnedValue internalGet(const StringRef name, bool *hasProperty);
+    ReturnedValue internalGet(String *name, bool *hasProperty);
     ReturnedValue internalGetIndexed(uint index, bool *hasProperty);
-    void internalPut(const StringRef name, const ValueRef value);
+    void internalPut(String *name, const ValueRef value);
     void internalPutIndexed(uint index, const ValueRef value);
-    bool internalDeleteProperty(const StringRef name);
+    bool internalDeleteProperty(String *name);
     bool internalDeleteIndexedProperty(uint index);
 
     friend struct ObjectIterator;