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 <yoann.lopes@theqtcompany.com>
This commit is contained in:
Marc Mutz
2016-03-02 15:19:22 +01:00
parent d2d0d93f76
commit 3198bf4944
60 changed files with 87 additions and 87 deletions

View File

@@ -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());

View File

@@ -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;

View File

@@ -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;

View File

@@ -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);

View File

@@ -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<QByteArray> availableDevices(QAudio::Mode) const = 0;

View File

@@ -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;

View File

@@ -74,7 +74,7 @@ public:
Error
};
explicit QSoundEffect(QObject *parent = 0);
explicit QSoundEffect(QObject *parent = Q_NULLPTR);
~QSoundEffect();
static QStringList supportedMimeTypes();

View File

@@ -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)

View File

@@ -129,9 +129,9 @@ public:
qreal requestedAperture() const;
qreal requestedShutterSpeed() const;
QList<int> supportedIsoSensitivities(bool *continuous = 0) const;
QList<qreal> supportedApertures(bool * continuous = 0) const;
QList<qreal> supportedShutterSpeeds(bool *continuous = 0) const;
QList<int> supportedIsoSensitivities(bool *continuous = Q_NULLPTR) const;
QList<qreal> supportedApertures(bool *continuous = Q_NULLPTR) const;
QList<qreal> 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)

View File

@@ -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<QSize> supportedResolutions(const QImageEncoderSettings &settings = QImageEncoderSettings(),
bool *continuous = 0) const;
bool *continuous = Q_NULLPTR) const;
QImageEncoderSettings encodingSettings() const;
void setEncodingSettings(const QImageEncoderSettings& settings);

View File

@@ -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"

View File

@@ -61,13 +61,13 @@ public:
virtual QString codecDescription(const QString &codecName) const = 0;
virtual QList<int> 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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -62,13 +62,13 @@ public:
virtual QString imageCodecDescription(const QString &codecName) const = 0;
virtual QList<QSize> 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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -59,10 +59,10 @@ public:
virtual ~QVideoEncoderSettingsControl();
virtual QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings,
bool *continuous = 0) const = 0;
bool *continuous = Q_NULLPTR) const = 0;
virtual QList<qreal> 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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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<QNetworkConfiguration> &configurations);

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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<int> supportedAudioSampleRates(const QAudioEncoderSettings &settings = QAudioEncoderSettings(),
bool *continuous = 0) const;
bool *continuous = Q_NULLPTR) const;
QStringList supportedVideoCodecs() const;
QString videoCodecDescription(const QString &codecName) const;
QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(),
bool *continuous = 0) const;
bool *continuous = Q_NULLPTR) const;
QList<qreal> 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;

View File

@@ -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;

View File

@@ -58,7 +58,7 @@ public:
ResourceError
};
explicit QAbstractVideoSurface(QObject *parent = 0);
explicit QAbstractVideoSurface(QObject *parent = Q_NULLPTR);
~QAbstractVideoSurface();
virtual QList<QVideoFrame::PixelFormat> supportedPixelFormats(

View File

@@ -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);

View File

@@ -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;

View File

@@ -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);

View File

@@ -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;

View File

@@ -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"