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

tst_QMainWindow: port away from Q_FOREACH

Browse Source 
These are all trivial: all are over (already or newly-made) const
local variables.

As a drive-by, replace a QList with a C array
("never use a dynamically-sized container for statically-sized data").

Task-number: QTBUG-115803
Change-Id: I1b1e8f093abf75093900631e6fe3cbc9e3019d34
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 6f5f10bea80eb9439a1498e7a19d8631fc791ed3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-08-05 10:43:43 +02:00 committed by Qt Cherry-pick Bot
parent 0136720e52
commit 55e5ab8d57
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
View File

@ -1358,12 +1358,13 @@ void tst_QMainWindow::restoreState()
//tests the restoration of the previous versions of window settings //tests the restoration of the previous versions of window settings
void tst_QMainWindow::restoreStateFromPreviousVersion() void tst_QMainWindow::restoreStateFromPreviousVersion()
{ {
QList<QByteArray> restoreData; const QByteArray restoreData[] = {
restoreData << QByteArray((char*)restoreData41, sizeof(restoreData41)) QByteArray((char*)restoreData41, sizeof(restoreData41)),
<< QByteArray((char*)restoreData42, sizeof(restoreData42)) QByteArray((char*)restoreData42, sizeof(restoreData42)),
<< QByteArray((char*)restoreData43, sizeof(restoreData43)); QByteArray((char*)restoreData43, sizeof(restoreData43)),
};
foreach(QByteArray ba, restoreData) { for (const QByteArray &ba : restoreData) {
QMainWindow win; QMainWindow win;
win.setCentralWidget(new QTextEdit); win.setCentralWidget(new QTextEdit);
@ -1671,8 +1672,8 @@ void MoveSeparator::apply(QMainWindow *mw) const
QMap<QString, QRect> dockWidgetGeometries(QMainWindow *mw) QMap<QString, QRect> dockWidgetGeometries(QMainWindow *mw)
{ {
QMap<QString, QRect> result; QMap<QString, QRect> result;
QList<QDockWidget*> dockWidgets = mw->findChildren<QDockWidget*>(); const QList<QDockWidget*> dockWidgets = mw->findChildren<QDockWidget*>();
foreach (QDockWidget *dw, dockWidgets) for (QDockWidget *dw : dockWidgets)
result.insert(dw->objectName(), dw->geometry()); result.insert(dw->objectName(), dw->geometry());
return result; return result;
} }
@ -1682,8 +1683,8 @@ QMap<QString, QRect> dockWidgetGeometries(QMainWindow *mw)
QMap<QString, QRect> _v_oldGeos = _oldGeos; \ QMap<QString, QRect> _v_oldGeos = _oldGeos; \
QMap<QString, QRect> _v_newGeos = _newGeos; \ QMap<QString, QRect> _v_newGeos = _newGeos; \
QCOMPARE(_v_newGeos.keys(), _v_oldGeos.keys()); \ QCOMPARE(_v_newGeos.keys(), _v_oldGeos.keys()); \
QStringList _v_keys = _v_newGeos.keys(); \ const QStringList _v_keys = _v_newGeos.keys(); \
foreach (const QString &key, _v_keys) { \ for (const QString &key : _v_keys) { \
QRect _v_r1 = _v_oldGeos[key]; \ QRect _v_r1 = _v_oldGeos[key]; \
QRect _v_r2 = _v_newGeos[key]; \ QRect _v_r2 = _v_newGeos[key]; \
if (_v_r1 != _v_r2) \ if (_v_r1 != _v_r2) \
@ -1735,8 +1736,8 @@ void tst_QMainWindow::saveRestore_data()
#ifdef QT_BUILD_INTERNAL #ifdef QT_BUILD_INTERNAL
void tst_QMainWindow::saveRestore() void tst_QMainWindow::saveRestore()
{ {
QFETCH(AddList, addList); QFETCH(const AddList, addList);
QFETCH(MoveList, moveList); QFETCH(const MoveList, moveList);
QByteArray stateData; QByteArray stateData;
QMap<QString, QRect> dockWidgetGeos; QMap<QString, QRect> dockWidgetGeos;
@ -1748,12 +1749,12 @@ void tst_QMainWindow::saveRestore()
QTextEdit centralWidget("The rain in Spain falls mainly on the plains"); QTextEdit centralWidget("The rain in Spain falls mainly on the plains");
mainWindow.setCentralWidget(&centralWidget); mainWindow.setCentralWidget(&centralWidget);
foreach (const AddDockWidget &adw, addList) for (const AddDockWidget &adw : addList)
adw.apply(&mainWindow); adw.apply(&mainWindow);
mainWindow.show(); mainWindow.show();
foreach (const MoveSeparator &ms, moveList) for (const MoveSeparator &ms : moveList)
ms.apply(&mainWindow); ms.apply(&mainWindow);
dockWidgetGeos = dockWidgetGeometries(&mainWindow); dockWidgetGeos = dockWidgetGeometries(&mainWindow);
@ -1771,7 +1772,7 @@ void tst_QMainWindow::saveRestore()
QTextEdit centralWidget("The rain in Spain falls mainly on the plains"); QTextEdit centralWidget("The rain in Spain falls mainly on the plains");
mainWindow.setCentralWidget(&centralWidget); mainWindow.setCentralWidget(&centralWidget);
foreach (const AddDockWidget &adw, addList) for (const AddDockWidget &adw : addList)
adw.apply(&mainWindow); adw.apply(&mainWindow);
mainWindow.show(); mainWindow.show();
@ -1788,7 +1789,7 @@ void tst_QMainWindow::saveRestore()
QTextEdit centralWidget("The rain in Spain falls mainly on the plains"); QTextEdit centralWidget("The rain in Spain falls mainly on the plains");
mainWindow.setCentralWidget(&centralWidget); mainWindow.setCentralWidget(&centralWidget);
foreach (const AddDockWidget &adw, addList) for (const AddDockWidget &adw : addList)
adw.apply(&mainWindow); adw.apply(&mainWindow);
mainWindow.resize(size); mainWindow.resize(size);
mainWindow.restoreState(stateData); mainWindow.restoreState(stateData);
@ -2096,10 +2097,11 @@ void tst_QMainWindow::resizeDocks()
mw.setDockNestingEnabled(true); mw.setDockNestingEnabled(true);
mw.resize(1800, 600); mw.resize(1800, 600);
foreach (const AddDockWidget &i, addList) for (const AddDockWidget &i : std::as_const(addList))
i.apply(&mw); i.apply(&mw);
foreach (QDockWidget *dw, mw.findChildren<QDockWidget *>()) const auto dockWidgets = mw.findChildren<QDockWidget *>();
for (QDockWidget *dw : dockWidgets)
dw->setStyleSheet( "* { background-color: " + dw->objectName() +" }"); dw->setStyleSheet( "* { background-color: " + dw->objectName() +" }");
mw.setCentralWidget(new QTextEdit); mw.setCentralWidget(new QTextEdit);
@ -2108,11 +2110,11 @@ void tst_QMainWindow::resizeDocks()
QVERIFY(QTest::qWaitForWindowExposed(&mw)); QVERIFY(QTest::qWaitForWindowExposed(&mw));
QFETCH(Qt::Orientation, orientation); QFETCH(Qt::Orientation, orientation);
QFETCH(QStringList, docks); QFETCH(const QStringList, docks);
QFETCH(QList<int>, sizes); QFETCH(QList<int>, sizes);
QList<QDockWidget *> list; QList<QDockWidget *> list;
foreach (const QString &name, docks) { for (const QString &name : docks) {
QDockWidget *d = mw.findChild<QDockWidget *>(name); QDockWidget *d = mw.findChild<QDockWidget *>(name);
QVERIFY(d); QVERIFY(d);
list << d; list << d;