1 files changed, 14 insertions, 13 deletions

diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp
index 28f6cdc7bd..2e12320bc3 100644
--- a/src/widgets/widgets/qdialogbuttonbox.cpp
+++ b/src/widgets/widgets/qdialogbuttonbox.cpp
@@ -178,15 +178,15 @@ public:
 };
 
 QDialogButtonBoxPrivate::QDialogButtonBoxPrivate(Qt::Orientation orient)
-    : orientation(orient), buttonLayout(0), internalRemove(false), center(false)
+    : orientation(orient), buttonLayout(nullptr), internalRemove(false), center(false)
 {
 }
 
 void QDialogButtonBoxPrivate::initLayout()
 {
     Q_Q(QDialogButtonBox);
-    layoutPolicy = QDialogButtonBox::ButtonLayout(q->style()->styleHint(QStyle::SH_DialogButtonLayout, 0, q));
-    bool createNewLayout = buttonLayout == 0
+    layoutPolicy = QDialogButtonBox::ButtonLayout(q->style()->styleHint(QStyle::SH_DialogButtonLayout, nullptr, q));
+    bool createNewLayout = buttonLayout == nullptr
         || (orientation == Qt::Horizontal && qobject_cast<QVBoxLayout *>(buttonLayout) != 0)
         || (orientation == Qt::Vertical && qobject_cast<QHBoxLayout *>(buttonLayout) != 0);
     if (createNewLayout) {
@@ -329,8 +329,8 @@ void QDialogButtonBoxPrivate::layoutButtons()
         ++currentLayout;
     }
 
-    QWidget *lastWidget = 0;
-    q->setFocusProxy(0);
+    QWidget *lastWidget = nullptr;
+    q->setFocusProxy(nullptr);
     for (int i = 0; i < buttonLayout->count(); ++i) {
         QLayoutItem *item = buttonLayout->itemAt(i);
         if (QWidget *widget = item->widget()) {
@@ -408,13 +408,13 @@ QPushButton *QDialogButtonBoxPrivate::createButton(QDialogButtonBox::StandardBut
         icon = QStyle::SP_RestoreDefaultsButton;
         break;
     case QDialogButtonBox::NoButton:
-        return 0;
+        return nullptr;
         ;
     }
     QPushButton *button = new QPushButton(QGuiApplicationPrivate::platformTheme()->standardButtonText(sbutton), q);
     QStyle *style = q->style();
-    if (style->styleHint(QStyle::SH_DialogButtonBox_ButtonsHaveIcons, 0, q) && icon != 0)
-        button->setIcon(style->standardIcon(QStyle::StandardPixmap(icon), 0, q));
+    if (style->styleHint(QStyle::SH_DialogButtonBox_ButtonsHaveIcons, nullptr, q) && icon != 0)
+        button->setIcon(style->standardIcon(QStyle::StandardPixmap(icon), nullptr, q));
     if (style != QApplication::style()) // Propagate style
         button->setStyle(style);
     standardButtonHash.insert(button, sbutton);
@@ -482,7 +482,7 @@ QDialogButtonBox::QDialogButtonBox(QWidget *parent)
     \sa orientation, addButton()
 */
 QDialogButtonBox::QDialogButtonBox(Qt::Orientation orientation, QWidget *parent)
-    : QWidget(*new QDialogButtonBoxPrivate(orientation), parent, 0)
+    : QWidget(*new QDialogButtonBoxPrivate(orientation), parent, { })
 {
     d_func()->initLayout();
 }
@@ -522,8 +522,8 @@ QDialogButtonBox::~QDialogButtonBox()
 
 /*!
     \enum QDialogButtonBox::ButtonRole
-    \enum QMessageBox::ButtonRole
 
+//! [buttonrole-enum]
     This enum describes the roles that can be used to describe buttons in
     the button box. Combinations of these roles are as flags used to
     describe different aspects of their behavior.
@@ -546,6 +546,7 @@ QDialogButtonBox::~QDialogButtonBox()
     \omitvalue NRoles
 
     \sa StandardButton
+//! [buttonrole-enum]
 */
 
 /*!
@@ -743,7 +744,7 @@ void QDialogButtonBox::removeButton(QAbstractButton *button)
         }
     }
     if (!d->internalRemove)
-        button->setParent(0);
+        button->setParent(nullptr);
 }
 
 /*!
@@ -781,7 +782,7 @@ QPushButton *QDialogButtonBox::addButton(const QString &text, ButtonRole role)
     Q_D(QDialogButtonBox);
     if (Q_UNLIKELY(role <= InvalidRole || role >= NRoles)) {
         qWarning("QDialogButtonBox::addButton: Invalid ButtonRole, button not added");
-        return 0;
+        return nullptr;
     }
     QPushButton *button = new QPushButton(text, this);
     d->addButton(button, role);
@@ -963,7 +964,7 @@ bool QDialogButtonBox::event(QEvent *event)
         QList<QAbstractButton *> acceptRoleList = d->buttonLists[AcceptRole];
         QPushButton *firstAcceptButton = acceptRoleList.isEmpty() ? 0 : qobject_cast<QPushButton *>(acceptRoleList.at(0));
         bool hasDefault = false;
-        QWidget *dialog = 0;
+        QWidget *dialog = nullptr;
         QWidget *p = this;
         while (p && !p->isWindow()) {
             p = p->parentWidget();