diff --git a/src/libs/extensionsystem/plugindetailsview.cpp b/src/libs/extensionsystem/plugindetailsview.cpp index 9d4f88489c4ae821eb720156d7b896d586f39f94..ebd6e5f132ffedd309e0c7f2de66018308536c36 100644 --- a/src/libs/extensionsystem/plugindetailsview.cpp +++ b/src/libs/extensionsystem/plugindetailsview.cpp @@ -83,8 +83,12 @@ void PluginDetailsView::update(PluginSpec *spec) m_ui->copyright->setText(spec->copyright()); m_ui->license->setText(spec->license()); QStringList depStrings; - foreach (PluginDependency dep, spec->dependencies()) { - depStrings << QString("%1 (%2)").arg(dep.name).arg(dep.version); + foreach (const PluginDependency &dep, spec->dependencies()) { + QString depString = dep.name; + depString += QLatin1String(" ("); + depString += dep.version; + depString += QLatin1Char(')'); + depStrings.append(depString); } m_ui->dependencies->addItems(depStrings); } diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp index 192fa34321c9db7c8cfe23c5ec72aab2d84c070f..733d2039ceb378b6c262a969e095c411a5982731 100644 --- a/src/libs/utils/filesearch.cpp +++ b/src/libs/utils/filesearch.cpp @@ -95,7 +95,7 @@ void runFileSearch(QFutureInterface<FileSearchResult> &future, QFile file; QBuffer buffer; - foreach (QString s, files) { + foreach (const QString &s, files) { if (future.isPaused()) future.waitForResume(); if (future.isCanceled()) { diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 64176d6350b01c0f198abcb5491ba02106eae915..e1b52d4b1bdcb851dd2ceade6ded4927d940e977 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -180,7 +180,7 @@ bool CMakeProject::parseCMakeLists() QSet<QString> projectFiles; if (cbpparser.hasCMakeFiles()) { fileList.append(cbpparser.cmakeFileList()); - foreach(ProjectExplorer::FileNode *node, cbpparser.cmakeFileList()) + foreach(const ProjectExplorer::FileNode *node, cbpparser.cmakeFileList()) projectFiles.insert(node->path()); } else { // Manually add the CMakeLists.txt file @@ -219,7 +219,7 @@ bool CMakeProject::parseCMakeLists() QStringList allIncludePaths; QStringList allFrameworkPaths; QList<ProjectExplorer::HeaderPath> allHeaderPaths = activeBC->toolChain()->systemHeaderPaths(); - foreach (ProjectExplorer::HeaderPath headerPath, allHeaderPaths) { + foreach (const ProjectExplorer::HeaderPath &headerPath, allHeaderPaths) { if (headerPath.kind() == ProjectExplorer::HeaderPath::FrameworkHeaderPath) allFrameworkPaths.append(headerPath.path()); else diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index d732d6947f64a751ac59981e46fdf18ee88b97e1..deb3c85b2f13f24fe412374bf790080e50a89764 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -1550,7 +1550,7 @@ QByteArray EditorManager::saveState() const QList<OpenEditorsModel::Entry> entries = m_d->m_editorModel->entries(); stream << entries.count(); - foreach (OpenEditorsModel::Entry entry, entries) { + foreach (const OpenEditorsModel::Entry &entry, entries) { stream << entry.fileName() << entry.displayName() << entry.id().toUtf8(); } diff --git a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp index 3b0beefeda79c02590160fe4a7aff5f918a880b2..65c6f49878799df4f313d7134a167c0d0e8ea29a 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorsmodel.cpp @@ -67,7 +67,7 @@ int OpenEditorsModel::rowCount(const QModelIndex &parent) const QList<IEditor *> OpenEditorsModel::editors() const { QList<IEditor *> result; - foreach (Entry entry, m_editors) + foreach (const Entry &entry, m_editors) if (entry.editor) result += entry.editor; return result; @@ -207,7 +207,7 @@ bool OpenEditorsModel::isDuplicate(IEditor *editor) const IEditor *OpenEditorsModel::originalForDuplicate(IEditor *duplicate) const { IFile *file = duplicate->file(); - foreach(Entry e, m_editors) + foreach(const Entry &e, m_editors) if (e.editor && e.editor->file() == file) return e.editor; return 0; diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp index 9c9bcb086c88bb790c66bd6abb3ccf94f3a19e99..74cf587787d6d3af9d7ecb885430aa47a75dcdf8 100644 --- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp @@ -245,7 +245,7 @@ void OpenEditorsWindow::setEditors(EditorView *mainView, EditorView *view, OpenE } // add purely restored editors which are not initialised yet - foreach (OpenEditorsModel::Entry entry, model->entries()) { + foreach (const OpenEditorsModel::Entry &entry, model->entries()) { if (entry.editor) continue; QTreeWidgetItem *item = new QTreeWidgetItem(); diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index a733a3b03df89bd9949b2f47894167234d928782..7afec519d82acf66edbbd409bba810fc13c1a630 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -96,7 +96,7 @@ void GeneralSettings::fillLanguageBox() const const QStringList languageFiles = QDir(creatorTrPath).entryList(QStringList(QLatin1String("*.qm"))); const QString currentLocale = language(); - Q_FOREACH(const QString languageFile, languageFiles) + Q_FOREACH(const QString &languageFile, languageFiles) { int start = languageFile.lastIndexOf(QLatin1Char('_'))+1; int end = languageFile.lastIndexOf(QLatin1Char('.')); diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp index b20dfecbf799fee809779611f524ff8d6f824e55..bc1dfcb347907c6bac95cb7ddabc18f026a2d431 100644 --- a/src/plugins/coreplugin/mimedatabase.cpp +++ b/src/plugins/coreplugin/mimedatabase.cpp @@ -496,7 +496,7 @@ unsigned MimeType::matchesFile(const QFileInfo &file) const unsigned MimeType::matchesFile(Internal::FileMatchContext &c) const { // check globs - foreach (QRegExp pattern, m_d->globPatterns) { + foreach (const QRegExp &pattern, m_d->globPatterns) { if (pattern.exactMatch(c.fileName())) return GlobMatchPriority; } @@ -507,7 +507,7 @@ unsigned MimeType::matchesFile(Internal::FileMatchContext &c) const const QByteArray data = c.data(); if (!data.isEmpty()) { - foreach (MimeTypeData::IMagicMatcherSharedPointer matcher, m_d->magicMatchers) { + foreach (const MimeTypeData::IMagicMatcherSharedPointer &matcher, m_d->magicMatchers) { if (matcher->matches(data)) return matcher->priority(); } diff --git a/src/plugins/cpaster/pasteview.cpp b/src/plugins/cpaster/pasteview.cpp index 21f00f151d371ae2f2cb08ee8094a696e68d8b5c..679fdc969585423f223637f4497afa827bf5d52c 100644 --- a/src/plugins/cpaster/pasteview.cpp +++ b/src/plugins/cpaster/pasteview.cpp @@ -160,7 +160,7 @@ int PasteView::show(const QString &user, const QString &description, const QStri QByteArray content; m_parts = parts; m_ui.uiPatchList->clear(); - foreach (const FileData part, parts) { + foreach (const FileData &part, parts) { QListWidgetItem *itm = new QListWidgetItem(part.filename, m_ui.uiPatchList); itm->setCheckState(Qt::Checked); itm->setFlags(Qt::ItemIsSelectable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled); diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp index 71f5442a5b4ca92f37b0e9152c8bb4bff2aa4fdc..c1be3357ec05db99e07e0b85eee085ce84eef8a3 100644 --- a/src/plugins/cppeditor/cpphoverhandler.cpp +++ b/src/plugins/cppeditor/cpphoverhandler.cpp @@ -289,7 +289,7 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in // We only want to show F1 if the tooltip matches the help id bool showF1 = true; - foreach (Document::DiagnosticMessage m, doc->diagnosticMessages()) { + foreach (const Document::DiagnosticMessage &m, doc->diagnosticMessages()) { if (m.line() == lineNumber) { m_toolTip = m.text(); showF1 = false; diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp index 87bc14ff494a44237a5d1fdab486609c92f41b5c..3d7cbebf9d944e31e682b0e6cc5c6ed71bd42b89 100644 --- a/src/plugins/cpptools/cppcodecompletion.cpp +++ b/src/plugins/cpptools/cppcodecompletion.cpp @@ -1178,7 +1178,7 @@ bool CppCodeCompletion::completeScope(const QList<LookupItem> &results, { QList<Symbol *> classes, namespaces; - foreach (LookupItem result, results) { + foreach (const LookupItem &result, results) { FullySpecifiedType ty = result.type(); if (Class *classTy = ty->asClassType()) @@ -1489,7 +1489,7 @@ void CppCodeCompletion::completions(QList<TextEditor::CompletionItem> *completio } else if (m_completionOperator == T_LPAREN || m_completionOperator == T_SIGNAL || m_completionOperator == T_SLOT) { - foreach (TextEditor::CompletionItem item, m_completions) { + foreach (const TextEditor::CompletionItem &item, m_completions) { if (item.text.startsWith(key, Qt::CaseInsensitive)) { completions->append(item); } diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index dd346e9cb79b84f8808546990de072cba5156f41..5e691d5efd7074db320fd87abf17369defbea42b 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -847,7 +847,7 @@ QFuture<void> CppModelManager::refreshSourceFiles(const QStringList &sourceFiles m_synchronizer.clearFutures(); - foreach (QFuture<void> future, futures) { + foreach (const QFuture<void> &future, futures) { if (! (future.isFinished() || future.isCanceled())) m_synchronizer.addFuture(future); } diff --git a/src/plugins/debugger/debuggeroutputwindow.cpp b/src/plugins/debugger/debuggeroutputwindow.cpp index ca90c72ada30e4b895482ee191675be3c49c1498..4a84cd2b149a4768748ecc157b8aed1b3b66c39b 100644 --- a/src/plugins/debugger/debuggeroutputwindow.cpp +++ b/src/plugins/debugger/debuggeroutputwindow.cpp @@ -349,8 +349,10 @@ void DebuggerOutputWindow::showOutput(int channel, const QString &output) foreach (QString line, output.split('\n')) { // FIXME: QTextEdit asserts on really long lines... const int n = 30000; - if (line.size() > n) - line = line.left(n) + " [...] <cut off>"; + if (line.size() > n) { + line.truncate(n); + line += QLatin1String(" [...] <cut off>"); + } if (line != QLatin1String("(gdb) ")) m_combinedText->appendPlainText(charForChannel(channel) + line); } diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 6c6a0ecfb70a644449ad0c7d7239294d6b2e2d4e..df9cfee218390f824e574e3cdfdd4693b5b61758 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -247,7 +247,7 @@ struct Range QDebug &operator<<(QDebug &ts, const QList<QTextEdit::ExtraSelection> &sels) { - foreach (QTextEdit::ExtraSelection sel, sels) + foreach (const QTextEdit::ExtraSelection &sel, sels) ts << "SEL: " << sel.cursor.anchor() << sel.cursor.position(); return ts; } diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp index fef6ad7acd74ffd7e9d265d260c20938d49bec0a..3f2518665d3e1d1c333c519d19a2800553f4f066 100644 --- a/src/plugins/help/filtersettingspage.cpp +++ b/src/plugins/help/filtersettingspage.cpp @@ -99,8 +99,8 @@ void FilterSettingsPage::updateFilterPage() help.setupData(); m_filterMapBackup.clear(); const QStringList filters = help.customFilters(); - foreach (const QString filter, filters) { - QStringList atts = help.filterAttributes(filter); + foreach (const QString &filter, filters) { + const QStringList atts = help.filterAttributes(filter); m_filterMapBackup.insert(filter, atts); if (!m_filterMap.contains(filter)) m_filterMap.insert(filter, atts); @@ -108,8 +108,8 @@ void FilterSettingsPage::updateFilterPage() m_ui.filterWidget->addItems(m_filterMap.keys()); - foreach (const QString a, help.filterAttributes()) - new QTreeWidgetItem(m_ui.attributeWidget, QStringList() << a); + foreach (const QString &a, help.filterAttributes()) + new QTreeWidgetItem(m_ui.attributeWidget, QStringList(a)); if (m_filterMap.keys().count()) m_ui.filterWidget->setCurrentRow(0); @@ -215,7 +215,7 @@ bool FilterSettingsPage::applyChanges() } } if (changed) { - foreach (QString filter, m_removedFilters) + foreach (const QString &filter, m_removedFilters) m_helpEngine->removeCustomFilter(filter); QMapIterator<QString, QStringList> it(m_filterMap); while (it.hasNext()) { diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp index 4833254e303cf4a6d5e4d9b8326ebdef53c53b6d..d7fd91775a5c5d0361e3dbd9b8a886d9e87d0752 100644 --- a/src/plugins/projectexplorer/buildstepspage.cpp +++ b/src/plugins/projectexplorer/buildstepspage.cpp @@ -57,7 +57,7 @@ BuildStepsPage::BuildStepsPage(Project *project, bool clean) : BuildStepsPage::~BuildStepsPage() { - foreach(BuildStepsWidgetStruct s, m_buildSteps) { + foreach(const BuildStepsWidgetStruct &s, m_buildSteps) { delete s.widget; delete s.detailsWidget; } diff --git a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp index 6810920b5561254dc40d115fadbabec62dea0ea6..be37cc9ea205bea0205938b46e6483480121a16d 100644 --- a/src/plugins/projectexplorer/editorsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/editorsettingspropertiespage.cpp @@ -99,8 +99,10 @@ EditorSettingsWidget::EditorSettingsWidget(Project *project) QTextCodec *codec = QTextCodec::codecForMib(mib); m_codecs += codec; QString name = codec->name(); - foreach (QByteArray alias, codec->aliases()) - name += QString(QLatin1String(" / ") + alias); + foreach (const QByteArray &alias, codec->aliases()) { + name += QLatin1String(" / "); + name += QString::fromLatin1(alias); + } m_ui.encodingComboBox->addItem(name); if (defaultTextCodec == codec) m_ui.encodingComboBox->setCurrentIndex(i); diff --git a/src/plugins/projectexplorer/persistentsettings.cpp b/src/plugins/projectexplorer/persistentsettings.cpp index 9b94095935044961a3a4e4f9c10d90dedb6b99ef..d06af8d0923c5b9747bb2ec62d112ad81e3993bb 100644 --- a/src/plugins/projectexplorer/persistentsettings.cpp +++ b/src/plugins/projectexplorer/persistentsettings.cpp @@ -143,7 +143,7 @@ void PersistentSettingsWriter::writeValue(QDomElement &ps, const QVariant &varia QDomElement values = ps.ownerDocument().createElement("valuelist"); values.setAttribute("type", QVariant::typeToName(QVariant::List)); QList<QVariant> varList = variant.toList(); - foreach (QVariant var, varList) { + foreach (const QVariant &var, varList) { writeValue(values, var); } ps.appendChild(values); diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index e1e664999de738d8e7499a3b47ab48bf64071639..eb9699ff4102db9028c3cf4327d425474c7447ca 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -477,7 +477,7 @@ void Qt4Project::updateCodeModel() //foreach(const HeaderPath &hp, tc->systemHeaderPaths()) // qDebug()<<hp.path(); } - foreach (HeaderPath headerPath, allHeaderPaths) { + foreach (const HeaderPath &headerPath, allHeaderPaths) { if (headerPath.kind() == HeaderPath::FrameworkHeaderPath) predefinedFrameworkPaths.append(headerPath.path()); else @@ -531,7 +531,7 @@ void Qt4Project::updateCodeModel() allPrecompileHeaders.append(info.precompiledHeader); // Add custom defines - foreach (const QString def, pro->variableValue(DefinesVar)) { + foreach (const QString &def, pro->variableValue(DefinesVar)) { definedMacros += "#define "; info.defines += "#define "; const int index = def.indexOf(QLatin1Char('=')); diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 8ac704e5dbd455d238e822c7daf011ab76a99407..2cb443efb0d1a330d24f6b6162fbc28b6c0d35ed 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -327,7 +327,7 @@ void QtVersionManager::addNewVersionsFromInstaller() QStringList newVersionsList = newVersionsValue.split(';', QString::SkipEmptyParts); bool defaultVersionWasReset = false; - foreach (QString newVersion, newVersionsList) { + foreach (const QString &newVersion, newVersionsList) { QStringList newVersionData = newVersion.split('='); if (newVersionData.count() >= 2) { if (QFile::exists(newVersionData[1])) { @@ -750,7 +750,7 @@ QtVersion *QtVersionManager::qtVersionForQMakeBinary(const QString &qmakePath) void dumpQMakeAssignments(const QList<QMakeAssignment> &list) { - foreach(QMakeAssignment qa, list) { + foreach(const QMakeAssignment &qa, list) { qDebug()<<qa.variable<<qa.op<<qa.value; } } @@ -789,11 +789,11 @@ QPair<QtVersion::QmakeBuildConfigs, QStringList> QtVersionManager::scanMakeFile( dumpQMakeAssignments(assignments); result2.append(additionalArguments); - foreach(QMakeAssignment qa, assignments) + foreach(const QMakeAssignment &qa, assignments) result2.append(qa.variable + qa.op + qa.value); if (!afterAssignments.isEmpty()) { result2.append("-after"); - foreach(QMakeAssignment qa, afterAssignments) + foreach(const QMakeAssignment &qa, afterAssignments) result2.append(qa.variable + qa.op + qa.value); } } @@ -918,7 +918,7 @@ QtVersion::QmakeBuildConfigs QtVersionManager::qmakeBuildConfigFromCmdArgs(QList QtVersion::QmakeBuildConfigs result = defaultBuildConfig; QList<QMakeAssignment> oldAssignments = *assignments; assignments->clear(); - foreach(QMakeAssignment qa, oldAssignments) { + foreach(const QMakeAssignment &qa, oldAssignments) { if (qa.variable == "CONFIG") { QStringList values = qa.value.split(' '); QStringList newValues; @@ -1100,7 +1100,7 @@ QList<QSharedPointer<ProjectExplorer::ToolChain> > QtVersion::toolChains() const ProjectExplorer::ToolChain *QtVersion::toolChain(ProjectExplorer::ToolChain::ToolChainType type) const { - foreach(QSharedPointer<ProjectExplorer::ToolChain> tcptr, toolChains()) + foreach(const QSharedPointer<ProjectExplorer::ToolChain> &tcptr, toolChains()) if (tcptr->type() == type) return tcptr.data(); return 0; @@ -1109,7 +1109,7 @@ ProjectExplorer::ToolChain *QtVersion::toolChain(ProjectExplorer::ToolChain::Too QList<ProjectExplorer::ToolChain::ToolChainType> QtVersion::possibleToolChainTypes() const { QList<ProjectExplorer::ToolChain::ToolChainType> types; - foreach(QSharedPointer<ProjectExplorer::ToolChain> tc, toolChains()) + foreach(const QSharedPointer<ProjectExplorer::ToolChain> &tc, toolChains()) types << tc->type(); return types; } diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index d0436d4eea8930b919e08a9b29ec82e4b8e0fe6f..0bbd9287507a00d19788935c39fd896ef9606e8c 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -4689,7 +4689,7 @@ void BaseTextEditor::_q_matchParentheses() if (animatePosition >= 0) { - foreach (QTextEdit::ExtraSelection sel, BaseTextEditor::extraSelections(ParenthesesMatchingSelection)) { + foreach (const QTextEdit::ExtraSelection &sel, BaseTextEditor::extraSelections(ParenthesesMatchingSelection)) { if (sel.cursor.selectionStart() == animatePosition || sel.cursor.selectionEnd() - 1 == animatePosition) { animatePosition = -1; diff --git a/src/plugins/texteditor/codecselector.cpp b/src/plugins/texteditor/codecselector.cpp index de5fc1343ace892ef4269edd04504930cc3c2af2..c49bdc48b377200e9aee9cf8c3399947cd353876 100644 --- a/src/plugins/texteditor/codecselector.cpp +++ b/src/plugins/texteditor/codecselector.cpp @@ -105,7 +105,7 @@ CodecSelector::CodecSelector(QWidget *parent, BaseTextDocument *doc) continue; } QString names = QString::fromLatin1(c->name()); - foreach (QByteArray alias, c->aliases()) + foreach (const QByteArray &alias, c->aliases()) names += QLatin1String(" / ") + QString::fromLatin1(alias); if (doc->codec() == c) currentIndex = encodings.count();