diff options
author | hjk <hjk@qt.io> | 2019-07-24 18:40:10 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-07-26 09:23:48 +0000 |
commit | 7ab6783e24c6a05a67f319817cd1bdd026a7ce43 (patch) | |
tree | 8b56ea311d333f45f300b915c3bd25a2b77b4aef /src/plugins/cpptools/cppsourceprocessor.h | |
parent | eab0df22f98fab37585e4513de836a06e4aa05d5 (diff) | |
download | qt-creator-7ab6783e24c6a05a67f319817cd1bdd026a7ce43.tar.gz |
Standardize on int for line and column values
Recently tons of warnings show up for presumably "problematic"
singned <-> unsigned and size conversions.
The Qt side uses 'int', and that's the biggest 'integration surface'
for us, so instead of establishing some internal boundary between
signed and unsigned areas, push that boundary out of creator core code,
and use 'int' everywhere.
Because it reduces friction further, also do it in libcplusplus.
Change-Id: I84f3b79852c8029713e7ea6f133ffb9ef7030a70
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppsourceprocessor.h')
-rw-r--r-- | src/plugins/cpptools/cppsourceprocessor.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/cpptools/cppsourceprocessor.h b/src/plugins/cpptools/cppsourceprocessor.h index de6ea7928a..faa5a266c8 100644 --- a/src/plugins/cpptools/cppsourceprocessor.h +++ b/src/plugins/cpptools/cppsourceprocessor.h @@ -93,20 +93,20 @@ private: // Client interface void macroAdded(const CPlusPlus::Macro ¯o) override; - void passedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset, - unsigned line, const CPlusPlus::Macro ¯o) override; - void failedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charOffset, + void passedMacroDefinitionCheck(int bytesOffset, int utf16charsOffset, + int line, const CPlusPlus::Macro ¯o) override; + void failedMacroDefinitionCheck(int bytesOffset, int utf16charOffset, const CPlusPlus::ByteArrayRef &name) override; - void notifyMacroReference(unsigned bytesOffset, unsigned utf16charOffset, - unsigned line, const CPlusPlus::Macro ¯o) override; - void startExpandingMacro(unsigned bytesOffset, unsigned utf16charOffset, - unsigned line, const CPlusPlus::Macro ¯o, + void notifyMacroReference(int bytesOffset, int utf16charOffset, + int line, const CPlusPlus::Macro ¯o) override; + void startExpandingMacro(int bytesOffset, int utf16charOffset, + int line, const CPlusPlus::Macro ¯o, const QVector<CPlusPlus::MacroArgumentReference> &actuals) override; - void stopExpandingMacro(unsigned bytesOffset, const CPlusPlus::Macro ¯o) override; + void stopExpandingMacro(int bytesOffset, const CPlusPlus::Macro ¯o) override; void markAsIncludeGuard(const QByteArray ¯oName) override; - void startSkippingBlocks(unsigned utf16charsOffset) override; - void stopSkippingBlocks(unsigned utf16charsOffset) override; - void sourceNeeded(unsigned line, const QString &fileName, IncludeType type, + void startSkippingBlocks(int utf16charsOffset) override; + void stopSkippingBlocks(int utf16charsOffset) override; + void sourceNeeded(int line, const QString &fileName, IncludeType type, const QStringList &initialIncludes) override; private: |