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

C++: Untangle include file resolving from loading.

Browse Source 
Change-Id: Iacf8cb12dd623c908538d80ee2595297a9bdde71
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Erik Verbruggen
2013-03-15 17:31:58 +01:00
committed by Nikolai Kosjar
parent 857457e057
commit 82e347095c
7 changed files with 82 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/cpptools/cppmodelmanager.h
View File

@@ -281,9 +281,10 @@ public:
protected:
CPlusPlus::Document::Ptr switchDocument(CPlusPlus::Document::Ptr doc);
bool includeFile(const QString &absoluteFilePath, QString *result, unsigned *revision);
QString tryIncludeFile(QString &fileName, IncludeType type, unsigned *revision);
QString tryIncludeFile_helper(QString &fileName, IncludeType type, unsigned *revision);
void getFileContents(const QString &absoluteFilePath, QString *contents, unsigned *revision) const;
bool checkFile(const QString &absoluteFilePath) const;
QString resolveFile(const QString &fileName, IncludeType type);
QString resolveFile_helper(const QString &fileName, IncludeType type);
void mergeEnvironment(CPlusPlus::Document::Ptr doc);
@@ -301,7 +302,7 @@ protected:
virtual void markAsIncludeGuard(const QByteArray &macroName);
virtual void startSkippingBlocks(unsigned offset);
virtual void stopSkippingBlocks(unsigned offset);
virtual void sourceNeeded(unsigned line, QString &fileName, IncludeType type);
virtual void sourceNeeded(unsigned line, const QString &fileName, IncludeType type);
private:
CPlusPlus::Snapshot m_snapshot;