diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-24 23:54:59 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-27 08:06:15 +0000 |
| commit | acc49e582abf76c962851f53cbd66134812f6a1f (patch) | |
| tree | ba82ce531f711397af949ac62fa9b0ca06158c11 /src/multimediawidgets | |
| parent | 97009b6470c09b9889870873a5c82a6a0bb565f8 (diff) | |
Replace Q_NULLPTR with nullptr
Change-Id: I3b7601b4a97f8a2b1d2da6ef134f1577846ba713
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimediawidgets')
| -rw-r--r-- | src/multimediawidgets/qcameraviewfinder.h | 2 | ||||
| -rw-r--r-- | src/multimediawidgets/qgraphicsvideoitem.h | 4 | ||||
| -rw-r--r-- | src/multimediawidgets/qvideowidget.h | 2 | ||||
| -rw-r--r-- | src/multimediawidgets/qvideowidgetcontrol.h | 2 |
4 files changed, 5 insertions, 5 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.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" |