feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Rename isProjectPartValid to isProjectPartLoaded

Browse Source 
Change-Id: Ib20700ebb7142cfa9e75edff3b21410fd3bdab05
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-09-24 14:25:53 +02:00
parent 143983a857
commit c45f08cdae
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
View File

@@ -227,7 +227,7 @@ ClangEditorDocumentProcessor *ClangEditorDocumentProcessor::get(const QString &f
static bool isProjectPartLoadedOrIsFallback(CppTools::ProjectPart::Ptr projectPart) static bool isProjectPartLoadedOrIsFallback(CppTools::ProjectPart::Ptr projectPart)
{ {
return projectPart return projectPart
&& (projectPart->id().isEmpty() || ClangCodeModel::Utils::isProjectPartValid(projectPart)); && (projectPart->id().isEmpty() || ClangCodeModel::Utils::isProjectPartLoaded(projectPart));
} }
void ClangEditorDocumentProcessor::updateProjectPartAndTranslationUnitForEditor() void ClangEditorDocumentProcessor::updateProjectPartAndTranslationUnitForEditor()

4
src/plugins/clangcodemodel/clangutils.cpp
View File

@@ -273,7 +273,7 @@ ProjectPart::Ptr projectPartForFileBasedOnProcessor(const QString &filePath)
return ProjectPart::Ptr(); return ProjectPart::Ptr();
} }
bool isProjectPartValid(const ProjectPart::Ptr projectPart) bool isProjectPartLoaded(const ProjectPart::Ptr projectPart)
{ {
if (projectPart) if (projectPart)
return CppModelManager::instance()->projectPartForId(projectPart->id()); return CppModelManager::instance()->projectPartForId(projectPart->id());
@@ -284,7 +284,7 @@ QString projectPartIdForFile(const QString &filePath)
{ {
const ProjectPart::Ptr projectPart = projectPartForFile(filePath); const ProjectPart::Ptr projectPart = projectPartForFile(filePath);
if (isProjectPartValid(projectPart)) if (isProjectPartLoaded(projectPart))
return projectPart->id(); // OK, Project Part is still loaded return projectPart->id(); // OK, Project Part is still loaded
return QString(); return QString();
} }

2
src/plugins/clangcodemodel/clangutils.h
View File

@@ -55,7 +55,7 @@ QStringList createPCHInclusionOptions(const QString &pchFile);
CppTools::ProjectPart::Ptr projectPartForFile(const QString &filePath); CppTools::ProjectPart::Ptr projectPartForFile(const QString &filePath);
CppTools::ProjectPart::Ptr projectPartForFileBasedOnProcessor(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); QString projectPartIdForFile(const QString &filePath);
} // namespace Utils } // namespace Utils