From a952500e902eb0a0fe5b5dbcdafb6cb66fb88141 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 20 Aug 2021 11:21:06 +0200 Subject: CppTools: Use only const pointers for ProjectInfo and ProjectPart All members were already const, but this makes it clear at all points of use that these data structures are immutable. Change-Id: Iea615c090bde462c445d15223caccc561b0c713d Reviewed-by: Jarek Kobus --- src/plugins/cppcheck/cppchecktool.cpp | 10 +++++----- src/plugins/cppcheck/cppchecktool.h | 2 +- src/plugins/cppcheck/cppchecktrigger.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/plugins/cppcheck') diff --git a/src/plugins/cppcheck/cppchecktool.cpp b/src/plugins/cppcheck/cppchecktool.cpp index a0cd174c2e6..d0495d1adf8 100644 --- a/src/plugins/cppcheck/cppchecktool.cpp +++ b/src/plugins/cppcheck/cppchecktool.cpp @@ -204,21 +204,21 @@ void CppcheckTool::check(const Utils::FilePaths &files) if (filtered.isEmpty()) return; - const CppTools::ProjectInfo::Ptr info + const CppTools::ProjectInfo::ConstPtr info = CppTools::CppModelManager::instance()->projectInfo(m_project); if (!info) return; - const QVector parts = info->projectParts(); + const QVector parts = info->projectParts(); if (parts.size() == 1) { QTC_ASSERT(parts.first(), return); addToQueue(filtered, *parts.first()); return; } - std::map groups; + std::map groups; for (const Utils::FilePath &file : qAsConst(filtered)) { const QString stringed = file.toString(); - for (const CppTools::ProjectPart::Ptr &part : parts) { + for (const CppTools::ProjectPart::ConstPtr &part : parts) { using CppTools::ProjectFile; QTC_ASSERT(part, continue); const auto match = [stringed](const ProjectFile &pFile){return pFile.path == stringed;}; @@ -231,7 +231,7 @@ void CppcheckTool::check(const Utils::FilePaths &files) addToQueue(group.second, *group.first); } -void CppcheckTool::addToQueue(const Utils::FilePaths &files, CppTools::ProjectPart &part) +void CppcheckTool::addToQueue(const Utils::FilePaths &files, const CppTools::ProjectPart &part) { const QString key = part.id(); if (!m_cachedAdditionalArguments.contains(key)) diff --git a/src/plugins/cppcheck/cppchecktool.h b/src/plugins/cppcheck/cppchecktool.h index c10c2516e2f..2951234683c 100644 --- a/src/plugins/cppcheck/cppchecktool.h +++ b/src/plugins/cppcheck/cppchecktool.h @@ -75,7 +75,7 @@ public: private: void updateArguments(); - void addToQueue(const Utils::FilePaths &files, CppTools::ProjectPart &part); + void addToQueue(const Utils::FilePaths &files, const CppTools::ProjectPart &part); QStringList additionalArguments(const CppTools::ProjectPart &part) const; CppcheckDiagnosticManager &m_manager; diff --git a/src/plugins/cppcheck/cppchecktrigger.cpp b/src/plugins/cppcheck/cppchecktrigger.cpp index 93a36596a64..47370c2cd5b 100644 --- a/src/plugins/cppcheck/cppchecktrigger.cpp +++ b/src/plugins/cppcheck/cppchecktrigger.cpp @@ -76,7 +76,7 @@ void CppcheckTrigger::checkEditors(const QList &editors) return; using CppModelManager = CppTools::CppModelManager; - const CppTools::ProjectInfo::Ptr info + const CppTools::ProjectInfo::ConstPtr info = CppModelManager::instance()->projectInfo(m_currentProject); if (!info) return; -- cgit v1.2.3