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 --- .../cppeditor/cppcodemodelinspectordialog.cpp | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/plugins/cppeditor/cppcodemodelinspectordialog.cpp') diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp index 3d1126014d..0a49d777f7 100644 --- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp +++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp @@ -1112,11 +1112,11 @@ class ProjectPartsModel : public QAbstractListModel public: ProjectPartsModel(QObject *parent); - void configure(const QList &projectInfos, - const ProjectPart::Ptr ¤tEditorsProjectPart); + void configure(const QList &projectInfos, + const ProjectPart::ConstPtr ¤tEditorsProjectPart); QModelIndex indexForCurrentEditorsProjectPart() const; - ProjectPart::Ptr projectPartForProjectId(const QString &projectPartId) const; + ProjectPart::ConstPtr projectPartForProjectId(const QString &projectPartId) const; enum Columns { PartNameColumn, PartFilePathColumn, ColumnCount }; @@ -1126,7 +1126,7 @@ public: QVariant headerData(int section, Qt::Orientation orientation, int role) const override; private: - QList m_projectPartsList; + QList m_projectPartsList; int m_currentEditorsProjectPartIndex; }; @@ -1135,13 +1135,13 @@ ProjectPartsModel::ProjectPartsModel(QObject *parent) { } -void ProjectPartsModel::configure(const QList &projectInfos, - const ProjectPart::Ptr ¤tEditorsProjectPart) +void ProjectPartsModel::configure(const QList &projectInfos, + const ProjectPart::ConstPtr ¤tEditorsProjectPart) { emit layoutAboutToBeChanged(); m_projectPartsList.clear(); - foreach (const ProjectInfo::Ptr &info, projectInfos) { - foreach (const ProjectPart::Ptr &projectPart, info->projectParts()) { + foreach (const ProjectInfo::ConstPtr &info, projectInfos) { + foreach (const ProjectPart::ConstPtr &projectPart, info->projectParts()) { if (!m_projectPartsList.contains(projectPart)) { m_projectPartsList << projectPart; if (projectPart == currentEditorsProjectPart) @@ -1159,13 +1159,13 @@ QModelIndex ProjectPartsModel::indexForCurrentEditorsProjectPart() const return createIndex(m_currentEditorsProjectPartIndex, PartFilePathColumn); } -ProjectPart::Ptr ProjectPartsModel::projectPartForProjectId(const QString &projectPartId) const +ProjectPart::ConstPtr ProjectPartsModel::projectPartForProjectId(const QString &projectPartId) const { - foreach (const ProjectPart::Ptr &part, m_projectPartsList) { + foreach (const ProjectPart::ConstPtr &part, m_projectPartsList) { if (part->id() == projectPartId) return part; } - return ProjectPart::Ptr(); + return ProjectPart::ConstPtr(); } int ProjectPartsModel::rowCount(const QModelIndex &/*parent*/) const @@ -1589,11 +1589,11 @@ void CppCodeModelInspectorDialog::refresh() onSnapshotSelected(snapshotIndex); // Project Parts - const ProjectPart::Ptr editorsProjectPart = cppEditorDocument + const ProjectPart::ConstPtr editorsProjectPart = cppEditorDocument ? cppEditorDocument->processor()->parser()->projectPartInfo().projectPart - : ProjectPart::Ptr(); + : ProjectPart::ConstPtr(); - const QList projectInfos = cmmi->projectInfos(); + const QList projectInfos = cmmi->projectInfos(); dumper.dumpProjectInfos(projectInfos); m_projectPartsModel->configure(projectInfos, editorsProjectPart); m_projectPartsView->resizeColumns(ProjectPartsModel::ColumnCount); @@ -1778,7 +1778,7 @@ static int defineCount(const ProjectExplorer::Macros ¯os) [](const Macro ¯o) { return macro.type == ProjectExplorer::MacroType::Define; })); } -void CppCodeModelInspectorDialog::updateProjectPartData(const ProjectPart::Ptr &part) +void CppCodeModelInspectorDialog::updateProjectPartData(const ProjectPart::ConstPtr &part) { QTC_ASSERT(part, return); -- cgit v1.2.3