From f4569d8bb066a6220ed6c4556254a6da0623b674 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@qt.io>
Date: Wed, 15 Mar 2017 14:45:44 +0100
Subject: qdoc: Fix signed vs unsigned comparisons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes several cases where QChar was compared to -1.

Change-Id: Ib7a0fec0f1e266ba47545296549e482592624ecc
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 src/qdoc/cppcodemarker.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/qdoc/cppcodemarker.cpp')

diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/cppcodemarker.cpp
index 387f2ac74..0f1137fa8 100644
--- a/src/qdoc/cppcodemarker.cpp
+++ b/src/qdoc/cppcodemarker.cpp
@@ -926,7 +926,7 @@ QString CppCodeMarker::addMarkUp(const QString &in,
 
     readChar();
 
-    while (ch != EOF) {
+    while (ch != QChar(EOF)) {
         QString tag;
         bool target = false;
 
@@ -985,7 +985,7 @@ QString CppCodeMarker::addMarkUp(const QString &in,
                 finish = i;
                 readChar();
 
-                while (ch != EOF && ch != '"') {
+                while (ch != QChar(EOF) && ch != '"') {
                     if (ch == '\\')
                         readChar();
                     readChar();
@@ -997,7 +997,7 @@ QString CppCodeMarker::addMarkUp(const QString &in,
             case '#':
                 finish = i;
                 readChar();
-                while (ch != EOF && ch != '\n') {
+                while (ch != QChar(EOF) && ch != '\n') {
                     if (ch == '\\')
                         readChar();
                     finish = i;
@@ -1009,7 +1009,7 @@ QString CppCodeMarker::addMarkUp(const QString &in,
                 finish = i;
                 readChar();
 
-                while (ch != EOF && ch != '\'') {
+                while (ch != QChar(EOF) && ch != '\'') {
                     if (ch == '\\')
                         readChar();
                     readChar();
@@ -1044,7 +1044,7 @@ QString CppCodeMarker::addMarkUp(const QString &in,
                     do {
                         finish = i;
                         readChar();
-                    } while (ch != EOF && ch != '\n');
+                    } while (ch != QChar(EOF) && ch != '\n');
                     tag = QStringLiteral("comment");
                 } else if (ch == '*') {
                     bool metAster = false;
@@ -1054,7 +1054,7 @@ QString CppCodeMarker::addMarkUp(const QString &in,
                     readChar();
 
                     while (!metAsterSlash) {
-                        if (ch == EOF)
+                        if (ch == QChar(EOF))
                             break;
 
                         if (ch == '*')
-- 
cgit v1.2.1