From c6358e5d380c18f3ebff148a095ddf3a9d6b266c Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@digia.com>
Date: Fri, 9 May 2014 10:04:13 -0400
Subject: 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>
---
 src/plugins/cpptools/cpppreprocessor.h | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/plugins/cpptools/cpppreprocessor.h')

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 &macro);
-    virtual void passedMacroDefinitionCheck(unsigned offset, unsigned line,
-                                            const CPlusPlus::Macro &macro);
-    virtual void failedMacroDefinitionCheck(unsigned offset, const CPlusPlus::ByteArrayRef &name);
-    virtual void notifyMacroReference(unsigned offset, unsigned line,
-                                      const CPlusPlus::Macro &macro);
-    virtual void startExpandingMacro(unsigned offset,
+    virtual void passedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset,
+                                            unsigned line, const CPlusPlus::Macro &macro);
+    virtual void failedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charOffset,
+                                            const CPlusPlus::ByteArrayRef &name);
+    virtual void notifyMacroReference(unsigned bytesOffset, unsigned utf16charOffset,
+                                      unsigned line, const CPlusPlus::Macro &macro);
+    virtual void startExpandingMacro(unsigned bytesOffset,
+                                     unsigned utf16charOffset,
                                      unsigned line,
                                      const CPlusPlus::Macro &macro,
                                      const QVector<CPlusPlus::MacroArgumentReference> &actuals);
-    virtual void stopExpandingMacro(unsigned offset, const CPlusPlus::Macro &macro);
+    virtual void stopExpandingMacro(unsigned bytesOffset, const CPlusPlus::Macro &macro);
     virtual void markAsIncludeGuard(const QByteArray &macroName);
-    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:
-- 
cgit v1.2.1