Changeset 846 for trunk/src/script/api/qscriptvalueiterator.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/api/qscriptvalueiterator.cpp (modified) (11 diffs)

trunk/src/script/api/qscriptvalueiterator.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])
@@ -85 +85 @@
         : initialized(false)
     {}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     void ensureInitialized()
     {
         if (initialized)
             return;
-        QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(object.engine());
+        QScriptEnginePrivate *eng_p = engine();
+        QScript::APIShim shim(eng_p);
         JSC::ExecState *exec = eng_p->globalExec();
         JSC::PropertyNameArray propertyNamesArray(exec);
-        propertyNamesArray.setShouldCache(false);
-        JSC::asObject(QScriptValuePrivate::get(object)->jscValue)->getOwnPropertyNames(exec, propertyNamesArray, /*includeNonEnumerable=*/true);
+        JSC::asObject(object()->jscValue)->getOwnPropertyNames(exec, propertyNamesArray, JSC::IncludeDontEnumProperties);
 
         JSC::PropertyNameArray::const_iterator propertyNamesIt = propertyNamesArray.begin();
         for(; propertyNamesIt != propertyNamesArray.end(); ++propertyNamesIt) {
-            propertyNames.append(propertyNamesIt->ustring());
+            propertyNames.append();
         }
         it = propertyNames.begin();
@@ -103 +125 @@
     }
 
-    QScriptValue object;
-    QLinkedList<JSC::UString> propertyNames;
-    QLinkedList<JSC::UString>::iterator it;
-    QLinkedList<JSC::UString>::iterator current;
+    QScriptValue object;
+    QLinkedList<JSC::> propertyNames;
+    QLinkedList<JSC::>::iterator it;
+    QLinkedList<JSC::>::iterator current;
     bool initialized;
 };
@@ -120 +142 @@
     if (object.isObject()) {
         d_ptr.reset(new QScriptValueIteratorPrivate());
-        d_ptr->object = object;
+        d_ptr->object = object;
     }
 }
@@ -241 +263 @@
 {
     Q_D(const QScriptValueIterator);
-    if (!d || !d->initialized)
+    if (!d || !d->initialized)
         return QString();
-    return *d->current;
+    return ;
 }
 
@@ -255 +277 @@
 {
     Q_D(const QScriptValueIterator);
-    if (!d || !d->initialized)
+    if (!d || !d->initialized)
         return QScriptString();
-    return d->object.engine()->toStringHandle(name());
+    return d->);
 }
 
@@ -269 +291 @@
 {
     Q_D(const QScriptValueIterator);
-    if (!d || !d->initialized)
+    if (!d || !d->initialized)
         return QScriptValue();
-    return d->object.property(name());
+    QScript::APIShim shim(d->engine());
+    JSC::JSValue jsValue = d->object()->property(*d->current);
+    return d->engine()->scriptValueFromJSCValue(jsValue);
 }
 
@@ -283 +307 @@
 {
     Q_D(QScriptValueIterator);
-    if (!d || !d->initialized)
-        return;
-    d->object.setProperty(name(), value);
+    if (!d || !d->initialized || !d->engine())
+        return;
+    QScript::APIShim shim(d->engine());
+    JSC::JSValue jsValue = d->engine()->scriptValueToJSCValue(value);
+    d->object()->setProperty(*d->current, jsValue);
 }
 
@@ -297 +323 @@
 {
     Q_D(const QScriptValueIterator);
-    if (!d || !d->initialized)
+    if (!d || !d->initialized)
         return 0;
-    return d->object.propertyFlags(name());
+    QScript::APIShim shim(d->engine());
+    return d->object()->propertyFlags(*d->current);
 }
 
@@ -311 +338 @@
 {
     Q_D(QScriptValueIterator);
-    if (!d || !d->initialized)
-        return;
-    d->object.setProperty(name(), QScriptValue());
+    if (!d || !d->initialized || !d->engine())
+        return;
+    QScript::APIShim shim(d->engine());
+    d->object()->setProperty(*d->current, JSC::JSValue());
     d->propertyNames.erase(d->current);
 }
@@ -327 +355 @@
     if (object.isObject()) {
         d_ptr.reset(new QScriptValueIteratorPrivate());
-        d_ptr->object = object;
+        d_ptr->object = object;
     }
     return *this;