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>

5 files changed, 24 insertions, 24 deletions

diff --git a/tests/unit/mockup/texteditor/semantichighlighter.h b/tests/unit/mockup/texteditor/semantichighlighter.h
index 323a48347c..94fdfecb9f 100644
--- a/tests/unit/mockup/texteditor/semantichighlighter.h
+++ b/tests/unit/mockup/texteditor/semantichighlighter.h
@@ -31,9 +31,9 @@ namespace TextEditor {
 
 class HighlightingResult {
 public:
-    unsigned line;
-    unsigned column;
-    unsigned length;
+    int line;
+    int column;
+    int length;
     TextStyles textStyles;
     int kind;
     bool useTextSyles;
@@ -48,11 +48,11 @@ public:
         : line(0), column(0), length(0), kind(0)
     {}
 
-    HighlightingResult(unsigned line, unsigned column, unsigned length, int kind)
+    HighlightingResult(int line, int column, int length, int kind)
         : line(line), column(column), length(length), kind(kind), useTextSyles(false)
     {}
 
-    HighlightingResult(unsigned line, unsigned column, unsigned length, TextStyles textStyles)
+    HighlightingResult(int line, int column, int length, TextStyles textStyles)
         : line(line), column(column), length(length), textStyles(textStyles), useTextSyles(true)
     {}
 
diff --git a/tests/unit/unittest/clangtranslationunit-test.cpp b/tests/unit/unittest/clangtranslationunit-test.cpp
index 2cb936c999..52fd447e98 100644
--- a/tests/unit/unittest/clangtranslationunit-test.cpp
+++ b/tests/unit/unittest/clangtranslationunit-test.cpp
@@ -53,8 +53,8 @@ protected:
 
     DiagnosticContainer createDiagnostic(const QString &text,
                                          ClangBackEnd::DiagnosticSeverity severity,
-                                         uint line,
-                                         uint column,
+                                         int line,
+                                         int column,
                                          const QString &filePath) const;
     QVector<DiagnosticContainer> diagnosticsFromMainFile() const;
     QVector<DiagnosticContainer> errorDiagnosticsFromHeaders() const;
@@ -141,8 +141,8 @@ void TranslationUnit::reparse()
 
 DiagnosticContainer TranslationUnit::createDiagnostic(const QString &text,
                                                       ClangBackEnd::DiagnosticSeverity severity,
-                                                      uint line,
-                                                      uint column,
+                                                      int line,
+                                                      int column,
                                                       const QString &filePath) const
 {
     return DiagnosticContainer(
diff --git a/tests/unit/unittest/fixit-test.cpp b/tests/unit/unittest/fixit-test.cpp
index 0063dc27fc..0d64107d09 100644
--- a/tests/unit/unittest/fixit-test.cpp
+++ b/tests/unit/unittest/fixit-test.cpp
@@ -108,17 +108,17 @@ TEST_F(FixIt, Text)
 TEST_F(FixIt, DISABLED_ON_WINDOWS(Start))
 {
     ASSERT_THAT(fixIt.range().start(), IsSourceLocation(Utf8StringLiteral("diagnostic_semicolon_fixit.cpp"),
-                                                        3u,
-                                                        13u,
-                                                        29u));
+                                                        3,
+                                                        13,
+                                                        29));
 }
 
 TEST_F(FixIt, DISABLED_ON_WINDOWS(End))
 {
     ASSERT_THAT(fixIt.range().end(), IsSourceLocation(Utf8StringLiteral("diagnostic_semicolon_fixit.cpp"),
-                                                      3u,
-                                                      13u,
-                                                      29u));
+                                                      3,
+                                                      13,
+                                                      29));
 }
 
 void FixIt::SetUpTestCase()
diff --git a/tests/unit/unittest/skippedsourceranges-test.cpp b/tests/unit/unittest/skippedsourceranges-test.cpp
index fd95dc4779..c91f726437 100644
--- a/tests/unit/unittest/skippedsourceranges-test.cpp
+++ b/tests/unit/unittest/skippedsourceranges-test.cpp
@@ -71,9 +71,9 @@ MATCHER_P4(IsSourceLocation, filePath, line, column, offset,
            )
 {
     if (!arg.filePath().endsWith(filePath)
-     || arg.line() != uint(line)
-     || arg.column() != uint(column)
-     || arg.offset() != uint(offset)) {
+     || arg.line() != line
+     || arg.column() != column
+     || arg.offset() != offset) {
         return false;
     }
 
diff --git a/tests/unit/unittest/sourcerange-test.cpp b/tests/unit/unittest/sourcerange-test.cpp
index 1b2b44a8f9..26c7a5a422 100644
--- a/tests/unit/unittest/sourcerange-test.cpp
+++ b/tests/unit/unittest/sourcerange-test.cpp
@@ -125,17 +125,17 @@ TEST_F(SourceRange, Size)
 TEST_F(SourceRange, DISABLED_ON_WINDOWS(Start))
 {
     ASSERT_THAT(sourceRange.start(), IsSourceLocation(Utf8StringLiteral("diagnostic_source_range.cpp"),
-                                                      8u,
-                                                      5u,
-                                                      43u));
+                                                      8,
+                                                      5,
+                                                      43));
 }
 
 TEST_F(SourceRange, DISABLED_ON_WINDOWS(End))
 {
     ASSERT_THAT(sourceRange.end(), IsSourceLocation(Utf8StringLiteral("diagnostic_source_range.cpp"),
-                                                      8u,
-                                                      6u,
-                                                      44u));
+                                                      8,
+                                                      6,
+                                                      44));
 }
 
 TEST_F(SourceRange, Create)