diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-12-16 13:12:04 +0100 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-12-16 13:56:16 +0000 |
commit | 566ab175b3a6f5f91c1362f2bfab3fc34f1d3b87 (patch) | |
tree | 5c0119f551297816d7ffebb1ebd14b630c7cf4bc /src/plugins/cpptools/baseeditordocumentparser.h | |
parent | b8b6f348e0d012017de23873a62d2b5af44dcdc9 (diff) | |
download | qt-creator-566ab175b3a6f5f91c1362f2bfab3fc34f1d3b87.tar.gz |
CppTools: Prioritize project parts from active project
...when selecting one for the editor document.
Change-Id: I85066aaa0862870cb2db2fb2cb40c2b2c23b2cac
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/cpptools/baseeditordocumentparser.h')
-rw-r--r-- | src/plugins/cpptools/baseeditordocumentparser.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/plugins/cpptools/baseeditordocumentparser.h b/src/plugins/cpptools/baseeditordocumentparser.h index 328fe421fd..9f107d5212 100644 --- a/src/plugins/cpptools/baseeditordocumentparser.h +++ b/src/plugins/cpptools/baseeditordocumentparser.h @@ -33,6 +33,8 @@ #include <QObject> #include <QMutex> +namespace ProjectExplorer { class Project; } + namespace CppTools { class CPPTOOLS_EXPORT BaseEditorDocumentParser : public QObject @@ -58,8 +60,11 @@ public: Configuration configuration() const; void setConfiguration(const Configuration &configuration); - void update(const WorkingCopy &workingCopy); - void update(const QFutureInterface<void> &future, const WorkingCopy &workingCopy); + void update(const WorkingCopy &workingCopy, + const ProjectExplorer::Project *activeProject); + void update(const QFutureInterface<void> &future, + const WorkingCopy &workingCopy, + const ProjectExplorer::Project *activeProject); ProjectPart::Ptr projectPart() const; @@ -73,13 +78,15 @@ protected: static ProjectPart::Ptr determineProjectPart(const QString &filePath, const Configuration &config, - const State &state); + const State &state, + const ProjectExplorer::Project *activeProject); mutable QMutex m_stateAndConfigurationMutex; private: virtual void updateHelper(const QFutureInterface<void> &future, - const WorkingCopy &workingCopy) = 0; + const WorkingCopy &workingCopy, + const ProjectExplorer::Project *activeProject) = 0; const QString m_filePath; Configuration m_configuration; |