diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp index 512939911c8..b9777b48da2 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.cpp +++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp @@ -55,8 +55,8 @@ std::pair positionEntry(const QList &list, const auto to_insert = static_cast(std::distance(begin, std::lower_bound(begin, end, entry, &compare))); if (to_remove == to_insert) - return std::make_pair(-1, -1); - return std::make_pair(to_remove, to_insert); + return {-1, -1}; + return {to_remove, to_insert}; } } // namespace diff --git a/src/plugins/coreplugin/locator/commandlocator.cpp b/src/plugins/coreplugin/locator/commandlocator.cpp index 88acac6eaae..24842f443f3 100644 --- a/src/plugins/coreplugin/locator/commandlocator.cpp +++ b/src/plugins/coreplugin/locator/commandlocator.cpp @@ -61,7 +61,7 @@ void CommandLocator::prepareSearch(const QString &entry) continue; QAction *action = command->action(); if (action && action->isEnabled()) - d->commandsData.append(qMakePair(i, action->text())); + d->commandsData.append({i, action->text()}); } } diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 7a9991eb6ea..df8ef17c33a 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -1125,7 +1125,7 @@ void MainWindow::addContextObject(IContext *context) if (m_contextWidgets.find(widget) != m_contextWidgets.end()) return; - m_contextWidgets.insert(std::make_pair(widget, context)); + m_contextWidgets.insert({widget, context}); connect(context, &QObject::destroyed, this, [this, context] { removeContextObject(context); }); } diff --git a/src/plugins/coreplugin/outputwindow.cpp b/src/plugins/coreplugin/outputwindow.cpp index 92c7be20366..b2ae43059f4 100644 --- a/src/plugins/coreplugin/outputwindow.cpp +++ b/src/plugins/coreplugin/outputwindow.cpp @@ -465,7 +465,7 @@ int OutputWindow::maxCharCount() const void OutputWindow::appendMessage(const QString &output, OutputFormat format) { if (d->queuedOutput.isEmpty() || d->queuedOutput.last().second != format) - d->queuedOutput << qMakePair(output, format); + d->queuedOutput.push_back({output, format}); else d->queuedOutput.last().first.append(output); if (!d->queueTimer.isActive()) @@ -482,7 +482,7 @@ void OutputWindow::registerPositionOf(unsigned taskId, int linkedOutputLines, in const int firstLine = blocknumber - linkedOutputLines - skipLines; 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