summaryrefslogtreecommitdiffstats
path: root/src/plugins/gstreamer
diff options
context:
space:
mode:
authorKevin Funk <kevin.funk@kdab.com>2017-09-24 23:54:59 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-27 08:06:15 +0000
commitacc49e582abf76c962851f53cbd66134812f6a1f (patch)
treeba82ce531f711397af949ac62fa9b0ca06158c11 /src/plugins/gstreamer
parent97009b6470c09b9889870873a5c82a6a0bb565f8 (diff)
Replace Q_NULLPTR with nullptr
Change-Id: I3b7601b4a97f8a2b1d2da6ef134f1577846ba713 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/gstreamer')
-rw-r--r--src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp2
-rw-r--r--src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp b/src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp
index f819c9f24..9d281e10c 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinimageprocessing.cpp
@@ -58,7 +58,7 @@ CameraBinImageProcessing::CameraBinImageProcessing(CameraBinSession *session)
, m_session(session)
, m_whiteBalanceMode(QCameraImageProcessing::WhiteBalanceAuto)
#if QT_CONFIG(linux_v4l)
- , m_v4lImageControl(Q_NULLPTR)
+ , m_v4lImageControl(nullptr)
#endif
{
#if QT_CONFIG(gstreamer_photography)
diff --git a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
index 2d3c7c2ea..4f45a0a2f 100644
--- a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
@@ -74,7 +74,7 @@ QMediaService* CameraBinServicePlugin::create(const QString &key)
"GStreamer %u.%u."
"\nPlease install the 'bad' GStreamer plugin package.",
major, minor);
- return Q_NULLPTR;
+ return nullptr;
}
return new CameraBinService(sourceFactory());