From c7107d4ecd2a629a05343b9c0dac2d6ebb98dac5 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Fri, 10 Jun 2022 20:02:51 +0300
Subject: [PATCH] use QStdVector<T> in QScriptValueIterator

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 src/script/api/qscriptvalueiterator.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp
index 2206b7c0c..ef3aa0b58 100644
--- a/src/script/api/qscriptvalueiterator.cpp
+++ b/src/script/api/qscriptvalueiterator.cpp
@@ -26,7 +26,7 @@
 #include "qscriptengine.h"
 #include "qscriptengine_p.h"
 #include "qscriptvalue_p.h"
-#include "qlist.h"
+#include "qstdcontainers_p.h"
 
 
 #include "JSObject.h"
@@ -123,9 +123,9 @@ public:
     }
 
     QScriptValue objectValue;
-    QList<JSC::Identifier> propertyNames;
-    QList<JSC::Identifier>::iterator it;
-    QList<JSC::Identifier>::iterator current;
+    QStdVector<JSC::Identifier> propertyNames;
+    QStdVector<JSC::Identifier>::iterator it;
+    QStdVector<JSC::Identifier>::iterator current;
     bool initialized;
 };
 
@@ -165,11 +165,7 @@ bool QScriptValueIterator::hasNext() const
         return false;
 
     const_cast<QScriptValueIteratorPrivate*>(d)->ensureInitialized();
-#ifdef QT_STRICT_ITERATORS
-    return d->it.i != d->propertyNames.end().i;
-#else
     return d->it != d->propertyNames.end();
-#endif
 }
 
 /*!
@@ -205,11 +201,7 @@ bool QScriptValueIterator::hasPrevious() const
         return false;
 
     const_cast<QScriptValueIteratorPrivate*>(d)->ensureInitialized();
-#ifdef QT_STRICT_ITERATORS
-    return d->it.i != d->propertyNames.begin().i;
-#else
     return d->it != d->propertyNames.begin();
-#endif
 }
 
 /*!
@@ -348,7 +340,7 @@ void QScriptValueIterator::remove()
         return;
     QScript::APIShim shim(d->engine());
     d->object()->setProperty(*d->current, JSC::JSValue());
-    d->propertyNames.erase(d->current);
+    d->it = d->propertyNames.erase(d->current);
 }
 
 /*!