1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GraphicsViewBenchmark: port from QList/Q_FOREACH to initializer_list/ranged-for

Browse Source 
This is more readable and at the same time helps to eradicate some
more Q_FOREACH uses for an eventual global QT_NO_FOREACH for all Qt
sources (QTBUG-115796).

Task-number: QTBUG-115803
Change-Id: I9cbe76bee8a6306fab0c0bc94cd874405ca825ba
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
This commit is contained in:
Marc Mutz 2023-08-05 19:15:17 +02:00
parent 11c2a5b477
commit 62312e6674
1 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/main.cpp
View File

@ -541,23 +541,11 @@ void tst_GraphicsViewBenchmark::update_data()
QTest::addColumn<bool>("subtreeCache");
QTest::addColumn<int>("rotationAngle");
QList<ListType> listTypes;
listTypes << Simple << Recycling;
QList<int> listSizes;
listSizes << 10 << 50 << 500;
QList<Theme::Themes> themes;
themes << Theme::Blue << Theme::Lime;
QList<int> rotationAngles;
rotationAngles << 0 << 90;
// Generate rows:
foreach (ListType listType, listTypes) {
foreach (int listSize, listSizes) {
foreach (int angle, rotationAngles) {
foreach (Theme::Themes theme, themes) {
for (ListType listType : {Simple, Recycling}) {
for (int listSize : {10, 50, 500}) {
for (int angle : {0, 90}) {
for (Theme::Themes theme : {Theme::Blue, Theme::Lime}) {
for (int toImage = 0; toImage < 2; ++toImage) {
for (int cache = 0; cache < 2; ++cache) {
QString string = rowString(listSize, listType, theme, toImage, cache, angle);
@ -613,27 +601,12 @@ void tst_GraphicsViewBenchmark::scroll_data()
QTest::addColumn<int>("rotationAngle");
QTest::addColumn<ScrollStep>("scrollStep");
QList<ListType> listTypes;
listTypes << Simple << Recycling;
QList<int> listSizes;
listSizes << 10 << 50 << 500;
QList<Theme::Themes> themes;
themes << Theme::Blue << Theme::Lime;
QList<int> rotationAngles;
rotationAngles << 0 << 90;
QList<ScrollStep> scrollSteps;
scrollSteps << Slow << Normal << Fast;
// Generate rows:
foreach (ListType listType, listTypes) {
foreach (int listSize, listSizes) {
foreach (int angle, rotationAngles) {
foreach (ScrollStep step, scrollSteps) {
foreach (Theme::Themes theme, themes) {
for (ListType listType : {Simple, Recycling}) {
for (int listSize : {10, 50, 500}) {
for (int angle : {0, 90}) {
for (ScrollStep step : {Slow, Normal, Fast}) {
for (Theme::Themes theme : {Theme::Blue, Theme::Lime}) {
for (int cache = 0; cache < 2; ++cache) {
QString string = rowString(listSize, listType, theme, cache, angle, step);
QTest::newRow(string.toLatin1()) << listSize << listType << theme