diff --git a/src/plugins/clangcodemodel/clangeditordocumentparser.cpp b/src/plugins/clangcodemodel/clangeditordocumentparser.cpp index 332eb5a5eab..136fe6c74d2 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentparser.cpp +++ b/src/plugins/clangcodemodel/clangeditordocumentparser.cpp @@ -35,9 +35,9 @@ ClangEditorDocumentParser::ClangEditorDocumentParser(const QString &filePath) setConfiguration(config); } -void ClangEditorDocumentParser::updateHelper(const QFutureInterface &, - const CppTools::WorkingCopy &, - const ProjectExplorer::Project *activeProject) +void ClangEditorDocumentParser::updateImpl(const QFutureInterface &, + const CppTools::WorkingCopy &, + const ProjectExplorer::Project *activeProject) { State state_ = state(); state_.projectPart = determineProjectPart(filePath(), configuration(), state_, activeProject); diff --git a/src/plugins/clangcodemodel/clangeditordocumentparser.h b/src/plugins/clangcodemodel/clangeditordocumentparser.h index fdc01694191..3a9777a17f9 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentparser.h +++ b/src/plugins/clangcodemodel/clangeditordocumentparser.h @@ -37,9 +37,9 @@ public: ClangEditorDocumentParser(const QString &filePath); private: - void updateHelper(const QFutureInterface &future, - const CppTools::WorkingCopy &, - const ProjectExplorer::Project *activeProject) override; + void updateImpl(const QFutureInterface &future, + const CppTools::WorkingCopy &, + const ProjectExplorer::Project *activeProject) override; }; } // namespace ClangCodeModel diff --git a/src/plugins/cpptools/baseeditordocumentparser.cpp b/src/plugins/cpptools/baseeditordocumentparser.cpp index 579d3096242..49adead280f 100644 --- a/src/plugins/cpptools/baseeditordocumentparser.cpp +++ b/src/plugins/cpptools/baseeditordocumentparser.cpp @@ -41,13 +41,13 @@ namespace CppTools { It's meant to be used in the C++ editor to get precise results by using the "best" project part for a file. - Derived classes are expected to implement updateHelper() this way: + Derived classes are expected to implement updateImpl() this way: \list \li Get a copy of the configuration and the last state. \li Work on the data and do whatever is necessary. At least, update the project part with the help of determineProjectPart(). - \li Ensure the new state is set before updateHelper() returns. + \li Ensure the new state is set before updateImpl() returns. \endlist */ @@ -89,7 +89,7 @@ void BaseEditorDocumentParser::update(const QFutureInterface &future, const ProjectExplorer::Project *activeProject) { QMutexLocker locker(&m_updateIsRunning); - updateHelper(future, workingCopy, activeProject); + updateImpl(future, workingCopy, activeProject); } BaseEditorDocumentParser::State BaseEditorDocumentParser::state() const diff --git a/src/plugins/cpptools/baseeditordocumentparser.h b/src/plugins/cpptools/baseeditordocumentparser.h index 9f107d52129..056dca52a80 100644 --- a/src/plugins/cpptools/baseeditordocumentparser.h +++ b/src/plugins/cpptools/baseeditordocumentparser.h @@ -84,9 +84,9 @@ protected: mutable QMutex m_stateAndConfigurationMutex; private: - virtual void updateHelper(const QFutureInterface &future, - const WorkingCopy &workingCopy, - const ProjectExplorer::Project *activeProject) = 0; + virtual void updateImpl(const QFutureInterface &future, + const WorkingCopy &workingCopy, + const ProjectExplorer::Project *activeProject) = 0; const QString m_filePath; Configuration m_configuration; diff --git a/src/plugins/cpptools/builtineditordocumentparser.cpp b/src/plugins/cpptools/builtineditordocumentparser.cpp index 354951d9b67..7559e652dbf 100644 --- a/src/plugins/cpptools/builtineditordocumentparser.cpp +++ b/src/plugins/cpptools/builtineditordocumentparser.cpp @@ -55,9 +55,9 @@ BuiltinEditorDocumentParser::BuiltinEditorDocumentParser(const QString &filePath qRegisterMetaType("CPlusPlus::Snapshot"); } -void BuiltinEditorDocumentParser::updateHelper(const QFutureInterface &future, - const WorkingCopy &theWorkingCopy, - const ProjectExplorer::Project *activeProject) +void BuiltinEditorDocumentParser::updateImpl(const QFutureInterface &future, + const WorkingCopy &theWorkingCopy, + const ProjectExplorer::Project *activeProject) { if (filePath().isEmpty()) return; diff --git a/src/plugins/cpptools/builtineditordocumentparser.h b/src/plugins/cpptools/builtineditordocumentparser.h index 463acd8026f..73f94796ae5 100644 --- a/src/plugins/cpptools/builtineditordocumentparser.h +++ b/src/plugins/cpptools/builtineditordocumentparser.h @@ -58,9 +58,9 @@ public: static Ptr get(const QString &filePath); private: - void updateHelper(const QFutureInterface &future, - const WorkingCopy &workingCopy, - const ProjectExplorer::Project *activeProject) override; + void updateImpl(const QFutureInterface &future, + const WorkingCopy &workingCopy, + const ProjectExplorer::Project *activeProject) override; void addFileAndDependencies(CPlusPlus::Snapshot *snapshot, QSet *toRemove, const Utils::FileName &fileName) const;