summaryrefslogtreecommitdiff
path: root/src/multimedia/controls/qimageencodercontrol.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-02 15:19:22 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-03 16:34:50 +0000
commit3198bf4944edd8f25996c2b4c4516f606165af59 (patch)
treec2888fd047c61687b2e65748a62e208b31d5c088 /src/multimedia/controls/qimageencodercontrol.h
parentd2d0d93f7654fdcca118dd17a745e560d524496b (diff)
downloadqtmultimedia-3198bf4944edd8f25996c2b4c4516f606165af59.tar.gz
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>
Diffstat (limited to 'src/multimedia/controls/qimageencodercontrol.h')
-rw-r--r--src/multimedia/controls/qimageencodercontrol.h4
1 files changed, 2 insertions, 2 deletions
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<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"