whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QTextStream: Use casts instead of Q_UINT64_C for negative values cast to quint64 

Q_UINT64_C appends a literal, which causes warnings:
tst_qtextstream.cpp(2026): warning C4146: unary minus operator applied to unsigned type, result still unsigned
tst_qtextstream.cpp(2030): warning C4146: unary minus operator applied to unsigned type, result still unsigned
tst_qtextstream.cpp(2031): warning C4146: unary minus operator applied to unsigned type, result still unsigned
tst_qtextstream.cpp(2032): warning C4146: unary minus operator applied to unsigned type, result still unsigned
tst_qtextstream.cpp(2289): warning C4146: unary minus operator applied to unsigned type, result still unsigned
tst_qtextstream.cpp(2309): warning C4146: unary minus operator applied to unsigned type, result still unsigned
tst_qtextstream.cpp(2329): warning C4146: unary minus operator applied to unsigned type, result still unsigned
tst_qtextstream.cpp(2355): warning C4146: unary minus operator applied to unsigned type, result still unsigned
tst_qtextstream.cpp(2381): warning C4146: unary minus operator applied to unsigned type, result still unsigned
tst_qtextstream.cpp(2411): warning C4146: unary minus operator applied to unsigned type, result still unsigned

Change-Id: I69ac87c224b75aff059477362d8a317c7e766ec2
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
bb10
Friedemann Kleint 2016-11-30 11:16:38 +01:00
parent 5ac33fff0f
commit 0a2759e8f8
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
View File

