diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2021-08-20 11:21:06 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-08-27 10:53:54 +0000 |
commit | a952500e902eb0a0fe5b5dbcdafb6cb66fb88141 (patch) | |
tree | 744dfbbf969359a3cb147b6bbc8ee47fe361a7ab /src/plugins/cppeditor | |
parent | 5d8551559af2300a67815582198b4ce580a7bba2 (diff) |
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 <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/plugins/cppeditor')
-rw-r--r-- | src/plugins/cppeditor/cppcodemodelinspectordialog.cpp | 30 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppcodemodelinspectordialog.h | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppeditorwidget.cpp | 15 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppeditorwidget.h | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppparsecontext.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppparsecontext.h | 2 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppquickfixes.cpp | 4 | ||||
-rw-r--r-- | src/plugins/cppeditor/fileandtokenactions_test.cpp | 4 |
8 files changed, 31 insertions, 30 deletions
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<ProjectInfo::Ptr> &projectInfos, - const ProjectPart::Ptr ¤tEditorsProjectPart); + void configure(const QList<ProjectInfo::ConstPtr> &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<ProjectPart::Ptr> m_projectPartsList; + QList<ProjectPart::ConstPtr> m_projectPartsList; int m_currentEditorsProjectPartIndex; }; @@ -1135,13 +1135,13 @@ ProjectPartsModel::ProjectPartsModel(QObject *parent) { } -void ProjectPartsModel::configure(const QList<ProjectInfo::Ptr> &projectInfos, - const ProjectPart::Ptr ¤tEditorsProjectPart) +void ProjectPartsModel::configure(const QList<ProjectInfo::ConstPtr> &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<ProjectInfo::Ptr> projectInfos = cmmi->projectInfos(); + const QList<ProjectInfo::ConstPtr> 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); diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.h b/src/plugins/cppeditor/cppcodemodelinspectordialog.h index 7faf93da84..310805aba8 100644 --- a/src/plugins/cppeditor/cppcodemodelinspectordialog.h +++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.h @@ -88,7 +88,7 @@ private: void updateDocumentData(const CPlusPlus::Document::Ptr &document); void clearProjectPartData(); - void updateProjectPartData(const CppTools::ProjectPart::Ptr &part); + void updateProjectPartData(const CppTools::ProjectPart::ConstPtr &part); bool event(QEvent *e) override; diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp index ae8fd52db7..45c59fc64b 100644 --- a/src/plugins/cppeditor/cppeditorwidget.cpp +++ b/src/plugins/cppeditor/cppeditorwidget.cpp @@ -591,10 +591,10 @@ bool CppEditorWidget::isWidgetHighlighted(QWidget *widget) namespace { -QList<ProjectPart::Ptr> fetchProjectParts(CppTools::CppModelManager *modelManager, +QList<ProjectPart::ConstPtr> fetchProjectParts(CppTools::CppModelManager *modelManager, const Utils::FilePath &filePath) { - QList<ProjectPart::Ptr> projectParts = modelManager->projectPart(filePath); + QList<ProjectPart::ConstPtr> projectParts = modelManager->projectPart(filePath); if (projectParts.isEmpty()) projectParts = modelManager->projectPartFromDependencies(filePath); @@ -604,12 +604,13 @@ QList<ProjectPart::Ptr> fetchProjectParts(CppTools::CppModelManager *modelManage return projectParts; } -ProjectPart *findProjectPartForCurrentProject(const QList<ProjectPart::Ptr> &projectParts, - ProjectExplorer::Project *currentProject) +const ProjectPart *findProjectPartForCurrentProject( + const QList<ProjectPart::ConstPtr> &projectParts, + ProjectExplorer::Project *currentProject) { const auto found = std::find_if(projectParts.cbegin(), projectParts.cend(), - [&](const CppTools::ProjectPart::Ptr &projectPart) { + [&](const CppTools::ProjectPart::ConstPtr &projectPart) { return projectPart->belongsToProject(currentProject); }); @@ -621,7 +622,7 @@ ProjectPart *findProjectPartForCurrentProject(const QList<ProjectPart::Ptr> &pro } // namespace -ProjectPart *CppEditorWidget::projectPart() const +const ProjectPart *CppEditorWidget::projectPart() const { if (!d->m_modelManager) return nullptr; @@ -680,7 +681,7 @@ void CppEditorWidget::renameSymbolUnderCursor() { using ClangBackEnd::SourceLocationsContainer; - ProjectPart *projPart = projectPart(); + const ProjectPart *projPart = projectPart(); if (!projPart) return; diff --git a/src/plugins/cppeditor/cppeditorwidget.h b/src/plugins/cppeditor/cppeditorwidget.h index 7ed46c55ea..85c974a6ca 100644 --- a/src/plugins/cppeditor/cppeditorwidget.h +++ b/src/plugins/cppeditor/cppeditorwidget.h @@ -151,7 +151,7 @@ private: CppTools::FollowSymbolInterface &followSymbolInterface() const; - CppTools::ProjectPart *projectPart() const; + const CppTools::ProjectPart *projectPart() const; private: QScopedPointer<CppEditorWidgetPrivate> d; diff --git a/src/plugins/cppeditor/cppparsecontext.cpp b/src/plugins/cppeditor/cppparsecontext.cpp index 521cc49328..d4003b445f 100644 --- a/src/plugins/cppeditor/cppparsecontext.cpp +++ b/src/plugins/cppeditor/cppparsecontext.cpp @@ -87,7 +87,7 @@ void ParseContextModel::reset(const CppTools::ProjectPartInfo &projectPartInfo) // Determine index for current const QString id = projectPartInfo.projectPart->id(); - m_currentIndex = Utils::indexOf(m_projectParts, [id](const CppTools::ProjectPart::Ptr &pp) { + m_currentIndex = Utils::indexOf(m_projectParts, [id](const CppTools::ProjectPart::ConstPtr &pp) { return pp->id() == id; }); QTC_CHECK(m_currentIndex >= 0); diff --git a/src/plugins/cppeditor/cppparsecontext.h b/src/plugins/cppeditor/cppparsecontext.h index 511448bb63..4d470b3770 100644 --- a/src/plugins/cppeditor/cppparsecontext.h +++ b/src/plugins/cppeditor/cppparsecontext.h @@ -62,7 +62,7 @@ private: private: CppTools::ProjectPartInfo::Hints m_hints; - QList<CppTools::ProjectPart::Ptr> m_projectParts; + QList<CppTools::ProjectPart::ConstPtr> m_projectParts; int m_currentIndex = -1; }; diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 60d18cb65c..73e4929c90 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -1913,11 +1913,11 @@ ProjectExplorer::HeaderPaths relevantHeaderPaths(const QString &filePath) ProjectExplorer::HeaderPaths headerPaths; CppModelManager *modelManager = CppModelManager::instance(); - const QList<ProjectPart::Ptr> projectParts = modelManager->projectPart(filePath); + const QList<ProjectPart::ConstPtr> projectParts = modelManager->projectPart(filePath); if (projectParts.isEmpty()) { // Not part of any project, better use all include paths than none headerPaths += modelManager->headerPaths(); } else { - foreach (const ProjectPart::Ptr &part, projectParts) + foreach (const ProjectPart::ConstPtr &part, projectParts) headerPaths += part->headerPaths; } diff --git a/src/plugins/cppeditor/fileandtokenactions_test.cpp b/src/plugins/cppeditor/fileandtokenactions_test.cpp index 719dc92fe4..1792b756d9 100644 --- a/src/plugins/cppeditor/fileandtokenactions_test.cpp +++ b/src/plugins/cppeditor/fileandtokenactions_test.cpp @@ -152,9 +152,9 @@ TestActionsTestCase::TestActionsTestCase(const Actions &tokenActions, const Acti // Collect files to process QStringList filesToOpen; QList<QPointer<ProjectExplorer::Project> > projects; - const QList<ProjectInfo::Ptr> projectInfos = m_modelManager->projectInfos(); + const QList<ProjectInfo::ConstPtr> projectInfos = m_modelManager->projectInfos(); - foreach (const ProjectInfo::Ptr &info, projectInfos) { + foreach (const ProjectInfo::ConstPtr &info, projectInfos) { qDebug() << "Project" << info->projectFilePath().toUserOutput() << "- files to process:" << info->sourceFiles().size(); foreach (const QString &sourceFile, info->sourceFiles()) |