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/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 +- 36 files changed, 41 insertions(+), 41 deletions(-) (limited to 'src/multimedia/controls') 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" -- cgit v1.2.3