diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index b8a3ab24808..a225479c69d 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -379,8 +379,7 @@ QList> BaseFileFind::createPatternWidgets() d->m_exclusionCombo->setToolTip(msgFilePatternToolTip()); exclusionLabel->setBuddy(d->m_exclusionCombo); syncComboWithSettings(d->m_exclusionCombo, d->m_exclusionSetting); - return { qMakePair(filterLabel, d->m_filterCombo), - qMakePair(exclusionLabel, d->m_exclusionCombo) }; + return {{filterLabel, d->m_filterCombo}, {exclusionLabel, d->m_exclusionCombo}}; } void BaseFileFind::writeCommonSettings(QSettings *settings) @@ -508,10 +507,9 @@ FilePaths BaseFileFind::replaceAll(const QString &text, ChangeSet changeSet; RefactoringFilePtr file = refactoring.file(filePath); - QSet > processed; + QSet> processed; for (const SearchResultItem &item : changeItems) { - const QPair &p = qMakePair(item.mainRange().begin.line, - item.mainRange().begin.column); + const QPair p{item.mainRange().begin.line, item.mainRange().begin.column}; if (processed.contains(p)) continue; processed.insert(p); diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp index d259674fb96..a4afd319821 100644 --- a/src/plugins/texteditor/refactoringchanges.cpp +++ b/src/plugins/texteditor/refactoringchanges.cpp @@ -43,8 +43,7 @@ RefactoringSelections RefactoringChanges::rangesToSelections(QTextDocument *docu start.setKeepPositionOnInsert(true); QTextCursor end(document); end.setPosition(qMin(range.end, document->characterCount() - 1)); - - selections.append(qMakePair(start, end)); + selections.push_back({start, end}); } return selections; diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp index 0e5d50b5d2f..674e6aab52b 100644 --- a/src/plugins/texteditor/texteditorplugin.cpp +++ b/src/plugins/texteditor/texteditorplugin.cpp @@ -261,20 +261,21 @@ void TextEditorPluginPrivate::updateSearchResultsFont(const FontSettings &settin const Format containingFunctionResultFormat = settings.formatFor(C_SEARCH_RESULT_CONTAINING_FUNCTION); window->setTextEditorFont(QFont(settings.family(), settings.fontSize() * settings.fontZoom() / 100), - {std::make_pair(SearchResultColor::Style::Default, - SearchResultColor(textFormat.background(), textFormat.foreground(), - defaultResultFormat.background(), defaultResultFormat.foreground(), - containingFunctionResultFormat.background(), containingFunctionResultFormat.foreground())), - std::make_pair(SearchResultColor::Style::Alt1, - SearchResultColor(textFormat.background(), textFormat.foreground(), - alt1ResultFormat.background(), alt1ResultFormat.foreground(), - containingFunctionResultFormat.background(), - containingFunctionResultFormat.foreground())), - std::make_pair(SearchResultColor::Style::Alt2, - SearchResultColor(textFormat.background(), textFormat.foreground(), - alt2ResultFormat.background(), alt2ResultFormat.foreground(), - containingFunctionResultFormat.background(), - containingFunctionResultFormat.foreground()))}); + {{SearchResultColor::Style::Default, + {textFormat.background(), textFormat.foreground(), + defaultResultFormat.background(), defaultResultFormat.foreground(), + containingFunctionResultFormat.background(), + containingFunctionResultFormat.foreground()}}, + {SearchResultColor::Style::Alt1, + {textFormat.background(), textFormat.foreground(), + alt1ResultFormat.background(), alt1ResultFormat.foreground(), + containingFunctionResultFormat.background(), + containingFunctionResultFormat.foreground()}}, + {SearchResultColor::Style::Alt2, + {textFormat.background(), textFormat.foreground(), + alt2ResultFormat.background(), alt2ResultFormat.foreground(), + containingFunctionResultFormat.background(), + containingFunctionResultFormat.foreground()}}}); } }