5 files changed, 7 insertions, 9 deletions
diff --git a/src/multimediawidgets/qcameraviewfinder.h b/src/multimediawidgets/qcameraviewfinder.h
index 57f20809a..eb0f396cc 100644
--- a/src/multimediawidgets/qcameraviewfinder.h
+++ b/src/multimediawidgets/qcameraviewfinder.h
@@ -61,7 +61,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QCameraViewfinder : public QVideoWidget
 {
     Q_OBJECT
 public:
-    explicit QCameraViewfinder(QWidget *parent = Q_NULLPTR);
+    explicit QCameraViewfinder(QWidget *parent = nullptr);
     ~QCameraViewfinder();
 
     QMediaObject *mediaObject() const override;
diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h
index 4a86d4412..3902389d9 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.h
+++ b/src/multimediawidgets/qgraphicsvideoitem.h
@@ -61,7 +61,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QGraphicsVideoItem : public QGraphicsObject, pu
     Q_PROPERTY(QSizeF size READ size WRITE setSize)
     Q_PROPERTY(QSizeF nativeSize READ nativeSize NOTIFY nativeSizeChanged)
 public:
-    explicit QGraphicsVideoItem(QGraphicsItem *parent = Q_NULLPTR);
+    explicit QGraphicsVideoItem(QGraphicsItem *parent = nullptr);
     ~QGraphicsVideoItem();
 
     QMediaObject *mediaObject() const override;
@@ -79,7 +79,7 @@ public:
 
     QRectF boundingRect() const override;
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override;
 
 Q_SIGNALS:
     void nativeSizeChanged(const QSizeF &size);
diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp
index c43f7a006..9a01c73aa 100644
--- a/src/multimediawidgets/qvideowidget.cpp
+++ b/src/multimediawidgets/qvideowidget.cpp
@@ -237,10 +237,8 @@ void QRendererVideoWidgetBackend::paintEvent(QPaintEvent *event)
 
         QBrush brush = m_widget->palette().window();
 
-        QVector<QRect> rects = borderRegion.rects();
-        for (QVector<QRect>::iterator it = rects.begin(), end = rects.end(); it != end; ++it) {
-            painter.fillRect(*it, brush);
-        }
+        for (const QRect &r : borderRegion)
+            painter.fillRect(r, brush);
     }
 
     if (m_surface->isActive() && m_boundingRect.intersects(event->rect())) {
diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h
index c8474288b..00b160821 100644
--- a/src/multimediawidgets/qvideowidget.h
+++ b/src/multimediawidgets/qvideowidget.h
@@ -64,7 +64,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidget : public QWidget, public QMediaBin
     Q_PROPERTY(int saturation READ saturation WRITE setSaturation NOTIFY saturationChanged)
 
 public:
-    explicit QVideoWidget(QWidget *parent = Q_NULLPTR);
+    explicit QVideoWidget(QWidget *parent = nullptr);
     ~QVideoWidget();
 
     QMediaObject *mediaObject() const override;
diff --git a/src/multimediawidgets/qvideowidgetcontrol.h b/src/multimediawidgets/qvideowidgetcontrol.h
index 7d9423882..c0d177d08 100644
--- a/src/multimediawidgets/qvideowidgetcontrol.h
+++ b/src/multimediawidgets/qvideowidgetcontrol.h
@@ -85,7 +85,7 @@ Q_SIGNALS:
     void saturationChanged(int saturation);
 
 protected:
-    explicit QVideoWidgetControl(QObject *parent = Q_NULLPTR);
+    explicit QVideoWidgetControl(QObject *parent = nullptr);
 };
 
 #define QVideoWidgetControl_iid "org.qt-project.qt.videowidgetcontrol/5.0"