diff options
Diffstat (limited to 'src/script/bridge/qscriptqobject_p.h')
| -rw-r--r-- | src/script/bridge/qscriptqobject_p.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/script/bridge/qscriptqobject_p.h b/src/script/bridge/qscriptqobject_p.h index 72d066d7c4..2d482ccc59 100644 --- a/src/script/bridge/qscriptqobject_p.h +++ b/src/script/bridge/qscriptqobject_p.h @@ -105,9 +105,11 @@ public: virtual bool getPropertyAttributes(const QScriptObject*, JSC::ExecState*, const JSC::Identifier&, unsigned&) const; - virtual void getPropertyNames(QScriptObject*, JSC::ExecState*, JSC::PropertyNameArray&, - unsigned listedAttributes = JSC::Structure::Prototype); - virtual void mark(QScriptObject*); + virtual void getOwnPropertyNames(QScriptObject*, JSC::ExecState*, + JSC::PropertyNameArray&, + bool includeNonEnumerable = false); + virtual void markChildren(QScriptObject*, JSC::MarkStack& markStack); + virtual bool compareToObject(QScriptObject*, JSC::ExecState*, JSC::JSObject*); inline QObject *value() const { return data->value; } inline void setValue(QObject* value) { data->value = value; } @@ -122,8 +124,6 @@ public: inline void setOptions(QScriptEngine::QObjectWrapOptions options) { data->options = options; } - virtual bool compareToObject(QScriptObject*, JSC::ExecState*, JSC::JSObject*); - protected: Data *data; }; @@ -181,7 +181,7 @@ public: QScriptEngine::ValueOwnership ownership, const QScriptEngine::QObjectWrapOptions &options); - void mark(); + void mark(JSC::MarkStack&); private: QScriptEnginePrivate *engine; @@ -208,7 +208,7 @@ public: virtual ~QtFunction(); virtual JSC::CallType getCallData(JSC::CallData&); - virtual void mark(); + virtual void markChildren(JSC::MarkStack&); virtual const JSC::ClassInfo* classInfo() const { return &info; } static const JSC::ClassInfo info; @@ -297,9 +297,9 @@ public: bool checkDontDelete = true); virtual bool getPropertyAttributes(JSC::ExecState*, const JSC::Identifier&, unsigned&) const; - virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&, - unsigned listedAttributes = JSC::Structure::Prototype); - virtual void mark(); + virtual void getOwnPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&, + bool includeNonEnumerable = false); + virtual void markChildren(JSC::MarkStack& markStack); virtual JSC::CallType getCallData(JSC::CallData&); virtual JSC::ConstructType getConstructData(JSC::ConstructData&); |