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/cppeditor/cpphighlighter.cpp | |
parent | eab0df22f98fab37585e4513de836a06e4aa05d5 (diff) |
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/cppeditor/cpphighlighter.cpp')
-rw-r--r-- | src/plugins/cppeditor/cpphighlighter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cppeditor/cpphighlighter.cpp b/src/plugins/cppeditor/cpphighlighter.cpp index a7531acf1e..681ba51ce3 100644 --- a/src/plugins/cppeditor/cpphighlighter.cpp +++ b/src/plugins/cppeditor/cpphighlighter.cpp @@ -86,7 +86,7 @@ void CppHighlighter::highlightBlock(const QString &text) return; } - const unsigned firstNonSpace = tokens.first().utf16charsBegin(); + const int firstNonSpace = tokens.first().utf16charsBegin(); Parentheses parentheses; parentheses.reserve(5); @@ -97,7 +97,7 @@ void CppHighlighter::highlightBlock(const QString &text) for (int i = 0; i < tokens.size(); ++i) { const Token &tk = tokens.at(i); - unsigned previousTokenEnd = 0; + int previousTokenEnd = 0; if (i != 0) { // mark the whitespaces previousTokenEnd = tokens.at(i - 1).utf16charsBegin() + |