From c45f08cdae88ec25ac63a8855045ce292d3f8c82 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 24 Sep 2015 14:25:53 +0200 Subject: [PATCH] Clang: Rename isProjectPartValid to isProjectPartLoaded Change-Id: Ib20700ebb7142cfa9e75edff3b21410fd3bdab05 Reviewed-by: Marco Bubke --- src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp | 2 +- src/plugins/clangcodemodel/clangutils.cpp | 4 ++-- src/plugins/clangcodemodel/clangutils.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp index bab2603eaa4..fe511ee560a 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp @@ -227,7 +227,7 @@ ClangEditorDocumentProcessor *ClangEditorDocumentProcessor::get(const QString &f static bool isProjectPartLoadedOrIsFallback(CppTools::ProjectPart::Ptr projectPart) { return projectPart - && (projectPart->id().isEmpty() || ClangCodeModel::Utils::isProjectPartValid(projectPart)); + && (projectPart->id().isEmpty() || ClangCodeModel::Utils::isProjectPartLoaded(projectPart)); } void ClangEditorDocumentProcessor::updateProjectPartAndTranslationUnitForEditor() diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp index d2c41fbce3d..0c437408fdb 100644 --- a/src/plugins/clangcodemodel/clangutils.cpp +++ b/src/plugins/clangcodemodel/clangutils.cpp @@ -273,7 +273,7 @@ ProjectPart::Ptr projectPartForFileBasedOnProcessor(const QString &filePath) return ProjectPart::Ptr(); } -bool isProjectPartValid(const ProjectPart::Ptr projectPart) +bool isProjectPartLoaded(const ProjectPart::Ptr projectPart) { if (projectPart) return CppModelManager::instance()->projectPartForId(projectPart->id()); @@ -284,7 +284,7 @@ QString projectPartIdForFile(const QString &filePath) { const ProjectPart::Ptr projectPart = projectPartForFile(filePath); - if (isProjectPartValid(projectPart)) + if (isProjectPartLoaded(projectPart)) return projectPart->id(); // OK, Project Part is still loaded return QString(); } diff --git a/src/plugins/clangcodemodel/clangutils.h b/src/plugins/clangcodemodel/clangutils.h index 79cc8687342..11d8e9db115 100644 --- a/src/plugins/clangcodemodel/clangutils.h +++ b/src/plugins/clangcodemodel/clangutils.h @@ -55,7 +55,7 @@ QStringList createPCHInclusionOptions(const QString &pchFile); CppTools::ProjectPart::Ptr projectPartForFile(const QString &filePath); CppTools::ProjectPart::Ptr projectPartForFileBasedOnProcessor(const QString &filePath); -bool isProjectPartValid(const CppTools::ProjectPart::Ptr projectPart); +bool isProjectPartLoaded(const CppTools::ProjectPart::Ptr projectPart); QString projectPartIdForFile(const QString &filePath); } // namespace Utils