diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-03-14 14:18:02 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-03-15 12:43:48 +0100 |
commit | fb9ded85d70815878fa08ab5cd0e399153db293d (patch) | |
tree | b96fb2566e65b4ce584f0b62a57a022ccae4a84a /src/tools/cplusplus-update-frontend | |
parent | 14e35b5dc4d4cc346e65d3b87940d6f584b69bb3 (diff) | |
download | qt-creator-fb9ded85d70815878fa08ab5cd0e399153db293d.tar.gz |
Fix Krazy warnings about values or keys iteration in Editor/C++.
Change-Id: I46ff779bae6d7bba105bc2019228ba38b95dc352
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/tools/cplusplus-update-frontend')
-rw-r--r-- | src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp index 5992cab2eb..844082a07d 100644 --- a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp +++ b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp @@ -1064,6 +1064,9 @@ void generateLastToken(QTextStream &os, const QString &className, const QStringL void generateAST_cpp(const Snapshot &snapshot, const QDir &cplusplusDir) { + typedef QMap<QString, ClassSpecifierAST *> StringClassSpecifierASTMap; + typedef StringClassSpecifierASTMap::ConstIterator StringClassSpecifierASTMapConstIt; + QFileInfo fileAST_cpp(cplusplusDir, QLatin1String("AST.cpp")); Q_ASSERT(fileAST_cpp.exists()); @@ -1085,8 +1088,8 @@ void generateAST_cpp(const Snapshot &snapshot, const QDir &cplusplusDir) AST_cpp_document->check(); Overview oo; - QMap<QString, ClassSpecifierAST *> classesNeedingFirstToken; - QMap<QString, ClassSpecifierAST *> classesNeedingLastToken; + StringClassSpecifierASTMap classesNeedingFirstToken; + StringClassSpecifierASTMap classesNeedingLastToken; // find all classes with method declarations for firstToken/lastToken foreach (ClassSpecifierAST *classAST, astNodes.deriveds) { @@ -1206,8 +1209,10 @@ void generateAST_cpp(const Snapshot &snapshot, const QDir &cplusplusDir) QString newMethods; QTextStream os(&newMethods); - foreach (const QString &className, classesNeedingFirstToken.keys()) { - const QStringList fields = collectFieldNames(classesNeedingFirstToken.value(className), true); + const StringClassSpecifierASTMapConstIt cfend = classesNeedingFirstToken.constEnd(); + for (StringClassSpecifierASTMapConstIt it = classesNeedingFirstToken.constBegin(); it != cfend; ++it) { + const QString &className = it.key(); + const QStringList fields = collectFieldNames(it.value(), true); os << "/** \\generated */" << endl; generateFirstToken(os, className, fields); if (ClassSpecifierAST *classAST = classesNeedingLastToken.value(className, 0)) { @@ -1217,10 +1222,10 @@ void generateAST_cpp(const Snapshot &snapshot, const QDir &cplusplusDir) classesNeedingLastToken.remove(className); } } - foreach (const QString &className, classesNeedingLastToken.keys()) { - const QStringList fields = collectFieldNames(classesNeedingLastToken.value(className), true); + const StringClassSpecifierASTMapConstIt clend = classesNeedingLastToken.constEnd(); + for (StringClassSpecifierASTMapConstIt it = classesNeedingLastToken.constBegin(); it != clend; ++it) { os << "/** \\generated */" << endl; - generateLastToken(os, className, fields); + generateLastToken(os, it.key(), collectFieldNames(it.value(), true)); } tc.setPosition(documentEnd); tc.insertText(newMethods); |