summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlbasicscript.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-07-16 05:02:25 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-07-16 05:02:25 (GMT)
commit1962eaef07cb3adf73e7d8815ac470f62003a192 (patch)
tree86b13f69b3dacce41aaad1656e10f674d087fec1 /src/declarative/qml/qmlbasicscript.cpp
parent1734f968773fade53a73c8ce04ea86de8df0b875 (diff)
downloadQt-1962eaef07cb3adf73e7d8815ac470f62003a192.zip
Qt-1962eaef07cb3adf73e7d8815ac470f62003a192.tar.gz
Qt-1962eaef07cb3adf73e7d8815ac470f62003a192.tar.bz2
Small cleanups
Diffstat (limited to 'src/declarative/qml/qmlbasicscript.cpp')
-rw-r--r--src/declarative/qml/qmlbasicscript.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp
index cc8d528..40ffffe 100644
--- a/src/declarative/qml/qmlbasicscript.cpp
+++ b/src/declarative/qml/qmlbasicscript.cpp
@@ -289,7 +289,7 @@ struct QmlBasicScriptCompiler
QmlParser::Object *context;
QmlParser::Object *component;
- QHash<QString, QPair<QmlParser::Object *, int> > ids;
+ QHash<QString, QmlParser::Object *> ids;
bool compile(QmlJS::AST::Node *);
@@ -577,10 +577,10 @@ bool QmlBasicScriptCompiler::parseName(AST::Node *node,
if (ids.contains(name)) {
instr.type = ScriptInstruction::LoadIdObject;
- instr.fetch.idx = ids.value(name).second;
+ instr.fetch.idx = ids.value(name)->idIndex;
if (type)
- *type = ids.value(name).first;
+ *type = ids.value(name);
} else {
int d0Idx = context->metaObject()->indexOfProperty(name.toUtf8().constData());