diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2016-10-13 11:36:00 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2016-10-17 11:02:26 +0000 |
| commit | b1433e2a050add8b4315bbe0c655f41cad4a8354 (patch) | |
| tree | 4030eed5df9d490721a738adcedcbdec67e1b9ba /src/plugins/cmakeprojectmanager/cmaketool.cpp | |
| parent | fe23c71414e259986c8ead802eac7decd544976f (diff) | |
CMake: Only pass the path mapper to the cbp-parser
No need to pass in the complete kit. Remove a couple of unnecessary
namespace names.
Change-Id: I2ac895535a80b4a54a423ce62dbdede65b67437b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmaketool.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmaketool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp index 2cc0228656c..c4192b6c872 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp @@ -228,11 +228,11 @@ void CMakeTool::setPathMapper(const CMakeTool::PathMapper &pathMapper) m_pathMapper = pathMapper; } -QString CMakeTool::mapAllPaths(const ProjectExplorer::Kit *kit, const QString &in) const +CMakeTool::PathMapper CMakeTool::pathMapper() const { if (m_pathMapper) - return m_pathMapper(kit, in); - return in; + return m_pathMapper; + return [](const QString &s) { return s; }; } void CMakeTool::readInformation(CMakeTool::QueryType type) const |