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.cpp | |
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.cpp')
-rw-r--r-- | src/plugins/cpptools/cppsourceprocessor.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/cpptools/cppsourceprocessor.cpp b/src/plugins/cpptools/cppsourceprocessor.cpp index 35a0ccf529..7f232c1ad7 100644 --- a/src/plugins/cpptools/cppsourceprocessor.cpp +++ b/src/plugins/cpptools/cppsourceprocessor.cpp @@ -324,8 +324,8 @@ void CppSourceProcessor::macroAdded(const CPlusPlus::Macro ¯o) m_currentDoc->appendMacro(macro); } -void CppSourceProcessor::passedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset, - unsigned line, const CPlusPlus::Macro ¯o) +void CppSourceProcessor::passedMacroDefinitionCheck(int bytesOffset, int utf16charsOffset, + int line, const CPlusPlus::Macro ¯o) { if (!m_currentDoc) return; @@ -336,7 +336,7 @@ void CppSourceProcessor::passedMacroDefinitionCheck(unsigned bytesOffset, unsign line, QVector<MacroArgumentReference>()); } -void CppSourceProcessor::failedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charOffset, +void CppSourceProcessor::failedMacroDefinitionCheck(int bytesOffset, int utf16charOffset, const ByteArrayRef &name) { if (!m_currentDoc) @@ -346,8 +346,8 @@ void CppSourceProcessor::failedMacroDefinitionCheck(unsigned bytesOffset, unsign bytesOffset, utf16charOffset); } -void CppSourceProcessor::notifyMacroReference(unsigned bytesOffset, unsigned utf16charOffset, - unsigned line, const CPlusPlus::Macro ¯o) +void CppSourceProcessor::notifyMacroReference(int bytesOffset, int utf16charOffset, + int line, const CPlusPlus::Macro ¯o) { if (!m_currentDoc) return; @@ -358,8 +358,8 @@ void CppSourceProcessor::notifyMacroReference(unsigned bytesOffset, unsigned utf line, QVector<MacroArgumentReference>()); } -void CppSourceProcessor::startExpandingMacro(unsigned bytesOffset, unsigned utf16charOffset, - unsigned line, const CPlusPlus::Macro ¯o, +void CppSourceProcessor::startExpandingMacro(int bytesOffset, int utf16charOffset, + int line, const CPlusPlus::Macro ¯o, const QVector<MacroArgumentReference> &actuals) { if (!m_currentDoc) @@ -371,7 +371,7 @@ void CppSourceProcessor::startExpandingMacro(unsigned bytesOffset, unsigned utf1 line, actuals); } -void CppSourceProcessor::stopExpandingMacro(unsigned, const CPlusPlus::Macro &) +void CppSourceProcessor::stopExpandingMacro(int, const CPlusPlus::Macro &) { if (!m_currentDoc) return; @@ -409,19 +409,19 @@ void CppSourceProcessor::mergeEnvironment(Document::Ptr doc) m_env.addMacros(doc->definedMacros()); } -void CppSourceProcessor::startSkippingBlocks(unsigned utf16charsOffset) +void CppSourceProcessor::startSkippingBlocks(int utf16charsOffset) { if (m_currentDoc) m_currentDoc->startSkippingBlocks(utf16charsOffset); } -void CppSourceProcessor::stopSkippingBlocks(unsigned utf16charsOffset) +void CppSourceProcessor::stopSkippingBlocks(int utf16charsOffset) { if (m_currentDoc) m_currentDoc->stopSkippingBlocks(utf16charsOffset); } -void CppSourceProcessor::sourceNeeded(unsigned line, const QString &fileName, IncludeType type, +void CppSourceProcessor::sourceNeeded(int line, const QString &fileName, IncludeType type, const QStringList &initialIncludes) { if (fileName.isEmpty()) |