1 files changed, 9 insertions, 12 deletions

diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 3bfbe754ef..9c40c0bd57 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -610,7 +610,7 @@ void tst_QMenu::widgetActionFocus()
 
 static QMenu *getTornOffMenu()
 {
-    foreach (QWidget *w, QApplication::allWidgets()) {
+    for (QWidget *w : QApplication::allWidgets()) {
         if (w->isVisible() && w->inherits("QTornOffMenu"))
             return static_cast<QMenu *>(w);
     }
@@ -948,30 +948,28 @@ void tst_QMenu::menuSizeHint()
 {
     QMenu menu;
     //this is a list of arbitrary strings so that we check the geometry
-    QStringList list = QStringList() << "trer" << "ezrfgtgvqd" << "sdgzgzerzerzer" << "eerzertz"  << "er";
-    foreach (QString str, list)
+    for (auto str : {"trer", "ezrfgtgvqd", "sdgzgzerzerzer", "eerzertz", "er"})
         menu.addAction(str);
 
-    int left, top, right, bottom;
-    menu.getContentsMargins(&left, &top, &right, &bottom);
+    const QMargins cm = menu.contentsMargins();
     const int panelWidth = menu.style()->pixelMetric(QStyle::PM_MenuPanelWidth, 0, &menu);
     const int hmargin = menu.style()->pixelMetric(QStyle::PM_MenuHMargin, 0, &menu),
     vmargin = menu.style()->pixelMetric(QStyle::PM_MenuVMargin, 0, &menu);
 
     int maxWidth =0;
     QRect result;
-    foreach (QAction *action, menu.actions()) {
+    for (QAction *action : menu.actions()) {
         maxWidth = qMax(maxWidth, menu.actionGeometry(action).width());
         result |= menu.actionGeometry(action);
-        QCOMPARE(result.x(), left + hmargin + panelWidth);
-        QCOMPARE(result.y(), top + vmargin + panelWidth);
+        QCOMPARE(result.x(), cm.left() + hmargin + panelWidth);
+        QCOMPARE(result.y(), cm.top() + vmargin + panelWidth);
     }
 
     QStyleOption opt(0);
     opt.rect = menu.rect();
     opt.state = QStyle::State_None;
 
-    QSize resSize = QSize(result.x(), result.y()) + result.size() + QSize(hmargin + right + panelWidth, vmargin + top + panelWidth);
+    QSize resSize = QSize(result.x(), result.y()) + result.size() + QSize(hmargin + cm.right() + panelWidth, vmargin + cm.top() + panelWidth);
 
     resSize = menu.style()->sizeFromContents(QStyle::CT_Menu, &opt,
                                     resSize.expandedTo(QApplication::globalStrut()), &menu);
@@ -1572,8 +1570,7 @@ void tst_QMenu::menuSize_Scrolling()
 
             int hmargin = style()->pixelMetric(QStyle::PM_MenuHMargin, nullptr, this);
             int fw = style()->pixelMetric(QStyle::PM_MenuPanelWidth, nullptr, this);
-            int leftMargin, topMargin, rightMargin, bottomMargin;
-            getContentsMargins(&leftMargin, &topMargin, &rightMargin, &bottomMargin);
+            const QMargins cm = contentsMargins();
             QRect lastItem = actionGeometry(actions().at(actions().length() - 1));
             QSize s = size();
 #ifdef Q_OS_WINRT
@@ -1586,7 +1583,7 @@ void tst_QMenu::menuSize_Scrolling()
                 return;
             }
 
-            QCOMPARE( s.width(), lastItem.right() + fw + hmargin + rightMargin + 1);
+            QCOMPARE( s.width(), lastItem.right() + fw + hmargin + cm.right() + 1);
             QMenu::showEvent(e);
         }