diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-03-17 16:58:38 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-03-25 13:45:04 +0100 |
| commit | a68fbbbf66b8ef65df9c4cc870b11c0e1b414512 (patch) | |
| tree | 4a7c476d5c8b6249438f5a8f237f2d184b2945e8 | |
| parent | ca3adabbf02dae85876bedf28eccea60c79365f4 (diff) | |
| download | qbs-a68fbbbf66b8ef65df9c4cc870b11c0e1b414512.tar.gz | |
use Item::PropertyDeclarationMap where appropriate
Change-Id: Id1449ecbc4b3e3f4302ccb3a5f7c397a58937456
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | src/lib/corelib/language/itemreaderastvisitor.cpp | 2 | ||||
| -rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/language/itemreaderastvisitor.cpp b/src/lib/corelib/language/itemreaderastvisitor.cpp index 40ec5050c..8800536d7 100644 --- a/src/lib/corelib/language/itemreaderastvisitor.cpp +++ b/src/lib/corelib/language/itemreaderastvisitor.cpp @@ -523,7 +523,7 @@ void ItemReaderASTVisitor::mergeItem(Item *dst, const Item *src, } } - for (QMap<QString, PropertyDeclaration>::const_iterator it + for (Item::PropertyDeclarationMap::const_iterator it = src->m_propertyDeclarations.constBegin(); it != src->m_propertyDeclarations.constEnd(); ++it) { dst->m_propertyDeclarations[it.key()] = it.value(); diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 081ccd55d..66ecb9fd5 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -210,7 +210,7 @@ void ProjectResolver::resolveProject(Item *item, ProjectContext *projectContext) projectContext->dummyModule = ResolvedModule::create(); QVariantMap projectProperties; - for (QMap<QString, PropertyDeclaration>::const_iterator it + for (Item::PropertyDeclarationMap::const_iterator it = item->propertyDeclarations().constBegin(); it != item->propertyDeclarations().constEnd(); ++it) { if (it.value().flags.testFlag(PropertyDeclaration::PropertyNotAvailableInConfig)) |