AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QMenu: Eradicate Q_FOREACH loops

Browse Source 
In two cases, we now detach. ¯\_(ツ)_/¯  This is test code.

Change-Id: I244f5e20dd923281049f38b76366163c16b6498c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Marc Mutz 2019-07-31 13:12:47 +03:00
parent 6e8dd46a6f
commit a2c18fd10c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
View File

@ -610,7 +610,7 @@ void tst_QMenu::widgetActionFocus()
static QMenu *getTornOffMenu() static QMenu *getTornOffMenu()
{ {
foreach (QWidget *w, QApplication::allWidgets()) { for (QWidget *w : QApplication::allWidgets()) {
if (w->isVisible() && w->inherits("QTornOffMenu")) if (w->isVisible() && w->inherits("QTornOffMenu"))
return static_cast<QMenu *>(w); return static_cast<QMenu *>(w);
} }
@ -948,8 +948,7 @@ void tst_QMenu::menuSizeHint()
{ {
QMenu menu; QMenu menu;
//this is a list of arbitrary strings so that we check the geometry //this is a list of arbitrary strings so that we check the geometry
QStringList list = QStringList() << "trer" << "ezrfgtgvqd" << "sdgzgzerzerzer" << "eerzertz" << "er"; for (auto str : {"trer", "ezrfgtgvqd", "sdgzgzerzerzer", "eerzertz", "er"})
foreach (QString str, list)
menu.addAction(str); menu.addAction(str);
int left, top, right, bottom; int left, top, right, bottom;
@ -960,7 +959,7 @@ void tst_QMenu::menuSizeHint()
int maxWidth =0; int maxWidth =0;
QRect result; QRect result;
foreach (QAction *action, menu.actions()) { for (QAction *action : menu.actions()) {
maxWidth = qMax(maxWidth, menu.actionGeometry(action).width()); maxWidth = qMax(maxWidth, menu.actionGeometry(action).width());
result |= menu.actionGeometry(action); result |= menu.actionGeometry(action);
QCOMPARE(result.x(), left + hmargin + panelWidth); QCOMPARE(result.x(), left + hmargin + panelWidth);