diff options
| author | Sergey Shambir <sergey.shambir.auto@gmail.com> | 2013-03-04 01:30:46 +0400 |
|---|---|---|
| committer | Sergey Shambir <sergey.shambir.auto@gmail.com> | 2013-03-21 17:22:18 +0100 |
| commit | 63fe568b9b36de9a3ddd72da45ef193d7471224f (patch) | |
| tree | b380436f34355a263d841c1190d4750f6c2de970 /src/plugins/cpptools/cppmodelmanager.h | |
| parent | 0c417bbb8e6c34e2dbc594dca70f607dd3dc5c82 (diff) | |
| download | qt-creator-63fe568b9b36de9a3ddd72da45ef193d7471224f.tar.gz | |
CppTools: improved languages support in ProjectPart
Please, read blueprint here:
http://qt-project.org/wiki/Blueprint-for-language-specs-system
Removed feature from QbsProjectManager: it not longer splits project on
separate C and C++ parts, because Qt version used only by clang parser
(not native) and can be ignored for pure C and Objective-C without C++.
Change-Id: I1c561f7f9f915cc6cb8579d19db74e8352f54c1e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.h')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h index c882a0ec4f..503c3c5258 100644 --- a/src/plugins/cpptools/cppmodelmanager.h +++ b/src/plugins/cpptools/cppmodelmanager.h @@ -94,7 +94,7 @@ public: virtual QList<ProjectInfo> projectInfos() const; virtual ProjectInfo projectInfo(ProjectExplorer::Project *project) const; virtual void updateProjectInfo(const ProjectInfo &pinfo); - virtual QList<ProjectPart::Ptr> projectPart(const QString &fileName) const; + virtual QList<CPlusPlus::ProjectPart::Ptr> projectPart(const QString &fileName) const; virtual CPlusPlus::Snapshot snapshot() const; virtual Document::Ptr document(const QString &fileName) const; @@ -244,7 +244,7 @@ private: mutable QMutex m_protectExtraDiagnostics; QHash<QString, QHash<int, QList<Document::DiagnosticMessage> > > m_extraDiagnostics; - QMap<QString, QList<ProjectPart::Ptr> > m_srcToProjectPart; + QMap<QString, QList<CPlusPlus::ProjectPart::Ptr> > m_srcToProjectPart; CppCompletionAssistProvider *m_completionAssistProvider; CppCompletionAssistProvider *m_completionFallback; |