1 files changed, 13 insertions, 13 deletions

diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index 27c0a12f71..f3fbdad483 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -33,7 +33,6 @@
 #include <QtGui/private/qcoregraphics_p.h>
 #elif QT_CONFIG(style_windowsvista)
 #include "qwizard_win_p.h"
-#include "qtimer.h"
 #endif
 
 #include "private/qdialog_p.h"
@@ -691,8 +690,9 @@ void QWizardPrivate::reset()
     if (current != -1) {
         q->currentPage()->hide();
         cleanupPagesNotInHistory();
-        for (int i = history.size() - 1; i >= 0; --i)
-            q->cleanupPage(history.at(i));
+        const auto end = history.crend();
+        for (auto it = history.crbegin(); it != end; ++it)
+            q->cleanupPage(*it);
         history.clear();
         for (QWizardPage *page : std::as_const(pageMap))
             page->d_func()->initialized = false;
@@ -862,7 +862,7 @@ QWizardLayoutInfo QWizardPrivate::layoutInfoForCurrentPage()
 
     QStyleOption option;
     option.initFrom(q);
-    const int layoutHorizontalSpacing = style->pixelMetric(QStyle::PM_LayoutHorizontalSpacing, &option);
+    const int layoutHorizontalSpacing = style->pixelMetric(QStyle::PM_LayoutHorizontalSpacing, &option, q);
     info.topLevelMarginLeft = style->pixelMetric(QStyle::PM_LayoutLeftMargin, nullptr, q);
     info.topLevelMarginRight = style->pixelMetric(QStyle::PM_LayoutRightMargin, nullptr, q);
     info.topLevelMarginTop = style->pixelMetric(QStyle::PM_LayoutTopMargin, nullptr, q);
@@ -874,7 +874,7 @@ QWizardLayoutInfo QWizardPrivate::layoutInfoForCurrentPage()
     info.hspacing = (layoutHorizontalSpacing == -1)
         ? style->layoutSpacing(QSizePolicy::DefaultType, QSizePolicy::DefaultType, Qt::Horizontal)
         : layoutHorizontalSpacing;
-    info.vspacing = style->pixelMetric(QStyle::PM_LayoutVerticalSpacing, &option);
+    info.vspacing = style->pixelMetric(QStyle::PM_LayoutVerticalSpacing, &option, q);
     info.buttonSpacing = (layoutHorizontalSpacing == -1)
         ? style->layoutSpacing(QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Horizontal)
         : layoutHorizontalSpacing;
@@ -1420,10 +1420,9 @@ void QWizardPrivate::updateButtonTexts()
 void QWizardPrivate::updateButtonLayout()
 {
     if (buttonsHaveCustomLayout) {
-        QVarLengthArray<QWizard::WizardButton, QWizard::NButtons> array(buttonsCustomLayout.size());
-        for (int i = 0; i < buttonsCustomLayout.size(); ++i)
-            array[i] = buttonsCustomLayout.at(i);
-        setButtonLayout(array.constData(), array.size());
+        QVarLengthArray<QWizard::WizardButton, QWizard::NButtons> array{
+                buttonsCustomLayout.cbegin(), buttonsCustomLayout.cend()};
+        setButtonLayout(array.constData(), int(array.size()));
     } else {
         // Positions:
         //     Help Stretch Custom1 Custom2 Custom3 Cancel Back Next Commit Finish Cancel Help
@@ -2188,8 +2187,8 @@ void QWizard::setPage(int theid, QWizardPage *page)
     page->setParent(d->pageFrame);
 
     QList<QWizardField> &pendingFields = page->d_func()->pendingFields;
-    for (int i = 0; i < pendingFields.size(); ++i)
-        d->addField(pendingFields.at(i));
+    for (const auto &field : std::as_const(pendingFields))
+        d->addField(field);
     pendingFields.clear();
 
     connect(page, SIGNAL(completeChanged()), this, SLOT(_q_updateButtonStates()));
@@ -3619,8 +3618,9 @@ bool QWizardPage::isComplete() const
         return true;
 
     const QList<QWizardField> &wizardFields = d->wizard->d_func()->fields;
-    for (int i = wizardFields.size() - 1; i >= 0; --i) {
-        const QWizardField &field = wizardFields.at(i);
+    const auto end = wizardFields.crend();
+    for (auto it = wizardFields.crbegin(); it != end; ++it) {
+        const QWizardField &field = *it;
         if (field.page == this && field.mandatory) {
             QVariant value = field.object->property(field.property);
             if (value == field.initialValue)