@ -2023,13 +2023,13 @@ void tst_QTextStream::generateNaturalNumbersData(bool for_QString)
QTest::newRow("2147483648") << QByteArray("2147483648") << Q_UINT64_C(2147483648);
QTest::newRow("-2147483646") << QByteArray("-2147483646") << qulonglong(-2147483646);
QTest::newRow("-2147483647") << QByteArray("-2147483647") << qulonglong(-2147483647);
QTest::newRow("-2147483648") << QByteArray("-2147483648") << Q_UINT64_C(-2147483648);
QTest::newRow("-2147483648") << QByteArray("-2147483648") << quint64(-2147483648LL);
QTest::newRow("4294967296") << QByteArray("4294967296") << Q_UINT64_C(4294967296);
QTest::newRow("4294967297") << QByteArray("4294967297") << Q_UINT64_C(4294967297);
QTest::newRow("4294967298") << QByteArray("4294967298") << Q_UINT64_C(4294967298);
QTest::newRow("-4294967296") << QByteArray("-4294967296") << Q_UINT64_C(-4294967296);
QTest::newRow("-4294967297") << QByteArray("-4294967297") << Q_UINT64_C(-4294967297);
QTest::newRow("-4294967298") << QByteArray("-4294967298") << Q_UINT64_C(-4294967298);
QTest::newRow("-4294967296") << QByteArray("-4294967296") << quint64(-4294967296);
QTest::newRow("-4294967297") << QByteArray("-4294967297") << quint64(-4294967297);
QTest::newRow("-4294967298") << QByteArray("-4294967298") << quint64(-4294967298);
QTest::newRow("9223372036854775807") << QByteArray("9223372036854775807") << Q_UINT64_C(9223372036854775807);
QTest::newRow("9223372036854775808") << QByteArray("9223372036854775808") << Q_UINT64_C(9223372036854775808);
QTest::newRow("9223372036854775809") << QByteArray("9223372036854775809") << Q_UINT64_C(9223372036854775809);
@ -2286,7 +2286,7 @@ void tst_QTextStream::signedShort_write_operator_ToDevice_data()
QTest::newRow("0") << Q_UINT64_C(0) << QByteArray("0") << QByteArray("0");
QTest::newRow("1") << Q_UINT64_C(1) << QByteArray("1") << QByteArray("1");
QTest::newRow("-1") << Q_UINT64_C(-1) << QByteArray("-1") << QByteArray("-1");
QTest::newRow("-1") << quint64(-1) << QByteArray("-1") << QByteArray("-1");
QTest::newRow("32767") << Q_UINT64_C(32767) << QByteArray("32767") << QByteArray("32,767");
QTest::newRow("32768") << Q_UINT64_C(32768) << QByteArray("-32768") << QByteArray("-32,768");
QTest::newRow("32769") << Q_UINT64_C(32769) << QByteArray("-32767") << QByteArray("-32,767");
@ -2306,7 +2306,7 @@ void tst_QTextStream::unsignedShort_write_operator_ToDevice_data()
QTest::newRow("0") << Q_UINT64_C(0) << QByteArray("0") << QByteArray("0");
QTest::newRow("1") << Q_UINT64_C(1) << QByteArray("1") << QByteArray("1");
QTest::newRow("-1") << Q_UINT64_C(-1) << QByteArray("65535") << QByteArray("65,535");
QTest::newRow("-1") << quint64(-1) << QByteArray("65535") << QByteArray("65,535");
QTest::newRow("32767") << Q_UINT64_C(32767) << QByteArray("32767") << QByteArray("32,767");
QTest::newRow("32768") << Q_UINT64_C(32768) << QByteArray("32768") << QByteArray("32,768");
QTest::newRow("32769") << Q_UINT64_C(32769) << QByteArray("32769") << QByteArray("32,769");
@ -2326,7 +2326,7 @@ void tst_QTextStream::signedInt_write_operator_ToDevice_data()
QTest::newRow("0") << Q_UINT64_C(0) << QByteArray("0") << QByteArray("0");
QTest::newRow("1") << Q_UINT64_C(1) << QByteArray("1") << QByteArray("1");
QTest::newRow("-1") << Q_UINT64_C(-1) << QByteArray("-1") << QByteArray("-1");
QTest::newRow("-1") << quint64(-1) << QByteArray("-1") << QByteArray("-1");
QTest::newRow("32767") << Q_UINT64_C(32767) << QByteArray("32767") << QByteArray("32,767");
QTest::newRow("32768") << Q_UINT64_C(32768) << QByteArray("32768") << QByteArray("32,768");
QTest::newRow("32769") << Q_UINT64_C(32769) << QByteArray("32769") << QByteArray("32,769");
@ -2352,7 +2352,7 @@ void tst_QTextStream::unsignedInt_write_operator_ToDevice_data()
QTest::newRow("0") << Q_UINT64_C(0) << QByteArray("0") << QByteArray("0");
QTest::newRow("1") << Q_UINT64_C(1) << QByteArray("1") << QByteArray("1");
QTest::newRow("-1") << Q_UINT64_C(-1) << QByteArray("4294967295") << QByteArray("4,294,967,295");
QTest::newRow("-1") << quint64(-1) << QByteArray("4294967295") << QByteArray("4,294,967,295");
QTest::newRow("32767") << Q_UINT64_C(32767) << QByteArray("32767") << QByteArray("32,767");
QTest::newRow("32768") << Q_UINT64_C(32768) << QByteArray("32768") << QByteArray("32,768");
QTest::newRow("32769") << Q_UINT64_C(32769) << QByteArray("32769") << QByteArray("32,769");
@ -2378,7 +2378,7 @@ void tst_QTextStream::qlonglong_write_operator_ToDevice_data()
QTest::newRow("0") << Q_UINT64_C(0) << QByteArray("0") << QByteArray("0");
QTest::newRow("1") << Q_UINT64_C(1) << QByteArray("1") << QByteArray("1");
QTest::newRow("-1") << Q_UINT64_C(-1) << QByteArray("-1") << QByteArray("-1");
QTest::newRow("-1") << quint64(-1) << QByteArray("-1") << QByteArray("-1");
QTest::newRow("32767") << Q_UINT64_C(32767) << QByteArray("32767") << QByteArray("32,767");
QTest::newRow("32768") << Q_UINT64_C(32768) << QByteArray("32768") << QByteArray("32,768");
QTest::newRow("32769") << Q_UINT64_C(32769) << QByteArray("32769") << QByteArray("32,769");
@ -2408,7 +2408,7 @@ void tst_QTextStream::qulonglong_write_operator_ToDevice_data()
QTest::newRow("0") << Q_UINT64_C(0) << QByteArray("0") << QByteArray("0");
QTest::newRow("1") << Q_UINT64_C(1) << QByteArray("1") << QByteArray("1");
QTest::newRow("-1") << Q_UINT64_C(-1) << QByteArray("18446744073709551615") << QByteArray("18,446,744,073,709,551,615");
QTest::newRow("-1") << quint64(-1) << QByteArray("18446744073709551615") << QByteArray("18,446,744,073,709,551,615");
QTest::newRow("32767") << Q_UINT64_C(32767) << QByteArray("32767") << QByteArray("32,767");
QTest::newRow("32768") << Q_UINT64_C(32768) << QByteArray("32768") << QByteArray("32,768");
QTest::newRow("32769") << Q_UINT64_C(32769) << QByteArray("32769") << QByteArray("32,769");