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

Clang: Rename HighlightingInformation to HighlightingMark

Browse Source 
Change-Id: I3954c7c9abe593ea04092337f48ac2b153e883ba
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Marco Bubke
2016-02-29 13:09:39 +01:00
parent a1a6c5dd13
commit 2349b13ae5
20 changed files with 1104 additions and 1145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/tools/clangbackend/ipcsource/clangtranslationunit.cpp
View File

@@ -35,7 +35,7 @@
#include "skippedsourceranges.h"
#include "sourcelocation.h"
#include "sourcerange.h"
#include "highlightinginformations.h"
#include "highlightingmarks.h"
#include "translationunitfilenotexitexception.h"
#include "translationunitisnullexception.h"
#include "translationunitparseerrorexception.h"
@@ -80,7 +80,7 @@ public:
uint documentRevision = 0;
bool needsToBeReparsed = false;
bool hasNewDiagnostics = true;
bool hasNewHighlightingInformations = true;
bool hasNewHighlightingMarks = true;
bool isUsedByCurrentEditor = false;
bool isVisibleInEditor = false;
};
@@ -247,9 +247,9 @@ bool TranslationUnit::hasNewDiagnostics() const
return d->hasNewDiagnostics;
}
bool TranslationUnit::hasNewHighlightingInformations() const
bool TranslationUnit::hasNewHighlightingMarks() const
{
return d->hasNewHighlightingInformations;
return d->hasNewHighlightingMarks;
}
DiagnosticSet TranslationUnit::diagnostics() const
@@ -319,14 +319,14 @@ Cursor TranslationUnit::cursor() const
return clang_getTranslationUnitCursor(cxTranslationUnit());
}
HighlightingInformations TranslationUnit::highlightingInformations() const
HighlightingMarks TranslationUnit::highlightingMarks() const
{
d->hasNewHighlightingInformations = false;
d->hasNewHighlightingMarks = false;
return highlightingInformationsInRange(cursor().sourceRange());
return highlightingMarksInRange(cursor().sourceRange());
}
HighlightingInformations TranslationUnit::highlightingInformationsInRange(const SourceRange &range) const
HighlightingMarks TranslationUnit::highlightingMarksInRange(const SourceRange &range) const
{
CXToken *cxTokens = 0;
uint cxTokensCount = 0;
@@ -334,7 +334,7 @@ HighlightingInformations TranslationUnit::highlightingInformationsInRange(const
clang_tokenize(translationUnit, range, &cxTokens, &cxTokensCount);
return HighlightingInformations(translationUnit, cxTokens, cxTokensCount);
return HighlightingMarks(translationUnit, cxTokens, cxTokensCount);
}
SkippedSourceRanges TranslationUnit::skippedSourceRanges() const
@@ -376,7 +376,7 @@ void TranslationUnit::setDirty()
{
d->needsToBeReparsed = true;
d->hasNewDiagnostics = true;
d->hasNewHighlightingInformations = true;
d->hasNewHighlightingMarks = true;
}
bool TranslationUnit::isMainFileAndExistsOrIsOtherFile(const Utf8String &filePath) const