diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-24 23:54:59 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-27 08:06:15 +0000 |
commit | acc49e582abf76c962851f53cbd66134812f6a1f (patch) | |
tree | ba82ce531f711397af949ac62fa9b0ca06158c11 /src/multimedia/controls/qvideoencodersettingscontrol.h | |
parent | 97009b6470c09b9889870873a5c82a6a0bb565f8 (diff) |
Replace Q_NULLPTR with nullptr
Change-Id: I3b7601b4a97f8a2b1d2da6ef134f1577846ba713
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/controls/qvideoencodersettingscontrol.h')
-rw-r--r-- | src/multimedia/controls/qvideoencodersettingscontrol.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.h b/src/multimedia/controls/qvideoencodersettingscontrol.h index ea1401aeb..366d585ee 100644 --- a/src/multimedia/controls/qvideoencodersettingscontrol.h +++ b/src/multimedia/controls/qvideoencodersettingscontrol.h @@ -65,10 +65,10 @@ public: virtual ~QVideoEncoderSettingsControl(); virtual QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings, - bool *continuous = Q_NULLPTR) const = 0; + bool *continuous = nullptr) const = 0; virtual QList<qreal> supportedFrameRates(const QVideoEncoderSettings &settings, - bool *continuous = Q_NULLPTR) const = 0; + bool *continuous = nullptr) const = 0; virtual QStringList supportedVideoCodecs() const = 0; virtual QString videoCodecDescription(const QString &codecName) const = 0; @@ -77,7 +77,7 @@ public: virtual void setVideoSettings(const QVideoEncoderSettings &settings) = 0; protected: - explicit QVideoEncoderSettingsControl(QObject *parent = Q_NULLPTR); + explicit QVideoEncoderSettingsControl(QObject *parent = nullptr); }; #define QVideoEncoderSettingsControl_iid "org.qt-project.qt.videoencodersettingscontrol/5.0" |