From 3198bf4944edd8f25996c2b4c4516f606165af59 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 2 Mar 2016 15:19:22 +0100 Subject: Add explicit and make public headers compile with -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Cleaned up placement of * and & in parameters as a drive-by. Added explicit where it was missing as a drive-by. This is not a source-incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Task-number: QTBUG-45291 Change-Id: If81ed0c71393aee21d347f5ade4bf3fcc07cd82f Reviewed-by: Yoann Lopes --- src/multimedia/audio/qaudiodecoder.h | 2 +- src/multimedia/audio/qaudioinput.h | 4 ++-- src/multimedia/audio/qaudiooutput.h | 4 ++-- src/multimedia/audio/qaudioprobe.h | 2 +- src/multimedia/audio/qaudiosystemplugin.h | 2 +- src/multimedia/audio/qsound.h | 2 +- src/multimedia/audio/qsoundeffect.h | 2 +- src/multimedia/camera/qcamera.h | 8 ++++---- src/multimedia/camera/qcameraexposure.h | 8 ++++---- src/multimedia/camera/qcameraimagecapture.h | 4 ++-- src/multimedia/controls/qaudiodecodercontrol.h | 2 +- src/multimedia/controls/qaudioencodersettingscontrol.h | 4 ++-- src/multimedia/controls/qaudioinputselectorcontrol.h | 2 +- src/multimedia/controls/qaudiooutputselectorcontrol.h | 2 +- src/multimedia/controls/qaudiorolecontrol.h | 2 +- src/multimedia/controls/qcameracapturebufferformatcontrol.h | 2 +- src/multimedia/controls/qcameracapturedestinationcontrol.h | 2 +- src/multimedia/controls/qcameracontrol.h | 2 +- src/multimedia/controls/qcameraexposurecontrol.h | 2 +- src/multimedia/controls/qcamerafeedbackcontrol.h | 2 +- src/multimedia/controls/qcameraflashcontrol.h | 2 +- src/multimedia/controls/qcamerafocuscontrol.h | 2 +- src/multimedia/controls/qcameraimagecapturecontrol.h | 2 +- src/multimedia/controls/qcameraimageprocessingcontrol.h | 2 +- src/multimedia/controls/qcamerainfocontrol.h | 2 +- src/multimedia/controls/qcameralockscontrol.h | 2 +- src/multimedia/controls/qcameraviewfindersettingscontrol.h | 4 ++-- src/multimedia/controls/qcamerazoomcontrol.h | 2 +- src/multimedia/controls/qimageencodercontrol.h | 4 ++-- src/multimedia/controls/qmediaaudioprobecontrol.h | 2 +- src/multimedia/controls/qmediaavailabilitycontrol.h | 2 +- src/multimedia/controls/qmediacontainercontrol.h | 2 +- src/multimedia/controls/qmediagaplessplaybackcontrol.h | 2 +- src/multimedia/controls/qmedianetworkaccesscontrol.h | 2 +- src/multimedia/controls/qmediaplayercontrol.h | 2 +- src/multimedia/controls/qmediarecordercontrol.h | 2 +- src/multimedia/controls/qmediastreamscontrol.h | 2 +- src/multimedia/controls/qmediavideoprobecontrol.h | 2 +- src/multimedia/controls/qmetadatareadercontrol.h | 2 +- src/multimedia/controls/qmetadatawritercontrol.h | 2 +- src/multimedia/controls/qradiodatacontrol.h | 2 +- src/multimedia/controls/qradiotunercontrol.h | 2 +- src/multimedia/controls/qvideodeviceselectorcontrol.h | 2 +- src/multimedia/controls/qvideoencodersettingscontrol.h | 6 +++--- src/multimedia/controls/qvideorenderercontrol.h | 2 +- src/multimedia/controls/qvideowindowcontrol.h | 2 +- src/multimedia/playback/qmediaplayer.h | 8 ++++---- src/multimedia/playback/qmediaplaylist.h | 10 +++++----- src/multimedia/qmediacontrol.h | 4 ++-- src/multimedia/radio/qradiodata.h | 2 +- src/multimedia/radio/qradiotuner.h | 2 +- src/multimedia/recording/qaudiorecorder.h | 2 +- src/multimedia/recording/qmediarecorder.h | 10 +++++----- src/multimedia/video/qabstractvideofilter.h | 2 +- src/multimedia/video/qabstractvideosurface.h | 2 +- src/multimedia/video/qvideoprobe.h | 2 +- src/multimediawidgets/qcameraviewfinder.h | 2 +- src/multimediawidgets/qgraphicsvideoitem.h | 4 ++-- src/multimediawidgets/qvideowidget.h | 2 +- src/multimediawidgets/qvideowidgetcontrol.h | 2 +- 60 files changed, 87 insertions(+), 87 deletions(-) (limited to 'src') diff --git a/src/multimedia/audio/qaudiodecoder.h b/src/multimedia/audio/qaudiodecoder.h index fd54670cf..aef5427fd 100644 --- a/src/multimedia/audio/qaudiodecoder.h +++ b/src/multimedia/audio/qaudiodecoder.h @@ -69,7 +69,7 @@ public: ServiceMissingError }; - QAudioDecoder(QObject *parent = 0); + explicit QAudioDecoder(QObject *parent = Q_NULLPTR); ~QAudioDecoder(); static QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs = QStringList()); diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h index bb809251c..6effa788f 100644 --- a/src/multimedia/audio/qaudioinput.h +++ b/src/multimedia/audio/qaudioinput.h @@ -56,8 +56,8 @@ class Q_MULTIMEDIA_EXPORT QAudioInput : public QObject Q_OBJECT public: - explicit QAudioInput(const QAudioFormat &format = QAudioFormat(), QObject *parent = 0); - explicit QAudioInput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = 0); + explicit QAudioInput(const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR); + explicit QAudioInput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR); ~QAudioInput(); QAudioFormat format() const; diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h index b36a30948..c05e34264 100644 --- a/src/multimedia/audio/qaudiooutput.h +++ b/src/multimedia/audio/qaudiooutput.h @@ -56,8 +56,8 @@ class Q_MULTIMEDIA_EXPORT QAudioOutput : public QObject Q_OBJECT public: - explicit QAudioOutput(const QAudioFormat &format = QAudioFormat(), QObject *parent = 0); - explicit QAudioOutput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = 0); + explicit QAudioOutput(const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR); + explicit QAudioOutput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR); ~QAudioOutput(); QAudioFormat format() const; diff --git a/src/multimedia/audio/qaudioprobe.h b/src/multimedia/audio/qaudioprobe.h index f462f7aa7..c1efc275a 100644 --- a/src/multimedia/audio/qaudioprobe.h +++ b/src/multimedia/audio/qaudioprobe.h @@ -47,7 +47,7 @@ class Q_MULTIMEDIA_EXPORT QAudioProbe : public QObject { Q_OBJECT public: - explicit QAudioProbe(QObject *parent = 0); + explicit QAudioProbe(QObject *parent = Q_NULLPTR); ~QAudioProbe(); bool setSource(QMediaObject *source); diff --git a/src/multimedia/audio/qaudiosystemplugin.h b/src/multimedia/audio/qaudiosystemplugin.h index 2ee170e38..dafe7e166 100644 --- a/src/multimedia/audio/qaudiosystemplugin.h +++ b/src/multimedia/audio/qaudiosystemplugin.h @@ -72,7 +72,7 @@ class Q_MULTIMEDIA_EXPORT QAudioSystemPlugin : public QObject, public QAudioSyst Q_INTERFACES(QAudioSystemFactoryInterface) public: - QAudioSystemPlugin(QObject *parent = 0); + explicit QAudioSystemPlugin(QObject *parent = Q_NULLPTR); ~QAudioSystemPlugin(); virtual QList availableDevices(QAudio::Mode) const = 0; diff --git a/src/multimedia/audio/qsound.h b/src/multimedia/audio/qsound.h index 0ac65010e..559000d5d 100644 --- a/src/multimedia/audio/qsound.h +++ b/src/multimedia/audio/qsound.h @@ -52,7 +52,7 @@ public: static void play(const QString& filename); - explicit QSound(const QString& filename, QObject* parent = 0); + explicit QSound(const QString &filename, QObject *parent = Q_NULLPTR); ~QSound(); int loops() const; diff --git a/src/multimedia/audio/qsoundeffect.h b/src/multimedia/audio/qsoundeffect.h index fa6425589..40d17a7e7 100644 --- a/src/multimedia/audio/qsoundeffect.h +++ b/src/multimedia/audio/qsoundeffect.h @@ -74,7 +74,7 @@ public: Error }; - explicit QSoundEffect(QObject *parent = 0); + explicit QSoundEffect(QObject *parent = Q_NULLPTR); ~QSoundEffect(); static QStringList supportedMimeTypes(); diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index ea81c02c4..2b4a058d8 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -159,10 +159,10 @@ public: FrontFace }; - QCamera(QObject *parent = 0); - QCamera(const QByteArray& deviceName, QObject *parent = 0); - QCamera(const QCameraInfo& cameraInfo, QObject *parent = 0); - QCamera(QCamera::Position position, QObject *parent = 0); + explicit QCamera(QObject *parent = Q_NULLPTR); + explicit QCamera(const QByteArray& deviceName, QObject *parent = Q_NULLPTR); + explicit QCamera(const QCameraInfo& cameraInfo, QObject *parent = Q_NULLPTR); + explicit QCamera(QCamera::Position position, QObject *parent = Q_NULLPTR); ~QCamera(); #if QT_DEPRECATED_SINCE(5, 3) diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h index fa781b8fc..fc81a44b8 100644 --- a/src/multimedia/camera/qcameraexposure.h +++ b/src/multimedia/camera/qcameraexposure.h @@ -129,9 +129,9 @@ public: qreal requestedAperture() const; qreal requestedShutterSpeed() const; - QList supportedIsoSensitivities(bool *continuous = 0) const; - QList supportedApertures(bool * continuous = 0) const; - QList supportedShutterSpeeds(bool *continuous = 0) const; + QList supportedIsoSensitivities(bool *continuous = Q_NULLPTR) const; + QList supportedApertures(bool *continuous = Q_NULLPTR) const; + QList supportedShutterSpeeds(bool *continuous = Q_NULLPTR) const; public Q_SLOTS: void setFlashMode(FlashModes mode); @@ -162,7 +162,7 @@ Q_SIGNALS: private: friend class QCamera; friend class QCameraPrivate; - explicit QCameraExposure(QCamera *parent = 0); + explicit QCameraExposure(QCamera *parent = Q_NULLPTR); virtual ~QCameraExposure(); Q_DISABLE_COPY(QCameraExposure) diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h index c75d6c622..a8d2d4abc 100644 --- a/src/multimedia/camera/qcameraimagecapture.h +++ b/src/multimedia/camera/qcameraimagecapture.h @@ -81,7 +81,7 @@ public: }; Q_DECLARE_FLAGS(CaptureDestinations, CaptureDestination) - QCameraImageCapture(QMediaObject *mediaObject, QObject *parent = 0); + explicit QCameraImageCapture(QMediaObject *mediaObject, QObject *parent = Q_NULLPTR); ~QCameraImageCapture(); bool isAvailable() const; @@ -98,7 +98,7 @@ public: QString imageCodecDescription(const QString &codecName) const; QList supportedResolutions(const QImageEncoderSettings &settings = QImageEncoderSettings(), - bool *continuous = 0) const; + bool *continuous = Q_NULLPTR) const; QImageEncoderSettings encodingSettings() const; void setEncodingSettings(const QImageEncoderSettings& settings); diff --git a/src/multimedia/controls/qaudiodecodercontrol.h b/src/multimedia/controls/qaudiodecodercontrol.h index f319f7414..2d5912165 100644 --- a/src/multimedia/controls/qaudiodecodercontrol.h +++ b/src/multimedia/controls/qaudiodecodercontrol.h @@ -86,7 +86,7 @@ Q_SIGNALS: void durationChanged(qint64 duration); protected: - QAudioDecoderControl(QObject* parent = 0); + explicit QAudioDecoderControl(QObject *parent = Q_NULLPTR); }; #define QAudioDecoderControl_iid "org.qt-project.qt.audiodecodercontrol/5.0" diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.h b/src/multimedia/controls/qaudioencodersettingscontrol.h index ebaf92333..e17377f40 100644 --- a/src/multimedia/controls/qaudioencodersettingscontrol.h +++ b/src/multimedia/controls/qaudioencodersettingscontrol.h @@ -61,13 +61,13 @@ public: virtual QString codecDescription(const QString &codecName) const = 0; virtual QList supportedSampleRates(const QAudioEncoderSettings &settings, - bool *continuous = 0) const = 0; + bool *continuous = Q_NULLPTR) const = 0; virtual QAudioEncoderSettings audioSettings() const = 0; virtual void setAudioSettings(const QAudioEncoderSettings&) = 0; protected: - QAudioEncoderSettingsControl(QObject *parent = 0); + explicit QAudioEncoderSettingsControl(QObject *parent = Q_NULLPTR); }; #define QAudioEncoderSettingsControl_iid "org.qt-project.qt.audioencodersettingscontrol/5.0" diff --git a/src/multimedia/controls/qaudioinputselectorcontrol.h b/src/multimedia/controls/qaudioinputselectorcontrol.h index d37481243..ebed8002e 100644 --- a/src/multimedia/controls/qaudioinputselectorcontrol.h +++ b/src/multimedia/controls/qaudioinputselectorcontrol.h @@ -62,7 +62,7 @@ Q_SIGNALS: void availableInputsChanged(); protected: - QAudioInputSelectorControl(QObject *parent = 0); + explicit QAudioInputSelectorControl(QObject *parent = Q_NULLPTR); }; #define QAudioInputSelectorControl_iid "org.qt-project.qt.audioinputselectorcontrol/5.0" diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.h b/src/multimedia/controls/qaudiooutputselectorcontrol.h index 132d90d7d..3abfd1571 100644 --- a/src/multimedia/controls/qaudiooutputselectorcontrol.h +++ b/src/multimedia/controls/qaudiooutputselectorcontrol.h @@ -62,7 +62,7 @@ Q_SIGNALS: void availableOutputsChanged(); protected: - QAudioOutputSelectorControl(QObject *parent = 0); + explicit QAudioOutputSelectorControl(QObject *parent = Q_NULLPTR); }; #define QAudioOutputSelectorControl_iid "org.qt-project.qt.audiooutputselectorcontrol/5.0" diff --git a/src/multimedia/controls/qaudiorolecontrol.h b/src/multimedia/controls/qaudiorolecontrol.h index 983b2aed0..1ae1378c8 100644 --- a/src/multimedia/controls/qaudiorolecontrol.h +++ b/src/multimedia/controls/qaudiorolecontrol.h @@ -58,7 +58,7 @@ Q_SIGNALS: void audioRoleChanged(QAudio::Role role); protected: - explicit QAudioRoleControl(QObject *parent = 0); + explicit QAudioRoleControl(QObject *parent = Q_NULLPTR); }; #define QAudioRoleControl_iid "org.qt-project.qt.audiorolecontrol/5.6" diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.h b/src/multimedia/controls/qcameracapturebufferformatcontrol.h index 2f699c651..8be7f36c5 100644 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.h +++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.h @@ -56,7 +56,7 @@ Q_SIGNALS: void bufferFormatChanged(QVideoFrame::PixelFormat); protected: - QCameraCaptureBufferFormatControl(QObject* parent = 0); + explicit QCameraCaptureBufferFormatControl(QObject *parent = Q_NULLPTR); }; #define QCameraCaptureBufferFormatControl_iid "org.qt-project.qt.cameracapturebufferformatcontrol/5.0" diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.h b/src/multimedia/controls/qcameracapturedestinationcontrol.h index efe7f0234..a5238add4 100644 --- a/src/multimedia/controls/qcameracapturedestinationcontrol.h +++ b/src/multimedia/controls/qcameracapturedestinationcontrol.h @@ -56,7 +56,7 @@ Q_SIGNALS: void captureDestinationChanged(QCameraImageCapture::CaptureDestinations); protected: - QCameraCaptureDestinationControl(QObject* parent = 0); + explicit QCameraCaptureDestinationControl(QObject *parent = Q_NULLPTR); }; #define QCameraCaptureDestinationControl_iid "org.qt-project.qt.cameracapturedestinationcontrol/5.0" diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h index ec7c2017c..6b1cc9f30 100644 --- a/src/multimedia/controls/qcameracontrol.h +++ b/src/multimedia/controls/qcameracontrol.h @@ -77,7 +77,7 @@ Q_SIGNALS: void captureModeChanged(QCamera::CaptureModes); protected: - QCameraControl(QObject* parent = 0); + explicit QCameraControl(QObject *parent = Q_NULLPTR); }; #define QCameraControl_iid "org.qt-project.qt.cameracontrol/5.0" diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h index 6f7ef4698..b905d378f 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.h +++ b/src/multimedia/controls/qcameraexposurecontrol.h @@ -81,7 +81,7 @@ Q_SIGNALS: void parameterRangeChanged(int parameter); protected: - QCameraExposureControl(QObject* parent = 0); + explicit QCameraExposureControl(QObject *parent = Q_NULLPTR); }; #define QCameraExposureControl_iid "org.qt-project.qt.cameraexposurecontrol/5.0" diff --git a/src/multimedia/controls/qcamerafeedbackcontrol.h b/src/multimedia/controls/qcamerafeedbackcontrol.h index 44ba9dda1..d256e52ad 100644 --- a/src/multimedia/controls/qcamerafeedbackcontrol.h +++ b/src/multimedia/controls/qcamerafeedbackcontrol.h @@ -78,7 +78,7 @@ public: virtual bool setEventFeedbackSound(EventType, const QString &filePath) = 0; protected: - QCameraFeedbackControl(QObject* parent = 0); + explicit QCameraFeedbackControl(QObject *parent = Q_NULLPTR); }; #define QCameraFeedbackControl_iid "org.qt-project.qt.camerafeedbackcontrol/5.0" diff --git a/src/multimedia/controls/qcameraflashcontrol.h b/src/multimedia/controls/qcameraflashcontrol.h index 653321e36..d00b7356a 100644 --- a/src/multimedia/controls/qcameraflashcontrol.h +++ b/src/multimedia/controls/qcameraflashcontrol.h @@ -62,7 +62,7 @@ Q_SIGNALS: void flashReady(bool); protected: - QCameraFlashControl(QObject* parent = 0); + explicit QCameraFlashControl(QObject *parent = Q_NULLPTR); }; #define QCameraFlashControl_iid "org.qt-project.qt.cameraflashcontrol/5.0" diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h index 868f5e493..3562fb8e2 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.h +++ b/src/multimedia/controls/qcamerafocuscontrol.h @@ -71,7 +71,7 @@ Q_SIGNALS: void focusZonesChanged(); protected: - QCameraFocusControl(QObject* parent = 0); + explicit QCameraFocusControl(QObject *parent = Q_NULLPTR); }; #define QCameraFocusControl_iid "org.qt-project.qt.camerafocuscontrol/5.0" diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h index 93ec9a7da..bd8e31c84 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.h +++ b/src/multimedia/controls/qcameraimagecapturecontrol.h @@ -74,7 +74,7 @@ Q_SIGNALS: void error(int id, int error, const QString &errorString); protected: - QCameraImageCaptureControl(QObject* parent = 0); + explicit QCameraImageCaptureControl(QObject *parent = Q_NULLPTR); }; #define QCameraImageCaptureControl_iid "org.qt-project.qt.cameraimagecapturecontrol/5.0" diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.h b/src/multimedia/controls/qcameraimageprocessingcontrol.h index 01686dc46..d0a1c16b3 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.h +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h @@ -76,7 +76,7 @@ public: virtual void setParameter(ProcessingParameter parameter, const QVariant &value) = 0; protected: - QCameraImageProcessingControl(QObject* parent = 0); + explicit QCameraImageProcessingControl(QObject *parent = Q_NULLPTR); }; #define QCameraImageProcessingControl_iid "org.qt-project.qt.cameraimageprocessingcontrol/5.0" diff --git a/src/multimedia/controls/qcamerainfocontrol.h b/src/multimedia/controls/qcamerainfocontrol.h index c9a564ea7..acdb30dca 100644 --- a/src/multimedia/controls/qcamerainfocontrol.h +++ b/src/multimedia/controls/qcamerainfocontrol.h @@ -52,7 +52,7 @@ public: virtual int cameraOrientation(const QString &deviceName) const = 0; protected: - QCameraInfoControl(QObject *parent = 0); + explicit QCameraInfoControl(QObject *parent = Q_NULLPTR); }; #define QCameraInfoControl_iid "org.qt-project.qt.camerainfocontrol/5.3" diff --git a/src/multimedia/controls/qcameralockscontrol.h b/src/multimedia/controls/qcameralockscontrol.h index 421563758..1fe8273b8 100644 --- a/src/multimedia/controls/qcameralockscontrol.h +++ b/src/multimedia/controls/qcameralockscontrol.h @@ -61,7 +61,7 @@ Q_SIGNALS: void lockStatusChanged(QCamera::LockType type, QCamera::LockStatus status, QCamera::LockChangeReason reason); protected: - QCameraLocksControl(QObject* parent = 0); + explicit QCameraLocksControl(QObject *parent = Q_NULLPTR); }; #define QCameraLocksControl_iid "org.qt-project.qt.cameralockscontrol/5.0" diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.h b/src/multimedia/controls/qcameraviewfindersettingscontrol.h index a48ae450e..84fe2d46b 100644 --- a/src/multimedia/controls/qcameraviewfindersettingscontrol.h +++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.h @@ -64,7 +64,7 @@ public: virtual void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) = 0; protected: - QCameraViewfinderSettingsControl(QObject *parent = 0); + explicit QCameraViewfinderSettingsControl(QObject *parent = Q_NULLPTR); }; #define QCameraViewfinderSettingsControl_iid "org.qt-project.qt.cameraviewfindersettingscontrol/5.0" @@ -86,7 +86,7 @@ public: virtual void setViewfinderSettings(const QCameraViewfinderSettings &settings) = 0; protected: - QCameraViewfinderSettingsControl2(QObject *parent = 0); + explicit QCameraViewfinderSettingsControl2(QObject *parent = Q_NULLPTR); }; #define QCameraViewfinderSettingsControl2_iid "org.qt-project.qt.cameraviewfindersettingscontrol2/5.5" diff --git a/src/multimedia/controls/qcamerazoomcontrol.h b/src/multimedia/controls/qcamerazoomcontrol.h index 07575a25c..f16052c92 100644 --- a/src/multimedia/controls/qcamerazoomcontrol.h +++ b/src/multimedia/controls/qcamerazoomcontrol.h @@ -69,7 +69,7 @@ Q_SIGNALS: void currentDigitalZoomChanged(qreal digitalZoom); protected: - QCameraZoomControl(QObject* parent = 0); + explicit QCameraZoomControl(QObject *parent = Q_NULLPTR); }; #define QCameraZoomControl_iid "org.qt-project.qt.camerazoomcontrol/5.0" diff --git a/src/multimedia/controls/qimageencodercontrol.h b/src/multimedia/controls/qimageencodercontrol.h index f448754e6..6dccd966e 100644 --- a/src/multimedia/controls/qimageencodercontrol.h +++ b/src/multimedia/controls/qimageencodercontrol.h @@ -62,13 +62,13 @@ public: virtual QString imageCodecDescription(const QString &codecName) const = 0; virtual QList supportedResolutions(const QImageEncoderSettings &settings, - bool *continuous = 0) const = 0; + bool *continuous = Q_NULLPTR) const = 0; virtual QImageEncoderSettings imageSettings() const = 0; virtual void setImageSettings(const QImageEncoderSettings &settings) = 0; protected: - QImageEncoderControl(QObject *parent = 0); + explicit QImageEncoderControl(QObject *parent = Q_NULLPTR); }; #define QImageEncoderControl_iid "org.qt-project.qt.imageencodercontrol/5.0" diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.h b/src/multimedia/controls/qmediaaudioprobecontrol.h index b6961ec94..04ec7aca9 100644 --- a/src/multimedia/controls/qmediaaudioprobecontrol.h +++ b/src/multimedia/controls/qmediaaudioprobecontrol.h @@ -50,7 +50,7 @@ Q_SIGNALS: void flush(); protected: - explicit QMediaAudioProbeControl(QObject *parent = 0); + explicit QMediaAudioProbeControl(QObject *parent = Q_NULLPTR); }; #define QMediaAudioProbeControl_iid "org.qt-project.qt.mediaaudioprobecontrol/5.0" diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h index 1f788f82f..eddadb441 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.h +++ b/src/multimedia/controls/qmediaavailabilitycontrol.h @@ -56,7 +56,7 @@ Q_SIGNALS: void availabilityChanged(QMultimedia::AvailabilityStatus availability); protected: - QMediaAvailabilityControl(QObject* parent = 0); + explicit QMediaAvailabilityControl(QObject *parent = Q_NULLPTR); }; #define QMediaAvailabilityControl_iid "org.qt-project.qt.mediaavailabilitycontrol/5.0" diff --git a/src/multimedia/controls/qmediacontainercontrol.h b/src/multimedia/controls/qmediacontainercontrol.h index 83b201cdd..ae15967e9 100644 --- a/src/multimedia/controls/qmediacontainercontrol.h +++ b/src/multimedia/controls/qmediacontainercontrol.h @@ -56,7 +56,7 @@ public: virtual QString containerDescription(const QString &formatMimeType) const = 0; protected: - QMediaContainerControl(QObject *parent = 0); + explicit QMediaContainerControl(QObject *parent = Q_NULLPTR); }; #define QMediaContainerControl_iid "org.qt-project.qt.mediacontainercontrol/5.0" diff --git a/src/multimedia/controls/qmediagaplessplaybackcontrol.h b/src/multimedia/controls/qmediagaplessplaybackcontrol.h index 79bb6168f..9158aed74 100644 --- a/src/multimedia/controls/qmediagaplessplaybackcontrol.h +++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.h @@ -60,7 +60,7 @@ Q_SIGNALS: void advancedToNextMedia(); protected: - QMediaGaplessPlaybackControl(QObject* parent = 0); + explicit QMediaGaplessPlaybackControl(QObject *parent = Q_NULLPTR); }; #define QMediaGaplessPlaybackControl_iid "org.qt-project.qt.mediagaplessplaybackcontrol/5.0" diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.h b/src/multimedia/controls/qmedianetworkaccesscontrol.h index 2db6b4a60..f70cbedde 100644 --- a/src/multimedia/controls/qmedianetworkaccesscontrol.h +++ b/src/multimedia/controls/qmedianetworkaccesscontrol.h @@ -59,7 +59,7 @@ Q_SIGNALS: void configurationChanged(const QNetworkConfiguration& configuration); protected: - QMediaNetworkAccessControl(QObject *parent = 0); + explicit QMediaNetworkAccessControl(QObject *parent = Q_NULLPTR); }; #define QMediaNetworkAccessControl_iid "org.qt-project.qt.medianetworkaccesscontrol/5.0" diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h index 61622aa8e..b8f915a3d 100644 --- a/src/multimedia/controls/qmediaplayercontrol.h +++ b/src/multimedia/controls/qmediaplayercontrol.h @@ -104,7 +104,7 @@ Q_SIGNALS: void error(int error, const QString &errorString); protected: - QMediaPlayerControl(QObject* parent = 0); + explicit QMediaPlayerControl(QObject *parent = Q_NULLPTR); }; #define QMediaPlayerControl_iid "org.qt-project.qt.mediaplayercontrol/5.0" diff --git a/src/multimedia/controls/qmediarecordercontrol.h b/src/multimedia/controls/qmediarecordercontrol.h index c3afa9b58..58e4d5aa1 100644 --- a/src/multimedia/controls/qmediarecordercontrol.h +++ b/src/multimedia/controls/qmediarecordercontrol.h @@ -82,7 +82,7 @@ public Q_SLOTS: virtual void setVolume(qreal volume) = 0; protected: - QMediaRecorderControl(QObject* parent = 0); + explicit QMediaRecorderControl(QObject *parent = Q_NULLPTR); }; #define QMediaRecorderControl_iid "org.qt-project.qt.mediarecordercontrol/5.0" diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h index ca2ad53bc..eee2803c7 100644 --- a/src/multimedia/controls/qmediastreamscontrol.h +++ b/src/multimedia/controls/qmediastreamscontrol.h @@ -67,7 +67,7 @@ Q_SIGNALS: void activeStreamsChanged(); protected: - QMediaStreamsControl(QObject *parent = 0); + explicit QMediaStreamsControl(QObject *parent = Q_NULLPTR); }; #define QMediaStreamsControl_iid "org.qt-project.qt.mediastreamscontrol/5.0" diff --git a/src/multimedia/controls/qmediavideoprobecontrol.h b/src/multimedia/controls/qmediavideoprobecontrol.h index 78f89400d..8a81ab9aa 100644 --- a/src/multimedia/controls/qmediavideoprobecontrol.h +++ b/src/multimedia/controls/qmediavideoprobecontrol.h @@ -52,7 +52,7 @@ Q_SIGNALS: void flush(); protected: - explicit QMediaVideoProbeControl(QObject *parent = 0); + explicit QMediaVideoProbeControl(QObject *parent = Q_NULLPTR); }; #define QMediaVideoProbeControl_iid "org.qt-project.qt.mediavideoprobecontrol/5.0" diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h index 7cf8a5f0d..285e08dd5 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.h +++ b/src/multimedia/controls/qmetadatareadercontrol.h @@ -65,7 +65,7 @@ Q_SIGNALS: void metaDataAvailableChanged(bool available); protected: - QMetaDataReaderControl(QObject *parent = 0); + explicit QMetaDataReaderControl(QObject *parent = Q_NULLPTR); }; #define QMetaDataReaderControl_iid "org.qt-project.qt.metadatareadercontrol/5.0" diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h index 7b6cef9c4..970feab0c 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.h +++ b/src/multimedia/controls/qmetadatawritercontrol.h @@ -68,7 +68,7 @@ Q_SIGNALS: void metaDataAvailableChanged(bool available); protected: - QMetaDataWriterControl(QObject *parent = 0); + explicit QMetaDataWriterControl(QObject *parent = Q_NULLPTR); }; #define QMetaDataWriterControl_iid "org.qt-project.qt.metadatawritercontrol/5.0" diff --git a/src/multimedia/controls/qradiodatacontrol.h b/src/multimedia/controls/qradiodatacontrol.h index e519c414e..91fa2a69b 100644 --- a/src/multimedia/controls/qradiodatacontrol.h +++ b/src/multimedia/controls/qradiodatacontrol.h @@ -70,7 +70,7 @@ Q_SIGNALS: void error(QRadioData::Error err); protected: - QRadioDataControl(QObject *parent = 0); + explicit QRadioDataControl(QObject *parent = Q_NULLPTR); }; #define QRadioDataControl_iid "org.qt-project.qt.radiodatacontrol/5.0" diff --git a/src/multimedia/controls/qradiotunercontrol.h b/src/multimedia/controls/qradiotunercontrol.h index fbcad5167..273120f5a 100644 --- a/src/multimedia/controls/qradiotunercontrol.h +++ b/src/multimedia/controls/qradiotunercontrol.h @@ -101,7 +101,7 @@ Q_SIGNALS: void antennaConnectedChanged(bool connectionStatus); protected: - QRadioTunerControl(QObject *parent = 0); + explicit QRadioTunerControl(QObject *parent = Q_NULLPTR); }; #define QRadioTunerControl_iid "org.qt-project.qt.radiotunercontrol/5.0" diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.h b/src/multimedia/controls/qvideodeviceselectorcontrol.h index 840c31efa..655b70dba 100644 --- a/src/multimedia/controls/qvideodeviceselectorcontrol.h +++ b/src/multimedia/controls/qvideodeviceselectorcontrol.h @@ -65,7 +65,7 @@ Q_SIGNALS: void devicesChanged(); protected: - QVideoDeviceSelectorControl(QObject *parent = 0); + explicit QVideoDeviceSelectorControl(QObject *parent = Q_NULLPTR); }; #define QVideoDeviceSelectorControl_iid "org.qt-project.qt.videodeviceselectorcontrol/5.0" diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.h b/src/multimedia/controls/qvideoencodersettingscontrol.h index 8638c3886..7b80cd51f 100644 --- a/src/multimedia/controls/qvideoencodersettingscontrol.h +++ b/src/multimedia/controls/qvideoencodersettingscontrol.h @@ -59,10 +59,10 @@ public: virtual ~QVideoEncoderSettingsControl(); virtual QList supportedResolutions(const QVideoEncoderSettings &settings, - bool *continuous = 0) const = 0; + bool *continuous = Q_NULLPTR) const = 0; virtual QList supportedFrameRates(const QVideoEncoderSettings &settings, - bool *continuous = 0) const = 0; + bool *continuous = Q_NULLPTR) const = 0; virtual QStringList supportedVideoCodecs() const = 0; virtual QString videoCodecDescription(const QString &codecName) const = 0; @@ -71,7 +71,7 @@ public: virtual void setVideoSettings(const QVideoEncoderSettings &settings) = 0; protected: - QVideoEncoderSettingsControl(QObject *parent = 0); + explicit QVideoEncoderSettingsControl(QObject *parent = Q_NULLPTR); }; #define QVideoEncoderSettingsControl_iid "org.qt-project.qt.videoencodersettingscontrol/5.0" diff --git a/src/multimedia/controls/qvideorenderercontrol.h b/src/multimedia/controls/qvideorenderercontrol.h index 754d83049..132a7cf07 100644 --- a/src/multimedia/controls/qvideorenderercontrol.h +++ b/src/multimedia/controls/qvideorenderercontrol.h @@ -50,7 +50,7 @@ public: virtual void setSurface(QAbstractVideoSurface *surface) = 0; protected: - QVideoRendererControl(QObject *parent = 0); + explicit QVideoRendererControl(QObject *parent = Q_NULLPTR); }; #define QVideoRendererControl_iid "org.qt-project.qt.videorenderercontrol/5.0" diff --git a/src/multimedia/controls/qvideowindowcontrol.h b/src/multimedia/controls/qvideowindowcontrol.h index c57eef070..ca786dbcd 100644 --- a/src/multimedia/controls/qvideowindowcontrol.h +++ b/src/multimedia/controls/qvideowindowcontrol.h @@ -88,7 +88,7 @@ Q_SIGNALS: void nativeSizeChanged(); protected: - QVideoWindowControl(QObject *parent = 0); + explicit QVideoWindowControl(QObject *parent = Q_NULLPTR); }; #define QVideoWindowControl_iid "org.qt-project.qt.videowindowcontrol/5.0" diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 437bf58ad..30a08f88b 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -113,13 +113,13 @@ public: MediaIsPlaylist }; - QMediaPlayer(QObject *parent = 0, Flags flags = 0); + explicit QMediaPlayer(QObject *parent = Q_NULLPTR, Flags flags = Flags()); ~QMediaPlayer(); static QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs = QStringList(), - Flags flags = 0); - static QStringList supportedMimeTypes(Flags flags = 0); + Flags flags = Flags()); + static QStringList supportedMimeTypes(Flags flags = Flags()); void setVideoOutput(QVideoWidget *); void setVideoOutput(QGraphicsVideoItem *); @@ -168,7 +168,7 @@ public Q_SLOTS: void setPlaybackRate(qreal rate); - void setMedia(const QMediaContent &media, QIODevice *stream = 0); + void setMedia(const QMediaContent &media, QIODevice *stream = Q_NULLPTR); void setPlaylist(QMediaPlaylist *playlist); void setNetworkConfigurations(const QList &configurations); diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h index 1388ac10f..3b6551ead 100644 --- a/src/multimedia/playback/qmediaplaylist.h +++ b/src/multimedia/playback/qmediaplaylist.h @@ -61,7 +61,7 @@ public: enum PlaybackMode { CurrentItemOnce, CurrentItemInLoop, Sequential, Loop, Random }; enum Error { NoError, FormatError, FormatNotSupportedError, NetworkError, AccessDeniedError }; - QMediaPlaylist(QObject *parent = 0); + explicit QMediaPlaylist(QObject *parent = Q_NULLPTR); virtual ~QMediaPlaylist(); QMediaObject *mediaObject() const; @@ -89,11 +89,11 @@ public: bool removeMedia(int start, int end); bool clear(); - void load(const QNetworkRequest &request, const char *format = 0); - void load(const QUrl &location, const char *format = 0); - void load(QIODevice * device, const char *format = 0); + void load(const QNetworkRequest &request, const char *format = Q_NULLPTR); + void load(const QUrl &location, const char *format = Q_NULLPTR); + void load(QIODevice *device, const char *format = Q_NULLPTR); - bool save(const QUrl &location, const char *format = 0); + bool save(const QUrl &location, const char *format = Q_NULLPTR); bool save(QIODevice * device, const char *format); Error error() const; diff --git a/src/multimedia/qmediacontrol.h b/src/multimedia/qmediacontrol.h index 480d96ea3..95c3e1029 100644 --- a/src/multimedia/qmediacontrol.h +++ b/src/multimedia/qmediacontrol.h @@ -53,8 +53,8 @@ public: ~QMediaControl(); protected: - QMediaControl(QObject *parent = 0); - QMediaControl(QMediaControlPrivate &dd, QObject *parent = 0); + explicit QMediaControl(QObject *parent = Q_NULLPTR); + explicit QMediaControl(QMediaControlPrivate &dd, QObject *parent = Q_NULLPTR); QMediaControlPrivate *d_ptr; diff --git a/src/multimedia/radio/qradiodata.h b/src/multimedia/radio/qradiodata.h index edc7acb49..894a9dd34 100644 --- a/src/multimedia/radio/qradiodata.h +++ b/src/multimedia/radio/qradiodata.h @@ -76,7 +76,7 @@ public: College }; - QRadioData(QMediaObject *mediaObject, QObject *parent = 0); + explicit QRadioData(QMediaObject *mediaObject, QObject *parent = Q_NULLPTR); ~QRadioData(); QMultimedia::AvailabilityStatus availability() const; diff --git a/src/multimedia/radio/qradiotuner.h b/src/multimedia/radio/qradiotuner.h index 7a394d0aa..09b8757a5 100644 --- a/src/multimedia/radio/qradiotuner.h +++ b/src/multimedia/radio/qradiotuner.h @@ -72,7 +72,7 @@ public: enum StereoMode { ForceStereo, ForceMono, Auto }; enum SearchMode { SearchFast, SearchGetStationId }; - QRadioTuner(QObject *parent = 0); + explicit QRadioTuner(QObject *parent = Q_NULLPTR); ~QRadioTuner(); QMultimedia::AvailabilityStatus availability() const; diff --git a/src/multimedia/recording/qaudiorecorder.h b/src/multimedia/recording/qaudiorecorder.h index 24b79ea30..d63a44b6a 100644 --- a/src/multimedia/recording/qaudiorecorder.h +++ b/src/multimedia/recording/qaudiorecorder.h @@ -56,7 +56,7 @@ class Q_MULTIMEDIA_EXPORT QAudioRecorder : public QMediaRecorder Q_OBJECT Q_PROPERTY(QString audioInput READ audioInput WRITE setAudioInput NOTIFY audioInputChanged) public: - QAudioRecorder(QObject *parent = 0); + explicit QAudioRecorder(QObject *parent = Q_NULLPTR); ~QAudioRecorder(); QStringList audioInputs() const; diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index 6f275b305..71e8ab5cf 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -100,7 +100,7 @@ public: OutOfSpaceError }; - QMediaRecorder(QMediaObject *mediaObject, QObject *parent = 0); + explicit QMediaRecorder(QMediaObject *mediaObject, QObject *parent = Q_NULLPTR); ~QMediaRecorder(); QMediaObject *mediaObject() const; @@ -131,16 +131,16 @@ public: QString audioCodecDescription(const QString &codecName) const; QList supportedAudioSampleRates(const QAudioEncoderSettings &settings = QAudioEncoderSettings(), - bool *continuous = 0) const; + bool *continuous = Q_NULLPTR) const; QStringList supportedVideoCodecs() const; QString videoCodecDescription(const QString &codecName) const; QList supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), - bool *continuous = 0) const; + bool *continuous = Q_NULLPTR) const; QList supportedFrameRates(const QVideoEncoderSettings &settings = QVideoEncoderSettings(), - bool *continuous = 0) const; + bool *continuous = Q_NULLPTR) const; QAudioEncoderSettings audioSettings() const; QVideoEncoderSettings videoSettings() const; @@ -187,7 +187,7 @@ Q_SIGNALS: void availabilityChanged(QMultimedia::AvailabilityStatus availability); protected: - QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = 0); + QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = Q_NULLPTR); bool setMediaObject(QMediaObject *object); QMediaRecorderPrivate *d_ptr; diff --git a/src/multimedia/video/qabstractvideofilter.h b/src/multimedia/video/qabstractvideofilter.h index 77f035e0a..51b6ee7b4 100644 --- a/src/multimedia/video/qabstractvideofilter.h +++ b/src/multimedia/video/qabstractvideofilter.h @@ -62,7 +62,7 @@ class Q_MULTIMEDIA_EXPORT QAbstractVideoFilter : public QObject Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged) public: - explicit QAbstractVideoFilter(QObject *parent = 0); + explicit QAbstractVideoFilter(QObject *parent = Q_NULLPTR); ~QAbstractVideoFilter(); bool isActive() const; diff --git a/src/multimedia/video/qabstractvideosurface.h b/src/multimedia/video/qabstractvideosurface.h index f8aefc3ba..e2b684125 100644 --- a/src/multimedia/video/qabstractvideosurface.h +++ b/src/multimedia/video/qabstractvideosurface.h @@ -58,7 +58,7 @@ public: ResourceError }; - explicit QAbstractVideoSurface(QObject *parent = 0); + explicit QAbstractVideoSurface(QObject *parent = Q_NULLPTR); ~QAbstractVideoSurface(); virtual QList supportedPixelFormats( diff --git a/src/multimedia/video/qvideoprobe.h b/src/multimedia/video/qvideoprobe.h index 5de594f06..d3c8dbfda 100644 --- a/src/multimedia/video/qvideoprobe.h +++ b/src/multimedia/video/qvideoprobe.h @@ -47,7 +47,7 @@ class Q_MULTIMEDIA_EXPORT QVideoProbe : public QObject { Q_OBJECT public: - explicit QVideoProbe(QObject *parent = 0); + explicit QVideoProbe(QObject *parent = Q_NULLPTR); ~QVideoProbe(); bool setSource(QMediaObject *source); diff --git a/src/multimediawidgets/qcameraviewfinder.h b/src/multimediawidgets/qcameraviewfinder.h index 65556c417..9bb2bda43 100644 --- a/src/multimediawidgets/qcameraviewfinder.h +++ b/src/multimediawidgets/qcameraviewfinder.h @@ -55,7 +55,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QCameraViewfinder : public QVideoWidget { Q_OBJECT public: - QCameraViewfinder(QWidget *parent = 0); + explicit QCameraViewfinder(QWidget *parent = Q_NULLPTR); ~QCameraViewfinder(); QMediaObject *mediaObject() const; diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h index 76dbae2e0..e43de0157 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.h +++ b/src/multimediawidgets/qgraphicsvideoitem.h @@ -57,7 +57,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: - QGraphicsVideoItem(QGraphicsItem *parent = 0); + explicit QGraphicsVideoItem(QGraphicsItem *parent = Q_NULLPTR); ~QGraphicsVideoItem(); QMediaObject *mediaObject() const; @@ -75,7 +75,7 @@ public: QRectF boundingRect() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR); Q_SIGNALS: void nativeSizeChanged(const QSizeF &size); diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h index 2f5eade30..1e67de886 100644 --- a/src/multimediawidgets/qvideowidget.h +++ b/src/multimediawidgets/qvideowidget.h @@ -58,7 +58,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidget : public QWidget, public QMediaBin Q_PROPERTY(int saturation READ saturation WRITE setSaturation NOTIFY saturationChanged) public: - QVideoWidget(QWidget *parent = 0); + explicit QVideoWidget(QWidget *parent = Q_NULLPTR); ~QVideoWidget(); QMediaObject *mediaObject() const; diff --git a/src/multimediawidgets/qvideowidgetcontrol.h b/src/multimediawidgets/qvideowidgetcontrol.h index c77d646db..dca9f2dd0 100644 --- a/src/multimediawidgets/qvideowidgetcontrol.h +++ b/src/multimediawidgets/qvideowidgetcontrol.h @@ -79,7 +79,7 @@ Q_SIGNALS: void saturationChanged(int saturation); protected: - QVideoWidgetControl(QObject *parent = 0); + explicit QVideoWidgetControl(QObject *parent = Q_NULLPTR); }; #define QVideoWidgetControl_iid "org.qt-project.qt.videowidgetcontrol/5.0" -- cgit v1.2.3