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

Meson: Merge ToolWrapper classes

Browse Source 
Change-Id: I140088263059944b39c913acd1df07312b249953
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2024-07-22 17:27:50 +02:00
parent 36a6fa1664
commit ed10d7a449
9 changed files with 64 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/plugins/mesonprojectmanager/mesontools.cpp
View File

@@ -10,23 +10,17 @@ using namespace Utils;
namespace MesonProjectManager {
namespace Internal {
template<typename T>
inline bool is(const MesonTools::Tool_t &tool)
MesonTools::Tool_t tool(const Utils::Id &id,
const std::vector<MesonTools::Tool_t> &tools,
ToolType toolType)
{
return bool(std::dynamic_pointer_cast<T>(tool));
}
template<typename T>
std::shared_ptr<T> tool(const Utils::Id &id, const std::vector<MesonTools::Tool_t> &tools)
{
static_assert(std::is_base_of<ToolWrapper, T>::value, "Type must derive from ToolWrapper");
const auto tool = std::find_if(std::cbegin(tools),
std::cend(tools),
[&id](const MesonTools::Tool_t &tool) {
return tool->id() == id;
});
if (tool != std::cend(tools) && is<T>(*tool))
return std::dynamic_pointer_cast<T>(*tool);
if (tool != std::cend(tools) && (*tool)->toolType() == toolType)
return *tool;
return nullptr;
}
@@ -63,12 +57,12 @@ static void fixAutoDetected(std::vector<MesonTools::Tool_t> &tools, ToolType too
bool MesonTools::isMesonWrapper(const MesonTools::Tool_t &tool)
{
return is<MesonWrapper>(tool);
return tool->toolType() == ToolType::Meson;
}
bool MesonTools::isNinjaWrapper(const MesonTools::Tool_t &tool)
{
return is<NinjaWrapper>(tool);
return tool->toolType() == ToolType::Ninja;
}
void MesonTools::setTools(std::vector<MesonTools::Tool_t> &&tools)
@@ -79,25 +73,24 @@ void MesonTools::setTools(std::vector<MesonTools::Tool_t> &&tools)
fixAutoDetected(self->m_tools, ToolType::Ninja);
}
std::shared_ptr<NinjaWrapper> MesonTools::ninjaWrapper(const Utils::Id &id)
std::shared_ptr<ToolWrapper> MesonTools::ninjaWrapper(const Utils::Id &id)
{
return tool<NinjaWrapper>(id, MesonTools::instance()->m_tools);
}
std::shared_ptr<MesonWrapper> MesonTools::mesonWrapper(const Utils::Id &id)
{
return tool<MesonWrapper>(id, MesonTools::instance()->m_tools);
return tool(id, MesonTools::instance()->m_tools, ToolType::Ninja);
}
std::shared_ptr<NinjaWrapper> MesonTools::ninjaWrapper()
std::shared_ptr<ToolWrapper> MesonTools::mesonWrapper(const Utils::Id &id)
{
return std::dynamic_pointer_cast<NinjaWrapper>(
autoDetected(MesonTools::instance()->m_tools, ToolType::Ninja));
return tool(id, MesonTools::instance()->m_tools, ToolType::Meson);
}
std::shared_ptr<MesonWrapper> MesonTools::mesonWrapper()
std::shared_ptr<ToolWrapper> MesonTools::autoDetectedNinja()
{
return std::dynamic_pointer_cast<MesonWrapper>(
autoDetected(MesonTools::instance()->m_tools, ToolType::Meson));
return autoDetected(MesonTools::instance()->m_tools, ToolType::Ninja);
}
std::shared_ptr<ToolWrapper> MesonTools::autoDetectedMeson()
{
return autoDetected(MesonTools::instance()->m_tools, ToolType::Meson);
}
} // namespace Internal