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

Meson: Inline one of the findTool() into its only user

Browse Source 
Change-Id: I6cadbc4a7c70fe8fc7590c12a638dd472df3f327
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2024-07-25 14:54:28 +02:00
parent 96b508c84a
commit bb7feab97b
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,18 +207,6 @@ std::optional<FilePath> findTool(ToolType toolType)
std::vector<MesonTools::Tool_t> s_tools;
static MesonTools::Tool_t findTool(const Id &id, ToolType toolType)
{
const auto tool = std::find_if(std::cbegin(s_tools),
std::cend(s_tools),
[&id](const MesonTools::Tool_t &tool) {
return tool->id() == id;
});
if (tool != std::cend(s_tools) && (*tool)->toolType() == toolType)
return *tool;
return nullptr;
}
MesonTools::Tool_t MesonTools::autoDetectedTool(ToolType toolType)
{
for (const auto &tool : s_tools) {
@@ -287,7 +275,14 @@ void MesonTools::removeTool(const Id &id)
std::shared_ptr<ToolWrapper> MesonTools::toolById(const Id &id, ToolType toolType)
{
return findTool(id, toolType);
const auto tool = std::find_if(std::cbegin(s_tools),
std::cend(s_tools),
[&id](const MesonTools::Tool_t &tool) {
return tool->id() == id;
});
if (tool != std::cend(s_tools) && (*tool)->toolType() == toolType)
return *tool;
return nullptr;
}
MesonTools *MesonTools::instance()

8
src/plugins/mesonprojectmanager/mesontools.h
View File

@@ -77,6 +77,7 @@ std::optional<Utils::FilePath> findTool(ToolType toolType);
class MesonTools : public QObject
{
Q_OBJECT
MesonTools() {}
~MesonTools() {}
@@ -94,10 +95,11 @@ public:
static std::shared_ptr<ToolWrapper> toolById(const Utils::Id &id, ToolType toolType);
static std::shared_ptr<ToolWrapper> autoDetectedTool(ToolType toolType);
Q_SIGNAL void toolAdded(const Tool_t &tool);
Q_SIGNAL void toolRemoved(const Tool_t &tool);
static MesonTools *instance();
signals:
void toolAdded(const Tool_t &tool);
void toolRemoved(const Tool_t &tool);
};
} // MesonProjectManager::Internal