forked from qt-creator/qt-creator
MesonProjectManager: Rename addMesonTool() overload
Rename it to addMesonToolHelper(). In this way addMesonTool is unique and may be used inside connections without QOverload. Change-Id: I3f109b5da3115e8275c05e9daec07192bef32ef7 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -21,9 +21,8 @@ ToolsModel::ToolsModel()
|
|||||||
new Utils::StaticTreeItem({ProjectExplorer::Constants::msgAutoDetected()},
|
new Utils::StaticTreeItem({ProjectExplorer::Constants::msgAutoDetected()},
|
||||||
{ProjectExplorer::Constants::msgAutoDetectedToolTip()}));
|
{ProjectExplorer::Constants::msgAutoDetectedToolTip()}));
|
||||||
rootItem()->appendChild(new Utils::StaticTreeItem(ProjectExplorer::Constants::msgManual()));
|
rootItem()->appendChild(new Utils::StaticTreeItem(ProjectExplorer::Constants::msgManual()));
|
||||||
for (const auto &tool : MesonTools::tools()) {
|
for (const auto &tool : MesonTools::tools())
|
||||||
addMesonTool(tool);
|
addMesonToolHelper(tool);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ToolTreeItem *ToolsModel::mesoneToolTreeItem(const QModelIndex &index) const
|
ToolTreeItem *ToolsModel::mesoneToolTreeItem(const QModelIndex &index) const
|
||||||
@@ -73,7 +72,7 @@ void ToolsModel::apply()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ToolsModel::addMesonTool(const MesonTools::Tool_t &tool)
|
void ToolsModel::addMesonToolHelper(const MesonTools::Tool_t &tool)
|
||||||
{
|
{
|
||||||
if (tool->autoDetected())
|
if (tool->autoDetected())
|
||||||
autoDetectedGroup()->appendChild(new ToolTreeItem(tool));
|
autoDetectedGroup()->appendChild(new ToolTreeItem(tool));
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public:
|
|||||||
void apply();
|
void apply();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void addMesonTool(const MesonTools::Tool_t &);
|
void addMesonToolHelper(const MesonTools::Tool_t &);
|
||||||
QString uniqueName(const QString &baseName);
|
QString uniqueName(const QString &baseName);
|
||||||
Utils::TreeItem *autoDetectedGroup() const;
|
Utils::TreeItem *autoDetectedGroup() const;
|
||||||
Utils::TreeItem *manualGroup() const;
|
Utils::TreeItem *manualGroup() const;
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ ToolsSettingsWidget::ToolsSettingsWidget()
|
|||||||
this, &ToolsSettingsWidget::currentMesonToolChanged);
|
this, &ToolsSettingsWidget::currentMesonToolChanged);
|
||||||
connect(m_itemSettings, &ToolItemSettings::applyChanges, &m_model, &ToolsModel::updateItem);
|
connect(m_itemSettings, &ToolItemSettings::applyChanges, &m_model, &ToolsModel::updateItem);
|
||||||
|
|
||||||
connect(addButton, &QPushButton::clicked, &m_model, QOverload<>::of(&ToolsModel::addMesonTool));
|
connect(addButton, &QPushButton::clicked, &m_model, &ToolsModel::addMesonTool);
|
||||||
connect(m_cloneButton, &QPushButton::clicked, this, &ToolsSettingsWidget::cloneMesonTool);
|
connect(m_cloneButton, &QPushButton::clicked, this, &ToolsSettingsWidget::cloneMesonTool);
|
||||||
connect(m_removeButton, &QPushButton::clicked, this, &ToolsSettingsWidget::removeMesonTool);
|
connect(m_removeButton, &QPushButton::clicked, this, &ToolsSettingsWidget::removeMesonTool);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user