diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-04-24 09:00:54 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-04-25 16:54:12 +0200 |
commit | ab6e93144a1153e0b53c9470bbd17956944e2d01 (patch) | |
tree | 3f3f4bde31a1f200ea0a3e5286ef159dfc87fa3a | |
parent | 3c2ea40bbe5327ce6a56dcef64ff3a8fb263705c (diff) | |
download | qtmultimedia-ab6e93144a1153e0b53c9470bbd17956944e2d01.tar.gz |
Fix compiler warnings from mixing int and size_t
Since the internal datastructures in the tests use std::vector, we
cannot compare their size() to int literals without upsetting MSVC.
Change-Id: I4f657a8ca4081ac30da8a438c89b829e1856f914
Reviewed-by: Doris Verria <doris.verria@qt.io>
-rw-r--r-- | tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp | 6 | ||||
-rw-r--r-- | tests/auto/integration/qscreencapture_integration/tst_qscreencapture_integration.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp index 953a43fc8..091b5e9e3 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -1708,7 +1708,7 @@ void tst_QMediaPlayerBackend::finiteLoops() surface.waitForFrame(); QTRY_COMPARE(player.playbackState(), QMediaPlayer::StoppedState); - QCOMPARE(positionChangingIntervals(positionSpy).size(), 3); + QCOMPARE(positionChangingIntervals(positionSpy).size(), 3u); QCOMPARE(player.mediaStatus(), QMediaPlayer::EndOfMedia); } } @@ -1800,7 +1800,7 @@ void tst_QMediaPlayerBackend::seekOnLoops() auto intervals = positionChangingIntervals(positionSpy); - QCOMPARE(intervals.size(), 3); + QCOMPARE(intervals.size(), 3u); QCOMPARE_GT(intervals[0].first, 0); QCOMPARE(intervals[0].second, player.duration()); QCOMPARE(intervals[1], std::make_pair(qint64(0), player.duration())); @@ -1847,7 +1847,7 @@ void tst_QMediaPlayerBackend::changeLoopsOnTheFly() QCOMPARE(player.mediaStatus(), QMediaPlayer::EndOfMedia); auto intervals = positionChangingIntervals(positionSpy); - QCOMPARE(intervals.size(), 2); + QCOMPARE(intervals.size(), 2u); QCOMPARE(intervals[1], std::make_pair(qint64(0), player.duration())); } diff --git a/tests/auto/integration/qscreencapture_integration/tst_qscreencapture_integration.cpp b/tests/auto/integration/qscreencapture_integration/tst_qscreencapture_integration.cpp index fbd5c15df..72f38af43 100644 --- a/tests/auto/integration/qscreencapture_integration/tst_qscreencapture_integration.cpp +++ b/tests/auto/integration/qscreencapture_integration/tst_qscreencapture_integration.cpp @@ -482,7 +482,7 @@ void tst_QScreenCaptureIntegration::recordToFile() player.setPlaybackRate(10); player.play(); QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::EndOfMedia); - const int framesCount = sink.images().size(); + const size_t framesCount = sink.images().size(); // Find pixel point at center of widget int x = 415 * videoResolution.width() / screenSize.width(); @@ -490,7 +490,7 @@ void tst_QScreenCaptureIntegration::recordToFile() auto point = QPoint(x, y); // Verify color of first fourth of the video frames - for (int i = 0; i <= static_cast<int>(framesCount * 0.25); i++) { + for (size_t i = 0; i <= static_cast<size_t>(framesCount * 0.25); i++) { QImage image = sink.images().at(i); QVERIFY(!image.isNull()); QRgb rgb = image.pixel(point); @@ -503,7 +503,7 @@ void tst_QScreenCaptureIntegration::recordToFile() } // Verify color of last fourth of the video frames - for (int i = static_cast<int>(framesCount * 0.75); i < framesCount; i++) { + for (size_t i = static_cast<size_t>(framesCount * 0.75); i < framesCount; i++) { QImage image = sink.images().at(i); QVERIFY(!image.isNull()); QRgb rgb = image.pixel(point); |