aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2011-09-30 10:10:13 +1000
committerQt by Nokia <qt-info@nokia.com>2011-09-30 10:37:05 +0200
commit270f4a7d6421b134b26b1aa10e6604b38689d638 (patch)
tree56e077b70db8c9d6f535887021099c76ff5fe23f /src
parentc263c6c832be3be85beb83e1ee2cce396874bf04 (diff)
Remove unnecessary members
Change-Id: I9dcdd2333c42aff8a648d5caaa4411c342923d42 Task-number: QTBUG-21151 Reviewed-on: http://codereview.qt-project.org/5822 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/qdeclarativevme.cpp19
-rw-r--r--src/declarative/qml/qdeclarativevme_p.h2
2 files changed, 6 insertions, 15 deletions
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index bf81ae4fde..f8405be2db 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -116,8 +116,6 @@ void QDeclarativeVME::init(QDeclarativeContextData *ctxt, QDeclarativeCompiledDa
rootContext = 0;
engine = ctxt->engine;
- bindValuesCount = 0;
- parserStatusCount = 0;
}
bool QDeclarativeVME::initDeferred(QObject *object)
@@ -151,8 +149,6 @@ bool QDeclarativeVME::initDeferred(QObject *object)
rootContext = 0;
engine = ctxt->engine;
- bindValuesCount = 0;
- parserStatusCount = 0;
return true;
}
@@ -1248,31 +1244,28 @@ bool QDeclarativeVME::complete(const Interrupt &interrupt)
{
ActiveVMERestorer restore(this, QDeclarativeEnginePrivate::get(engine));
- while (bindValuesCount < bindValues.count()) {
- if(bindValues.at(bindValuesCount)) {
- QDeclarativeAbstractBinding *b = bindValues.at(bindValuesCount);
+ while (!bindValues.isEmpty()) {
+ QDeclarativeAbstractBinding *b = bindValues.pop();
+
+ if(b) {
b->m_mePtr = 0;
b->setEnabled(true, QDeclarativePropertyPrivate::BypassInterceptor |
QDeclarativePropertyPrivate::DontRemoveBinding);
}
- ++bindValuesCount;
if (interrupt.shouldInterrupt())
return false;
}
bindValues.deallocate();
- while (parserStatusCount < parserStatus.count()) {
- QDeclarativeParserStatus *status =
- parserStatus.at(parserStatus.count() - parserStatusCount - 1);
+ while (!parserStatus.isEmpty()) {
+ QDeclarativeParserStatus *status = parserStatus.pop();
if (status && status->d) {
status->d = 0;
status->componentComplete();
}
- ++parserStatusCount;
-
if (interrupt.shouldInterrupt())
return false;
}
diff --git a/src/declarative/qml/qdeclarativevme_p.h b/src/declarative/qml/qdeclarativevme_p.h
index 3d79f9d340..80c02b1b89 100644
--- a/src/declarative/qml/qdeclarativevme_p.h
+++ b/src/declarative/qml/qdeclarativevme_p.h
@@ -141,8 +141,6 @@ private:
QFiniteStack<QObject *> objects;
QFiniteStack<QDeclarativeVMETypes::List> lists;
- int bindValuesCount;
- int parserStatusCount;
QFiniteStack<QDeclarativeAbstractBinding *> bindValues;
QFiniteStack<QDeclarativeParserStatus *> parserStatus;
QDeclarativeContextData *rootContext;