-namespace BinEditor {
-namespace Internal {
+namespace BinEditor::Internal {
class BinEditorPlugin : public ExtensionSystem::IPlugin
{
@@ -22,12 +20,6 @@ class BinEditorPlugin : public ExtensionSystem::IPlugin
void extensionsInitialized() final {}
};
-class BinEditorFactory final : public Core::IEditorFactory
-{
-public:
- BinEditorFactory();
-};
-
class FactoryServiceImpl : public QObject, public FactoryService
{
Q_OBJECT
@@ -37,5 +29,4 @@ public:
EditorService *createEditorService(const QString &title0, bool wantsEditor) final;
};
-} // namespace Internal
-} // namespace BinEditor
+} // BinEditor::Internal
diff --git a/src/plugins/bineditor/bineditortr.h b/src/plugins/bineditor/bineditortr.h
index fd13b1cb81f..630d4d56e18 100644
--- a/src/plugins/bineditor/bineditortr.h
+++ b/src/plugins/bineditor/bineditortr.h
@@ -12,4 +12,4 @@ struct Tr
Q_DECLARE_TR_FUNCTIONS(BinEditor)
};
-} // namespace BinEditor
+} // BinEditor
diff --git a/src/plugins/bineditor/bineditorwidget.cpp b/src/plugins/bineditor/bineditorwidget.cpp
index a6f77425ca9..5a3e47229ce 100644
--- a/src/plugins/bineditor/bineditorwidget.cpp
+++ b/src/plugins/bineditor/bineditorwidget.cpp
@@ -2,8 +2,10 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "bineditorwidget.h"
+
#include "bineditorconstants.h"
#include "bineditorservice.h"
+#include "bineditortr.h"
#include "markup.h"
#include
@@ -42,8 +44,7 @@
using namespace Core;
using namespace Utils;
-namespace BinEditor {
-namespace Internal {
+namespace BinEditor::Internal {
const QChar MidpointChar(u'\u00B7');
@@ -1218,7 +1219,7 @@ QString BinEditorWidget::toolTip(const QHelpEvent *helpEvent) const
QString msg;
QTextStream str(&msg);
str << ""
- << tr("Memory at 0x%1").arg(address, 0, 16) << "
";
+ << Tr::tr("Memory at 0x%1").arg(address, 0, 16) << "";
for (const Markup &m : qAsConst(m_markup)) {
if (m.covers(address) && !m.toolTip.isEmpty()) {
@@ -1226,16 +1227,16 @@ QString BinEditorWidget::toolTip(const QHelpEvent *helpEvent) const
break;
}
}
- const QString msgDecimalUnsigned = tr("Decimal unsigned value:");
- const QString msgDecimalSigned = tr("Decimal signed value:");
- const QString msgOldDecimalUnsigned = tr("Previous decimal unsigned value:");
- const QString msgOldDecimalSigned = tr("Previous decimal signed value:");
+ const QString msgDecimalUnsigned = Tr::tr("Decimal unsigned value:");
+ const QString msgDecimalSigned = Tr::tr("Decimal signed value:");
+ const QString msgOldDecimalUnsigned = Tr::tr("Previous decimal unsigned value:");
+ const QString msgOldDecimalSigned = Tr::tr("Previous decimal signed value:");
// Table showing little vs. big endian integers for multi-byte
if (intSize > 1) {
str << "| "
- << tr("%1-bit Integer Type").arg(8 * intSize) << " | "
- << tr("Little Endian") << " | " << tr("Big Endian") << " |
|---|
";
+ << Tr::tr("%1-bit Integer Type").arg(8 * intSize) << ""
+ << Tr::tr("Little Endian") << " | " << Tr::tr("Big Endian") << " | ";
str << tableRowStartC << msgDecimalUnsigned
<< numericTableRowSepC << littleEndianValue << numericTableRowSepC
<< bigEndianValue << tableRowEndC << tableRowStartC << msgDecimalSigned
@@ -1261,14 +1262,14 @@ QString BinEditorWidget::toolTip(const QHelpEvent *helpEvent) const
str << tableRowStartC << msgDecimalSigned << numericTableRowSepC
<< littleEndianSigned << tableRowEndC;
}
- str << tableRowStartC << tr("Binary value:") << numericTableRowSepC;
+ str << tableRowStartC << Tr::tr("Binary value:") << numericTableRowSepC;
str.setIntegerBase(2);
str.setFieldWidth(8);
str.setPadChar(QLatin1Char('0'));
str << littleEndianValue;
str.setFieldWidth(0);
str << tableRowEndC << tableRowStartC
- << tr("Octal value:") << numericTableRowSepC;
+ << Tr::tr("Octal value:") << numericTableRowSepC;
str.setIntegerBase(8);
str.setFieldWidth(3);
str << littleEndianValue << tableRowEndC;
@@ -1281,13 +1282,13 @@ QString BinEditorWidget::toolTip(const QHelpEvent *helpEvent) const
str << tableRowStartC << msgOldDecimalSigned << numericTableRowSepC
<< littleEndianSignedOld << tableRowEndC;
}
- str << tableRowStartC << tr("Previous binary value:")
+ str << tableRowStartC << Tr::tr("Previous binary value:")
<< numericTableRowSepC;
str.setIntegerBase(2);
str.setFieldWidth(8);
str << littleEndianValueOld;
str.setFieldWidth(0);
- str << tableRowEndC << tableRowStartC << tr("Previous octal value:")
+ str << tableRowEndC << tableRowStartC << Tr::tr("Previous octal value:")
<< numericTableRowSepC;
str.setIntegerBase(8);
str.setFieldWidth(3);
@@ -1303,10 +1304,10 @@ QString BinEditorWidget::toolTip(const QHelpEvent *helpEvent) const
double doubleValue, doubleValueOld;
asDouble(selStart, doubleValue, false);
asDouble(selStart, doubleValueOld, true);
- str << tableRowStartC << tr("double value:") << numericTableRowSepC
+ str << tableRowStartC << Tr::tr("double value:") << numericTableRowSepC
<< doubleValue << tableRowEndC;
if (doubleValue != doubleValueOld)
- str << tableRowStartC << tr("Previous double value:") << numericTableRowSepC
+ str << tableRowStartC << Tr::tr("Previous double value:") << numericTableRowSepC
<< doubleValueOld << tableRowEndC;
str << "
";
}
@@ -1317,10 +1318,10 @@ QString BinEditorWidget::toolTip(const QHelpEvent *helpEvent) const
float floatValue, floatValueOld;
asFloat(selStart, floatValue, false);
asFloat(selStart, floatValueOld, true);
- str << tableRowStartC << tr("float value:") << numericTableRowSepC
+ str << tableRowStartC << Tr::tr("float value:") << numericTableRowSepC
<< floatValue << tableRowEndC;
if (floatValue != floatValueOld)
- str << tableRowStartC << tr("Previous float value:") << numericTableRowSepC
+ str << tableRowStartC << Tr::tr("Previous float value:") << numericTableRowSepC
<< floatValueOld << tableRowEndC;
str << "";
@@ -1441,8 +1442,7 @@ void BinEditorWidget::keyPressEvent(QKeyEvent *e)
static void showZoomIndicator(QWidget *editor, const int newZoom)
{
Utils::FadingIndicator::showText(editor,
- QCoreApplication::translate("BinEditorWidget::TextEditorWidget",
- "Zoom: %1%").arg(newZoom),
+ Tr::tr("Zoom: %1%").arg(newZoom),
Utils::FadingIndicator::SmallText);
}
@@ -1465,8 +1465,8 @@ void BinEditorWidget::copy(bool raw)
int selEnd = selectionEnd();
const int selectionLength = selEnd - selStart + 1;
if (selectionLength >> 22) {
- QMessageBox::warning(this, tr("Copying Failed"),
- tr("You cannot copy more than 4 MB of binary data."));
+ QMessageBox::warning(this, Tr::tr("Copying Failed"),
+ Tr::tr("You cannot copy more than 4 MB of binary data."));
return;
}
QByteArray data = dataMid(selStart, selectionLength);
@@ -1577,15 +1577,15 @@ void BinEditorWidget::contextMenuEvent(QContextMenuEvent *event)
QPointer contextMenu(new QMenu(this));
- auto copyAsciiAction = new QAction(tr("Copy Selection as ASCII Characters"), contextMenu);
- auto copyHexAction = new QAction(tr("Copy Selection as Hex Values"), contextMenu);
+ auto copyAsciiAction = new QAction(Tr::tr("Copy Selection as ASCII Characters"), contextMenu);
+ auto copyHexAction = new QAction(Tr::tr("Copy Selection as Hex Values"), contextMenu);
auto copyBeValue = new QAction(contextMenu);
auto copyLeValue = new QAction(contextMenu);
auto jumpToBeAddressHereAction = new QAction(contextMenu);
auto jumpToBeAddressNewWindowAction = new QAction(contextMenu);
auto jumpToLeAddressHereAction = new QAction(contextMenu);
auto jumpToLeAddressNewWindowAction = new QAction(contextMenu);
- auto addWatchpointAction = new QAction(tr("Set Data Breakpoint on Selection"), contextMenu);
+ auto addWatchpointAction = new QAction(Tr::tr("Set Data Breakpoint on Selection"), contextMenu);
contextMenu->addAction(copyAsciiAction);
contextMenu->addAction(copyHexAction);
contextMenu->addAction(addWatchpointAction);
@@ -1596,11 +1596,11 @@ void BinEditorWidget::contextMenuEvent(QContextMenuEvent *event)
quint64 leAddress = 0;
if (byteCount <= 8) {
asIntegers(selStart, byteCount, beAddress, leAddress);
- copyBeValue->setText(tr("Copy 0x%1").arg(QString::number(beAddress, 16)));
+ copyBeValue->setText(Tr::tr("Copy 0x%1").arg(QString::number(beAddress, 16)));
contextMenu->addAction(copyBeValue);
// If the menu entries would be identical, show only one of them.
if (beAddress != leAddress) {
- copyLeValue->setText(tr("Copy 0x%1").arg(QString::number(leAddress, 16)));
+ copyLeValue->setText(Tr::tr("Copy 0x%1").arg(QString::number(leAddress, 16)));
contextMenu->addAction(copyLeValue);
}
setupJumpToMenuAction(contextMenu, jumpToBeAddressHereAction,
@@ -1611,9 +1611,9 @@ void BinEditorWidget::contextMenuEvent(QContextMenuEvent *event)
jumpToLeAddressNewWindowAction, leAddress);
}
} else {
- jumpToBeAddressHereAction->setText(tr("Jump to Address in This Window"));
- jumpToBeAddressNewWindowAction->setText(tr("Jump to Address in New Window"));
- copyBeValue->setText(tr("Copy Value"));
+ jumpToBeAddressHereAction->setText(Tr::tr("Jump to Address in This Window"));
+ jumpToBeAddressNewWindowAction->setText(Tr::tr("Jump to Address in New Window"));
+ copyBeValue->setText(Tr::tr("Copy Value"));
jumpToBeAddressHereAction->setEnabled(false);
jumpToBeAddressNewWindowAction->setEnabled(false);
copyBeValue->setEnabled(false);
@@ -1650,9 +1650,9 @@ void BinEditorWidget::contextMenuEvent(QContextMenuEvent *event)
void BinEditorWidget::setupJumpToMenuAction(QMenu *menu, QAction *actionHere,
QAction *actionNew, quint64 addr)
{
- actionHere->setText(tr("Jump to Address 0x%1 in This Window")
+ actionHere->setText(Tr::tr("Jump to Address 0x%1 in This Window")
.arg(QString::number(addr, 16)));
- actionNew->setText(tr("Jump to Address 0x%1 in New Window")
+ actionNew->setText(Tr::tr("Jump to Address 0x%1 in New Window")
.arg(QString::number(addr, 16)));
menu->addAction(actionHere);
menu->addAction(actionNew);
@@ -1735,5 +1735,4 @@ void BinEditorWidget::setMarkup(const QList &markup)
viewport()->update();
}
-} // namespace Internal
-} // namespace BinEditor
+} // BinEditor::Internal
diff --git a/src/plugins/bineditor/bineditorwidget.h b/src/plugins/bineditor/bineditorwidget.h
index 596f98b3c3f..c09885575df 100644
--- a/src/plugins/bineditor/bineditorwidget.h
+++ b/src/plugins/bineditor/bineditorwidget.h
@@ -31,8 +31,7 @@ namespace Core { class IEditor; }
namespace TextEditor { class FontSettings; }
-namespace BinEditor {
-namespace Internal {
+namespace BinEditor::Internal {
class BinEditorWidgetPrivate;
@@ -228,5 +227,4 @@ private:
QList m_markup;
};
-} // namespace Internal
-} // namespace BinEditor
+} // BinEditor::Internal
diff --git a/src/plugins/bineditor/markup.h b/src/plugins/bineditor/markup.h
index 026fa7e1e89..cbda93b1428 100644
--- a/src/plugins/bineditor/markup.h
+++ b/src/plugins/bineditor/markup.h
@@ -23,6 +23,6 @@ public:
QString toolTip;
};
-} // namespace BinEditor
+} // BinEditor
Q_DECLARE_METATYPE(BinEditor::Markup)
diff --git a/src/plugins/bookmarks/bookmark.cpp b/src/plugins/bookmarks/bookmark.cpp
index fead3df3ed9..e99a2214357 100644
--- a/src/plugins/bookmarks/bookmark.cpp
+++ b/src/plugins/bookmarks/bookmark.cpp
@@ -2,25 +2,26 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "bookmark.h"
+
#include "bookmarkmanager.h"
#include "bookmarks_global.h"
+#include "bookmarkstr.h"
#include
-#include
-#include
#include
-using namespace Bookmarks::Internal;
using namespace Utils;
+namespace Bookmarks::Internal {
+
Bookmark::Bookmark(int lineNumber, BookmarkManager *manager) :
TextMark(FilePath(), lineNumber, Constants::BOOKMARKS_TEXT_MARK_CATEGORY),
m_manager(manager)
{
- setColor(Utils::Theme::Bookmarks_TextMarkColor);
- setIcon(Utils::Icons::BOOKMARK_TEXTEDITOR.icon());
- setDefaultToolTip(QApplication::translate("BookmarkManager", "Bookmark"));
+ setColor(Theme::Bookmarks_TextMarkColor);
+ setIcon(Icons::BOOKMARK_TEXTEDITOR.icon());
+ setDefaultToolTip(Tr::tr("Bookmark"));
setPriority(TextEditor::TextMark::NormalPriority);
}
@@ -94,3 +95,5 @@ QString Bookmark::note() const
{
return toolTip();
}
+
+} // Bookmarks::Internal
diff --git a/src/plugins/bookmarks/bookmark.h b/src/plugins/bookmarks/bookmark.h
index 38a177e484a..93f5b8a88ae 100644
--- a/src/plugins/bookmarks/bookmark.h
+++ b/src/plugins/bookmarks/bookmark.h
@@ -5,8 +5,7 @@
#include
-namespace Bookmarks {
-namespace Internal {
+namespace Bookmarks::Internal {
class BookmarkManager;
@@ -35,5 +34,4 @@ private:
QString m_lineText;
};
-} // namespace Internal
-} // namespace Bookmarks
+} // Bookmarks::Internal
diff --git a/src/plugins/bookmarks/bookmarkfilter.cpp b/src/plugins/bookmarks/bookmarkfilter.cpp
index c17c134b379..493c5916d32 100644
--- a/src/plugins/bookmarks/bookmarkfilter.cpp
+++ b/src/plugins/bookmarks/bookmarkfilter.cpp
@@ -9,10 +9,11 @@
#include
-using namespace Bookmarks::Internal;
using namespace Core;
using namespace Utils;
+namespace Bookmarks::Internal {
+
BookmarkFilter::BookmarkFilter(BookmarkManager *manager)
: m_manager(manager)
{
@@ -114,3 +115,5 @@ void BookmarkFilter::accept(const LocatorFilterEntry &selection, QString *newTex
m_manager->gotoBookmark(bookmark);
}
}
+
+} // Bookmarks::Internal
diff --git a/src/plugins/bookmarks/bookmarkfilter.h b/src/plugins/bookmarks/bookmarkfilter.h
index fc7262bdfd4..bc068ac176b 100644
--- a/src/plugins/bookmarks/bookmarkfilter.h
+++ b/src/plugins/bookmarks/bookmarkfilter.h
@@ -5,14 +5,12 @@
#include
-namespace Bookmarks {
-namespace Internal {
+namespace Bookmarks::Internal {
class BookmarkManager;
class BookmarkFilter : public Core::ILocatorFilter
{
- Q_OBJECT
public:
explicit BookmarkFilter(BookmarkManager *manager);
void prepareSearch(const QString &entry) override;
@@ -26,5 +24,4 @@ private:
QList m_results;
};
-} // namespace Internal
-} // namespace Bookmarks
+} // Bookmarks::Internal
diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp
index f3693ed51c3..41a46590b66 100644
--- a/src/plugins/bookmarks/bookmarkmanager.cpp
+++ b/src/plugins/bookmarks/bookmarkmanager.cpp
@@ -43,8 +43,7 @@ using namespace ProjectExplorer;
using namespace Core;
using namespace Utils;
-namespace Bookmarks {
-namespace Internal {
+namespace Bookmarks::Internal {
BookmarkDelegate::BookmarkDelegate(QObject *parent)
: QStyledItemDelegate(parent)
@@ -794,5 +793,4 @@ NavigationView BookmarkViewFactory::createWidget()
return {view, view->createToolBarWidgets()};
}
-} // namespace Internal
-} // namespace Bookmarks
+} // Bookmarks::Internal
diff --git a/src/plugins/bookmarks/bookmarkmanager.h b/src/plugins/bookmarks/bookmarkmanager.h
index da34b54dd31..0667c9633a3 100644
--- a/src/plugins/bookmarks/bookmarkmanager.h
+++ b/src/plugins/bookmarks/bookmarkmanager.h
@@ -16,8 +16,7 @@
namespace Core { class IContext; }
-namespace Bookmarks {
-namespace Internal {
+namespace Bookmarks::Internal {
class Bookmark;
class BookmarksPlugin;
@@ -102,17 +101,13 @@ private:
class BookmarkView final : public Utils::ListView
{
- Q_OBJECT
-
public:
explicit BookmarkView(BookmarkManager *manager);
QList createToolBarWidgets();
-public slots:
void gotoBookmark(const QModelIndex &index);
-protected slots:
void removeFromContextMenu();
void removeAll();
@@ -129,8 +124,6 @@ private:
class BookmarkViewFactory : public Core::INavigationWidgetFactory
{
- Q_OBJECT
-
public:
BookmarkViewFactory(BookmarkManager *bm);
@@ -142,8 +135,6 @@ private:
class BookmarkDelegate : public QStyledItemDelegate
{
- Q_OBJECT
-
public:
BookmarkDelegate(QObject *parent = nullptr);
@@ -156,5 +147,4 @@ private:
mutable QPixmap m_selectedPixmap;
};
-} // namespace Internal
-} // namespace Bookmarks
+} // Bookmarks::Internal
diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp
index 33da6d8e798..f1b6a78ddf3 100644
--- a/src/plugins/bookmarks/bookmarksplugin.cpp
+++ b/src/plugins/bookmarks/bookmarksplugin.cpp
@@ -31,8 +31,7 @@ using namespace Utils;
using namespace Bookmarks::Constants;
-namespace Bookmarks {
-namespace Internal {
+namespace Bookmarks::Internal {
class BookmarksPluginPrivate : public QObject
{
@@ -225,5 +224,4 @@ void BookmarksPluginPrivate::requestContextMenu(TextEditorWidget *widget,
menu->addAction(&m_editBookmarkAction);
}
-} // namespace Internal
-} // namespace Bookmarks
+} // Bookmarks::Internal
diff --git a/src/plugins/bookmarks/bookmarksplugin.h b/src/plugins/bookmarks/bookmarksplugin.h
index 5a3172819b4..30e81a96857 100644
--- a/src/plugins/bookmarks/bookmarksplugin.h
+++ b/src/plugins/bookmarks/bookmarksplugin.h
@@ -5,8 +5,7 @@
#include
-namespace Bookmarks {
-namespace Internal {
+namespace Bookmarks::Internal {
class BookmarksPlugin final : public ExtensionSystem::IPlugin
{
@@ -20,5 +19,4 @@ class BookmarksPlugin final : public ExtensionSystem::IPlugin
class BookmarksPluginPrivate *d = nullptr;
};
-} // namespace Internal
-} // namespace Bookmarks
+} // Bookmarks::Internal
diff --git a/src/plugins/clangcodemodel/clangdclient.cpp b/src/plugins/clangcodemodel/clangdclient.cpp
index 36bf395a0a8..0474d1d6ed4 100644
--- a/src/plugins/clangcodemodel/clangdclient.cpp
+++ b/src/plugins/clangcodemodel/clangdclient.cpp
@@ -212,7 +212,7 @@ template class VersionedDataCache
public:
void insert(const DocType &doc, const DataType &data)
{
- m_data.emplace(std::make_pair(doc, VersionedDocData(doc, data)));
+ m_data.emplace(doc, VersionedDocData(doc, data));
}
void remove(const DocType &doc) { m_data.erase(doc); }
std::optional> take(const DocType &doc)
@@ -531,7 +531,7 @@ QTextCursor ClangdClient::adjustedCursorForHighlighting(const QTextCursor &curso
const LanguageClient::Client::CustomInspectorTabs ClangdClient::createCustomInspectorTabs()
{
- return {std::make_pair(new ClangdMemoryUsageWidget(this), tr("Memory Usage"))};
+ return {{new ClangdMemoryUsageWidget(this), tr("Memory Usage")}};
}
class ClangdDiagnosticManager : public LanguageClient::DiagnosticManager
@@ -1332,9 +1332,7 @@ void ClangdClient::Private::handleSemanticTokens(TextDocument *doc,
data->previousTokens.first = tokens;
data->previousTokens.second = version;
} else {
- HighlightingData data;
- data.previousTokens = qMakePair(tokens, version);
- highlightingData.insert(doc, data);
+ highlightingData.insert(doc, {{tokens, version}, {}});
}
for (const ExpandedSemanticToken &t : tokens)
qCDebug(clangdLogHighlight()) << '\t' << t.line << t.column << t.length << t.type
diff --git a/src/plugins/clangcodemodel/clangdcompletion.cpp b/src/plugins/clangcodemodel/clangdcompletion.cpp
index d99e9ae92f4..442a3fb2401 100644
--- a/src/plugins/clangcodemodel/clangdcompletion.cpp
+++ b/src/plugins/clangcodemodel/clangdcompletion.cpp
@@ -493,7 +493,7 @@ QList CustomAssistProcessor::completeInclude(
for (AssistProposalItemInterface * const item : qAsConst(completions)) {
QString s = item->text();
s.replace('/', QChar(0)); // The dir separator should compare less than anything else.
- completionsForSorting << qMakePair(item, s);
+ completionsForSorting.push_back({item, s});
}
Utils::sort(completionsForSorting, [](const auto &left, const auto &right) {
return left.second < right.second;
diff --git a/src/plugins/clangcodemodel/clangdfindreferences.cpp b/src/plugins/clangcodemodel/clangdfindreferences.cpp
index aa26808259c..c48c0caebea 100644
--- a/src/plugins/clangcodemodel/clangdfindreferences.cpp
+++ b/src/plugins/clangcodemodel/clangdfindreferences.cpp
@@ -200,7 +200,7 @@ void ClangdFindReferences::Private::handleFindUsagesResult(const QList
});
for (const Location &loc : locations)
- fileData[loc.uri()].rangesAndLineText << qMakePair(loc.range(), QString());
+ fileData[loc.uri()].rangesAndLineText.push_back({loc.range(), {}});
for (auto it = fileData.begin(); it != fileData.end();) {
const Utils::FilePath filePath = it.key().toFilePath();
if (!filePath.exists()) { // https://github.com/clangd/clangd/issues/935
diff --git a/src/plugins/clangcodemodel/clangdfollowsymbol.cpp b/src/plugins/clangcodemodel/clangdfollowsymbol.cpp
index 21dc5352cc2..2e138bc96d5 100644
--- a/src/plugins/clangcodemodel/clangdfollowsymbol.cpp
+++ b/src/plugins/clangcodemodel/clangdfollowsymbol.cpp
@@ -454,7 +454,7 @@ void ClangdFollowSymbol::Private::handleGotoImplementationResult(
if (!sentinel)
return;
if (!name.isEmpty())
- symbolsToDisplay << qMakePair(prefix + name, link);
+ symbolsToDisplay.push_back({prefix + name, link});
pendingSymbolInfoRequests.removeOne(reqId);
virtualFuncAssistProcessor->update();
if (pendingSymbolInfoRequests.isEmpty() && pendingGotoDefRequests.isEmpty()
diff --git a/src/plugins/clangcodemodel/clangdmemoryusagewidget.cpp b/src/plugins/clangcodemodel/clangdmemoryusagewidget.cpp
index 06ec53d621c..fcceebe06ea 100644
--- a/src/plugins/clangcodemodel/clangdmemoryusagewidget.cpp
+++ b/src/plugins/clangcodemodel/clangdmemoryusagewidget.cpp
@@ -39,7 +39,7 @@ public:
for (auto it = obj.begin(); it != obj.end(); ++it) {
if (it.key() == totalKey() || it.key() == selfKey())
continue;
- components << std::make_pair(MemoryTree(it.value()), it.key());
+ components.push_back({MemoryTree(it.value()), it.key()});
}
return components;
}
@@ -81,11 +81,9 @@ private:
QString memString() const
{
- static const QList> factors{
- std::make_pair(1000000000, QString("GB")),
- std::make_pair(1000000, QString("MB")),
- std::make_pair(1000, QString("KB")),
- };
+ static const QList> factors{{1000000000, "GB"},
+ {1000000, "MB"},
+ {1000, "KB"}};
for (const auto &factor : factors) {
if (m_bytesUsed > factor.first)
return QString::number(qint64(std::round(double(m_bytesUsed) / factor.first)))
diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
index bf9a6927bec..a395de05bc2 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
+++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp
@@ -190,14 +190,12 @@ static QString createExplainingStepToolTipString(const ExplainingStep &step)
QList lines;
if (!step.message.isEmpty()) {
- lines << qMakePair(
- QCoreApplication::translate("ClangTools::ExplainingStep", "Message:"),
- step.message.toHtmlEscaped());
+ lines.push_back({QCoreApplication::translate("ClangTools::ExplainingStep", "Message:"),
+ step.message.toHtmlEscaped()});
}
- lines << qMakePair(
- QCoreApplication::translate("ClangTools::ExplainingStep", "Location:"),
- createFullLocationString(step.location));
+ lines.push_back({QCoreApplication::translate("ClangTools::ExplainingStep", "Location:"),
+ createFullLocationString(step.location)});
QString html = QLatin1String(""
""
diff --git a/src/plugins/clangtools/clangtoolsutils.cpp b/src/plugins/clangtools/clangtoolsutils.cpp
index 741e5de9f94..9eeaed31d4b 100644
--- a/src/plugins/clangtools/clangtoolsutils.cpp
+++ b/src/plugins/clangtools/clangtoolsutils.cpp
@@ -61,30 +61,26 @@ QString createDiagnosticToolTipString(
QList lines;
if (!diagnostic.category.isEmpty()) {
- lines << qMakePair(
- QCoreApplication::translate("ClangTools::Diagnostic", "Category:"),
- diagnostic.category.toHtmlEscaped());
+ lines.push_back({QCoreApplication::translate("ClangTools::Diagnostic", "Category:"),
+ diagnostic.category.toHtmlEscaped()});
}
if (!diagnostic.type.isEmpty()) {
- lines << qMakePair(
- QCoreApplication::translate("ClangTools::Diagnostic", "Type:"),
- diagnostic.type.toHtmlEscaped());
+ lines.push_back({QCoreApplication::translate("ClangTools::Diagnostic", "Type:"),
+ diagnostic.type.toHtmlEscaped()});
}
if (!diagnostic.description.isEmpty()) {
- lines << qMakePair(
- QCoreApplication::translate("ClangTools::Diagnostic", "Description:"),
- diagnostic.description.toHtmlEscaped());
+ lines.push_back({QCoreApplication::translate("ClangTools::Diagnostic", "Description:"),
+ diagnostic.description.toHtmlEscaped()});
}
- lines << qMakePair(
- QCoreApplication::translate("ClangTools::Diagnostic", "Location:"),
- createFullLocationString(diagnostic.location));
+ lines.push_back({QCoreApplication::translate("ClangTools::Diagnostic", "Location:"),
+ createFullLocationString(diagnostic.location)});
if (status) {
- lines << qMakePair(QCoreApplication::translate("ClangTools::Diagnostic", "Fixit status:"),
- fixitStatus(*status));
+ lines.push_back({QCoreApplication::translate("ClangTools::Diagnostic", "Fixit status:"),
+ fixitStatus(*status)});
}
if (showSteps && !diagnostic.explainingSteps.isEmpty()) {
@@ -103,8 +99,8 @@ QString createDiagnosticToolTipString(
const QString url = documentationUrl(diagnostic.name);
if (!url.isEmpty()) {
- lines << qMakePair(QCoreApplication::translate("ClangTools::Diagnostic", "Documentation:"),
- QString("%1").arg(url));
+ lines.push_back({QCoreApplication::translate("ClangTools::Diagnostic", "Documentation:"),
+ QString("%1").arg(url)});
}
QString html = QLatin1String(""
diff --git a/src/plugins/clangtools/executableinfo.cpp b/src/plugins/clangtools/executableinfo.cpp
index eb9d47e0855..148411c85ce 100644
--- a/src/plugins/clangtools/executableinfo.cpp
+++ b/src/plugins/clangtools/executableinfo.cpp
@@ -147,7 +147,7 @@ ClazyStandaloneInfo ClazyStandaloneInfo::getInfo(const FilePath &executablePath)
const auto it = cache.find(executablePath);
if (it == cache.end()) {
const ClazyStandaloneInfo info(executablePath);
- cache.insert(executablePath, qMakePair(timeStamp, info));
+ cache.insert(executablePath, {timeStamp, info});
return info;
}
if (it->first != timeStamp) {
@@ -219,8 +219,8 @@ QPair getClangIncludeDirAndVersion(const FilePath &clangToolP
const FilePath dynamicResourceDir = queryResourceDir(clangToolPath);
const QString dynamicVersion = queryVersion(clangToolPath, QueryFailMode::Noisy);
if (dynamicResourceDir.isEmpty() || dynamicVersion.isEmpty())
- return qMakePair(FilePath::fromString(CLANG_INCLUDE_DIR), QString(CLANG_VERSION));
- return qMakePair(dynamicResourceDir + "/include", dynamicVersion);
+ return {FilePath::fromString(CLANG_INCLUDE_DIR), QString(CLANG_VERSION)};
+ return {dynamicResourceDir + "/include", dynamicVersion};
}
QHash> ClazyStandaloneInfo::cache;
diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp
index e72bbb29954..90301a7c87c 100644
--- a/src/plugins/classview/classviewmanager.cpp
+++ b/src/plugins/classview/classviewmanager.cpp
@@ -99,7 +99,7 @@ void ManagerPrivate::resetParser()
QHash> projectData;
for (const Project *project : SessionManager::projects()) {
projectData.insert(project->projectFilePath(),
- qMakePair(project->displayName(), project->files(Project::SourceFiles)));
+ {project->displayName(), project->files(Project::SourceFiles)});
}
QMetaObject::invokeMethod(m_parser, [this, projectData]() {
m_parser->resetData(projectData);
diff --git a/src/plugins/clearcase/clearcasesync.cpp b/src/plugins/clearcase/clearcasesync.cpp
index d1e0dccc7de..feb52726943 100644
--- a/src/plugins/clearcase/clearcasesync.cpp
+++ b/src/plugins/clearcase/clearcasesync.cpp
@@ -126,7 +126,7 @@ void ClearCaseSync::updateTotalFilesCount(const QString &view, ClearCaseSettings
void ClearCaseSync::updateStatusForNotManagedFiles(const QStringList &files)
{
- foreach (const QString &file, files) {
+ for (const QString &file : files) {
QString absFile = QFileInfo(file).absoluteFilePath();
if (!m_statusMap->contains(absFile))
ClearCasePlugin::setStatus(absFile, FileStatus::NotManaged, false);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 119a5c1d3f8..784ebe419b2 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -1168,7 +1168,8 @@ static CommandLine defaultInitialCMakeCommand(const Kit *k, const QString buildT
static void addCMakeConfigurePresetToInitialArguments(QStringList &initialArguments,
const CMakeProject *project,
const Kit *k,
- const Utils::Environment &env)
+ const Utils::Environment &env,
+ const Utils::FilePath &buildDirectory)
{
const CMakeConfigItem presetItem = CMakeConfigurationKitAspect::cmakePresetConfigItem(k);
@@ -1230,6 +1231,11 @@ static void addCMakeConfigurePresetToInitialArguments(QStringList &initialArgume
initialArguments.append("--debug-output");
}
+ CMakePresets::Macros::updateToolchainFile(configurePreset,
+ env,
+ project->projectDirectory(),
+ buildDirectory);
+
// Merge the presets cache variables
CMakeConfig cache;
if (configurePreset.cacheVariables)
@@ -1547,15 +1553,16 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
CMakeProject *cmakeProject = static_cast(target->project());
setUserConfigureEnvironmentChanges(getEnvironmentItemsFromCMakeConfigurePreset(cmakeProject, k));
+ updateAndEmitConfigureEnvironmentChanged();
QStringList initialCMakeArguments = cmd.splitArguments();
addCMakeConfigurePresetToInitialArguments(initialCMakeArguments,
cmakeProject,
k,
- configureEnvironment());
+ configureEnvironment(),
+ info.buildDirectory);
m_buildSystem->setInitialCMakeArguments(initialCMakeArguments);
m_buildSystem->setCMakeBuildType(buildType);
- updateAndEmitConfigureEnvironmentChanged();
setBuildPresetToBuildSteps(target);
});
@@ -1825,24 +1832,31 @@ void CMakeBuildConfiguration::setInitialBuildAndCleanSteps(const ProjectExplorer
const CMakeConfigItem presetItem = CMakeConfigurationKitAspect::cmakePresetConfigItem(
target->kit());
+ int buildSteps = 1;
if (!presetItem.isNull()) {
const QString presetName = presetItem.expandedValue(target->kit());
const CMakeProject *project = static_cast(target->project());
const auto buildPresets = project->presetsData().buildPresets;
- const int count = std::count_if(buildPresets.begin(),
- buildPresets.end(),
- [presetName](const PresetsDetails::BuildPreset &preset) {
- return preset.configurePreset == presetName
- && !preset.hidden.value();
- });
+ const int count
+ = std::count_if(buildPresets.begin(),
+ buildPresets.end(),
+ [presetName, project](const PresetsDetails::BuildPreset &preset) {
+ bool enabled = true;
+ if (preset.condition)
+ enabled = CMakePresets::Macros::evaluatePresetCondition(
+ preset, project->projectDirectory());
- for (int i = 0; i < count; ++i)
- appendInitialBuildStep(Constants::CMAKE_BUILD_STEP_ID);
-
- } else {
- appendInitialBuildStep(Constants::CMAKE_BUILD_STEP_ID);
+ return preset.configurePreset == presetName
+ && !preset.hidden.value() && enabled;
+ });
+ if (count != 0)
+ buildSteps = count;
}
+
+ for (int i = 0; i < buildSteps; ++i)
+ appendInitialBuildStep(Constants::CMAKE_BUILD_STEP_ID);
+
appendInitialCleanStep(Constants::CMAKE_BUILD_STEP_ID);
}
@@ -1858,10 +1872,15 @@ void CMakeBuildConfiguration::setBuildPresetToBuildSteps(const ProjectExplorer::
const CMakeProject *project = static_cast(target->project());
const auto allBuildPresets = project->presetsData().buildPresets;
- const auto buildPresets
- = Utils::filtered(allBuildPresets, [presetName](const PresetsDetails::BuildPreset &preset) {
- return preset.configurePreset == presetName && !preset.hidden.value();
- });
+ const auto buildPresets = Utils::filtered(
+ allBuildPresets, [presetName, project](const PresetsDetails::BuildPreset &preset) {
+ bool enabled = true;
+ if (preset.condition)
+ enabled = CMakePresets::Macros::evaluatePresetCondition(preset,
+ project->projectDirectory());
+
+ return preset.configurePreset == presetName && !preset.hidden.value() && enabled;
+ });
const QList buildStepList
= Utils::filtered(buildSteps()->steps(), [](const BuildStep *bs) {
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index 1608a454d60..875971a1cfa 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -300,7 +300,7 @@ void CMakeBuildStep::setupOutputFormatter(Utils::OutputFormatter *formatter)
emit progress(percent, {});
});
formatter->addLineParser(progressParser);
- cmakeParser->setSourceDirectory(project()->projectDirectory().toString());
+ cmakeParser->setSourceDirectory(project()->projectDirectory());
formatter->addLineParsers({cmakeParser, new GnuMakeParser});
ToolChain *tc = ToolChainKitAspect::cxxToolChain(kit());
OutputTaskParser *xcodeBuildParser = nullptr;
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
index 22e963a1be4..9ddeb279914 100644
--- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
@@ -1145,11 +1145,14 @@ Tasks CMakeConfigurationKitAspect::validate(const Kit *k) const
{
QTC_ASSERT(k, return Tasks());
+ const CMakeTool *const cmake = CMakeKitAspect::cmakeTool(k);
+ if (!cmake)
+ return Tasks();
+
const QtSupport::QtVersion *const version = QtSupport::QtKitAspect::qtVersion(k);
const ToolChain *const tcC = ToolChainKitAspect::cToolChain(k);
const ToolChain *const tcCxx = ToolChainKitAspect::cxxToolChain(k);
const CMakeConfig config = configuration(k);
- const CMakeTool *const cmake = CMakeKitAspect::cmakeTool(k);
const bool isQt4 = version && version->qtVersion() < QVersionNumber(5, 0, 0);
FilePath qmakePath; // This is relative to the cmake used for building.
diff --git a/src/plugins/cmakeprojectmanager/cmakeparser.cpp b/src/plugins/cmakeprojectmanager/cmakeparser.cpp
index e4a1c7b093e..1b6573869dc 100644
--- a/src/plugins/cmakeprojectmanager/cmakeparser.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeparser.cpp
@@ -32,12 +32,19 @@ CMakeParser::CMakeParser()
QTC_CHECK(m_locationLine.isValid());
}
-void CMakeParser::setSourceDirectory(const QString &sourceDir)
+void CMakeParser::setSourceDirectory(const FilePath &sourceDir)
{
if (m_sourceDirectory)
- emit searchDirExpired(FilePath::fromString(m_sourceDirectory.value().path()));
- m_sourceDirectory = QDir(sourceDir);
- emit newSearchDirFound(FilePath::fromString(sourceDir));
+ emit searchDirExpired(m_sourceDirectory.value());
+ m_sourceDirectory = sourceDir;
+ emit newSearchDirFound(sourceDir);
+}
+
+FilePath CMakeParser::resolvePath(const QString &path) const
+{
+ if (m_sourceDirectory)
+ return m_sourceDirectory->resolvePath(path);
+ return FilePath::fromUserInput(path);
}
OutputLineParser::Result CMakeParser::handleLine(const QString &line, OutputFormat type)
@@ -69,12 +76,11 @@ OutputLineParser::Result CMakeParser::handleLine(const QString &line, OutputForm
match = m_commonError.match(trimmedLine);
if (match.hasMatch()) {
- QString path = m_sourceDirectory ? m_sourceDirectory->absoluteFilePath(
- QDir::fromNativeSeparators(match.captured(1)))
- : QDir::fromNativeSeparators(match.captured(1));
+ const FilePath path = resolvePath(match.captured(1));
+
m_lastTask = BuildSystemTask(Task::Error,
QString(),
- absoluteFilePath(FilePath::fromUserInput(path)),
+ absoluteFilePath(path),
match.captured(2).toInt());
m_lines = 1;
LinkSpecs linkSpecs;
@@ -94,12 +100,10 @@ OutputLineParser::Result CMakeParser::handleLine(const QString &line, OutputForm
}
match = m_commonWarning.match(trimmedLine);
if (match.hasMatch()) {
- QString path = m_sourceDirectory ? m_sourceDirectory->absoluteFilePath(
- QDir::fromNativeSeparators(match.captured(2)))
- : QDir::fromNativeSeparators(match.captured(2));
+ const FilePath path = resolvePath(match.captured(2));
m_lastTask = BuildSystemTask(Task::Warning,
QString(),
- absoluteFilePath(FilePath::fromUserInput(path)),
+ absoluteFilePath(path),
match.captured(3).toInt());
m_lines = 1;
LinkSpecs linkSpecs;
diff --git a/src/plugins/cmakeprojectmanager/cmakeparser.h b/src/plugins/cmakeprojectmanager/cmakeparser.h
index 686840575ee..e9d28b78e75 100644
--- a/src/plugins/cmakeprojectmanager/cmakeparser.h
+++ b/src/plugins/cmakeprojectmanager/cmakeparser.h
@@ -8,7 +8,8 @@
#include
#include
-#include
+#include
+
#include
#include
@@ -21,17 +22,18 @@ class CMAKE_EXPORT CMakeParser : public ProjectExplorer::OutputTaskParser
public:
explicit CMakeParser();
- void setSourceDirectory(const QString &sourceDir);
+ void setSourceDirectory(const Utils::FilePath &sourceDir);
private:
Result handleLine(const QString &line, Utils::OutputFormat type) override;
void flush() override;
+ Utils::FilePath resolvePath(const QString &path) const;
enum TripleLineError { NONE, LINE_LOCATION, LINE_DESCRIPTION, LINE_DESCRIPTION2 };
TripleLineError m_expectTripleLineErrorData = NONE;
- std::optional m_sourceDirectory;
+ std::optional m_sourceDirectory;
ProjectExplorer::Task m_lastTask;
QRegularExpression m_commonError;
QRegularExpression m_nextSubError;
@@ -41,4 +43,4 @@ private:
int m_lines = 0;
};
-} // namespace CMakeProjectManager
+} // CMakeProjectManager
diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
index 00a958b5496..4960b2e5c09 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp
@@ -55,10 +55,19 @@ void CMakeProcess::run(const BuildDirParameters ¶meters, const QStringList &
const FilePath cmakeExecutable = cmake->cmakeExecutable();
- if (!cmakeExecutable.ensureReachable(parameters.sourceDirectory)
- || !cmakeExecutable.ensureReachable(parameters.buildDirectory)) {
+ if (!cmakeExecutable.ensureReachable(parameters.sourceDirectory)) {
QString msg = ::CMakeProjectManager::Tr::tr(
- "The source or build directory is not reachable by the CMake executable.");
+ "The source directory %1 is not reachable by the CMake executable %2.")
+ .arg(parameters.sourceDirectory.displayName()).arg(cmakeExecutable.displayName());
+ BuildSystem::appendBuildSystemOutput(msg + '\n');
+ emit finished();
+ return;
+ }
+
+ if (!cmakeExecutable.ensureReachable(parameters.buildDirectory)) {
+ QString msg = ::CMakeProjectManager::Tr::tr(
+ "The build directory %1 is not reachable by the CMake executable %2.")
+ .arg(parameters.buildDirectory.displayName()).arg(cmakeExecutable.displayName());
BuildSystem::appendBuildSystemOutput(msg + '\n');
emit finished();
return;
@@ -88,7 +97,7 @@ void CMakeProcess::run(const BuildDirParameters ¶meters, const QStringList &
}
const auto parser = new CMakeParser;
- parser->setSourceDirectory(parameters.sourceDirectory.path());
+ parser->setSourceDirectory(parameters.sourceDirectory);
m_parser.addLineParser(parser);
// Always use the sourceDir: If we are triggered because the build directory is getting deleted
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
index be51a7d47cb..3e6b0ece8e4 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
@@ -123,6 +123,11 @@ FilePaths CMakeProjectImporter::importCandidates()
if (configPreset.hidden.value())
continue;
+ if (configPreset.condition) {
+ if (!CMakePresets::Macros::evaluatePresetCondition(configPreset, projectFilePath()))
+ continue;
+ }
+
const FilePath configPresetDir = m_presetsTempDir.filePath(configPreset.name);
configPresetDir.createDir();
candidates << configPresetDir;
@@ -165,6 +170,14 @@ static CMakeConfig configurationFromPresetProbe(
args.emplace_back("-G");
args.emplace_back(configurePreset.generator.value());
}
+ if (configurePreset.architecture && configurePreset.architecture.value().value) {
+ args.emplace_back("-A");
+ args.emplace_back(configurePreset.architecture.value().value.value());
+ }
+ if (configurePreset.toolset && configurePreset.toolset.value().value) {
+ args.emplace_back("-T");
+ args.emplace_back(configurePreset.toolset.value().value.value());
+ }
if (configurePreset.cacheVariables) {
const CMakeConfig cache = configurePreset.cacheVariables
@@ -233,7 +246,9 @@ static FilePath qmakeFromCMakeCache(const CMakeConfig &config)
prefixPath = config.stringValueOf("CMAKE_PREFIX_PATH");
}
qCDebug(cmInputLog) << "PrefixPath:" << prefixPath;
- if (prefixPath.isEmpty())
+
+ FilePath toolchainFile = config.filePathValueOf(QByteArray("CMAKE_TOOLCHAIN_FILE"));
+ if (prefixPath.isEmpty() && toolchainFile.isEmpty())
return FilePath();
// Run a CMake project that would do qmake probing
@@ -284,9 +299,10 @@ static FilePath qmakeFromCMakeCache(const CMakeConfig &config)
cmake.setTimeOutMessageBoxEnabled(false);
QString cmakeGenerator = config.stringValueOf(QByteArray("CMAKE_GENERATOR"));
+ QString cmakeGeneratorPlatform = config.stringValueOf(QByteArray("CMAKE_GENERATOR_PLATFORM"));
+ QString cmakeGeneratorToolset = config.stringValueOf(QByteArray("CMAKE_GENERATOR_TOOLSET"));
FilePath cmakeExecutable = config.filePathValueOf(QByteArray("CMAKE_COMMAND"));
FilePath cmakeMakeProgram = config.filePathValueOf(QByteArray("CMAKE_MAKE_PROGRAM"));
- FilePath toolchainFile = config.filePathValueOf(QByteArray("CMAKE_TOOLCHAIN_FILE"));
FilePath hostPath = config.filePathValueOf(QByteArray("QT_HOST_PATH"));
QStringList args;
@@ -296,6 +312,14 @@ static FilePath qmakeFromCMakeCache(const CMakeConfig &config)
args.push_back(qtcQMakeProbeDir.filePath("build").path());
args.push_back("-G");
args.push_back(cmakeGenerator);
+ if (!cmakeGeneratorPlatform.isEmpty()) {
+ args.push_back("-A");
+ args.push_back(cmakeGeneratorPlatform);
+ }
+ if (!cmakeGeneratorToolset.isEmpty()) {
+ args.push_back("-T");
+ args.push_back(cmakeGeneratorToolset);
+ }
if (!cmakeMakeProgram.isEmpty()) {
args.push_back(QStringLiteral("-DCMAKE_MAKE_PROGRAM=%1").arg(cmakeMakeProgram.toString()));
@@ -303,7 +327,8 @@ static FilePath qmakeFromCMakeCache(const CMakeConfig &config)
if (toolchainFile.isEmpty()) {
args.push_back(QStringLiteral("-DCMAKE_PREFIX_PATH=%1").arg(prefixPath));
} else {
- args.push_back(QStringLiteral("-DCMAKE_FIND_ROOT_PATH=%1").arg(prefixPath));
+ if (!prefixPath.isEmpty())
+ args.push_back(QStringLiteral("-DCMAKE_FIND_ROOT_PATH=%1").arg(prefixPath));
args.push_back(QStringLiteral("-DCMAKE_TOOLCHAIN_FILE=%1").arg(toolchainFile.toString()));
}
if (!hostPath.isEmpty()) {
@@ -383,13 +408,15 @@ QList CMakeProjectImporter::examineDirectory(const FilePath &importPath,
auto data = std::make_unique();
const QString presetName = importPath.fileName();
-
PresetsDetails::ConfigurePreset configurePreset
= Utils::findOrDefault(m_presetsData.configurePresets,
[presetName](const PresetsDetails::ConfigurePreset &preset) {
return preset.name == presetName;
});
+ Environment env = Environment::systemEnvironment();
+ CMakePresets::Macros::expand(configurePreset, env, projectDirectory());
+
if (configurePreset.displayName)
data->cmakePresetDisplayname = configurePreset.displayName.value();
else
@@ -415,14 +442,16 @@ QList CMakeProjectImporter::examineDirectory(const FilePath &importPath,
QString binaryDir = importPath.toString();
if (configurePreset.binaryDir) {
binaryDir = configurePreset.binaryDir.value();
- CMakePresets::Macros::expand(configurePreset,
- Environment::systemEnvironment(),
- projectDirectory(),
- binaryDir);
+ CMakePresets::Macros::expand(configurePreset, env, projectDirectory(), binaryDir);
}
data->buildDirectory = Utils::FilePath::fromString(binaryDir);
+ CMakePresets::Macros::updateToolchainFile(configurePreset,
+ env,
+ projectDirectory(),
+ data->buildDirectory);
+
const CMakeConfig cache = configurePreset.cacheVariables
? configurePreset.cacheVariables.value()
: CMakeConfig();
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp
index 5d82561d68b..4cef534ff1d 100644
--- a/src/plugins/cmakeprojectmanager/cmaketool.cpp
+++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp
@@ -173,13 +173,14 @@ bool CMakeTool::isValid() const
void CMakeTool::runCMake(QtcProcess &cmake, const QStringList &args, int timeoutS) const
{
+ const FilePath executable = cmakeExecutable();
cmake.setTimeoutS(timeoutS);
cmake.setDisableUnixTerminal();
- Environment env = Environment::systemEnvironment();
+ Environment env = executable.deviceEnvironment();
env.setupEnglishOutput();
cmake.setEnvironment(env);
cmake.setTimeOutMessageBoxEnabled(false);
- cmake.setCommand({cmakeExecutable(), args});
+ cmake.setCommand({executable, args});
cmake.runBlocking();
}
@@ -541,13 +542,11 @@ void CMakeTool::parseFromCapabilities(const QString &input) const
const QVariantMap object = r.toMap();
const QString kind = object.value("kind").toString();
const QVariantList versionList = object.value("version").toList();
- std::pair highestVersion = std::make_pair(-1, -1);
+ std::pair highestVersion{-1, -1};
for (const QVariant &v : versionList) {
const QVariantMap versionObject = v.toMap();
- const std::pair version = std::make_pair(getVersion(versionObject,
- "major"),
- getVersion(versionObject,
- "minor"));
+ const std::pair version{getVersion(versionObject, "major"),
+ getVersion(versionObject, "minor")};
if (version.first > highestVersion.first
|| (version.first == highestVersion.first
&& version.second > highestVersion.second))
@@ -566,9 +565,9 @@ void CMakeTool::parseFromCapabilities(const QString &input) const
// Fix up fileapi support for cmake 3.14:
if (m_introspection->m_version.major == 3 && m_introspection->m_version.minor == 14) {
- m_introspection->m_fileApis.append({QString("codemodel"), std::make_pair(2, 0)});
- m_introspection->m_fileApis.append({QString("cache"), std::make_pair(2, 0)});
- m_introspection->m_fileApis.append({QString("cmakefiles"), std::make_pair(1, 0)});
+ m_introspection->m_fileApis.append({QString("codemodel"), {2, 0}});
+ m_introspection->m_fileApis.append({QString("cache"), {2, 0}});
+ m_introspection->m_fileApis.append({QString("cmakefiles"), {1, 0}});
}
}
diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
index 804f6a0841b..4abee299646 100644
--- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
@@ -699,7 +699,7 @@ void setupLocationInfoForTargets(CMakeProjectNode *rootNode, const QList result;
for (const FolderNode::LocationInfo &i : bt) {
int count = locations.count();
- locations.insert(std::make_pair(i.path, i.line));
+ locations.insert({i.path, i.line});
if (count != locations.count()) {
result.append(i);
}
diff --git a/src/plugins/cmakeprojectmanager/fileapiparser.cpp b/src/plugins/cmakeprojectmanager/fileapiparser.cpp
index ea323931559..adf05be72ea 100644
--- a/src/plugins/cmakeprojectmanager/fileapiparser.cpp
+++ b/src/plugins/cmakeprojectmanager/fileapiparser.cpp
@@ -52,7 +52,7 @@ static std::pair cmakeVersion(const QJsonObject &obj)
const QJsonObject version = obj.value("version").toObject();
const int major = version.value("major").toInt(-1);
const int minor = version.value("minor").toInt(-1);
- return std::make_pair(major, minor);
+ return {major, minor};
}
static bool checkJsonObject(const QJsonObject &obj, const QString &kind, int major, int minor = -1)
@@ -67,7 +67,7 @@ static bool checkJsonObject(const QJsonObject &obj, const QString &kind, int maj
static std::pair nameValue(const QJsonObject &obj)
{
- return std::make_pair(obj.value("name").toString(), obj.value("value").toString());
+ return {obj.value("name").toString(), obj.value("value").toString()};
}
static QJsonDocument readJsonFile(const FilePath &filePath)
diff --git a/src/plugins/cmakeprojectmanager/presetsmacros.cpp b/src/plugins/cmakeprojectmanager/presetsmacros.cpp
index 29ecdf946bf..37ef043c12e 100644
--- a/src/plugins/cmakeprojectmanager/presetsmacros.cpp
+++ b/src/plugins/cmakeprojectmanager/presetsmacros.cpp
@@ -12,6 +12,25 @@
namespace CMakeProjectManager::Internal::CMakePresets::Macros {
+QString getHostSystemName()
+{
+ Utils::OsType osType = Utils::HostOsInfo::hostOs();
+
+ switch (osType) {
+ case Utils::OsTypeWindows:
+ return "Windows";
+ case Utils::OsTypeLinux:
+ return "Linux";
+ case Utils::OsTypeMac:
+ return "Darwin";
+ case Utils::OsTypeOtherUnix:
+ return "Unix";
+ case Utils::OsTypeOther:
+ return "Other";
+ }
+ return "Other";
+}
+
void expandAllButEnv(const PresetsDetails::ConfigurePreset &preset,
const Utils::FilePath &sourceDirectory,
QString &value)
@@ -25,6 +44,8 @@ void expandAllButEnv(const PresetsDetails::ConfigurePreset &preset,
value.replace("${presetName}", preset.name);
if (preset.generator)
value.replace("${generator}", preset.generator.value());
+
+ value.replace("${hostSystemName}", getHostSystemName());
}
void expandAllButEnv(const PresetsDetails::BuildPreset &preset,
@@ -141,6 +162,106 @@ void expand(const PresetType &preset,
value.replace(match.captured(1), env.value(match.captured(2)));
}
+void updateToolchainFile(
+ CMakeProjectManager::Internal::PresetsDetails::ConfigurePreset &configurePreset,
+ const Utils::Environment &env,
+ const Utils::FilePath &sourceDirectory,
+ const Utils::FilePath &buildDirectory)
+{
+ if (!configurePreset.toolchainFile)
+ return;
+
+ QString toolchainFileName = configurePreset.toolchainFile.value();
+ CMakePresets::Macros::expand(configurePreset, env, sourceDirectory, toolchainFileName);
+
+ // Resolve the relative path first to source and afterwards to build directory
+ Utils::FilePath toolchainFile = Utils::FilePath::fromString(toolchainFileName);
+ if (toolchainFile.isRelativePath()) {
+ for (const auto &path : {sourceDirectory, buildDirectory}) {
+ Utils::FilePath probePath = toolchainFile.resolvePath(path);
+ if (probePath.exists() && probePath != path) {
+ toolchainFile = probePath;
+ break;
+ }
+ }
+ }
+
+ if (!toolchainFile.exists())
+ return;
+
+ // toolchainFile takes precedence to CMAKE_TOOLCHAIN_FILE
+ CMakeConfig cache = configurePreset.cacheVariables ? configurePreset.cacheVariables.value()
+ : CMakeConfig();
+
+ auto it = std::find_if(cache.begin(), cache.end(), [](const CMakeConfigItem &item) {
+ return item.key == "CMAKE_TOOLCHAIN_FILE";
+ });
+ if (it != cache.end())
+ it->value = toolchainFile.toString().toUtf8();
+ else
+ cache << CMakeConfigItem("CMAKE_TOOLCHAIN_FILE",
+ CMakeConfigItem::FILEPATH,
+ toolchainFile.toString().toUtf8());
+
+ configurePreset.cacheVariables = cache;
+}
+
+template
+void expandConditionValues(const PresetType &preset,
+ const Utils::Environment &env,
+ const Utils::FilePath &sourceDirectory,
+ PresetsDetails::Condition &condition)
+{
+ if (condition.isEquals() || condition.isNotEquals()) {
+ if (condition.lhs)
+ expand(preset, env, sourceDirectory, condition.lhs.value());
+ if (condition.rhs)
+ expand(preset, env, sourceDirectory, condition.rhs.value());
+ }
+
+ if (condition.isInList() || condition.isNotInList()) {
+ if (condition.string)
+ expand(preset, env, sourceDirectory, condition.string.value());
+ if (condition.list)
+ for (QString &listValue : condition.list.value())
+ expand(preset, env, sourceDirectory, listValue);
+ }
+
+ if (condition.isMatches() || condition.isNotMatches()) {
+ if (condition.string)
+ expand(preset, env, sourceDirectory, condition.string.value());
+ if (condition.regex)
+ expand(preset, env, sourceDirectory, condition.regex.value());
+ }
+
+ if (condition.isAnyOf() || condition.isAllOf()) {
+ if (condition.conditions)
+ for (PresetsDetails::Condition::ConditionPtr &c : condition.conditions.value())
+ expandConditionValues(preset, env, sourceDirectory, *c);
+ }
+
+ if (condition.isNot()) {
+ if (condition.condition)
+ expandConditionValues(preset, env, sourceDirectory, *condition.condition.value());
+ }
+}
+
+template
+bool evaluatePresetCondition(const PresetType &preset, const Utils::FilePath &sourceDirectory)
+{
+ if (!preset.condition)
+ return true;
+
+ Utils::Environment env = Utils::Environment::systemEnvironment();
+ expand(preset, env, sourceDirectory);
+
+ PresetsDetails::Condition condition = preset.condition.value();
+ expandConditionValues(preset, env, sourceDirectory, condition);
+
+ return condition.evaluate();
+}
+
+
// Expand for PresetsDetails::ConfigurePreset
template void expand(const PresetsDetails::ConfigurePreset &preset,
Utils::Environment &env,
@@ -155,6 +276,9 @@ template void expand(const PresetsDetails::Conf
const Utils::FilePath &sourceDirectory,
QString &value);
+template bool evaluatePresetCondition(
+ const PresetsDetails::ConfigurePreset &preset, const Utils::FilePath &sourceDirectory);
+
// Expand for PresetsDetails::BuildPreset
template void expand(const PresetsDetails::BuildPreset &preset,
Utils::Environment &env,
@@ -169,4 +293,7 @@ template void expand(const PresetsDetails::BuildPre
const Utils::FilePath &sourceDirectory,
QString &value);
+template bool evaluatePresetCondition(
+ const PresetsDetails::BuildPreset &preset, const Utils::FilePath &sourceDirectory);
+
} // namespace CMakeProjectManager::Internal::CMakePresets::Macros
diff --git a/src/plugins/cmakeprojectmanager/presetsmacros.h b/src/plugins/cmakeprojectmanager/presetsmacros.h
index 9da2734da2a..0acf4d37cb6 100644
--- a/src/plugins/cmakeprojectmanager/presetsmacros.h
+++ b/src/plugins/cmakeprojectmanager/presetsmacros.h
@@ -12,6 +12,10 @@ class FilePath;
namespace CMakeProjectManager::Internal {
+namespace PresetsDetails {
+class ConfigurePreset;
+}
+
namespace CMakePresets::Macros {
/**
* Expands the CMakePresets Macros using Utils::Environment as target and source for parent environment values.
@@ -40,6 +44,22 @@ void expand(const PresetType &preset,
const Utils::FilePath &sourceDirectory,
QString &value);
+/**
+ * Updates the cacheVariables parameter of the configurePreset with the expandned toolchainFile parameter.
+ * Including macro expansion and relative paths resolving.
+ */
+void updateToolchainFile(PresetsDetails::ConfigurePreset &configurePreset,
+ const Utils::Environment &env,
+ const Utils::FilePath &sourceDirectory,
+ const Utils::FilePath &buildDirectory);
+
+/**
+ * Expands the condition values and then evaluates the condition object of the preset and returns
+ * the boolean result.
+ */
+template
+bool evaluatePresetCondition(const PresetType &preset, const Utils::FilePath &sourceDirectory);
+
} // namespace CMakePresets::Macros
} // namespace CMakeProjectManager::Internal
diff --git a/src/plugins/cmakeprojectmanager/presetsparser.cpp b/src/plugins/cmakeprojectmanager/presetsparser.cpp
index 970b05921a5..441709109db 100644
--- a/src/plugins/cmakeprojectmanager/presetsparser.cpp
+++ b/src/plugins/cmakeprojectmanager/presetsparser.cpp
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "presetsparser.h"
+#include "utils/algorithm.h"
#include "cmakeprojectmanagertr.h"
@@ -34,6 +35,102 @@ bool parseCMakeMinimumRequired(const QJsonValue &jsonValue, QVersionNumber &vers
return true;
}
+std::optional parseCondition(const QJsonValue &jsonValue)
+{
+ std::optional condition;
+
+ if (jsonValue.isUndefined())
+ return condition;
+
+ condition = PresetsDetails::Condition();
+
+ if (jsonValue.isNull()) {
+ condition->type = "null";
+ return condition;
+ }
+
+ if (jsonValue.isBool()) {
+ condition->type = "const";
+ condition->constValue = jsonValue.toBool();
+ return condition;
+ }
+
+ if (!jsonValue.isObject())
+ return condition;
+
+ QJsonObject object = jsonValue.toObject();
+ QString type = object.value("type").toString();
+ if (type.isEmpty())
+ return condition;
+
+ if (type == "const") {
+ condition->type = type;
+ condition->constValue = object.value("const").toBool();
+ return condition;
+ }
+
+ for (const auto &equals : {QString("equals"), QString("notEquals")}) {
+ if (type == equals) {
+ condition->type = equals;
+ condition->lhs = object.value("lhs").toString();
+ condition->rhs = object.value("rhs").toString();
+ }
+ }
+ if (!condition->type.isEmpty())
+ return condition;
+
+ for (const auto &inList : {QString("inList"), QString("notInList")}) {
+ if (type == inList) {
+ condition->type = inList;
+ condition->string = object.value("string").toString();
+ if (object.value("list").isArray()) {
+ condition->list = QStringList();
+ const QJsonArray listArray = object.value("list").toArray();
+ for (const QJsonValue &listValue : listArray)
+ condition->list.value() << listValue.toString();
+ }
+ }
+ }
+ if (!condition->type.isEmpty())
+ return condition;
+
+ for (const auto &matches : {QString("matches"), QString("notMatches")}) {
+ if (type == matches) {
+ condition->type = matches;
+ condition->string = object.value("string").toString();
+ condition->regex = object.value("regex").toString();
+ }
+ }
+ if (!condition->type.isEmpty())
+ return condition;
+
+ for (const auto &anyOf : {QString("anyOf"), QString("allOf")}) {
+ if (type == anyOf) {
+ condition->type = anyOf;
+ if (object.value("conditions").isArray()) {
+ condition->conditions = std::vector();
+ const QJsonArray conditionsArray = object.value("conditions").toArray();
+ for (const QJsonValue &conditionsValue : conditionsArray) {
+ condition->conditions.value().emplace_back(
+ std::make_shared(
+ parseCondition(conditionsValue).value()));
+ }
+ }
+ }
+ }
+ if (!condition->type.isEmpty())
+ return condition;
+
+ if (type == "not") {
+ condition->type = type;
+ condition->condition = std::make_shared(
+ parseCondition(object.value("condition")).value());
+ return condition;
+ }
+
+ return condition;
+}
+
bool parseConfigurePresets(const QJsonValue &jsonValue,
QList &configurePresets)
{
@@ -68,6 +165,10 @@ bool parseConfigurePresets(const QJsonValue &jsonValue,
preset.inherits.value() << inheritsValue;
}
}
+
+ if (object.contains("condition"))
+ preset.condition = parseCondition(object.value("condition"));
+
if (object.contains("displayName"))
preset.displayName = object.value("displayName").toString();
if (object.contains("description"))
@@ -76,6 +177,8 @@ bool parseConfigurePresets(const QJsonValue &jsonValue,
preset.generator = object.value("generator").toString();
if (object.contains("binaryDir"))
preset.binaryDir = object.value("binaryDir").toString();
+ if (object.contains("toolchainFile"))
+ preset.toolchainFile = object.value("toolchainFile").toString();
if (object.contains("cmakeExecutable"))
preset.cmakeExecutable = object.value("cmakeExecutable").toString();
@@ -218,6 +321,10 @@ bool parseBuildPresets(const QJsonValue &jsonValue,
preset.inherits.value() << inheritsValue;
}
}
+
+ if (object.contains("condition"))
+ preset.condition = parseCondition(object.value("condition"));
+
if (object.contains("displayName"))
preset.displayName = object.value("displayName").toString();
if (object.contains("description"))
@@ -334,6 +441,9 @@ bool PresetsParser::parse(const Utils::FilePath &jsonFile, QString &errorMessage
void PresetsDetails::ConfigurePreset::inheritFrom(const ConfigurePreset &other)
{
+ if (!condition && other.condition && !other.condition.value().isNull())
+ condition = other.condition;
+
if (!vendor && other.vendor)
vendor = other.vendor;
@@ -346,6 +456,9 @@ void PresetsDetails::ConfigurePreset::inheritFrom(const ConfigurePreset &other)
if (!toolset && other.toolset)
toolset = other.toolset;
+ if (!toolchainFile && other.toolchainFile)
+ toolchainFile = other.toolchainFile;
+
if (!binaryDir && other.binaryDir)
binaryDir = other.binaryDir;
@@ -370,6 +483,9 @@ void PresetsDetails::ConfigurePreset::inheritFrom(const ConfigurePreset &other)
void PresetsDetails::BuildPreset::inheritFrom(const BuildPreset &other)
{
+ if (!condition && other.condition && !other.condition.value().isNull())
+ condition = other.condition;
+
if (!vendor && other.vendor)
vendor = other.vendor;
@@ -401,4 +517,46 @@ void PresetsDetails::BuildPreset::inheritFrom(const BuildPreset &other)
nativeToolOptions = other.nativeToolOptions;
}
+bool PresetsDetails::Condition::evaluate() const
+{
+ if (isNull())
+ return true;
+
+ if (isConst() && constValue)
+ return constValue.value();
+
+ if (isEquals() && lhs && rhs)
+ return lhs.value() == rhs.value();
+
+ if (isNotEquals() && lhs && rhs)
+ return lhs.value() != rhs.value();
+
+ if (isInList() && string && list)
+ return list.value().contains(string.value());
+
+ if (isNotInList() && string && list)
+ return !list.value().contains(string.value());
+
+ if (isMatches() && string && regex) {
+ QRegularExpression qRegex(regex.value());
+ return qRegex.match(string.value()).hasMatch();
+ }
+
+ if (isNotMatches() && string && regex) {
+ QRegularExpression qRegex(regex.value());
+ return !qRegex.match(string.value()).hasMatch();
+ }
+
+ if (isAnyOf() && conditions)
+ return Utils::anyOf(conditions.value(), [](const ConditionPtr &c) { return c->evaluate(); });
+
+ if (isAllOf() && conditions)
+ return Utils::allOf(conditions.value(), [](const ConditionPtr &c) { return c->evaluate(); });
+
+ if (isNot() && condition)
+ return !condition.value()->evaluate();
+
+ return false;
+}
+
} // CMakeProjectManager::Internal
diff --git a/src/plugins/cmakeprojectmanager/presetsparser.h b/src/plugins/cmakeprojectmanager/presetsparser.h
index 0dd65be7caa..5577620d5d8 100644
--- a/src/plugins/cmakeprojectmanager/presetsparser.h
+++ b/src/plugins/cmakeprojectmanager/presetsparser.h
@@ -43,6 +43,47 @@ public:
std::optional find = false;
};
+class Condition {
+public:
+ QString type;
+
+ bool isNull() const { return type == "null"; }
+ bool isConst() const { return type == "const"; }
+ bool isEquals() const { return type == "equals"; }
+ bool isNotEquals() const { return type == "notEquals"; }
+ bool isInList() const { return type == "inList"; }
+ bool isNotInList() const { return type == "notInList"; }
+ bool isMatches() const { return type == "matches"; }
+ bool isNotMatches() const { return type == "notMatches"; }
+ bool isAnyOf() const { return type == "anyOf"; }
+ bool isAllOf() const { return type == "allOf"; }
+ bool isNot() const { return type == "not"; }
+
+ bool evaluate() const;
+
+ // const
+ std::optional constValue;
+
+ // equals, notEquals
+ std::optional lhs;
+ std::optional rhs;
+
+ // inList, notInList
+ std::optional string;
+ std::optional list;
+
+ // matches, notMatches
+ std::optional regex;
+
+ using ConditionPtr = std::shared_ptr;
+
+ // anyOf, allOf
+ std::optional> conditions;
+
+ // not
+ std::optional condition;
+};
+
class ConfigurePreset {
public:
void inheritFrom(const ConfigurePreset &other);
@@ -50,12 +91,14 @@ public:
QString name;
std::optional hidden = false;
std::optional inherits;
+ std::optional condition;
std::optional> vendor;
std::optional displayName;
std::optional description;
std::optional generator;
std::optional architecture;
std::optional toolset;
+ std::optional toolchainFile;
std::optional binaryDir;
std::optional cmakeExecutable;
std::optional cacheVariables;
@@ -72,6 +115,7 @@ public:
QString name;
std::optional