diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-02 15:19:22 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-03 16:34:50 +0000 |
| commit | 3198bf4944edd8f25996c2b4c4516f606165af59 (patch) | |
| tree | c2888fd047c61687b2e65748a62e208b31d5c088 /src/multimedia/camera/qcameraexposure.h | |
| parent | d2d0d93f7654fdcca118dd17a745e560d524496b (diff) | |
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/camera/qcameraexposure.h')
| -rw-r--r-- | src/multimedia/camera/qcameraexposure.h | 8 |
1 files changed, 4 insertions, 4 deletions
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<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) |