summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptvalueiterator.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/api/qscriptvalueiterator.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/api/qscriptvalueiterator.cpp')
-rw-r--r--src/script/api/qscriptvalueiterator.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp
index 0092fbd..5d2c43b 100644
--- a/src/script/api/qscriptvalueiterator.cpp
+++ b/src/script/api/qscriptvalueiterator.cpp
@@ -117,17 +117,6 @@ public:
for(; propertyNamesIt != propertyNamesArray.end(); ++propertyNamesIt) {
propertyNames.append(propertyNamesIt->ustring());
}
- if (object.isArray() || (QScriptValuePrivate::get(object)->jscValue.isObject(&JSC::JSArray::info))) {
- const JSC::JSArray *array = JSC::asArray(QScriptValuePrivate::get(object)->jscValue);
- const int length = array->length();
- for (int i = 0; i < length; ++i)
- propertyNames.append(JSC::UString::from(i));
- } else if (object.isString() || (QScriptValuePrivate::get(object)->jscValue.isObject(&JSC::StringObject::info))) {
- const JSC::UString string = QScriptValuePrivate::get(object)->jscValue.toString(exec);
- const int length = string.size();
- for (int i = 0; i < length; ++i)
- propertyNames.append(JSC::UString::from(i));
- }
it = propertyNames.begin();
initialized = true;
}