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>

3 files changed, 10 insertions, 10 deletions

diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index ea81c02c4..2b4a058d8 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -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)
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)
diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h
index c75d6c622..a8d2d4abc 100644
--- a/src/multimedia/camera/qcameraimagecapture.h
+++ b/src/multimedia/camera/qcameraimagecapture.h
@@ -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);