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

CppTools: Remove some duplication

Browse Source 
Change-Id: I8c84660b28c3e76b2cedd08ff3b44a38583f38a0
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2016-12-14 18:58:23 +01:00
parent 5421615070
commit bd66d5ac05
15 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cpptools/builtineditordocumentparser.cpp
View File

@@ -56,8 +56,7 @@ BuiltinEditorDocumentParser::BuiltinEditorDocumentParser(const QString &filePath
}
void BuiltinEditorDocumentParser::updateImpl(const QFutureInterface<void> &future,
const WorkingCopy &theWorkingCopy,
const ProjectExplorer::Project *activeProject)
const UpdateParams &updateParams)
{
if (filePath().isEmpty())
return;
@@ -67,7 +66,7 @@ void BuiltinEditorDocumentParser::updateImpl(const QFutureInterface<void> &futur
State baseState = state();
ExtraState state = extraState();
WorkingCopy workingCopy = theWorkingCopy;
WorkingCopy workingCopy = updateParams.workingCopy;
bool invalidateSnapshot = false, invalidateConfig = false, editorDefinesChanged_ = false;
@@ -78,7 +77,10 @@ void BuiltinEditorDocumentParser::updateImpl(const QFutureInterface<void> &futur
QString projectConfigFile;
LanguageFeatures features = LanguageFeatures::defaultFeatures();
baseState.projectPart = determineProjectPart(filePath(), baseConfig, baseState, activeProject);
baseState.projectPart = determineProjectPart(filePath(),
baseConfig,
baseState,
updateParams.activeProject);
if (state.forceSnapshotInvalidation) {
invalidateSnapshot = true;