summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorJochen Seemann <seemann.jochen@gmail.com>2018-07-22 19:52:19 +0200
committerJochen Seemann <seemann.jochen@gmail.com>2019-01-04 22:22:35 +0000
commit4e735ae42aca5c6957d8cf57d6858322569b794a (patch)
treee98bdf4d81ef199f62d7fdce62c7b8d74e73e3dc /src/multimedia
parent2403f8dc6f1f72bab326025a78b98ec5f81a3d34 (diff)
multimedia: modernize by using nullptr
Change-Id: Id1084fec084b972aaa1d2389ee56ee831a821172 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/audio/qaudiobuffer.cpp24
-rw-r--r--src/multimedia/audio/qaudiodecoder.cpp18
-rw-r--r--src/multimedia/audio/qaudiodevicefactory.cpp8
-rw-r--r--src/multimedia/audio/qaudiodeviceinfo.cpp6
-rw-r--r--src/multimedia/audio/qaudioprobe.cpp6
-rw-r--r--src/multimedia/audio/qsamplecache_p.cpp10
-rw-r--r--src/multimedia/audio/qsamplecache_p.h2
-rw-r--r--src/multimedia/audio/qwavedecoder_p.h2
-rw-r--r--src/multimedia/camera/qcamera.cpp50
-rw-r--r--src/multimedia/camera/qcamera_p.h24
-rw-r--r--src/multimedia/camera/qcameraexposure.cpp6
-rw-r--r--src/multimedia/camera/qcamerafocus.cpp6
-rw-r--r--src/multimedia/camera/qcameraimagecapture.cpp34
-rw-r--r--src/multimedia/camera/qcameraimageprocessing.cpp2
-rw-r--r--src/multimedia/controls/qmediaplaylistcontrol_p.h2
-rw-r--r--src/multimedia/controls/qmediaplaylistsourcecontrol_p.h2
-rw-r--r--src/multimedia/playback/qmediacontent.cpp14
-rw-r--r--src/multimedia/playback/qmedianetworkplaylistprovider_p.h4
-rw-r--r--src/multimedia/playback/qmediaplayer.cpp86
-rw-r--r--src/multimedia/playback/qmediaplaylist.cpp6
-rw-r--r--src/multimedia/playback/qmediaplaylist_p.h12
-rw-r--r--src/multimedia/playback/qmediaplaylistioplugin_p.h2
-rw-r--r--src/multimedia/playback/qmediaplaylistnavigator.cpp2
-rw-r--r--src/multimedia/playback/qmediaplaylistnavigator_p.h2
-rw-r--r--src/multimedia/playback/qmediaplaylistprovider_p.h8
-rw-r--r--src/multimedia/playback/qplaylistfileparser.cpp4
-rw-r--r--src/multimedia/playback/qplaylistfileparser_p.h6
-rw-r--r--src/multimedia/qmediacontrol.h2
-rw-r--r--src/multimedia/qmediaobject.cpp6
-rw-r--r--src/multimedia/qmediaobject_p.h2
-rw-r--r--src/multimedia/qmediapluginloader.cpp4
-rw-r--r--src/multimedia/qmediaresourcepolicy_p.cpp2
-rw-r--r--src/multimedia/qmediaresourcepolicyplugin_p.h2
-rw-r--r--src/multimedia/qmediaresourceset_p.h2
-rw-r--r--src/multimedia/qmediaserviceprovider.cpp22
-rw-r--r--src/multimedia/radio/qradiodata.cpp32
-rw-r--r--src/multimedia/radio/qradiotuner.cpp58
-rw-r--r--src/multimedia/recording/qaudiorecorder.cpp16
-rw-r--r--src/multimedia/recording/qmediarecorder.cpp46
-rw-r--r--src/multimedia/video/qabstractvideobuffer.cpp4
-rw-r--r--src/multimedia/video/qabstractvideobuffer_p.h2
-rw-r--r--src/multimedia/video/qimagevideobuffer.cpp2
-rw-r--r--src/multimedia/video/qmemoryvideobuffer.cpp2
-rw-r--r--src/multimedia/video/qvideoframe.cpp22
-rw-r--r--src/multimedia/video/qvideooutputorientationhandler_p.h2
-rw-r--r--src/multimedia/video/qvideoprobe.cpp6
-rw-r--r--src/multimedia/video/qvideosurfaceoutput.cpp4
-rw-r--r--src/multimedia/video/qvideosurfaceoutput_p.h2
48 files changed, 294 insertions, 294 deletions
diff --git a/src/multimedia/audio/qaudiobuffer.cpp b/src/multimedia/audio/qaudiobuffer.cpp
index 849d79ab3..f3e7ae670 100644
--- a/src/multimedia/audio/qaudiobuffer.cpp
+++ b/src/multimedia/audio/qaudiobuffer.cpp
@@ -85,7 +85,7 @@ public:
static QAudioBufferPrivate *acquire(QAudioBufferPrivate *other)
{
if (!other)
- return 0;
+ return nullptr;
// Ref the other (if there are extant data() pointers, they will
// also point here - it's a feature, not a bug, like QByteArray)
@@ -131,7 +131,7 @@ public:
}
}
} else
- mBuffer = 0;
+ mBuffer = nullptr;
}
~QMemoryAudioBufferProvider()
@@ -178,7 +178,7 @@ QAudioBufferPrivate *QAudioBufferPrivate::clone()
}
}
- return 0;
+ return nullptr;
}
/*!
@@ -199,7 +199,7 @@ QAudioBufferPrivate *QAudioBufferPrivate::clone()
Create a new, empty, invalid buffer.
*/
QAudioBuffer::QAudioBuffer()
- : d(0)
+ : d(nullptr)
{
}
@@ -244,7 +244,7 @@ QAudioBuffer::QAudioBuffer(const QByteArray &data, const QAudioFormat &format, q
int frameCount = format.framesForBytes(data.size());
d = new QAudioBufferPrivate(new QMemoryAudioBufferProvider(data.constData(), frameCount, format, startTime));
} else
- d = 0;
+ d = nullptr;
}
/*!
@@ -259,9 +259,9 @@ QAudioBuffer::QAudioBuffer(const QByteArray &data, const QAudioFormat &format, q
QAudioBuffer::QAudioBuffer(int numFrames, const QAudioFormat &format, qint64 startTime)
{
if (format.isValid())
- d = new QAudioBufferPrivate(new QMemoryAudioBufferProvider(0, numFrames, format, startTime));
+ d = new QAudioBufferPrivate(new QMemoryAudioBufferProvider(nullptr, numFrames, format, startTime));
else
- d = 0;
+ d = nullptr;
}
/*!
@@ -394,7 +394,7 @@ qint64 QAudioBuffer::startTime() const
const void* QAudioBuffer::constData() const
{
if (!isValid())
- return 0;
+ return nullptr;
return d->mProvider->constData();
}
@@ -417,7 +417,7 @@ const void* QAudioBuffer::constData() const
const void* QAudioBuffer::data() const
{
if (!isValid())
- return 0;
+ return nullptr;
return d->mProvider->constData();
}
@@ -456,7 +456,7 @@ const void* QAudioBuffer::data() const
void *QAudioBuffer::data()
{
if (!isValid())
- return 0;
+ return nullptr;
if (d->mCount.load() != 1) {
// Can't share a writable buffer
@@ -465,7 +465,7 @@ void *QAudioBuffer::data()
// This shouldn't happen
if (!newd)
- return 0;
+ return nullptr;
d->deref();
d = newd;
@@ -489,7 +489,7 @@ void *QAudioBuffer::data()
return memBuffer->writableData();
}
- return 0;
+ return nullptr;
}
// Template helper classes worth documenting
diff --git a/src/multimedia/audio/qaudiodecoder.cpp b/src/multimedia/audio/qaudiodecoder.cpp
index ea1d0e56d..b4ba854e1 100644
--- a/src/multimedia/audio/qaudiodecoder.cpp
+++ b/src/multimedia/audio/qaudiodecoder.cpp
@@ -84,8 +84,8 @@ class QAudioDecoderPrivate : public QMediaObjectPrivate
public:
QAudioDecoderPrivate()
- : provider(0)
- , control(0)
+ : provider(nullptr)
+ , control(nullptr)
, state(QAudioDecoder::StoppedState)
, error(QAudioDecoder::NoError)
{}
@@ -135,7 +135,7 @@ QAudioDecoder::QAudioDecoder(QObject *parent)
d->provider = QMediaServiceProvider::defaultServiceProvider();
if (d->service) {
d->control = qobject_cast<QAudioDecoderControl*>(d->service->requestControl(QAudioDecoderControl_iid));
- if (d->control != 0) {
+ if (d->control != nullptr) {
connect(d->control, SIGNAL(stateChanged(QAudioDecoder::State)), SLOT(_q_stateChanged(QAudioDecoder::State)));
connect(d->control, SIGNAL(error(int,QString)), SLOT(_q_error(int,QString)));
@@ -205,7 +205,7 @@ void QAudioDecoder::start()
{
Q_D(QAudioDecoder);
- if (d->control == 0) {
+ if (d->control == nullptr) {
QMetaObject::invokeMethod(this, "_q_error", Qt::QueuedConnection,
Q_ARG(int, QAudioDecoder::ServiceMissingError),
Q_ARG(QString, tr("The QAudioDecoder object does not have a valid service")));
@@ -226,7 +226,7 @@ void QAudioDecoder::stop()
{
Q_D(QAudioDecoder);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->stop();
}
@@ -256,7 +256,7 @@ void QAudioDecoder::setSourceFilename(const QString &fileName)
{
Q_D(QAudioDecoder);
- if (d->control != 0)
+ if (d->control != nullptr)
d_func()->control->setSourceFilename(fileName);
}
@@ -269,7 +269,7 @@ QIODevice *QAudioDecoder::sourceDevice() const
Q_D(const QAudioDecoder);
if (d->control)
return d->control->sourceDevice();
- return 0;
+ return nullptr;
}
/*!
@@ -285,7 +285,7 @@ void QAudioDecoder::setSourceDevice(QIODevice *device)
{
Q_D(QAudioDecoder);
- if (d->control != 0)
+ if (d->control != nullptr)
d_func()->control->setSourceDevice(device);
}
@@ -327,7 +327,7 @@ void QAudioDecoder::setAudioFormat(const QAudioFormat &format)
if (state() != QAudioDecoder::StoppedState)
return;
- if (d->control != 0)
+ if (d->control != nullptr)
d_func()->control->setAudioFormat(format);
}
diff --git a/src/multimedia/audio/qaudiodevicefactory.cpp b/src/multimedia/audio/qaudiodevicefactory.cpp
index b1788f28a..cf770c468 100644
--- a/src/multimedia/audio/qaudiodevicefactory.cpp
+++ b/src/multimedia/audio/qaudiodevicefactory.cpp
@@ -77,7 +77,7 @@ class QNullInputDevice : public QAbstractAudioInput
{
public:
void start(QIODevice*) override { qWarning()<<"using null input device, none available";}
- QIODevice* start() override { qWarning()<<"using null input device, none available"; return 0; }
+ QIODevice *start() override { qWarning()<<"using null input device, none available"; return nullptr; }
void stop() override {}
void reset() override {}
void suspend() override {}
@@ -102,7 +102,7 @@ class QNullOutputDevice : public QAbstractAudioOutput
{
public:
void start(QIODevice*) override {qWarning()<<"using null output device, none available";}
- QIODevice* start() override { qWarning()<<"using null output device, none available"; return 0; }
+ QIODevice *start() override { qWarning()<<"using null output device, none available"; return nullptr; }
void stop() override {}
void reset() override {}
void suspend() override {}
@@ -194,7 +194,7 @@ QAudioDeviceInfo QAudioDeviceFactory::defaultDevice(QAudio::Mode mode)
QAbstractAudioDeviceInfo* QAudioDeviceFactory::audioDeviceInfo(const QString &realm, const QByteArray &handle, QAudio::Mode mode)
{
- QAbstractAudioDeviceInfo *rc = 0;
+ QAbstractAudioDeviceInfo *rc = nullptr;
#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
QAudioSystemFactoryInterface* plugin =
@@ -204,7 +204,7 @@ QAbstractAudioDeviceInfo* QAudioDeviceFactory::audioDeviceInfo(const QString &re
rc = plugin->createDeviceInfo(handle, mode);
#endif
- return rc == 0 ? new QNullDeviceInfo() : rc;
+ return rc == nullptr ? new QNullDeviceInfo() : rc;
}
QAbstractAudioInput* QAudioDeviceFactory::createDefaultInputDevice(QAudioFormat const &format)
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp
index f4f548017..b8cac18eb 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo.cpp
@@ -57,7 +57,7 @@ class QAudioDeviceInfoPrivate : public QSharedData
public:
QAudioDeviceInfoPrivate()
: mode(QAudio::AudioOutput)
- , info(0)
+ , info(nullptr)
{
}
@@ -67,7 +67,7 @@ public:
if (!handle.isEmpty())
info = QAudioDeviceFactory::audioDeviceInfo(realm, handle, mode);
else
- info = NULL;
+ info = nullptr;
}
QAudioDeviceInfoPrivate(const QAudioDeviceInfoPrivate &other):
@@ -213,7 +213,7 @@ bool QAudioDeviceInfo::operator !=(const QAudioDeviceInfo &other) const
*/
bool QAudioDeviceInfo::isNull() const
{
- return d->info == 0;
+ return d->info == nullptr;
}
/*!
diff --git a/src/multimedia/audio/qaudioprobe.cpp b/src/multimedia/audio/qaudioprobe.cpp
index 23687c3cb..b6fe86b11 100644
--- a/src/multimedia/audio/qaudioprobe.cpp
+++ b/src/multimedia/audio/qaudioprobe.cpp
@@ -156,7 +156,7 @@ bool QAudioProbe::setSource(QMediaObject *source)
}
}
- return (!source || d->probee != 0);
+ return (!source || d->probee != nullptr);
}
/*!
@@ -176,7 +176,7 @@ bool QAudioProbe::setSource(QMediaObject *source)
*/
bool QAudioProbe::setSource(QMediaRecorder *mediaRecorder)
{
- QMediaObject *source = mediaRecorder ? mediaRecorder->mediaObject() : 0;
+ QMediaObject *source = mediaRecorder ? mediaRecorder->mediaObject() : nullptr;
bool result = setSource(source);
if (!mediaRecorder)
@@ -195,7 +195,7 @@ bool QAudioProbe::setSource(QMediaRecorder *mediaRecorder)
*/
bool QAudioProbe::isActive() const
{
- return d->probee != 0;
+ return d->probee != nullptr;
}
/*!
diff --git a/src/multimedia/audio/qsamplecache_p.cpp b/src/multimedia/audio/qsamplecache_p.cpp
index c956d764b..945fabe52 100644
--- a/src/multimedia/audio/qsamplecache_p.cpp
+++ b/src/multimedia/audio/qsamplecache_p.cpp
@@ -97,7 +97,7 @@ QT_BEGIN_NAMESPACE
QSampleCache::QSampleCache(QObject *parent)
: QObject(parent)
- , m_networkAccessManager(0)
+ , m_networkAccessManager(nullptr)
, m_mutex(QMutex::Recursive)
, m_capacity(0)
, m_usage(0)
@@ -327,8 +327,8 @@ void QSample::cleanup()
if (m_stream)
m_stream->deleteLater();
- m_waveDecoder = 0;
- m_stream = 0;
+ m_waveDecoder = nullptr;
+ m_stream = nullptr;
}
// Called in application thread
@@ -429,8 +429,8 @@ void QSample::onReady()
// Called in application thread, then moved to loader thread
QSample::QSample(const QUrl& url, QSampleCache *parent)
: m_parent(parent)
- , m_stream(0)
- , m_waveDecoder(0)
+ , m_stream(nullptr)
+ , m_waveDecoder(nullptr)
, m_url(url)
, m_sampleReadLength(0)
, m_state(Creating)
diff --git a/src/multimedia/audio/qsamplecache_p.h b/src/multimedia/audio/qsamplecache_p.h
index d3a348528..094e3281e 100644
--- a/src/multimedia/audio/qsamplecache_p.h
+++ b/src/multimedia/audio/qsamplecache_p.h
@@ -127,7 +127,7 @@ class Q_MULTIMEDIA_EXPORT QSampleCache : public QObject
public:
friend class QSample;
- QSampleCache(QObject *parent = 0);
+ QSampleCache(QObject *parent = nullptr);
~QSampleCache();
QSample* requestSample(const QUrl& url);
diff --git a/src/multimedia/audio/qwavedecoder_p.h b/src/multimedia/audio/qwavedecoder_p.h
index 0f1cef599..3be0dbaa6 100644
--- a/src/multimedia/audio/qwavedecoder_p.h
+++ b/src/multimedia/audio/qwavedecoder_p.h
@@ -64,7 +64,7 @@ class QWaveDecoder : public QIODevice
Q_OBJECT
public:
- explicit QWaveDecoder(QIODevice *source, QObject *parent = 0);
+ explicit QWaveDecoder(QIODevice *source, QObject *parent = nullptr);
~QWaveDecoder();
QAudioFormat audioFormat() const;
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index 722c5b629..75f42db6e 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -206,12 +206,12 @@ void QCameraPrivate::initControls()
error = QCamera::NoError;
} else {
- control = 0;
- locksControl = 0;
- deviceControl = 0;
- infoControl = 0;
- viewfinderSettingsControl = 0;
- viewfinderSettingsControl2 = 0;
+ control = nullptr;
+ locksControl = nullptr;
+ deviceControl = nullptr;
+ infoControl = nullptr;
+ viewfinderSettingsControl = nullptr;
+ viewfinderSettingsControl2 = nullptr;
error = QCamera::ServiceMissingError;
errorString = QCamera::tr("The camera service is missing");
@@ -241,16 +241,16 @@ void QCameraPrivate::clear()
provider->releaseService(service);
}
- cameraExposure = 0;
- cameraFocus = 0;
- imageProcessing = 0;
- control = 0;
- locksControl = 0;
- deviceControl = 0;
- infoControl = 0;
- viewfinderSettingsControl = 0;
- viewfinderSettingsControl2 = 0;
- service = 0;
+ cameraExposure = nullptr;
+ cameraFocus = nullptr;
+ imageProcessing = nullptr;
+ control = nullptr;
+ locksControl = nullptr;
+ deviceControl = nullptr;
+ infoControl = nullptr;
+ viewfinderSettingsControl = nullptr;
+ viewfinderSettingsControl2 = nullptr;
+ service = nullptr;
}
void QCameraPrivate::updateLockStatus()
@@ -328,7 +328,7 @@ QCamera::QCamera(QObject *parent):
d->init();
// Select the default camera
- if (d->service != 0 && d->deviceControl)
+ if (d->service != nullptr && d->deviceControl)
d->deviceControl->setSelectedDevice(d->deviceControl->defaultDevice());
}
@@ -347,7 +347,7 @@ QCamera::QCamera(const QByteArray& deviceName, QObject *parent):
Q_D(QCamera);
d->init();
- if (d->service != 0) {
+ if (d->service != nullptr) {
//pass device name to service
if (d->deviceControl) {
const QString name = QString::fromLatin1(deviceName);
@@ -376,7 +376,7 @@ QCamera::QCamera(const QCameraInfo &cameraInfo, QObject *parent)
Q_D(QCamera);
d->init();
- if (d->service != 0 && d->deviceControl) {
+ if (d->service != nullptr && d->deviceControl) {
for (int i = 0; i < d->deviceControl->deviceCount(); i++) {
if (d->deviceControl->deviceName(i) == cameraInfo.deviceName()) {
d->deviceControl->setSelectedDevice(i);
@@ -406,7 +406,7 @@ QCamera::QCamera(QCamera::Position position, QObject *parent)
Q_D(QCamera);
d->init();
- if (d->service != 0 && d->deviceControl) {
+ if (d->service != nullptr && d->deviceControl) {
bool selectDefault = true;
if (d->infoControl && position != UnspecifiedPosition) {
@@ -440,7 +440,7 @@ QCamera::~QCamera()
QMultimedia::AvailabilityStatus QCamera::availability() const
{
Q_D(const QCamera);
- if (d->control == NULL)
+ if (d->control == nullptr)
return QMultimedia::ServiceMissing;
if (d->deviceControl && d->deviceControl->deviceCount() == 0)
@@ -494,7 +494,7 @@ void QCamera::setViewfinder(QVideoWidget *viewfinder)
// We don't know (in this library) that QVideoWidget inherits QObject
QObject *viewFinderObject = reinterpret_cast<QObject*>(viewfinder);
- d->viewfinder = viewFinderObject && bind(viewFinderObject) ? viewFinderObject : 0;
+ d->viewfinder = viewFinderObject && bind(viewFinderObject) ? viewFinderObject : nullptr;
}
/*!
@@ -515,7 +515,7 @@ void QCamera::setViewfinder(QGraphicsVideoItem *viewfinder)
// but QObject inheritance depends on QObject coming first, so try this out.
QObject *viewFinderObject = reinterpret_cast<QObject*>(viewfinder);
- d->viewfinder = viewFinderObject && bind(viewFinderObject) ? viewFinderObject : 0;
+ d->viewfinder = viewFinderObject && bind(viewFinderObject) ? viewFinderObject : nullptr;
}
/*!
@@ -535,14 +535,14 @@ void QCamera::setViewfinder(QAbstractVideoSurface *surface)
if (d->viewfinder)
unbind(d->viewfinder);
- d->viewfinder = 0;
+ d->viewfinder = nullptr;
if (surface && bind(&d->surfaceViewfinder))
d->viewfinder = &d->surfaceViewfinder;
} else if (!surface) {
//unbind the surfaceViewfinder if null surface is set
unbind(&d->surfaceViewfinder);
- d->viewfinder = 0;
+ d->viewfinder = nullptr;
}
}
diff --git a/src/multimedia/camera/qcamera_p.h b/src/multimedia/camera/qcamera_p.h
index 49b4376b2..99759dbd3 100644
--- a/src/multimedia/camera/qcamera_p.h
+++ b/src/multimedia/camera/qcamera_p.h
@@ -71,18 +71,18 @@ class QCameraPrivate : public QMediaObjectPrivate
public:
QCameraPrivate():
QMediaObjectPrivate(),
- provider(0),
- control(0),
- deviceControl(0),
- locksControl(0),
- infoControl(0),
- viewfinderSettingsControl(0),
- viewfinderSettingsControl2(0),
- cameraExposure(0),
- cameraFocus(0),
- imageProcessing(0),
- viewfinder(0),
- capture(0),
+ provider(nullptr),
+ control(nullptr),
+ deviceControl(nullptr),
+ locksControl(nullptr),
+ infoControl(nullptr),
+ viewfinderSettingsControl(nullptr),
+ viewfinderSettingsControl2(nullptr),
+ cameraExposure(nullptr),
+ cameraFocus(nullptr),
+ imageProcessing(nullptr),
+ viewfinder(nullptr),
+ capture(nullptr),
state(QCamera::UnloadedState),
error(QCamera::NoError),
requestedLocks(QCamera::NoLock),
diff --git a/src/multimedia/camera/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp
index d289aed33..91950c7d2 100644
--- a/src/multimedia/camera/qcameraexposure.cpp
+++ b/src/multimedia/camera/qcameraexposure.cpp
@@ -98,8 +98,8 @@ void QCameraExposurePrivate::initControls()
Q_Q(QCameraExposure);
QMediaService *service = camera->service();
- exposureControl = 0;
- flashControl = 0;
+ exposureControl = nullptr;
+ flashControl = nullptr;
if (service) {
exposureControl = qobject_cast<QCameraExposureControl *>(service->requestControl(QCameraExposureControl_iid));
flashControl = qobject_cast<QCameraFlashControl *>(service->requestControl(QCameraFlashControl_iid));
@@ -217,7 +217,7 @@ QCameraExposure::~QCameraExposure()
*/
bool QCameraExposure::isAvailable() const
{
- return d_func()->exposureControl != 0;
+ return d_func()->exposureControl != nullptr;
}
diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp
index 848b33df8..e73a8ea46 100644
--- a/src/multimedia/camera/qcamerafocus.cpp
+++ b/src/multimedia/camera/qcamerafocus.cpp
@@ -339,8 +339,8 @@ void QCameraFocusPrivate::initControls()
{
Q_Q(QCameraFocus);
- focusControl = 0;
- zoomControl = 0;
+ focusControl = nullptr;
+ zoomControl = nullptr;
QMediaService *service = camera->service();
if (service) {
@@ -348,7 +348,7 @@ void QCameraFocusPrivate::initControls()
zoomControl = qobject_cast<QCameraZoomControl *>(service->requestControl(QCameraZoomControl_iid));
}
- available = focusControl != 0;
+ available = focusControl != nullptr;
if (!focusControl)
focusControl = new QCameraFocusFakeFocusControl(q);
diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp
index cedae2609..8f364a686 100644
--- a/src/multimedia/camera/qcameraimagecapture.cpp
+++ b/src/multimedia/camera/qcameraimagecapture.cpp
@@ -117,11 +117,11 @@ public:
};
QCameraImageCapturePrivate::QCameraImageCapturePrivate():
- mediaObject(0),
- control(0),
- encoderControl(0),
- captureDestinationControl(0),
- bufferFormatControl(0),
+ mediaObject(nullptr),
+ control(nullptr),
+ encoderControl(nullptr),
+ captureDestinationControl(nullptr),
+ bufferFormatControl(nullptr),
error(QCameraImageCapture::NoError)
{
}
@@ -144,11 +144,11 @@ void QCameraImageCapturePrivate::_q_readyChanged(bool ready)
void QCameraImageCapturePrivate::_q_serviceDestroyed()
{
- mediaObject = 0;
- control = 0;
- encoderControl = 0;
- captureDestinationControl = 0;
- bufferFormatControl = 0;
+ mediaObject = nullptr;
+ control = nullptr;
+ encoderControl = nullptr;
+ captureDestinationControl = nullptr;
+ bufferFormatControl = nullptr;
}
/*!
@@ -284,11 +284,11 @@ bool QCameraImageCapture::setMediaObject(QMediaObject *mediaObject)
}
// without QCameraImageCaptureControl discard the media object
- d->mediaObject = 0;
- d->control = 0;
- d->encoderControl = 0;
- d->captureDestinationControl = 0;
- d->bufferFormatControl = 0;
+ d->mediaObject = nullptr;
+ d->control = nullptr;
+ d->encoderControl = nullptr;
+ d->captureDestinationControl = nullptr;
+ d->bufferFormatControl = nullptr;
return false;
}
@@ -298,7 +298,7 @@ bool QCameraImageCapture::setMediaObject(QMediaObject *mediaObject)
*/
bool QCameraImageCapture::isAvailable() const
{
- if (d_func()->control != NULL)
+ if (d_func()->control != nullptr)
return true;
else
return false;
@@ -309,7 +309,7 @@ bool QCameraImageCapture::isAvailable() const
*/
QMultimedia::AvailabilityStatus QCameraImageCapture::availability() const
{
- if (d_func()->control != NULL)
+ if (d_func()->control != nullptr)
return QMultimedia::Available;
else
return QMultimedia::ServiceMissing;
diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp
index 737b74b73..c2cefeae7 100644
--- a/src/multimedia/camera/qcameraimageprocessing.cpp
+++ b/src/multimedia/camera/qcameraimageprocessing.cpp
@@ -130,7 +130,7 @@ void QCameraImageProcessingPrivate::initControls()
if (service)
imageControl = qobject_cast<QCameraImageProcessingControl *>(service->requestControl(QCameraImageProcessingControl_iid));
- available = (imageControl != 0);
+ available = (imageControl != nullptr);
if (!imageControl)
imageControl = new QCameraImageProcessingFakeControl(q_ptr);
diff --git a/src/multimedia/controls/qmediaplaylistcontrol_p.h b/src/multimedia/controls/qmediaplaylistcontrol_p.h
index 721a471c4..93c5a3e25 100644
--- a/src/multimedia/controls/qmediaplaylistcontrol_p.h
+++ b/src/multimedia/controls/qmediaplaylistcontrol_p.h
@@ -90,7 +90,7 @@ Q_SIGNALS:
void playbackModeChanged(QMediaPlaylist::PlaybackMode mode);
protected:
- QMediaPlaylistControl(QObject* parent = 0);
+ QMediaPlaylistControl(QObject *parent = nullptr);
};
#define QMediaPlaylistControl_iid "org.qt-project.qt.mediaplaylistcontrol/5.0"
diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h b/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h
index 18bf91d5b..a98ee8738 100644
--- a/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h
+++ b/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h
@@ -73,7 +73,7 @@ Q_SIGNALS:
void playlistChanged(QMediaPlaylist* playlist);
protected:
- QMediaPlaylistSourceControl(QObject* parent = 0);
+ QMediaPlaylistSourceControl(QObject *parent = nullptr);
};
#define QMediaPlaylistSourceControl_iid "org.qt-project.qt.mediaplaylistsourcecontrol/5.0"
diff --git a/src/multimedia/playback/qmediacontent.cpp b/src/multimedia/playback/qmediacontent.cpp
index bce65ddbc..85ccc35a2 100644
--- a/src/multimedia/playback/qmediacontent.cpp
+++ b/src/multimedia/playback/qmediacontent.cpp
@@ -253,8 +253,8 @@ QMediaContent& QMediaContent::operator=(const QMediaContent &other)
bool QMediaContent::operator==(const QMediaContent &other) const
{
- return (d.constData() == 0 && other.d.constData() == 0) ||
- (d.constData() != 0 && other.d.constData() != 0 &&
+ return (d.constData() == 0 && other.d.constData() == nullptr) ||
+ (d.constData() != 0 && other.d.constData() != nullptr &&
*d.constData() == *other.d.constData());
}
@@ -273,7 +273,7 @@ bool QMediaContent::operator!=(const QMediaContent &other) const
bool QMediaContent::isNull() const
{
- return d.constData() == 0;
+ return d.constData() == nullptr;
}
/*!
@@ -311,7 +311,7 @@ QNetworkRequest QMediaContent::canonicalRequest() const
QMediaResource QMediaContent::canonicalResource() const
{
- return d.constData() != 0
+ return d.constData() != nullptr
? d->resources.value(0)
: QMediaResource();
}
@@ -325,7 +325,7 @@ QMediaResource QMediaContent::canonicalResource() const
QMediaResourceList QMediaContent::resources() const
{
- return d.constData() != 0
+ return d.constData() != nullptr
? d->resources
: QMediaResourceList();
}
@@ -337,9 +337,9 @@ QMediaResourceList QMediaContent::resources() const
QMediaPlaylist *QMediaContent::playlist() const
{
- return d.constData() != 0
+ return d.constData() != nullptr
? d->playlist.data()
- : 0;
+ : nullptr;
}
QT_END_NAMESPACE
diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider_p.h b/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
index 3d1ffe66a..6b5220935 100644
--- a/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
+++ b/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
@@ -61,10 +61,10 @@ class Q_MULTIMEDIA_EXPORT QMediaNetworkPlaylistProvider : public QMediaPlaylistP
{
Q_OBJECT
public:
- QMediaNetworkPlaylistProvider(QObject *parent=0);
+ QMediaNetworkPlaylistProvider(QObject *parent = nullptr);
~QMediaNetworkPlaylistProvider();
- bool load(const QNetworkRequest &request, const char *format = 0) override;
+ bool load(const QNetworkRequest &request, const char *format = nullptr) override;
int mediaCount() const override;
QMediaContent media(int pos) const override;
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 19d4ec42c..3308537a9 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -109,12 +109,12 @@ class QMediaPlayerPrivate : public QMediaObjectPrivate
public:
QMediaPlayerPrivate()
- : provider(0)
- , control(0)
- , audioRoleControl(0)
- , customAudioRoleControl(0)
- , playlist(0)
- , networkAccessControl(0)
+ : provider(nullptr)
+ , control(nullptr)
+ , audioRoleControl(nullptr)
+ , customAudioRoleControl(nullptr)
+ , playlist(nullptr)
+ , networkAccessControl(nullptr)
, state(QMediaPlayer::StoppedState)
, status(QMediaPlayer::UnknownMediaStatus)
, error(QMediaPlayer::NoError)
@@ -148,7 +148,7 @@ public:
QMediaPlaylist *parentPlaylist(QMediaPlaylist *pls);
bool isInChain(const QUrl &url);
- void setMedia(const QMediaContent &media, QIODevice *stream = 0);
+ void setMedia(const QMediaContent &media, QIODevice *stream = nullptr);
void setPlaylist(QMediaPlaylist *playlist);
void setPlaylistMedia();
@@ -175,7 +175,7 @@ QMediaPlaylist *QMediaPlayerPrivate::parentPlaylist(QMediaPlaylist *pls)
for (QMediaPlaylist *current = rootMedia.playlist(); current && current != pls; current = current->currentMedia().playlist())
if (current->currentMedia().playlist() == pls)
return current;
- return 0;
+ return nullptr;
}
bool QMediaPlayerPrivate::isInChain(const QUrl &url)
@@ -309,7 +309,7 @@ void QMediaPlayerPrivate::_q_updateMedia(const QMediaContent &media)
const QMediaPlayer::State currentState = state;
- setMedia(media, 0);
+ setMedia(media, nullptr);
if (!media.isNull()) {
switch (currentState) {
@@ -329,8 +329,8 @@ void QMediaPlayerPrivate::_q_updateMedia(const QMediaContent &media)
void QMediaPlayerPrivate::_q_playlistDestroyed()
{
- playlist = 0;
- setMedia(QMediaContent(), 0);
+ playlist = nullptr;
+ setMedia(QMediaContent(), nullptr);
}
void QMediaPlayerPrivate::setMedia(const QMediaContent &media, QIODevice *stream)
@@ -360,7 +360,7 @@ void QMediaPlayerPrivate::setMedia(const QMediaContent &media, QIODevice *stream
// on the backend side since we can't load the new one and we want to be in the
// InvalidMedia status.
ignoreNextStatusChange = QMediaPlayer::NoMedia;
- control->setMedia(QMediaContent(), 0);
+ control->setMedia(QMediaContent(), nullptr);
} else if (hasStreamPlaybackFeature) {
control->setMedia(media, file.data());
@@ -386,7 +386,7 @@ void QMediaPlayerPrivate::setMedia(const QMediaContent &media, QIODevice *stream
tempFile->close();
file.reset(tempFile);
- control->setMedia(QMediaContent(QUrl::fromLocalFile(file->fileName())), 0);
+ control->setMedia(QMediaContent(QUrl::fromLocalFile(file->fileName())), nullptr);
#else
qWarning("Qt was built with -no-feature-temporaryfile: playback from resource file is not supported!");
#endif
@@ -447,13 +447,13 @@ void QMediaPlayerPrivate::setPlaylistMedia()
// media is not changed,
// frontend needs to emit currentMediaChanged
bool isSameMedia = (q->currentMedia() == playlist->currentMedia());
- setMedia(playlist->currentMedia(), 0);
+ setMedia(playlist->currentMedia(), nullptr);
if (isSameMedia) {
emit q->currentMediaChanged(q->currentMedia());
}
}
} else {
- setMedia(QMediaContent(), 0);
+ setMedia(QMediaContent(), nullptr);
}
}
@@ -545,7 +545,7 @@ void QMediaPlayerPrivate::_q_handlePlaylistLoadFailed()
if (playlist)
playlist->next();
else
- setMedia(QMediaContent(), 0);
+ setMedia(QMediaContent(), nullptr);
}
static QMediaService *playerService(QMediaPlayer::Flags flags)
@@ -583,12 +583,12 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags):
Q_D(QMediaPlayer);
d->provider = QMediaServiceProvider::defaultServiceProvider();
- if (d->service == 0) {
+ if (d->service == nullptr) {
d->error = ServiceMissingError;
} else {
d->control = qobject_cast<QMediaPlayerControl*>(d->service->requestControl(QMediaPlayerControl_iid));
d->networkAccessControl = qobject_cast<QMediaNetworkAccessControl*>(d->service->requestControl(QMediaNetworkAccessControl_iid));
- if (d->control != 0) {
+ if (d->control != nullptr) {
connect(d->control, SIGNAL(mediaChanged(QMediaContent)), SLOT(_q_handleMediaChanged(QMediaContent)));
connect(d->control, SIGNAL(stateChanged(QMediaPlayer::State)), SLOT(_q_stateChanged(QMediaPlayer::State)));
connect(d->control, SIGNAL(mediaStatusChanged(QMediaPlayer::MediaStatus)),
@@ -631,7 +631,7 @@ QMediaPlayer::QMediaPlayer(QObject *parent, QMediaPlayer::Flags flags):
}
}
}
- if (d->networkAccessControl != 0) {
+ if (d->networkAccessControl != nullptr) {
connect(d->networkAccessControl, SIGNAL(configurationChanged(QNetworkConfiguration)),
this, SIGNAL(networkConfigurationChanged(QNetworkConfiguration)));
}
@@ -685,7 +685,7 @@ const QIODevice *QMediaPlayer::mediaStream() const
if (d->control && d->qrcMedia.isNull())
return d->control->mediaStream();
- return 0;
+ return nullptr;
}
QMediaPlaylist *QMediaPlayer::playlist() const
@@ -737,7 +737,7 @@ QMediaPlayer::State QMediaPlayer::state() const
// In case if EndOfMedia status is already received
// but state is not.
- if (d->control != 0
+ if (d->control != nullptr
&& d->status == QMediaPlayer::EndOfMedia
&& d->state != d->control->state()) {
return d->control->state();
@@ -755,7 +755,7 @@ qint64 QMediaPlayer::duration() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->duration();
return -1;
@@ -765,7 +765,7 @@ qint64 QMediaPlayer::position() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->position();
return 0;
@@ -775,7 +775,7 @@ int QMediaPlayer::volume() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->volume();
return 0;
@@ -785,7 +785,7 @@ bool QMediaPlayer::isMuted() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->isMuted();
return false;
@@ -795,7 +795,7 @@ int QMediaPlayer::bufferStatus() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->bufferStatus();
return 0;
@@ -805,7 +805,7 @@ bool QMediaPlayer::isAudioAvailable() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->isAudioAvailable();
return false;
@@ -815,7 +815,7 @@ bool QMediaPlayer::isVideoAvailable() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->isVideoAvailable();
return false;
@@ -825,7 +825,7 @@ bool QMediaPlayer::isSeekable() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->isSeekable();
return false;
@@ -835,7 +835,7 @@ qreal QMediaPlayer::playbackRate() const
{
Q_D(const QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->playbackRate();
return 0.0;
@@ -880,7 +880,7 @@ void QMediaPlayer::play()
{
Q_D(QMediaPlayer);
- if (d->control == 0) {
+ if (d->control == nullptr) {
QMetaObject::invokeMethod(this, "_q_error", Qt::QueuedConnection,
Q_ARG(int, QMediaPlayer::ServiceMissingError),
Q_ARG(QString, tr("The QMediaPlayer object does not have a valid service")));
@@ -918,7 +918,7 @@ void QMediaPlayer::pause()
{
Q_D(QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->pause();
}
@@ -930,7 +930,7 @@ void QMediaPlayer::stop()
{
Q_D(QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->stop();
// If media player didn't stop in response to control.
@@ -949,7 +949,7 @@ void QMediaPlayer::setPosition(qint64 position)
{
Q_D(QMediaPlayer);
- if (d->control == 0)
+ if (d->control == nullptr)
return;
d->control->setPosition(qMax(position, 0ll));
@@ -959,7 +959,7 @@ void QMediaPlayer::setVolume(int v)
{
Q_D(QMediaPlayer);
- if (d->control == 0)
+ if (d->control == nullptr)
return;
int clamped = qBound(0, v, 100);
@@ -973,7 +973,7 @@ void QMediaPlayer::setMuted(bool muted)
{
Q_D(QMediaPlayer);
- if (d->control == 0 || muted == isMuted())
+ if (d->control == nullptr || muted == isMuted())
return;
d->control->setMuted(muted);
@@ -983,7 +983,7 @@ void QMediaPlayer::setPlaybackRate(qreal rate)
{
Q_D(QMediaPlayer);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->setPlaybackRate(rate);
}
@@ -1011,7 +1011,7 @@ void QMediaPlayer::setMedia(const QMediaContent &media, QIODevice *stream)
QMediaContent oldMedia = d->rootMedia;
d->disconnectPlaylist();
- d->playlist = 0;
+ d->playlist = nullptr;
d->rootMedia = media;
d->nestedPlaylists = 0;
@@ -1097,7 +1097,7 @@ void QMediaPlayer::setVideoOutput(QVideoWidget *output)
// We don't know (in this library) that QVideoWidget inherits QObject
QObject *outputObject = reinterpret_cast<QObject*>(output);
- d->videoOutput = outputObject && bind(outputObject) ? outputObject : 0;
+ d->videoOutput = outputObject && bind(outputObject) ? outputObject : nullptr;
}
/*!
@@ -1119,7 +1119,7 @@ void QMediaPlayer::setVideoOutput(QGraphicsVideoItem *output)
// but QObject inheritance depends on QObject coming first, so try this out.
QObject *outputObject = reinterpret_cast<QObject*>(output);
- d->videoOutput = outputObject && bind(outputObject) ? outputObject : 0;
+ d->videoOutput = outputObject && bind(outputObject) ? outputObject : nullptr;
}
/*!
@@ -1139,14 +1139,14 @@ void QMediaPlayer::setVideoOutput(QAbstractVideoSurface *surface)
if (d->videoOutput)
unbind(d->videoOutput);
- d->videoOutput = 0;
+ d->videoOutput = nullptr;
if (surface && bind(&d->surfaceOutput))
d->videoOutput = &d->surfaceOutput;
} else if (!surface) {
//unbind the surfaceOutput if null surface is set
unbind(&d->surfaceOutput);
- d->videoOutput = 0;
+ d->videoOutput = nullptr;
}
}
@@ -1165,7 +1165,7 @@ QAudio::Role QMediaPlayer::audioRole() const
{
Q_D(const QMediaPlayer);
- if (d->audioRoleControl != NULL)
+ if (d->audioRoleControl != nullptr)
return d->audioRoleControl->audioRole();
return QAudio::UnknownRole;
diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp
index 97fe75044..7618827da 100644
--- a/src/multimedia/playback/qmediaplaylist.cpp
+++ b/src/multimedia/playback/qmediaplaylist.cpp
@@ -124,7 +124,7 @@ QMediaPlaylist::QMediaPlaylist(QObject *parent)
d->q_ptr = this;
d->networkPlaylistControl = new QMediaNetworkPlaylistControl(this);
- setMediaObject(0);
+ setMediaObject(nullptr);
}
/*!
@@ -163,9 +163,9 @@ bool QMediaPlaylist::setMediaObject(QMediaObject *mediaObject)
return true;
QMediaService *service = mediaObject
- ? mediaObject->service() : 0;
+ ? mediaObject->service() : nullptr;
- QMediaPlaylistControl *newControl = 0;
+ QMediaPlaylistControl *newControl = nullptr;
if (service)
newControl = qobject_cast<QMediaPlaylistControl*>(service->requestControl(QMediaPlaylistControl_iid));
diff --git a/src/multimedia/playback/qmediaplaylist_p.h b/src/multimedia/playback/qmediaplaylist_p.h
index 8e081dd67..16fce00a9 100644
--- a/src/multimedia/playback/qmediaplaylist_p.h
+++ b/src/multimedia/playback/qmediaplaylist_p.h
@@ -78,9 +78,9 @@ class QMediaPlaylistPrivate
Q_DECLARE_PUBLIC(QMediaPlaylist)
public:
QMediaPlaylistPrivate()
- :mediaObject(0),
- control(0),
- networkPlaylistControl(0),
+ :mediaObject(nullptr),
+ control(nullptr),
+ networkPlaylistControl(nullptr),
error(QMediaPlaylist::NoError)
{
}
@@ -98,10 +98,10 @@ public:
void _q_mediaObjectDeleted()
{
Q_Q(QMediaPlaylist);
- mediaObject = 0;
+ mediaObject = nullptr;
if (control != networkPlaylistControl)
- control = 0;
- q->setMediaObject(0);
+ control = nullptr;
+ q->setMediaObject(nullptr);
}
QMediaObject *mediaObject;
diff --git a/src/multimedia/playback/qmediaplaylistioplugin_p.h b/src/multimedia/playback/qmediaplaylistioplugin_p.h
index 1e157d135..50bdcf9c0 100644
--- a/src/multimedia/playback/qmediaplaylistioplugin_p.h
+++ b/src/multimedia/playback/qmediaplaylistioplugin_p.h
@@ -106,7 +106,7 @@ class Q_MULTIMEDIA_EXPORT QMediaPlaylistIOPlugin : public QObject, public QMedia
Q_OBJECT
Q_INTERFACES(QMediaPlaylistIOInterface)
public:
- explicit QMediaPlaylistIOPlugin(QObject *parent = 0);
+ explicit QMediaPlaylistIOPlugin(QObject *parent = nullptr);
~QMediaPlaylistIOPlugin();
bool canRead(QIODevice *device, const QByteArray &format = QByteArray() ) const override = 0;
diff --git a/src/multimedia/playback/qmediaplaylistnavigator.cpp b/src/multimedia/playback/qmediaplaylistnavigator.cpp
index 0966c9396..120f621f5 100644
--- a/src/multimedia/playback/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/playback/qmediaplaylistnavigator.cpp
@@ -63,7 +63,7 @@ class QMediaPlaylistNavigatorPrivate
Q_DECLARE_NON_CONST_PUBLIC(QMediaPlaylistNavigator)
public:
QMediaPlaylistNavigatorPrivate()
- :playlist(0),
+ :playlist(nullptr),
currentPos(-1),
lastValidPos(-1),
playbackMode(QMediaPlaylist::Sequential),
diff --git a/src/multimedia/playback/qmediaplaylistnavigator_p.h b/src/multimedia/playback/qmediaplaylistnavigator_p.h
index 3899c42d9..2ac03a62c 100644
--- a/src/multimedia/playback/qmediaplaylistnavigator_p.h
+++ b/src/multimedia/playback/qmediaplaylistnavigator_p.h
@@ -67,7 +67,7 @@ class Q_MULTIMEDIA_EXPORT QMediaPlaylistNavigator : public QObject
Q_PROPERTY(QMediaContent currentItem READ currentItem)
public:
- QMediaPlaylistNavigator(QMediaPlaylistProvider *playlist, QObject *parent = 0);
+ QMediaPlaylistNavigator(QMediaPlaylistProvider *playlist, QObject *parent = nullptr);
virtual ~QMediaPlaylistNavigator();
QMediaPlaylistProvider *playlist() const;
diff --git a/src/multimedia/playback/qmediaplaylistprovider_p.h b/src/multimedia/playback/qmediaplaylistprovider_p.h
index 899c7c8bc..ed27612b9 100644
--- a/src/multimedia/playback/qmediaplaylistprovider_p.h
+++ b/src/multimedia/playback/qmediaplaylistprovider_p.h
@@ -70,12 +70,12 @@ class Q_MULTIMEDIA_EXPORT QMediaPlaylistProvider : public QObject
{
Q_OBJECT
public:
- QMediaPlaylistProvider(QObject *parent=0);
+ QMediaPlaylistProvider(QObject *parent = nullptr);
virtual ~QMediaPlaylistProvider();
- virtual bool load(const QNetworkRequest &request, const char *format = 0);
- virtual bool load(QIODevice * device, const char *format = 0);
- virtual bool save(const QUrl &location, const char *format = 0);
+ virtual bool load(const QNetworkRequest &request, const char *format = nullptr);
+ virtual bool load(QIODevice *device, const char *format = nullptr);
+ virtual bool save(const QUrl &location, const char *format = nullptr);
virtual bool save(QIODevice * device, const char *format);
virtual int mediaCount() const = 0;
diff --git a/src/multimedia/playback/qplaylistfileparser.cpp b/src/multimedia/playback/qplaylistfileparser.cpp
index 49c417085..92e7f97e8 100644
--- a/src/multimedia/playback/qplaylistfileparser.cpp
+++ b/src/multimedia/playback/qplaylistfileparser.cpp
@@ -273,7 +273,7 @@ class QPlaylistFileParserPrivate
public:
QPlaylistFileParserPrivate(QPlaylistFileParser *q)
: q_ptr(q)
- , m_stream(0)
+ , m_stream(nullptr)
, m_type(QPlaylistFileParser::UNKNOWN)
, m_scanIndex(0)
, m_lineIndex(-1)
@@ -302,7 +302,7 @@ public:
QMediaContent m_media;
QString m_mimeType;
bool isValid() const { return m_stream || !m_media.isNull(); }
- void reset() { m_stream = 0; m_media = QMediaContent(); m_mimeType = QString(); }
+ void reset() { m_stream = nullptr; m_media = QMediaContent(); m_mimeType = QString(); }
} m_pendingJob;
int m_scanIndex;
int m_lineIndex;
diff --git a/src/multimedia/playback/qplaylistfileparser_p.h b/src/multimedia/playback/qplaylistfileparser_p.h
index 328ecf998..cf96ccdbf 100644
--- a/src/multimedia/playback/qplaylistfileparser_p.h
+++ b/src/multimedia/playback/qplaylistfileparser_p.h
@@ -66,7 +66,7 @@ class Q_MULTIMEDIA_EXPORT QPlaylistFileParser : public QObject
{
Q_OBJECT
public:
- QPlaylistFileParser(QObject *parent = 0);
+ QPlaylistFileParser(QObject *parent = nullptr);
~QPlaylistFileParser();
enum FileType
@@ -86,7 +86,7 @@ public:
NetworkError
};
- void start(const QMediaContent &media, QIODevice *stream = 0, const QString &mimeType = QString());
+ void start(const QMediaContent &media, QIODevice *stream = nullptr, const QString &mimeType = QString());
void start(const QNetworkRequest &request, const QString &mimeType = QString());
void abort();
@@ -109,7 +109,7 @@ private:
const QString& mime);
static FileType findPlaylistType(const QString &suffix,
const QString& mime,
- const char *data = 0,
+ const char *data = nullptr,
quint32 size = 0);
Q_DISABLE_COPY(QPlaylistFileParser)
diff --git a/src/multimedia/qmediacontrol.h b/src/multimedia/qmediacontrol.h
index cff42e3ca..48ae44f8a 100644
--- a/src/multimedia/qmediacontrol.h
+++ b/src/multimedia/qmediacontrol.h
@@ -68,7 +68,7 @@ private:
Q_DECLARE_PRIVATE(QMediaControl)
};
-template <typename T> const char *qmediacontrol_iid() { return 0; }
+template <typename T> const char *qmediacontrol_iid() { return nullptr; }
#define Q_MEDIA_DECLARE_CONTROL(Class, IId) \
template <> inline const char *qmediacontrol_iid<Class *>() { return IId; }
diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp
index 71b2d148c..a12cab404 100644
--- a/src/multimedia/qmediaobject.cpp
+++ b/src/multimedia/qmediaobject.cpp
@@ -127,7 +127,7 @@ QMediaObject::~QMediaObject()
QMultimedia::AvailabilityStatus QMediaObject::availability() const
{
- if (d_func()->service == 0)
+ if (d_func()->service == nullptr)
return QMultimedia::ServiceMissing;
if (d_func()->availabilityControl)
@@ -216,7 +216,7 @@ void QMediaObject::unbind(QObject *object)
QMediaBindableInterface *helper = qobject_cast<QMediaBindableInterface*>(object);
if (helper && helper->mediaObject() == this)
- helper->setMediaObject(0);
+ helper->setMediaObject(nullptr);
else
qWarning() << "QMediaObject: Trying to unbind not connected helper object";
}
@@ -395,7 +395,7 @@ void QMediaObject::setupControls()
{
Q_D(QMediaObject);
- if (d->service != 0) {
+ if (d->service != nullptr) {
d->metaDataControl = qobject_cast<QMetaDataReaderControl*>(
d->service->requestControl(QMetaDataReaderControl_iid));
diff --git a/src/multimedia/qmediaobject_p.h b/src/multimedia/qmediaobject_p.h
index 3e663e03d..85caf9a50 100644
--- a/src/multimedia/qmediaobject_p.h
+++ b/src/multimedia/qmediaobject_p.h
@@ -73,7 +73,7 @@ class QMediaObjectPrivate
Q_DECLARE_PUBLIC(QMediaObject)
public:
- QMediaObjectPrivate(): service(0), metaDataControl(0), availabilityControl(0), notifyTimer(0), q_ptr(0) {}
+ QMediaObjectPrivate() : service(nullptr), metaDataControl(nullptr), availabilityControl(nullptr), notifyTimer(nullptr), q_ptr(nullptr) {}
virtual ~QMediaObjectPrivate() {}
void _q_notify();
diff --git a/src/multimedia/qmediapluginloader.cpp b/src/multimedia/qmediapluginloader.cpp
index bd3c525f4..d0a058ac9 100644
--- a/src/multimedia/qmediapluginloader.cpp
+++ b/src/multimedia/qmediapluginloader.cpp
@@ -68,11 +68,11 @@ QStringList QMediaPluginLoader::keys() const
QObject* QMediaPluginLoader::instance(QString const &key)
{
if (!m_metadata.contains(key))
- return 0;
+ return nullptr;
int idx = m_metadata.value(key).first().value(QStringLiteral("index")).toDouble();
if (idx < 0)
- return 0;
+ return nullptr;
return m_factoryLoader->instance(idx);
}
diff --git a/src/multimedia/qmediaresourcepolicy_p.cpp b/src/multimedia/qmediaresourcepolicy_p.cpp
index 1577f11af..14dc15968 100644
--- a/src/multimedia/qmediaresourcepolicy_p.cpp
+++ b/src/multimedia/qmediaresourcepolicy_p.cpp
@@ -84,7 +84,7 @@ QObject* QMediaResourcePolicy::createResourceSet(const QString& interfaceId)
QMediaResourceSetFactoryInterface *factory =
qobject_cast<QMediaResourceSetFactoryInterface*>(resourcePolicyLoader()
->instance(QLatin1String("default")));
- QObject* obj = 0;
+ QObject *obj = nullptr;
if (factory)
obj = factory->create(interfaceId);
diff --git a/src/multimedia/qmediaresourcepolicyplugin_p.h b/src/multimedia/qmediaresourcepolicyplugin_p.h
index 7b53c3b3a..e37551390 100644
--- a/src/multimedia/qmediaresourcepolicyplugin_p.h
+++ b/src/multimedia/qmediaresourcepolicyplugin_p.h
@@ -72,7 +72,7 @@ class Q_MULTIMEDIA_EXPORT QMediaResourcePolicyPlugin : public QObject, public QM
Q_INTERFACES(QMediaResourceSetFactoryInterface)
public:
- QMediaResourcePolicyPlugin(QObject *parent = 0);
+ QMediaResourcePolicyPlugin(QObject *parent = nullptr);
~QMediaResourcePolicyPlugin();
};
diff --git a/src/multimedia/qmediaresourceset_p.h b/src/multimedia/qmediaresourceset_p.h
index a0158877f..5ad4ca7aa 100644
--- a/src/multimedia/qmediaresourceset_p.h
+++ b/src/multimedia/qmediaresourceset_p.h
@@ -80,7 +80,7 @@ Q_SIGNALS:
void availabilityChanged(bool available);
protected:
- QMediaPlayerResourceSetInterface(QObject *parent = 0);
+ QMediaPlayerResourceSetInterface(QObject *parent = nullptr);
};
QT_END_NAMESPACE
diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp
index 21e34bd49..4166ff8eb 100644
--- a/src/multimedia/qmediaserviceprovider.cpp
+++ b/src/multimedia/qmediaserviceprovider.cpp
@@ -56,7 +56,7 @@ class QMediaServiceProviderHintPrivate : public QSharedData
{
public:
QMediaServiceProviderHintPrivate(QMediaServiceProviderHint::Type type)
- :type(type), cameraPosition(QCamera::UnspecifiedPosition), features(0)
+ :type(type), cameraPosition(QCamera::UnspecifiedPosition), features(nullptr)
{
}
@@ -309,7 +309,7 @@ class QPluginServiceProvider : public QMediaServiceProvider
QByteArray type;
QMediaServiceProviderPlugin *plugin;
- MediaServiceData() : plugin(0) { }
+ MediaServiceData() : plugin(nullptr) { }
};
QMap<const QMediaService*, MediaServiceData> mediaServiceData;
@@ -329,7 +329,7 @@ public:
}
if (!plugins.isEmpty()) {
- QMediaServiceProviderPlugin *plugin = 0;
+ QMediaServiceProviderPlugin *plugin = nullptr;
switch (hint.type()) {
case QMediaServiceProviderHint::Null:
@@ -423,9 +423,9 @@ public:
break;
}
- if (plugin != 0) {
+ if (plugin != nullptr) {
QMediaService *service = plugin->create(key);
- if (service != 0) {
+ if (service != nullptr) {
MediaServiceData d;
d.type = type;
d.plugin = plugin;
@@ -437,15 +437,15 @@ public:
}
qWarning() << "defaultServiceProvider::requestService(): no service found for -" << key;
- return 0;
+ return nullptr;
}
void releaseService(QMediaService *service) override
{
- if (service != 0) {
+ if (service != nullptr) {
MediaServiceData d = mediaServiceData.take(service);
- if (d.plugin != 0)
+ if (d.plugin != nullptr)
d.plugin->release(service);
}
}
@@ -704,7 +704,7 @@ QMediaServiceProviderHint::Features QMediaServiceProvider::supportedFeatures(con
{
Q_UNUSED(service);
- return QMediaServiceProviderHint::Features(0);
+ return QMediaServiceProviderHint::Features(nullptr);
}
/*!
@@ -798,7 +798,7 @@ int QMediaServiceProvider::cameraOrientation(const QByteArray &device) const
return 0;
}
-static QMediaServiceProvider *qt_defaultMediaServiceProvider = 0;
+static QMediaServiceProvider *qt_defaultMediaServiceProvider = nullptr;
/*!
Sets a media service \a provider as the default.
@@ -817,7 +817,7 @@ void QMediaServiceProvider::setDefaultServiceProvider(QMediaServiceProvider *pro
*/
QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider()
{
- return qt_defaultMediaServiceProvider != 0
+ return qt_defaultMediaServiceProvider != nullptr
? qt_defaultMediaServiceProvider
: static_cast<QMediaServiceProvider *>(pluginProvider());
}
diff --git a/src/multimedia/radio/qradiodata.cpp b/src/multimedia/radio/qradiodata.cpp
index 9ed6cb522..d71488b52 100644
--- a/src/multimedia/radio/qradiodata.cpp
+++ b/src/multimedia/radio/qradiodata.cpp
@@ -95,14 +95,14 @@ public:
};
QRadioDataPrivate::QRadioDataPrivate()
- : mediaObject(0)
- , control(0)
+ : mediaObject(nullptr)
+ , control(nullptr)
{}
void QRadioDataPrivate::_q_serviceDestroyed()
{
- mediaObject = 0;
- control = 0;
+ mediaObject = nullptr;
+ control = nullptr;
}
/*!
@@ -211,8 +211,8 @@ bool QRadioData::setMediaObject(QMediaObject *mediaObject)
}
// without QRadioDataControl discard the media object
- d->mediaObject = 0;
- d->control = 0;
+ d->mediaObject = nullptr;
+ d->control = nullptr;
return false;
}
@@ -228,7 +228,7 @@ QMultimedia::AvailabilityStatus QRadioData::availability() const
{
Q_D(const QRadioData);
- if (d->control == 0)
+ if (d->control == nullptr)
return QMultimedia::ServiceMissing;
return d->mediaObject->availability();
@@ -244,7 +244,7 @@ QString QRadioData::stationId() const
{
Q_D(const QRadioData);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->stationId();
return QString();
}
@@ -259,7 +259,7 @@ QRadioData::ProgramType QRadioData::programType() const
{
Q_D(const QRadioData);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->programType();
return QRadioData::Undefined;
@@ -275,7 +275,7 @@ QString QRadioData::programTypeName() const
{
Q_D(const QRadioData);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->programTypeName();
return QString();
}
@@ -290,7 +290,7 @@ QString QRadioData::stationName() const
{
Q_D(const QRadioData);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->stationName();
return QString();
}
@@ -305,7 +305,7 @@ QString QRadioData::radioText() const
{
Q_D(const QRadioData);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->radioText();
return QString();
}
@@ -320,7 +320,7 @@ bool QRadioData::isAlternativeFrequenciesEnabled() const
{
Q_D(const QRadioData);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->isAlternativeFrequenciesEnabled();
return false;
}
@@ -329,7 +329,7 @@ void QRadioData::setAlternativeFrequenciesEnabled( bool enabled )
{
Q_D(const QRadioData);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->setAlternativeFrequenciesEnabled(enabled);
}
@@ -343,7 +343,7 @@ QRadioData::Error QRadioData::error() const
{
Q_D(const QRadioData);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->error();
return QRadioData::ResourceError;
}
@@ -357,7 +357,7 @@ QString QRadioData::errorString() const
{
Q_D(const QRadioData);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->errorString();
return QString();
}
diff --git a/src/multimedia/radio/qradiotuner.cpp b/src/multimedia/radio/qradiotuner.cpp
index 3206b4ee5..cc9abdbf8 100644
--- a/src/multimedia/radio/qradiotuner.cpp
+++ b/src/multimedia/radio/qradiotuner.cpp
@@ -88,7 +88,7 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterRadioTunerMetaTypes)
class QRadioTunerPrivate : public QMediaObjectPrivate
{
public:
- QRadioTunerPrivate():provider(0), control(0), radioData(0) {}
+ QRadioTunerPrivate():provider(nullptr), control(nullptr), radioData(nullptr) {}
QMediaServiceProvider *provider;
QRadioTunerControl* control;
QRadioData *radioData;
@@ -112,9 +112,9 @@ QRadioTuner::QRadioTuner(QObject *parent):
d->provider = QMediaServiceProvider::defaultServiceProvider();
- if (d->service != 0) {
+ if (d->service != nullptr) {
d->control = qobject_cast<QRadioTunerControl*>(d->service->requestControl(QRadioTunerControl_iid));
- if (d->control != 0) {
+ if (d->control != nullptr) {
connect(d->control, SIGNAL(stateChanged(QRadioTuner::State)), SIGNAL(stateChanged(QRadioTuner::State)));
connect(d->control, SIGNAL(bandChanged(QRadioTuner::Band)), SIGNAL(bandChanged(QRadioTuner::Band)));
connect(d->control, SIGNAL(frequencyChanged(int)), SIGNAL(frequencyChanged(int)));
@@ -154,7 +154,7 @@ QRadioTuner::~QRadioTuner()
*/
QMultimedia::AvailabilityStatus QRadioTuner::availability() const
{
- if (d_func()->control == 0)
+ if (d_func()->control == nullptr)
return QMultimedia::ServiceMissing;
if (!d_func()->control->isAntennaConnected())
@@ -187,7 +187,7 @@ QRadioTuner::Band QRadioTuner::band() const
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->band();
return QRadioTuner::FM;
@@ -202,7 +202,7 @@ int QRadioTuner::frequency() const
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->frequency();
return 0;
@@ -217,7 +217,7 @@ int QRadioTuner::frequencyStep(QRadioTuner::Band band) const
{
Q_D(const QRadioTuner);
- if(d->control != 0)
+ if (d->control != nullptr)
return d->control->frequencyStep(band);
return 0;
@@ -231,7 +231,7 @@ QPair<int,int> QRadioTuner::frequencyRange(QRadioTuner::Band band) const
{
Q_D(const QRadioTuner);
- if(d->control != 0)
+ if (d->control != nullptr)
return d->control->frequencyRange(band);
return qMakePair<int,int>(0,0);
@@ -246,7 +246,7 @@ bool QRadioTuner::isStereo() const
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->isStereo();
return false;
@@ -262,7 +262,7 @@ QRadioTuner::StereoMode QRadioTuner::stereoMode() const
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->stereoMode();
return QRadioTuner::Auto;
@@ -272,7 +272,7 @@ void QRadioTuner::setStereoMode(QRadioTuner::StereoMode mode)
{
Q_D(QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->setStereoMode(mode);
}
@@ -286,7 +286,7 @@ bool QRadioTuner::isBandSupported(QRadioTuner::Band band) const
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->isBandSupported(band);
return false;
@@ -300,7 +300,7 @@ void QRadioTuner::start()
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->start();
}
@@ -312,7 +312,7 @@ void QRadioTuner::stop()
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->stop();
}
@@ -325,7 +325,7 @@ int QRadioTuner::signalStrength() const
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->signalStrength();
return 0;
@@ -341,7 +341,7 @@ int QRadioTuner::volume() const
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->volume();
return 0;
@@ -356,7 +356,7 @@ bool QRadioTuner::isMuted() const
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->isMuted();
return false;
@@ -372,7 +372,7 @@ void QRadioTuner::setBand(QRadioTuner::Band band)
{
Q_D(QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->setBand(band);
}
@@ -387,7 +387,7 @@ void QRadioTuner::setFrequency(int frequency)
{
Q_D(QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->setFrequency(frequency);
}
@@ -395,7 +395,7 @@ void QRadioTuner::setVolume(int volume)
{
Q_D(QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->setVolume(volume);
}
@@ -403,7 +403,7 @@ void QRadioTuner::setMuted(bool muted)
{
Q_D(QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->setMuted(muted);
}
@@ -418,7 +418,7 @@ bool QRadioTuner::isSearching() const
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->isSearching();
return false;
@@ -432,7 +432,7 @@ bool QRadioTuner::isAntennaConnected() const
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->isAntennaConnected();
return false;
@@ -448,7 +448,7 @@ void QRadioTuner::searchForward()
{
Q_D(QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->searchForward();
}
@@ -462,7 +462,7 @@ void QRadioTuner::searchBackward()
{
Q_D(QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->searchBackward();
}
@@ -490,7 +490,7 @@ void QRadioTuner::searchAllStations(QRadioTuner::SearchMode searchMode)
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->searchAllStations(searchMode);
}
@@ -504,7 +504,7 @@ void QRadioTuner::cancelSearch()
{
Q_D(QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
d->control->cancelSearch();
}
@@ -518,7 +518,7 @@ QRadioTuner::Error QRadioTuner::error() const
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->error();
return QRadioTuner::ResourceError;
@@ -534,7 +534,7 @@ QString QRadioTuner::errorString() const
{
Q_D(const QRadioTuner);
- if (d->control != 0)
+ if (d->control != nullptr)
return d->control->errorString();
return QString();
diff --git a/src/multimedia/recording/qaudiorecorder.cpp b/src/multimedia/recording/qaudiorecorder.cpp
index 1d3e5ba7f..dcbdabc17 100644
--- a/src/multimedia/recording/qaudiorecorder.cpp
+++ b/src/multimedia/recording/qaudiorecorder.cpp
@@ -96,11 +96,11 @@ public:
void initControls()
{
Q_Q(QAudioRecorder);
- audioInputSelector = 0;
+ audioInputSelector = nullptr;
- QMediaService *service = mediaObject ? mediaObject->service() : 0;
+ QMediaService *service = mediaObject ? mediaObject->service() : nullptr;
- if (service != 0)
+ if (service != nullptr)
audioInputSelector = qobject_cast<QAudioInputSelectorControl*>(service->requestControl(QAudioInputSelectorControl_iid));
if (audioInputSelector) {
@@ -113,8 +113,8 @@ public:
QAudioRecorderPrivate():
QMediaRecorderPrivate(),
- provider(0),
- audioInputSelector(0) {}
+ provider(nullptr),
+ audioInputSelector(nullptr) {}
QMediaServiceProvider *provider;
QAudioInputSelectorControl *audioInputSelector;
@@ -128,7 +128,7 @@ public:
*/
QAudioRecorder::QAudioRecorder(QObject *parent):
- QMediaRecorder(*new QAudioRecorderPrivate, 0, parent)
+ QMediaRecorder(*new QAudioRecorderPrivate, nullptr, parent)
{
Q_D(QAudioRecorder);
d->provider = QMediaServiceProvider::defaultServiceProvider();
@@ -145,9 +145,9 @@ QAudioRecorder::QAudioRecorder(QObject *parent):
QAudioRecorder::~QAudioRecorder()
{
Q_D(QAudioRecorder);
- QMediaService *service = d->mediaObject ? d->mediaObject->service() : 0;
+ QMediaService *service = d->mediaObject ? d->mediaObject->service() : nullptr;
QMediaObject *mediaObject = d->mediaObject;
- setMediaObject(0);
+ setMediaObject(nullptr);
if (service && d->audioInputSelector)
service->releaseControl(d->audioInputSelector);
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index 3bab3dada..2b7729481 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -89,15 +89,15 @@ Q_CONSTRUCTOR_FUNCTION(qRegisterMediaRecorderMetaTypes)
QMediaRecorderPrivate::QMediaRecorderPrivate():
- mediaObject(0),
- control(0),
- formatControl(0),
- audioControl(0),
- videoControl(0),
- metaDataControl(0),
- availabilityControl(0),
+ mediaObject(nullptr),
+ control(nullptr),
+ formatControl(nullptr),
+ audioControl(nullptr),
+ videoControl(nullptr),
+ metaDataControl(nullptr),
+ availabilityControl(nullptr),
settingsChanged(false),
- notifyTimer(0),
+ notifyTimer(nullptr),
state(QMediaRecorder::StoppedState),
error(QMediaRecorder::NoError)
{
@@ -135,13 +135,13 @@ void QMediaRecorderPrivate::_q_error(int error, const QString &errorString)
void QMediaRecorderPrivate::_q_serviceDestroyed()
{
- mediaObject = 0;
- control = 0;
- formatControl = 0;
- audioControl = 0;
- videoControl = 0;
- metaDataControl = 0;
- availabilityControl = 0;
+ mediaObject = nullptr;
+ control = nullptr;
+ formatControl = nullptr;
+ audioControl = nullptr;
+ videoControl = nullptr;
+ metaDataControl = nullptr;
+ availabilityControl = nullptr;
settingsChanged = true;
}
@@ -328,12 +328,12 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
}
}
- d->control = 0;
- d->formatControl = 0;
- d->audioControl = 0;
- d->videoControl = 0;
- d->metaDataControl = 0;
- d->availabilityControl = 0;
+ d->control = nullptr;
+ d->formatControl = nullptr;
+ d->audioControl = nullptr;
+ d->videoControl = nullptr;
+ d->metaDataControl = nullptr;
+ d->availabilityControl = nullptr;
d->mediaObject = object;
@@ -407,7 +407,7 @@ bool QMediaRecorder::setMediaObject(QMediaObject *object)
}
}
- d->mediaObject = 0;
+ d->mediaObject = nullptr;
return false;
}
@@ -453,7 +453,7 @@ bool QMediaRecorder::isAvailable() const
*/
QMultimedia::AvailabilityStatus QMediaRecorder::availability() const
{
- if (d_func()->control == NULL)
+ if (d_func()->control == nullptr)
return QMultimedia::ServiceMissing;
if (d_func()->availabilityControl)
diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp
index 50e38a98c..f0dd6d2eb 100644
--- a/src/multimedia/video/qabstractvideobuffer.cpp
+++ b/src/multimedia/video/qabstractvideobuffer.cpp
@@ -126,7 +126,7 @@ int QAbstractVideoBufferPrivate::map(
Constructs an abstract video buffer of the given \a type.
*/
QAbstractVideoBuffer::QAbstractVideoBuffer(HandleType type)
- : d_ptr(0)
+ : d_ptr(nullptr)
, m_type(type)
{
}
@@ -328,7 +328,7 @@ uchar *QAbstractPlanarVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPe
*bytesPerLine = strides[0];
return data[0];
} else {
- return 0;
+ return nullptr;
}
}
diff --git a/src/multimedia/video/qabstractvideobuffer_p.h b/src/multimedia/video/qabstractvideobuffer_p.h
index 9e3ced9b5..4877d3120 100644
--- a/src/multimedia/video/qabstractvideobuffer_p.h
+++ b/src/multimedia/video/qabstractvideobuffer_p.h
@@ -64,7 +64,7 @@ class QAbstractVideoBufferPrivate
{
public:
QAbstractVideoBufferPrivate()
- : q_ptr(0)
+ : q_ptr(nullptr)
{}
virtual ~QAbstractVideoBufferPrivate()
diff --git a/src/multimedia/video/qimagevideobuffer.cpp b/src/multimedia/video/qimagevideobuffer.cpp
index f407e02d0..28dacefc6 100644
--- a/src/multimedia/video/qimagevideobuffer.cpp
+++ b/src/multimedia/video/qimagevideobuffer.cpp
@@ -96,7 +96,7 @@ uchar *QImageVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPerLine)
return d->image.bits();
} else {
- return 0;
+ return nullptr;
}
}
diff --git a/src/multimedia/video/qmemoryvideobuffer.cpp b/src/multimedia/video/qmemoryvideobuffer.cpp
index 1b52bb7cd..e05210d9d 100644
--- a/src/multimedia/video/qmemoryvideobuffer.cpp
+++ b/src/multimedia/video/qmemoryvideobuffer.cpp
@@ -112,7 +112,7 @@ uchar *QMemoryVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPerLine)
return reinterpret_cast<uchar *>(d->data.data());
} else {
- return 0;
+ return nullptr;
}
}
diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp
index 7b1998afc..867bf1092 100644
--- a/src/multimedia/video/qvideoframe.cpp
+++ b/src/multimedia/video/qvideoframe.cpp
@@ -75,7 +75,7 @@ public:
, planeCount(0)
, pixelFormat(QVideoFrame::Format_Invalid)
, fieldType(QVideoFrame::ProgressiveFrame)
- , buffer(0)
+ , buffer(nullptr)
, mappedCount(0)
{
memset(data, 0, sizeof(data));
@@ -90,7 +90,7 @@ public:
, planeCount(0)
, pixelFormat(format)
, fieldType(QVideoFrame::ProgressiveFrame)
- , buffer(0)
+ , buffer(nullptr)
, mappedCount(0)
{
memset(data, 0, sizeof(data));
@@ -412,7 +412,7 @@ QVideoFrame::~QVideoFrame()
*/
bool QVideoFrame::isValid() const
{
- return d->buffer != 0;
+ return d->buffer != nullptr;
}
/*!
@@ -488,7 +488,7 @@ void QVideoFrame::setFieldType(QVideoFrame::FieldType field)
bool QVideoFrame::isMapped() const
{
- return d->buffer != 0 && d->buffer->mapMode() != QAbstractVideoBuffer::NotMapped;
+ return d->buffer != nullptr && d->buffer->mapMode() != QAbstractVideoBuffer::NotMapped;
}
/*!
@@ -507,7 +507,7 @@ bool QVideoFrame::isMapped() const
*/
bool QVideoFrame::isWritable() const
{
- return d->buffer != 0 && (d->buffer->mapMode() & QAbstractVideoBuffer::WriteOnly);
+ return d->buffer != nullptr && (d->buffer->mapMode() & QAbstractVideoBuffer::WriteOnly);
}
/*!
@@ -523,7 +523,7 @@ bool QVideoFrame::isWritable() const
*/
bool QVideoFrame::isReadable() const
{
- return d->buffer != 0 && (d->buffer->mapMode() & QAbstractVideoBuffer::ReadOnly);
+ return d->buffer != nullptr && (d->buffer->mapMode() & QAbstractVideoBuffer::ReadOnly);
}
/*!
@@ -533,7 +533,7 @@ bool QVideoFrame::isReadable() const
*/
QAbstractVideoBuffer::MapMode QVideoFrame::mapMode() const
{
- return d->buffer != 0 ? d->buffer->mapMode() : QAbstractVideoBuffer::NotMapped;
+ return d->buffer != nullptr ? d->buffer->mapMode() : QAbstractVideoBuffer::NotMapped;
}
/*!
@@ -587,7 +587,7 @@ bool QVideoFrame::map(QAbstractVideoBuffer::MapMode mode)
}
}
- Q_ASSERT(d->data[0] == 0);
+ Q_ASSERT(d->data[0] == nullptr);
Q_ASSERT(d->bytesPerLine[0] == 0);
Q_ASSERT(d->planeCount == 0);
Q_ASSERT(d->mappedBytes == 0);
@@ -767,7 +767,7 @@ uchar *QVideoFrame::bits()
*/
uchar *QVideoFrame::bits(int plane)
{
- return plane >= 0 && plane < d->planeCount ? d->data[plane] : 0;
+ return plane >= 0 && plane < d->planeCount ? d->data[plane] : nullptr;
}
/*!
@@ -798,7 +798,7 @@ const uchar *QVideoFrame::bits() const
*/
const uchar *QVideoFrame::bits(int plane) const
{
- return plane >= 0 && plane < d->planeCount ? d->data[plane] : 0;
+ return plane >= 0 && plane < d->planeCount ? d->data[plane] : nullptr;
}
/*!
@@ -836,7 +836,7 @@ int QVideoFrame::planeCount() const
*/
QVariant QVideoFrame::handle() const
{
- return d->buffer != 0 ? d->buffer->handle() : QVariant();
+ return d->buffer != nullptr ? d->buffer->handle() : QVariant();
}
/*!
diff --git a/src/multimedia/video/qvideooutputorientationhandler_p.h b/src/multimedia/video/qvideooutputorientationhandler_p.h
index b5cfc089b..d04a781ab 100644
--- a/src/multimedia/video/qvideooutputorientationhandler_p.h
+++ b/src/multimedia/video/qvideooutputorientationhandler_p.h
@@ -61,7 +61,7 @@ class Q_MULTIMEDIA_EXPORT QVideoOutputOrientationHandler : public QObject
{
Q_OBJECT
public:
- explicit QVideoOutputOrientationHandler(QObject *parent = 0);
+ explicit QVideoOutputOrientationHandler(QObject *parent = nullptr);
int currentOrientation() const;
diff --git a/src/multimedia/video/qvideoprobe.cpp b/src/multimedia/video/qvideoprobe.cpp
index b1531df63..f7995b297 100644
--- a/src/multimedia/video/qvideoprobe.cpp
+++ b/src/multimedia/video/qvideoprobe.cpp
@@ -161,7 +161,7 @@ bool QVideoProbe::setSource(QMediaObject *source)
}
}
- return (!source || d->probee != 0);
+ return (!source || d->probee != nullptr);
}
/*!
@@ -179,7 +179,7 @@ bool QVideoProbe::setSource(QMediaObject *source)
*/
bool QVideoProbe::setSource(QMediaRecorder *mediaRecorder)
{
- QMediaObject *source = mediaRecorder ? mediaRecorder->mediaObject() : 0;
+ QMediaObject *source = mediaRecorder ? mediaRecorder->mediaObject() : nullptr;
bool result = setSource(source);
if (!mediaRecorder)
@@ -198,7 +198,7 @@ bool QVideoProbe::setSource(QMediaRecorder *mediaRecorder)
*/
bool QVideoProbe::isActive() const
{
- return d->probee != 0;
+ return d->probee != nullptr;
}
/*!
diff --git a/src/multimedia/video/qvideosurfaceoutput.cpp b/src/multimedia/video/qvideosurfaceoutput.cpp
index feb956dd0..ebc9e1cb6 100644
--- a/src/multimedia/video/qvideosurfaceoutput.cpp
+++ b/src/multimedia/video/qvideosurfaceoutput.cpp
@@ -55,7 +55,7 @@ QVideoSurfaceOutput::QVideoSurfaceOutput(QObject*parent)
QVideoSurfaceOutput::~QVideoSurfaceOutput()
{
if (m_control) {
- m_control.data()->setSurface(0);
+ m_control.data()->setSurface(nullptr);
m_service.data()->releaseControl(m_control.data());
}
}
@@ -76,7 +76,7 @@ void QVideoSurfaceOutput::setVideoSurface(QAbstractVideoSurface *surface)
bool QVideoSurfaceOutput::setMediaObject(QMediaObject *object)
{
if (m_control) {
- m_control.data()->setSurface(0);
+ m_control.data()->setSurface(nullptr);
m_service.data()->releaseControl(m_control.data());
}
m_control.clear();
diff --git a/src/multimedia/video/qvideosurfaceoutput_p.h b/src/multimedia/video/qvideosurfaceoutput_p.h
index a1b24abbf..5d050bcb0 100644
--- a/src/multimedia/video/qvideosurfaceoutput_p.h
+++ b/src/multimedia/video/qvideosurfaceoutput_p.h
@@ -67,7 +67,7 @@ class QVideoSurfaceOutput : public QObject, public QMediaBindableInterface
Q_OBJECT
Q_INTERFACES(QMediaBindableInterface)
public:
- QVideoSurfaceOutput(QObject*parent = 0);
+ QVideoSurfaceOutput(QObject *parent = nullptr);
~QVideoSurfaceOutput();
QMediaObject *mediaObject() const override;