diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-05-09 10:04:13 -0400 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-05-23 14:34:01 +0200 |
| commit | c6358e5d380c18f3ebff148a095ddf3a9d6b266c (patch) | |
| tree | 84fc2fa9919e2d57720ae3944e2d3a94b6c28c68 /src/plugins/cpptools/cpppreprocessor.h | |
| parent | bb7da966b801a2884cd7cf47f640bf7ac7d775df (diff) | |
| download | qt-creator-c6358e5d380c18f3ebff148a095ddf3a9d6b266c.tar.gz | |
C++: Add utf16 indices to Macro and Document::MacroUse
In most cases we need to work with the utf16 indices. Only in
cppfindreferences the byte interface is still needed since there we read
in files and work on a QByteArray to save memory.
Change-Id: I6ef6a93fc1875a8c9a305c075d51a9ca034c41bb
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpppreprocessor.h')
| -rw-r--r-- | src/plugins/cpptools/cpppreprocessor.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/plugins/cpptools/cpppreprocessor.h b/src/plugins/cpptools/cpppreprocessor.h index f8b076be8a..a250074f94 100644 --- a/src/plugins/cpptools/cpppreprocessor.h +++ b/src/plugins/cpptools/cpppreprocessor.h @@ -64,19 +64,21 @@ protected: void mergeEnvironment(CPlusPlus::Document::Ptr doc); virtual void macroAdded(const CPlusPlus::Macro ¯o); - virtual void passedMacroDefinitionCheck(unsigned offset, unsigned line, - const CPlusPlus::Macro ¯o); - virtual void failedMacroDefinitionCheck(unsigned offset, const CPlusPlus::ByteArrayRef &name); - virtual void notifyMacroReference(unsigned offset, unsigned line, - const CPlusPlus::Macro ¯o); - virtual void startExpandingMacro(unsigned offset, + virtual void passedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset, + unsigned line, const CPlusPlus::Macro ¯o); + virtual void failedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charOffset, + const CPlusPlus::ByteArrayRef &name); + virtual void notifyMacroReference(unsigned bytesOffset, unsigned utf16charOffset, + unsigned line, const CPlusPlus::Macro ¯o); + virtual void startExpandingMacro(unsigned bytesOffset, + unsigned utf16charOffset, unsigned line, const CPlusPlus::Macro ¯o, const QVector<CPlusPlus::MacroArgumentReference> &actuals); - virtual void stopExpandingMacro(unsigned offset, const CPlusPlus::Macro ¯o); + virtual void stopExpandingMacro(unsigned bytesOffset, const CPlusPlus::Macro ¯o); virtual void markAsIncludeGuard(const QByteArray ¯oName); - virtual void startSkippingBlocks(unsigned offset); - virtual void stopSkippingBlocks(unsigned offset); + virtual void startSkippingBlocks(unsigned utf16charsOffset); + virtual void stopSkippingBlocks(unsigned utf16charsOffset); virtual void sourceNeeded(unsigned line, const QString &fileName, IncludeType type); private: |