feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditorPlugin: Limit the usage of std::make_pair

Browse Source 
And qMakePair.

Change-Id: Id92a662fa0674b9e9f835280bb9378c8d00549e8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Jarek Kobus
2022-09-30 10:35:15 +02:00
parent 3885b936b6
commit 4c1f410881
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/texteditor/basefilefind.cpp
View File

@@ -379,8 +379,7 @@ QList<QPair<QWidget *, QWidget *>> 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<QPair<int, int> > processed;
QSet<QPair<int, int>> processed;
for (const SearchResultItem &item : changeItems) {
const QPair<int, int> &p = qMakePair(item.mainRange().begin.line,
item.mainRange().begin.column);
const QPair<int, int> p{item.mainRange().begin.line, item.mainRange().begin.column};
if (processed.contains(p))
continue;
processed.insert(p);

3
src/plugins/texteditor/refactoringchanges.cpp
View File

@@ -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;

29
src/plugins/texteditor/texteditorplugin.cpp
View File

@@ -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()}}});
}
}