1 files changed, 7 insertions, 4 deletions
diff --git a/src/widgets/itemviews/qdatawidgetmapper.cpp b/src/widgets/itemviews/qdatawidgetmapper.cpp
index 125ee73194..74100c077e 100644
--- a/src/widgets/itemviews/qdatawidgetmapper.cpp
+++ b/src/widgets/itemviews/qdatawidgetmapper.cpp
@@ -56,7 +56,7 @@ public:
     Q_DECLARE_PUBLIC(QDataWidgetMapper)
 
     QDataWidgetMapperPrivate()
-        : model(QAbstractItemModelPrivate::staticEmptyModel()), delegate(0),
+        : model(QAbstractItemModelPrivate::staticEmptyModel()), delegate(nullptr),
           orientation(Qt::Horizontal), submitPolicy(QDataWidgetMapper::AutoSubmit)
     {
     }
@@ -226,7 +226,7 @@ void QDataWidgetMapperPrivate::_q_modelDestroyed()
 {
     Q_Q(QDataWidgetMapper);
 
-    model = 0;
+    model = nullptr;
     q->setModel(QAbstractItemModelPrivate::staticEmptyModel());
 }
 
@@ -374,7 +374,7 @@ QAbstractItemModel *QDataWidgetMapper::model() const
 {
     Q_D(const QDataWidgetMapper);
     return d->model == QAbstractItemModelPrivate::staticEmptyModel()
-            ? static_cast<QAbstractItemModel *>(0)
+            ? static_cast<QAbstractItemModel *>(nullptr)
             : d->model;
 }
 
@@ -383,6 +383,9 @@ QAbstractItemModel *QDataWidgetMapper::model() const
     data from the model into the widget and from the widget to the model,
     using QAbstractItemDelegate::setEditorData() and QAbstractItemDelegate::setModelData().
 
+    Any existing delegate will be removed, but not deleted. QDataWidgetMapper
+    does not take ownership of \a delegate.
+
     The delegate also decides when to apply data and when to change the editor,
     using QAbstractItemDelegate::commitData() and QAbstractItemDelegate::closeEditor().
 
@@ -567,7 +570,7 @@ QWidget *QDataWidgetMapper::mappedWidgetAt(int section) const
             return e.widget;
     }
 
-    return 0;
+    return nullptr;
 }
 
 /*!