summaryrefslogtreecommitdiffstats
path: root/src/script/bridge/qscriptobject.cpp
diff options
context:
space:
mode:
authorBenjamin Poulain <benjamin.poulain@nokia.com>2009-08-05 18:56:44 (GMT)
committerBenjamin Poulain <benjamin.poulain@nokia.com>2009-08-05 19:10:00 (GMT)
commit520378cfedd63544a9689687256d2c89352ee561 (patch)
tree79a2c0e667dc95ffed3b8300edff098d15664f41 /src/script/bridge/qscriptobject.cpp
parenta0fecb437176786e9c809a45e64351516b05a201 (diff)
downloadQt-520378cfedd63544a9689687256d2c89352ee561.zip
Qt-520378cfedd63544a9689687256d2c89352ee561.tar.gz
Qt-520378cfedd63544a9689687256d2c89352ee561.tar.bz2
Updates getPropertyNames() on all javascript object to use the flag
getPropertyNames() now uses a flag to specify which property should be filtered. This flag should be used by all javascript objects. This patch fixes the changes introduced by e520df1f8678bd59adb341fb586f008a7de17fe8
Diffstat (limited to 'src/script/bridge/qscriptobject.cpp')
-rw-r--r--src/script/bridge/qscriptobject.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/script/bridge/qscriptobject.cpp b/src/script/bridge/qscriptobject.cpp
index e4d2168..bbc51d9 100644
--- a/src/script/bridge/qscriptobject.cpp
+++ b/src/script/bridge/qscriptobject.cpp
@@ -133,13 +133,13 @@ bool QScriptObject::getPropertyAttributes(JSC::ExecState* exec, const JSC::Ident
return d->delegate->getPropertyAttributes(this, exec, propertyName, attributes);
}
-void QScriptObject::getPropertyNames(JSC::ExecState* exec, JSC::PropertyNameArray& propertyNames, bool includeNonEnumerable)
+void QScriptObject::getPropertyNames(JSC::ExecState* exec, JSC::PropertyNameArray& propertyNames, unsigned listedAttributes)
{
if (!d || !d->delegate) {
- JSC::JSObject::getPropertyNames(exec, propertyNames, includeNonEnumerable);
+ JSC::JSObject::getPropertyNames(exec, propertyNames, listedAttributes);
return;
}
- d->delegate->getPropertyNames(this, exec, propertyNames, includeNonEnumerable);
+ d->delegate->getPropertyNames(this, exec, propertyNames, listedAttributes);
}
void QScriptObject::mark()
@@ -220,9 +220,9 @@ bool QScriptObjectDelegate::getPropertyAttributes(const QScriptObject* object,
void QScriptObjectDelegate::getPropertyNames(QScriptObject* object, JSC::ExecState* exec,
JSC::PropertyNameArray& propertyNames,
- bool includeNonEnumerable)
+ unsigned listedAttributes)
{
- object->JSC::JSObject::getPropertyNames(exec, propertyNames, includeNonEnumerable);
+ object->JSC::JSObject::getPropertyNames(exec, propertyNames, listedAttributes);
}
void QScriptObjectDelegate::mark(QScriptObject* object)