Fix typo in internal API

Enumberable -> Enumerable :)

Change-Id: I12afbade4c68c5bf86c3b623a1862e82483db844
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/qml/qml/v4/qv4jsonobject.cpp b/src/qml/qml/v4/qv4jsonobject.cpp
index b2d5d7b..b575609 100644 (file)
--- a/src/qml/qml/v4/qv4jsonobject.cpp
+++ b/src/qml/qml/v4/qv4jsonobject.cpp
@@ -775,7 +775,7 @@ QString Stringify::JO(Object *o)
 
     QStringList partial;
     if (propertyList.isEmpty()) {
-        ObjectIterator it(o, ObjectIterator::EnumberableOnly);
+        ObjectIterator it(o, ObjectIterator::EnumerableOnly);
 
         while (1) {
             String *name;

diff --git a/src/qml/qml/v4/qv4object_p.h b/src/qml/qml/v4/qv4object_p.h
index 74f8c0b..4140bca 100644 (file)
--- a/src/qml/qml/v4/qv4object_p.h
+++ b/src/qml/qml/v4/qv4object_p.h
@@ -376,7 +376,7 @@ private:
 struct ForEachIteratorObject: Object {
     ObjectIterator it;
     ForEachIteratorObject(ExecutionContext *ctx, Object *o)
-        : Object(ctx->engine), it(o, ObjectIterator::EnumberableOnly|ObjectIterator::WithProtoChain) {
+        : Object(ctx->engine), it(o, ObjectIterator::EnumerableOnly|ObjectIterator::WithProtoChain) {
         vtbl = &static_vtbl;
         type = Type_ForeachIteratorObject;
     }

diff --git a/src/qml/qml/v4/qv4objectiterator.cpp b/src/qml/qml/v4/qv4objectiterator.cpp
index ea96b7d..c74bce0 100644 (file)
--- a/src/qml/qml/v4/qv4objectiterator.cpp
+++ b/src/qml/qml/v4/qv4objectiterator.cpp
@@ -102,7 +102,7 @@ Property *ObjectIterator::next(String **name, uint *index, PropertyAttributes *a
                 p = current->arrayData + pidx;
                 arrayNode = arrayNode->nextNode();
                 PropertyAttributes a = current->arrayAttributes ? current->arrayAttributes[pidx] : PropertyAttributes(Attr_Data);
-                if (!(flags & EnumberableOnly) || a.isEnumerable()) {
+                if (!(flags & EnumerableOnly) || a.isEnumerable()) {
                     arrayIndex = k + 1;
                     *index = k;
                     if (attrs)
@@ -120,7 +120,7 @@ Property *ObjectIterator::next(String **name, uint *index, PropertyAttributes *a
             PropertyAttributes a = current->arrayAttributes ? current->arrayAttributes[pidx] : PropertyAttributes(Attr_Data);
             ++arrayIndex;
             if ((!current->arrayAttributes || !current->arrayAttributes[pidx].isGeneric())
-                 && (!(flags & EnumberableOnly) || a.isEnumerable())) {
+                 && (!(flags & EnumerableOnly) || a.isEnumerable())) {
                 *index = arrayIndex - 1;
                 if (attrs)
                     *attrs = a;
@@ -139,7 +139,7 @@ Property *ObjectIterator::next(String **name, uint *index, PropertyAttributes *a
                 PropertyAttributes a;
                 if (current->dynamicPropertyQuery)
                     a = current->dynamicPropertyQuery(current, n);
-                if (!(flags & EnumberableOnly) || a.isEnumerable()) {
+                if (!(flags & EnumerableOnly) || a.isEnumerable()) {
                     *name = n;
                     if (attrs)
                         *attrs = a;
@@ -177,7 +177,7 @@ Property *ObjectIterator::next(String **name, uint *index, PropertyAttributes *a
         p = current->memberData + memberIndex;
         PropertyAttributes a = internalClass->propertyData[memberIndex];
         ++memberIndex;
-        if (!(flags & EnumberableOnly) || a.isEnumerable()) {
+        if (!(flags & EnumerableOnly) || a.isEnumerable()) {
             *name = n;
             if (attrs)
                 *attrs = a;

diff --git a/src/qml/qml/v4/qv4objectiterator_p.h b/src/qml/qml/v4/qv4objectiterator_p.h
index ae63344..fa6b4fb 100644 (file)
--- a/src/qml/qml/v4/qv4objectiterator_p.h
+++ b/src/qml/qml/v4/qv4objectiterator_p.h
@@ -62,7 +62,7 @@ struct ObjectIterator
 {
     enum Flags {
         NoFlags = 0,
-        EnumberableOnly = 0x1,
+        EnumerableOnly = 0x1,
         WithProtoChain = 0x2,
         CurrentIsString = 0x4
     };

diff --git a/src/qml/qml/v4/qv4objectproto.cpp b/src/qml/qml/v4/qv4objectproto.cpp
index 3803d42..ceaffbb 100644 (file)
--- a/src/qml/qml/v4/qv4objectproto.cpp
+++ b/src/qml/qml/v4/qv4objectproto.cpp
@@ -212,7 +212,7 @@ Value ObjectPrototype::method_defineProperties(SimpleCallContext *ctx)
 
     Object *o = ctx->argument(1).toObject(ctx);
 
-    ObjectIterator it(o, ObjectIterator::EnumberableOnly);
+    ObjectIterator it(o, ObjectIterator::EnumerableOnly);
     while (1) {
         uint index;
         String *name;
@@ -356,7 +356,7 @@ Value ObjectPrototype::method_keys(SimpleCallContext *ctx)
 
     ArrayObject *a = ctx->engine->newArrayObject();
 
-    ObjectIterator it(o, ObjectIterator::EnumberableOnly);
+    ObjectIterator it(o, ObjectIterator::EnumerableOnly);
     while (1) {
         uint index;
         String *name;

diff --git a/src/qml/qml/v4/qv4v8.cpp b/src/qml/qml/v4/qv4v8.cpp
index 1816a01..4d1f38b 100644 (file)
--- a/src/qml/qml/v4/qv4v8.cpp
+++ b/src/qml/qml/v4/qv4v8.cpp
@@ -904,7 +904,7 @@ Handle<Array> Object::GetPropertyNames()
     assert(o);
 
     QV4::ArrayObject *array = currentEngine()->newArrayObject();
-    ObjectIterator it(o, ObjectIterator::WithProtoChain|ObjectIterator::EnumberableOnly);
+    ObjectIterator it(o, ObjectIterator::WithProtoChain|ObjectIterator::EnumerableOnly);
     while (1) {
         QV4::Value v = it.nextPropertyNameAsString();
         if (v.isNull())
@@ -920,7 +920,7 @@ Handle<Array> Object::GetOwnPropertyNames()
     assert(o);
     QV4::Value arg = QV4::Value::fromObject(o);
     ArrayObject *array = currentEngine()->newArrayObject();
-    ObjectIterator it(o, ObjectIterator::EnumberableOnly);
+    ObjectIterator it(o, ObjectIterator::EnumerableOnly);
     while (1) {
         QV4::Value v = it.nextPropertyNameAsString();
         if (v.isNull())

diff --git a/src/qml/qml/v8/qv4jsonwrapper.cpp b/src/qml/qml/v8/qv4jsonwrapper.cpp
index d20592c..5f0f285 100644 (file)
--- a/src/qml/qml/v8/qv4jsonwrapper.cpp
+++ b/src/qml/qml/v8/qv4jsonwrapper.cpp
@@ -126,7 +126,7 @@ QJsonObject QV4JsonWrapper::toJsonObject(QV4::Object *o, V4ObjectSet &visitedObj
 
     visitedObjects.insert(o);
 
-    ObjectIterator it(o, ObjectIterator::EnumberableOnly);
+    ObjectIterator it(o, ObjectIterator::EnumerableOnly);
     while (1) {
         PropertyAttributes attributes;
         String *name;

diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index 7d1bdb7..8797bb3 100644 (file)
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -948,7 +948,7 @@ QVariantMap QV8Engine::variantMapFromJS(QV4::Object *o,
 
     visitedObjects.insert(o);
 
-    QV4::ObjectIterator it(o, QV4::ObjectIterator::EnumberableOnly);
+    QV4::ObjectIterator it(o, QV4::ObjectIterator::EnumerableOnly);
     while (1) {
         QV4::PropertyAttributes attributes;
         QV4::String *name;