From cff2b83b108c389bd9cdde0d2cfa2401bdc5ffe8 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 24 Jan 2014 15:36:04 +0100 Subject: Fix MSVC 64bit warnings about int64 truncation in tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic98090dbc7e320df652a60fc67a5291c60f7796a Reviewed-by: Jędrzej Nowacki --- tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp | 2 +- tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp | 6 +++--- tests/shared/filesystem.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp index d3a8bcfd13..28519e1161 100644 --- a/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp +++ b/tests/auto/corelib/io/qurlinternal/tst_qurlinternal.cpp @@ -1040,7 +1040,7 @@ void tst_QUrlInternal::encodingRecodeInvalidUtf8() output = QTest::currentDataTag(); if (!qt_urlRecode(output, input.constData(), input.constData() + input.length(), QUrl::FullyEncoded)) output += input; - for (int i = strlen(QTest::currentDataTag()); i < output.length(); ++i) { + for (int i = int(strlen(QTest::currentDataTag())); i < output.length(); ++i) { QVERIFY2(output.at(i).unicode() < 0x80 || output.at(i) == QChar::ReplacementCharacter, qPrintable(QString("Character at i == %1 was U+%2").arg(i).arg(output.at(i).unicode(), 4, 16, QLatin1Char('0')))); } diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp index 621b5811f9..a8732e0ce0 100644 --- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp +++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp @@ -469,7 +469,7 @@ void tst_QArrayData::simpleVector() for (int i = 0; i < 60; ++i) QCOMPARE(v1[i], v8[i % 10]); - v1.insert(v1.size(), v6.constBegin(), v6.constEnd()); + v1.insert(int(v1.size()), v6.constBegin(), v6.constEnd()); // v1 is now [ 0..9 x 6, 0..9 x 3 ] QCOMPARE(v1.size(), size_t(90)); @@ -1235,7 +1235,7 @@ void tst_QArrayData::arrayOps2() vo.resize(10); for (size_t i = 7; i < 10; ++i) { - vi[i] = i; + vi[i] = int(i); vs[i] = QString::number(i); QCOMPARE(vo[i].id, i); @@ -1727,7 +1727,7 @@ void tst_QArrayData::grow() // Going element-wise is slow under valgrind if (previousCapacity - i > 10) { i = previousCapacity - 5; - vector.back() = -i; + vector.back() = -int(i); vector.resize(i); // It's still not the time to re-allocate diff --git a/tests/shared/filesystem.h b/tests/shared/filesystem.h index a68130a324..2082128a09 100644 --- a/tests/shared/filesystem.h +++ b/tests/shared/filesystem.h @@ -133,7 +133,7 @@ public: memset( reparseInfo, 0, sizeof( *reparseInfo )); reparseInfo->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; - reparseInfo->ReparseTargetLength = DWORD(target.size() * sizeof(wchar_t)); + reparseInfo->ReparseTargetLength = WORD(target.size()) * WORD(sizeof(wchar_t)); reparseInfo->ReparseTargetMaximumLength = reparseInfo->ReparseTargetLength + sizeof(wchar_t); target.toWCharArray(reparseInfo->ReparseTarget); reparseInfo->ReparseDataLength = reparseInfo->ReparseTargetLength + 12; -- cgit v1.2.3