1 files changed, 16 insertions, 16 deletions

diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index 1c695a1113..b4140e1115 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -849,7 +849,7 @@ void tst_QFile::readAll()
 
     QByteArray a = file.readAll();
     file.reset();
-    QVERIFY(file.pos() == 0);
+    QCOMPARE(file.pos(), 0);
 
     QVERIFY(file.bytesAvailable() > 7);
     QByteArray b = file.read(1);
@@ -1195,7 +1195,7 @@ void tst_QFile::append()
     f.close();
 
     QVERIFY2(f.open(QIODevice::Append), msgOpenFailed(f).constData());
-    QVERIFY(f.pos() == 1);
+    QCOMPARE(f.pos(), 1);
     f.putChar('a');
     f.close();
     QCOMPARE(int(f.size()), 2);
@@ -2047,7 +2047,7 @@ void tst_QFile::longFileName()
         QString line = ts.readLine();
         QCOMPARE(line, fileName);
     }
-    QString newName = fileName + QLatin1String("1");
+    QString newName = fileName + QLatin1Char('1');
     {
         QVERIFY(QFile::copy(fileName, newName));
         QFile file(newName);
@@ -2224,7 +2224,7 @@ void tst_QFile::removeOpenFile()
         QVERIFY(removed);
         QVERIFY(!f.isOpen());
         QVERIFY(!f.exists());
-        QVERIFY(f.error() == QFile::NoError);
+        QCOMPARE(f.error(), QFile::NoError);
     }
 
     {
@@ -2251,7 +2251,7 @@ void tst_QFile::removeOpenFile()
         QVERIFY(removed);
         QVERIFY(!f.isOpen());
         QVERIFY(!f.exists());
-        QVERIFY(f.error() == QFile::NoError);
+        QCOMPARE(f.error(), QFile::NoError);
     }
 }
 
@@ -2819,13 +2819,13 @@ void tst_QFile::readEof()
         char buf[10];
         int ret = file.read(buf, sizeof buf);
         QCOMPARE(ret, 0);
-        QVERIFY(file.error() == QFile::NoError);
+        QCOMPARE(file.error(), QFile::NoError);
         QVERIFY(file.atEnd());
 
         // Do it again to ensure that we get the same result
         ret = file.read(buf, sizeof buf);
         QCOMPARE(ret, 0);
-        QVERIFY(file.error() == QFile::NoError);
+        QCOMPARE(file.error(), QFile::NoError);
         QVERIFY(file.atEnd());
     }
 
@@ -2840,13 +2840,13 @@ void tst_QFile::readEof()
 
         QByteArray ret = file.read(10);
         QVERIFY(ret.isEmpty());
-        QVERIFY(file.error() == QFile::NoError);
+        QCOMPARE(file.error(), QFile::NoError);
         QVERIFY(file.atEnd());
 
         // Do it again to ensure that we get the same result
         ret = file.read(10);
         QVERIFY(ret.isEmpty());
-        QVERIFY(file.error() == QFile::NoError);
+        QCOMPARE(file.error(), QFile::NoError);
         QVERIFY(file.atEnd());
     }
 
@@ -2862,13 +2862,13 @@ void tst_QFile::readEof()
         char buf[10];
         int ret = file.readLine(buf, sizeof buf);
         QCOMPARE(ret, -1);
-        QVERIFY(file.error() == QFile::NoError);
+        QCOMPARE(file.error(), QFile::NoError);
         QVERIFY(file.atEnd());
 
         // Do it again to ensure that we get the same result
         ret = file.readLine(buf, sizeof buf);
         QCOMPARE(ret, -1);
-        QVERIFY(file.error() == QFile::NoError);
+        QCOMPARE(file.error(), QFile::NoError);
         QVERIFY(file.atEnd());
     }
 
@@ -2883,13 +2883,13 @@ void tst_QFile::readEof()
 
         QByteArray ret = file.readLine();
         QVERIFY(ret.isNull());
-        QVERIFY(file.error() == QFile::NoError);
+        QCOMPARE(file.error(), QFile::NoError);
         QVERIFY(file.atEnd());
 
         // Do it again to ensure that we get the same result
         ret = file.readLine();
         QVERIFY(ret.isNull());
-        QVERIFY(file.error() == QFile::NoError);
+        QCOMPARE(file.error(), QFile::NoError);
         QVERIFY(file.atEnd());
     }
 
@@ -2904,12 +2904,12 @@ void tst_QFile::readEof()
 
         char c;
         QVERIFY(!file.getChar(&c));
-        QVERIFY(file.error() == QFile::NoError);
+        QCOMPARE(file.error(), QFile::NoError);
         QVERIFY(file.atEnd());
 
         // Do it again to ensure that we get the same result
         QVERIFY(!file.getChar(&c));
-        QVERIFY(file.error() == QFile::NoError);
+        QCOMPARE(file.error(), QFile::NoError);
         QVERIFY(file.atEnd());
     }
 }
@@ -2997,7 +2997,7 @@ void tst_QFile::map()
     memory = file.map(offset, size);
     QCOMPARE(file.error(), QFile::NoError);
     QVERIFY(memory);
-    QVERIFY(memory[0] == 'Q');
+    QCOMPARE(memory[0], uchar('Q'));
     QVERIFY(file.unmap(memory));
     QCOMPARE(file.error(), QFile::NoError);