src/script/bridge/qscriptobject.cpp
changeset 30 5dc02b23752f
parent 18 2f34d5167611
--- a/src/script/bridge/qscriptobject.cpp	Wed Jun 23 19:07:03 2010 +0300
+++ b/src/script/bridge/qscriptobject.cpp	Tue Jul 06 15:10:48 2010 +0300
@@ -81,30 +81,21 @@
 }
 
 bool QScriptObject::deleteProperty(JSC::ExecState* exec,
-                                   const JSC::Identifier& propertyName,
-                                   bool checkDontDelete)
+                                   const JSC::Identifier& propertyName)
 {
     if (!d || !d->delegate)
-        return JSC::JSObject::deleteProperty(exec, propertyName, checkDontDelete);
-    return d->delegate->deleteProperty(this, exec, propertyName, checkDontDelete);
-}
-
-bool QScriptObject::getPropertyAttributes(JSC::ExecState* exec, const JSC::Identifier& propertyName,
-                                          unsigned& attributes) const
-{
-    if (!d || !d->delegate)
-        return JSC::JSObject::getPropertyAttributes(exec, propertyName, attributes);
-    return d->delegate->getPropertyAttributes(this, exec, propertyName, attributes);
+        return JSC::JSObject::deleteProperty(exec, propertyName);
+    return d->delegate->deleteProperty(this, exec, propertyName);
 }
 
 void QScriptObject::getOwnPropertyNames(JSC::ExecState* exec, JSC::PropertyNameArray& propertyNames,
-                                        bool includeNonEnumerable)
+                                        JSC::EnumerationMode mode)
 {
     if (!d || !d->delegate) {
-        JSC::JSObject::getOwnPropertyNames(exec, propertyNames, includeNonEnumerable);
+        JSC::JSObject::getOwnPropertyNames(exec, propertyNames, mode);
         return;
     }
-    d->delegate->getOwnPropertyNames(this, exec, propertyNames, includeNonEnumerable);
+    d->delegate->getOwnPropertyNames(this, exec, propertyNames, mode);
 }
 
 bool QScriptObject::compareToObject(JSC::ExecState* exec, JSC::JSObject *other)
@@ -189,25 +180,16 @@
 }
 
 bool QScriptObjectDelegate::deleteProperty(QScriptObject* object, JSC::ExecState* exec,
-                                           const JSC::Identifier& propertyName,
-                                           bool checkDontDelete)
+                                           const JSC::Identifier& propertyName)
 {
-    return object->JSC::JSObject::deleteProperty(exec, propertyName, checkDontDelete);
-}
-
-bool QScriptObjectDelegate::getPropertyAttributes(const QScriptObject* object,
-                                                  JSC::ExecState* exec,
-                                                  const JSC::Identifier& propertyName,
-                                                  unsigned& attributes) const
-{
-    return object->JSC::JSObject::getPropertyAttributes(exec, propertyName, attributes);
+    return object->JSC::JSObject::deleteProperty(exec, propertyName);
 }
 
 void QScriptObjectDelegate::getOwnPropertyNames(QScriptObject* object, JSC::ExecState* exec,
                                                 JSC::PropertyNameArray& propertyNames,
-                                                bool includeNonEnumerable)
+                                                JSC::EnumerationMode mode)
 {
-    object->JSC::JSObject::getOwnPropertyNames(exec, propertyNames, includeNonEnumerable);
+    object->JSC::JSObject::getOwnPropertyNames(exec, propertyNames, mode);
 }
 
 void QScriptObjectDelegate::markChildren(QScriptObject* object, JSC::MarkStack& markStack)