diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-07-14 17:34:06 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-30 13:18:28 +0200 |
| commit | 275149f704436fc1115fb337a5803e86f7fce9cf (patch) | |
| tree | cafe19ff3220b956f6f0000122259a33b440a316 /src/declarative/qml/v4 | |
| parent | fcb55f3a289f911299f92509287be97723ddbf50 (diff) | |
Remove some QHash and QLists.
Change-Id: I153fa1abbe27f0724e453c5c979f740e956819c9
Reviewed-on: http://codereview.qt.nokia.com/3747
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'src/declarative/qml/v4')
| -rw-r--r-- | src/declarative/qml/v4/qdeclarativev4compiler_p.h | 7 | ||||
| -rw-r--r-- | src/declarative/qml/v4/qdeclarativev4irbuilder.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/declarative/qml/v4/qdeclarativev4compiler_p.h b/src/declarative/qml/v4/qdeclarativev4compiler_p.h index cc93f4dbf2..bf53fef940 100644 --- a/src/declarative/qml/v4/qdeclarativev4compiler_p.h +++ b/src/declarative/qml/v4/qdeclarativev4compiler_p.h @@ -53,8 +53,9 @@ // We mean it. // -#include "private/qdeclarativeexpression_p.h" -#include "private/qdeclarativebinding_p.h" +#include <private/qdeclarativeexpression_p.h> +#include <private/qdeclarativebinding_p.h> +#include <private/qdeclarativecompiler_p.h> QT_BEGIN_HEADER @@ -77,7 +78,7 @@ public: QDeclarativeParser::Object *context; QDeclarativeParser::Property *property; QDeclarativeParser::Variant expression; - QHash<QString, QDeclarativeParser::Object *> ids; + QDeclarativeCompilerTypes::IdList *ids; QDeclarativeTypeNameCache *importCache; QDeclarativeImports imports; }; diff --git a/src/declarative/qml/v4/qdeclarativev4irbuilder.cpp b/src/declarative/qml/v4/qdeclarativev4irbuilder.cpp index 6a6f4f0baf..fbee5a633a 100644 --- a/src/declarative/qml/v4/qdeclarativev4irbuilder.cpp +++ b/src/declarative/qml/v4/qdeclarativev4irbuilder.cpp @@ -439,7 +439,7 @@ bool QDeclarativeV4IRBuilder::visit(AST::IdentifierExpression *ast) } else if (m_engine->v8engine()->illegalNames().contains(name) ) { if (qmlVerboseCompiler()) qWarning() << "*** illegal symbol:" << name; return false; - } else if (const QDeclarativeParser::Object *obj = m_expression->ids.value(name)) { + } else if (const QDeclarativeParser::Object *obj = m_expression->ids->value(name)) { IR::Name *code = _block->ID_OBJECT(name, obj, line, column); if (obj == m_expression->component) code->storage = IR::Name::RootStorage; |