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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp
index 3887fb7..892ca5b 100644
--- a/src/script/bridge/qscriptqobject.cpp
+++ b/src/script/bridge/qscriptqobject.cpp
@@ -1511,7 +1511,7 @@ bool QObjectDelegate::getPropertyAttributes(const QScriptObject *object,
 
 void QObjectDelegate::getPropertyNames(QScriptObject *object, JSC::ExecState *exec,
                                        JSC::PropertyNameArray &propertyNames,
-                                       bool includeNonEnumerable)
+                                       unsigned listedAttributes)
 {
     QObject *qobject = data->value;
     if (!qobject) {
@@ -1527,7 +1527,7 @@ void QObjectDelegate::getPropertyNames(QScriptObject *object, JSC::ExecState *ex
                     ? meta->propertyOffset() : 0;
         for ( ; i < meta->propertyCount(); ++i) {
             QMetaProperty prop = meta->property(i);
-            if (includeNonEnumerable || isEnumerableMetaProperty(prop, meta, i)) {
+            if ((listedAttributes & JSC::Structure::NonEnumerable) || isEnumerableMetaProperty(prop, meta, i)) {
                 QString name = QString::fromLatin1(prop.name());
                 propertyNames.add(JSC::Identifier(exec, qtStringToJSCUString(name)));
             }
@@ -1555,7 +1555,7 @@ void QObjectDelegate::getPropertyNames(QScriptObject *object, JSC::ExecState *ex
         }
     }
 
-    QScriptObjectDelegate::getPropertyNames(object, exec, propertyNames, includeNonEnumerable);
+    QScriptObjectDelegate::getPropertyNames(object, exec, propertyNames, listedAttributes);
 }
 
 void QObjectDelegate::mark(QScriptObject *object)
@@ -1793,7 +1793,7 @@ bool QMetaObjectWrapperObject::getPropertyAttributes(JSC::ExecState *exec,
     return JSC::JSObject::getPropertyAttributes(exec, propertyName, attributes);
 }
 
-void QMetaObjectWrapperObject::getPropertyNames(JSC::ExecState *exec, JSC::PropertyNameArray &propertyNames, bool includeNonEnumerable)
+void QMetaObjectWrapperObject::getPropertyNames(JSC::ExecState *exec, JSC::PropertyNameArray &propertyNames, unsigned listedAttributes)
 {
     const QMetaObject *meta = data->value;
     if (!meta)
@@ -1803,7 +1803,7 @@ void QMetaObjectWrapperObject::getPropertyNames(JSC::ExecState *exec, JSC::Prope
         for (int j = 0; j < e.keyCount(); ++j)
             propertyNames.add(JSC::Identifier(exec, e.key(j)));
     }
-    JSC::JSObject::getPropertyNames(exec, propertyNames, includeNonEnumerable);
+    JSC::JSObject::getPropertyNames(exec, propertyNames, listedAttributes);
 }
 
 void QMetaObjectWrapperObject::mark()