diff --git a/src/plugins/mesonprojectmanager/mesontools.cpp b/src/plugins/mesonprojectmanager/mesontools.cpp index c7d81880a51..b9b6eccd97e 100644 --- a/src/plugins/mesonprojectmanager/mesontools.cpp +++ b/src/plugins/mesonprojectmanager/mesontools.cpp @@ -35,19 +35,6 @@ ToolWrapper::ToolWrapper(const Store &data) m_autoDetected = data[Constants::ToolsSettings::AUTO_DETECTED_KEY].toBool(); } -ToolWrapper::ToolWrapper(ToolType toolType, - const QString &name, - const FilePath &path, - bool autoDetected) - : m_toolType(toolType) - , m_version(read_version(path)) - , m_isValid{path.exists() && !m_version.isNull()} - , m_autoDetected{autoDetected} - , m_id{Id::generate()} - , m_exe{path} - , m_name{name} -{} - ToolWrapper::ToolWrapper(ToolType toolType, const QString &name, const FilePath &path, @@ -57,7 +44,7 @@ ToolWrapper::ToolWrapper(ToolType toolType, , m_version(read_version(path)) , m_isValid{path.exists() && !m_version.isNull()} , m_autoDetected{autoDetected} - , m_id{id} + , m_id{id.isValid() ? id : Id::generate()} , m_exe{path} , m_name{name} { @@ -251,13 +238,13 @@ static void fixAutoDetected(ToolType toolType) if (std::optional path = findTool(toolType)) { s_tools.emplace_back( std::make_shared(toolType, - QString("System %1 at %2").arg("Meson").arg(path->toString()), *path, true)); + QString("System %1 at %2").arg("Meson").arg(path->toString()), *path, Id{}, true)); } } else if (toolType == ToolType::Ninja) { if (std::optional path = findTool(toolType)) { s_tools.emplace_back( std::make_shared(toolType, - QString("System %1 at %2").arg("Ninja").arg(path->toString()), *path, true)); + QString("System %1 at %2").arg("Ninja").arg(path->toString()), *path, Id{}, true)); } } } diff --git a/src/plugins/mesonprojectmanager/mesontools.h b/src/plugins/mesonprojectmanager/mesontools.h index b283388df7c..395fcc5b495 100644 --- a/src/plugins/mesonprojectmanager/mesontools.h +++ b/src/plugins/mesonprojectmanager/mesontools.h @@ -26,11 +26,7 @@ public: ToolWrapper(ToolType toolType, const QString &name, const Utils::FilePath &path, - bool autoDetected = false); - ToolWrapper(ToolType toolType, - const QString &name, - const Utils::FilePath &path, - const Utils::Id &id, + const Utils::Id &id = {}, bool autoDetected = false); ~ToolWrapper();