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

CorePlugin: Limit the usage of qMakePair and std::make_pair

Browse Source 
Change-Id: Ibf96ca29d2570841955366371f1bab11198b3e67
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-09-30 11:53:28 +02:00
parent 5d7c5e21c0
commit 3885b936b6
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/editormanager/documentmodel.cpp
View File

@@ -55,8 +55,8 @@ std::pair<int, int> positionEntry(const QList<DocumentModel::Entry *> &list,
const auto to_insert const auto to_insert
= static_cast<int>(std::distance(begin, std::lower_bound(begin, end, entry, &compare))); = static_cast<int>(std::distance(begin, std::lower_bound(begin, end, entry, &compare)));
if (to_remove == to_insert) if (to_remove == to_insert)
return std::make_pair(-1, -1); return {-1, -1};
return std::make_pair(to_remove, to_insert); return {to_remove, to_insert};
} }
} // namespace } // namespace

2
src/plugins/coreplugin/locator/commandlocator.cpp
View File

@@ -61,7 +61,7 @@ void CommandLocator::prepareSearch(const QString &entry)
continue; continue;
QAction *action = command->action(); QAction *action = command->action();
if (action && action->isEnabled()) if (action && action->isEnabled())
d->commandsData.append(qMakePair(i, action->text())); d->commandsData.append({i, action->text()});
} }
} }

2
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -1125,7 +1125,7 @@ void MainWindow::addContextObject(IContext *context)
if (m_contextWidgets.find(widget) != m_contextWidgets.end()) if (m_contextWidgets.find(widget) != m_contextWidgets.end())
return; return;
m_contextWidgets.insert(std::make_pair(widget, context)); m_contextWidgets.insert({widget, context});
connect(context, &QObject::destroyed, this, [this, context] { removeContextObject(context); }); connect(context, &QObject::destroyed, this, [this, context] { removeContextObject(context); });
} }

4
src/plugins/coreplugin/outputwindow.cpp
View File

@@ -465,7 +465,7 @@ int OutputWindow::maxCharCount() const
void OutputWindow::appendMessage(const QString &output, OutputFormat format) void OutputWindow::appendMessage(const QString &output, OutputFormat format)
{ {
if (d->queuedOutput.isEmpty() || d->queuedOutput.last().second != format) if (d->queuedOutput.isEmpty() || d->queuedOutput.last().second != format)
d->queuedOutput << qMakePair(output, format); d->queuedOutput.push_back({output, format});
else else
d->queuedOutput.last().first.append(output); d->queuedOutput.last().first.append(output);
if (!d->queueTimer.isActive()) if (!d->queueTimer.isActive())
@@ -482,7 +482,7 @@ void OutputWindow::registerPositionOf(unsigned taskId, int linkedOutputLines, in
const int firstLine = blocknumber - linkedOutputLines - skipLines; const int firstLine = blocknumber - linkedOutputLines - skipLines;
const int lastLine = firstLine + linkedOutputLines - 1; const int lastLine = firstLine + linkedOutputLines - 1;
d->taskPositions.insert(taskId, qMakePair(firstLine, lastLine)); d->taskPositions.insert(taskId, {firstLine, lastLine});
} }
bool OutputWindow::knowsPositionOf(unsigned taskId) const bool OutputWindow::knowsPositionOf(unsigned taskId) const