diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-06 10:53:47 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-06 10:53:47 (GMT) |
| commit | e8043818e92c275884f1a29ed740f8f82b0bc084 (patch) | |
| tree | 4f0344ba63f34ec209c661b14af1103796944fef /src/script/bridge/qscriptglobalobject_p.h | |
| parent | 9429424b52a9c66d6313d3085ef5638f87ee0055 (diff) | |
| download | Qt-e8043818e92c275884f1a29ed740f8f82b0bc084.zip Qt-e8043818e92c275884f1a29ed740f8f82b0bc084.tar.gz Qt-e8043818e92c275884f1a29ed740f8f82b0bc084.tar.bz2 | |
make iteration work for the global object again
Follow-up to commit 520378cfedd63544a9689687256d2c89352ee561
Diffstat (limited to 'src/script/bridge/qscriptglobalobject_p.h')
| -rw-r--r-- | src/script/bridge/qscriptglobalobject_p.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/script/bridge/qscriptglobalobject_p.h b/src/script/bridge/qscriptglobalobject_p.h index 8b44693..47e35b2 100644 --- a/src/script/bridge/qscriptglobalobject_p.h +++ b/src/script/bridge/qscriptglobalobject_p.h @@ -81,7 +81,8 @@ public: bool checkDontDelete = true); virtual bool getPropertyAttributes(JSC::ExecState*, const JSC::Identifier&, unsigned&) const; - virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&, bool includeNonEnumerable = false); + virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&, + unsigned listedAttributes = JSC::Structure::Prototype); public: JSC::JSObject *customGlobalObject; @@ -118,8 +119,9 @@ public: virtual bool getPropertyAttributes(JSC::ExecState* exec, const JSC::Identifier& propertyName, unsigned& attributes) const { return originalGlobalObject->JSC::JSGlobalObject::getPropertyAttributes(exec, propertyName, attributes); } - virtual void getPropertyNames(JSC::ExecState* exec, JSC::PropertyNameArray& propertyNames, bool includeNonEnumerable = false) - { originalGlobalObject->JSC::JSGlobalObject::getPropertyNames(exec, propertyNames, includeNonEnumerable); } + virtual void getPropertyNames(JSC::ExecState* exec, JSC::PropertyNameArray& propertyNames, + unsigned listedAttributes = JSC::Structure::Prototype) + { originalGlobalObject->JSC::JSGlobalObject::getPropertyNames(exec, propertyNames, listedAttributes); } private: JSC::JSGlobalObject *originalGlobalObject; }; |