summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativevme.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-03-11 08:25:35 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-03-11 08:26:01 (GMT)
commitdc234e69f73ec7d83a0e63b7bdf197f88bc1fad9 (patch)
tree9812a017b23a98d35c60251e97f5d95ae4511993 /src/declarative/qml/qdeclarativevme.cpp
parent02c95426f67d7e664cb02ef6bbf3697ce8dac373 (diff)
downloadQt-dc234e69f73ec7d83a0e63b7bdf197f88bc1fad9.zip
Qt-dc234e69f73ec7d83a0e63b7bdf197f88bc1fad9.tar.gz
Qt-dc234e69f73ec7d83a0e63b7bdf197f88bc1fad9.tar.bz2
Cosmetic tweaks
Diffstat (limited to 'src/declarative/qml/qdeclarativevme.cpp')
-rw-r--r--src/declarative/qml/qdeclarativevme.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index 055a857..05553fd 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -130,9 +130,9 @@ void QDeclarativeVME::runDeferred(QObject *object)
}
QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarativeContext *ctxt,
- QDeclarativeCompiledData *comp,
- int start, int count,
- const QBitField &bindingSkipList)
+ QDeclarativeCompiledData *comp,
+ int start, int count,
+ const QBitField &bindingSkipList)
{
Q_ASSERT(comp);
Q_ASSERT(ctxt);
@@ -834,11 +834,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, QDeclarati
if (parserStatus.count)
ep->parserStatus << parserStatus;
- if (stack.isEmpty())
- return 0;
- else
- return stack.top();
- return 0;
+ Q_ASSERT(stack.count() == 1);
+ return stack.top();
}
bool QDeclarativeVME::isError() const