From 056e8aa4c257b862343dc095bc1d14b45e5fe878 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 11 Mar 2013 17:23:55 +0100 Subject: [PATCH] Fix some Krazy warnings about non-const ref iterator. Change-Id: I1c78f5f5a7174002cd25bea109d5fe795530cdb5 Reviewed-by: Daniel Teske --- src/libs/utils/environment.cpp | 2 +- src/libs/utils/json.cpp | 2 +- src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp | 2 +- src/plugins/debugger/gdb/gdbengine.cpp | 4 ++-- src/plugins/debugger/qml/qmlinspectoragent.cpp | 2 +- .../componentcore/modelnodecontextmenu_helper.cpp | 2 +- .../designercore/metainfo/subcomponentmanager.cpp | 2 +- .../qmldesigner/designercore/model/rewriterview.cpp | 2 +- src/plugins/qmljseditor/qmljscompletionassist.cpp | 2 +- src/plugins/qnx/blackberryconfiguration.cpp | 2 +- src/plugins/texteditor/refactoringchanges.cpp | 5 +++-- .../cplusplus-update-frontend.cpp | 7 ++++--- src/tools/sdktool/addkitoperation.cpp | 2 +- src/tools/sdktool/addqtoperation.cpp | 2 +- src/tools/sdktool/addtoolchainoperation.cpp | 2 +- src/tools/sdktool/findkeyoperation.cpp | 2 +- 16 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp index 9ca27f28bc2..08548d9e53c 100644 --- a/src/libs/utils/environment.cpp +++ b/src/libs/utils/environment.cpp @@ -258,7 +258,7 @@ QString Environment::searchInPath(const QString &executable, } } - foreach (QString dir, additionalDirs) { + foreach (const QString &dir, additionalDirs) { QString tmp = searchInDirectory(execs, dir); if (!tmp.isEmpty()) return tmp; diff --git a/src/libs/utils/json.cpp b/src/libs/utils/json.cpp index a173691068d..29b450b050a 100644 --- a/src/libs/utils/json.cpp +++ b/src/libs/utils/json.cpp @@ -87,7 +87,7 @@ JsonValue *JsonValue::build(const QVariant &variant) case QVariant::List: { JsonArrayValue *newValue = new JsonArrayValue; - foreach (const QVariant element, variant.toList()) + foreach (const QVariant &element, variant.toList()) newValue->addElement(build(element)); return newValue; } diff --git a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp index a34b4f545ae..401fc90a386 100644 --- a/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp @@ -74,7 +74,7 @@ QList CMakeLocatorFilter::matchesFor(QFutureInterface(p); if (cmakeProject) { - foreach (CMakeBuildTarget ct, cmakeProject->buildTargets()) { + foreach (const CMakeBuildTarget &ct, cmakeProject->buildTargets()) { if (ct.title.contains(entry)) { Locator::FilterEntry entry(this, ct.title, cmakeProject->document()->fileName()); entry.extraInfo = FileUtils::shortNativePath( diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 5c90fdb053d..5f89e0b1a7e 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -2675,7 +2675,7 @@ void GdbEngine::handleBreakInsert1(const GdbResponse &response) BreakpointResponseId rid(nr); if (!isHiddenBreakpoint(rid)) { BreakpointResponse br = handler->response(id); - foreach (const GdbMi bkpt, response.data.children()) { + foreach (const GdbMi &bkpt, response.data.children()) { nr = bkpt.findChild("number").data(); rid = BreakpointResponseId(nr); QTC_ASSERT(rid.isValid(), continue); @@ -3518,7 +3518,7 @@ void GdbEngine::handleModulesList(const GdbResponse &response) void GdbEngine::examineModules() { ModulesHandler *handler = modulesHandler(); - foreach (Module module, handler->modules()) { + foreach (const Module &module, handler->modules()) { if (module.elfData.symbolsType == UnknownSymbols) handler->updateModule(module); } diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp index 3c3fcd80dd4..01666405a2a 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.cpp +++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp @@ -467,7 +467,7 @@ void QmlInspectorAgent::onResult(quint32 queryId, const QVariant &value, m_objectTreeQueryIds.removeOne(queryId); if (value.type() == QVariant::List) { QVariantList objList = value.toList(); - foreach (QVariant var, objList) { + foreach (const QVariant &var, objList) { // TODO: check which among the list is the actual // object that needs to be selected. verifyAndInsertObjectInTree(qvariant_cast(var)); diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp index 675f8b8b134..14e47b7a5ec 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp @@ -77,7 +77,7 @@ static inline void getProperties(const ModelNode node, QHash &propertyHash) { QHash auxiliaryData = node.auxiliaryData(); - foreach (const PropertyName propertyName, auxiliaryData.keys()) { + foreach (const PropertyName &propertyName, auxiliaryData.keys()) { node.setAuxiliaryData(propertyName, QVariant()); } diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp index c82fa8f1df9..d6ac8467a68 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp @@ -212,7 +212,7 @@ void SubComponentManager::parseDirectories() if (dirInfo.exists() && dirInfo.isDir()) parseDirectory(dirInfo.canonicalFilePath()); - foreach (const QString subDir, QDir(QFileInfo(file).path()).entryList(QDir::Dirs | QDir::NoDot | QDir::NoDotDot)) { + foreach (const QString &subDir, QDir(QFileInfo(file).path()).entryList(QDir::Dirs | QDir::NoDot | QDir::NoDotDot)) { parseDirectory(dirInfo.canonicalFilePath() + "/" + subDir, true, subDir.toUtf8()); } } diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index 718d966475f..21f79597730 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -717,7 +717,7 @@ QString RewriterView::pathForImport(const Import &import) QmlJS::ImportInfo importInfo; - foreach (QmlJS::Import qmljsImport, imports->all()) { + foreach (const QmlJS::Import &qmljsImport, imports->all()) { if (qmljsImport.info.name() == importStr) importInfo = qmljsImport.info; } diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp index d1c559988b7..621d090b0f0 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.cpp +++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp @@ -668,7 +668,7 @@ IAssistProposal *QmlJSCompletionAssistProcessor::perform(const IAssistInterface QStringList nCompletions; QString prefix(libVersion.left(toSkip)); nCompletions.reserve(completions.size()); - foreach (QString completion, completions) + foreach (const QString &completion, completions) if (completion.startsWith(prefix)) nCompletions.append(completion.right(completion.size()-toSkip)); completions = nCompletions; diff --git a/src/plugins/qnx/blackberryconfiguration.cpp b/src/plugins/qnx/blackberryconfiguration.cpp index 8fecd7fbfef..9007ec83230 100644 --- a/src/plugins/qnx/blackberryconfiguration.cpp +++ b/src/plugins/qnx/blackberryconfiguration.cpp @@ -135,7 +135,7 @@ void BlackBerryConfiguration::loadCertificates() settings->beginGroup(SettingsGroup); settings->beginGroup(CertificateGroup); - foreach (QString certificateId, settings->childGroups()) { + foreach (const QString &certificateId, settings->childGroups()) { settings->beginGroup(certificateId); BlackBerryCertificate *cert = diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp index 00054b99e77..db870ee0e15 100644 --- a/src/plugins/texteditor/refactoringchanges.cpp +++ b/src/plugins/texteditor/refactoringchanges.cpp @@ -382,8 +382,9 @@ void RefactoringFile::indentOrReindent(void (RefactoringChangesData::*mf)(const const BaseTextEditorWidget *) const, const QList > &ranges) { - QPair p; - foreach (p, ranges) { + typedef QPair CursorPair; + + foreach (const CursorPair &p, ranges) { QTextCursor selection(p.first.document()); selection.setPosition(p.first.position()); selection.setPosition(p.second.position(), QTextCursor::KeepAnchor); diff --git a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp index dea4f1e0869..5992cab2eb4 100644 --- a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp +++ b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp @@ -1562,6 +1562,8 @@ void generateASTFwd_h(const Snapshot &snapshot, const QDir &cplusplusDir, const void generateASTPatternBuilder_h(const QDir &cplusplusDir) { + typedef QPair StringPair; + QFileInfo fileInfo(cplusplusDir, QLatin1String("ASTPatternBuilder.h")); QFile file(fileInfo.absoluteFilePath()); if (! file.open(QFile::WriteOnly)) @@ -1619,7 +1621,7 @@ void generateASTPatternBuilder_h(const QDir &cplusplusDir) out << " " << className << " *" << methodName << "("; - QList > args; + QList args; bool first = true; for (unsigned index = 0; index < klass->memberCount(); ++index) { @@ -1652,8 +1654,7 @@ void generateASTPatternBuilder_h(const QDir &cplusplusDir) << " " << className << " *__ast = new (&pool) " << className << ';' << endl; - QPair p; - foreach (p, args) { + foreach (const StringPair &p, args) { out << " __ast->" << p.second << " = " << p.second << ';' << endl; } diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index 33486f3981d..58837a21a55 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -355,7 +355,7 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, // Sanity check: Make sure displayName is unique. QStringList nameKeys = FindKeyOperation::findKey(map, QLatin1String(DISPLAYNAME)); QStringList nameList; - foreach (const QString nameKey, nameKeys) + foreach (const QString &nameKey, nameKeys) nameList << GetOperation::get(map, nameKey).toString(); const QString uniqueName = makeUnique(displayName, nameList); diff --git a/src/tools/sdktool/addqtoperation.cpp b/src/tools/sdktool/addqtoperation.cpp index 5fa0b472988..d61b1d8501b 100644 --- a/src/tools/sdktool/addqtoperation.cpp +++ b/src/tools/sdktool/addqtoperation.cpp @@ -285,7 +285,7 @@ QVariantMap AddQtOperation::addQt(const QVariantMap &map, // Sanity check: Make sure displayName is unique. QStringList nameKeys = FindKeyOperation::findKey(map, QLatin1String(DISPLAYNAME)); QStringList nameList; - foreach (const QString nameKey, nameKeys) + foreach (const QString &nameKey, nameKeys) nameList << GetOperation::get(map, nameKey).toString(); const QString uniqueName = makeUnique(displayName, nameList); diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp index 0eeeb8dfdea..0aeca51154d 100644 --- a/src/tools/sdktool/addtoolchainoperation.cpp +++ b/src/tools/sdktool/addtoolchainoperation.cpp @@ -249,7 +249,7 @@ QVariantMap AddToolChainOperation::addToolChain(const QVariantMap &map, // Sanity check: Make sure displayName is unique. QStringList nameKeys = FindKeyOperation::findKey(map, QLatin1String(DISPLAYNAME)); QStringList nameList; - foreach (const QString nameKey, nameKeys) + foreach (const QString &nameKey, nameKeys) nameList << GetOperation::get(map, nameKey).toString(); const QString uniqueName = makeUnique(displayName, nameList); diff --git a/src/tools/sdktool/findkeyoperation.cpp b/src/tools/sdktool/findkeyoperation.cpp index 00e0bfcf5bc..b6ac1314c33 100644 --- a/src/tools/sdktool/findkeyoperation.cpp +++ b/src/tools/sdktool/findkeyoperation.cpp @@ -74,7 +74,7 @@ int FindKeyOperation::execute() const foreach (const QString &k, m_keys) { const QStringList result = findKey(map, k); - foreach (const QString r, result) + foreach (const QString &r, result) std::cout << qPrintable(r) << std::endl; }