Changeset 846 for trunk/src/script/bridge/qscriptobject.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/script/bridge/qscriptobject.cpp (modified) (3 diffs)

trunk/src/script/bridge/qscriptobject.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -82 +82 @@
 
 bool QScriptObject::deleteProperty(JSC::ExecState* exec,
-                                   const JSC::Identifier& propertyName,
-                                   bool checkDontDelete)
-{
-    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);
+                                   const JSC::Identifier& propertyName)
+{
+    if (!d || !d->delegate)
+        return JSC::JSObject::deleteProperty(exec, propertyName);
+    return d->delegate->deleteProperty(this, exec, propertyName);
 }
 
 void QScriptObject::getOwnPropertyNames(JSC::ExecState* exec, JSC::PropertyNameArray& propertyNames,
-                                        bool includeNonEnumerable)
-{
-    if (!d || !d->delegate) {
-        JSC::JSObject::getOwnPropertyNames(exec, propertyNames, includeNonEnumerable);
-        return;
-    }
-    d->delegate->getOwnPropertyNames(this, exec, propertyNames, includeNonEnumerable);
+                                        e)
+{
+    if (!d || !d->delegate) {
+        JSC::JSObject::getOwnPropertyNames(exec, propertyNames, e);
+        return;
+    }
+    d->delegate->getOwnPropertyNames(this, exec, propertyNames, e);
 }
 
@@ -190 +181 @@
 
 bool QScriptObjectDelegate::deleteProperty(QScriptObject* object, JSC::ExecState* exec,
-                                           const JSC::Identifier& propertyName,
-                                           bool checkDontDelete)
-{
-    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);
+                                           const JSC::Identifier& propertyName)
+{
+    return object->JSC::JSObject::deleteProperty(exec, propertyName);
 }
 
 void QScriptObjectDelegate::getOwnPropertyNames(QScriptObject* object, JSC::ExecState* exec,
                                                 JSC::PropertyNameArray& propertyNames,
-                                                bool includeNonEnumerable)
-{
-    object->JSC::JSObject::getOwnPropertyNames(exec, propertyNames, includeNonEnumerable);
+                                                e)
+{
+    object->JSC::JSObject::getOwnPropertyNames(exec, propertyNames, e);
 }