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/plugins/android/src/mediacapture | |
parent | 97009b6470c09b9889870873a5c82a6a0bb565f8 (diff) |
Replace Q_NULLPTR with nullptr
Change-Id: I3b7601b4a97f8a2b1d2da6ef134f1577846ba713
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/android/src/mediacapture')
-rw-r--r-- | src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.cpp b/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.cpp index 1f33b1e55..2243df732 100644 --- a/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.cpp +++ b/src/plugins/android/src/mediacapture/qandroidcameravideorenderercontrol.cpp @@ -108,7 +108,7 @@ QAndroidCameraDataVideoOutput::QAndroidCameraDataVideoOutput(QAndroidCameraVideo QAndroidCameraDataVideoOutput::~QAndroidCameraDataVideoOutput() { - m_control->cameraSession()->setPreviewCallback(Q_NULLPTR); + m_control->cameraSession()->setPreviewCallback(nullptr); delete m_surfaceView; } @@ -146,7 +146,7 @@ void QAndroidCameraDataVideoOutput::configureFormat() } if (m_pixelFormat == QVideoFrame::Format_Invalid) { - m_control->cameraSession()->setPreviewCallback(Q_NULLPTR); + m_control->cameraSession()->setPreviewCallback(nullptr); qWarning("The video surface is not compatible with any format supported by the camera"); } else { m_control->cameraSession()->setPreviewCallback(this); |