Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use QStdVector<T> in QScriptValueIterator

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-06-10 20:02:51 +03:00
parent ef4a737250
commit c7107d4ecd
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/script/api/qscriptvalueiterator.cpp
View file

@ -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);
}
/*!