summaryrefslogtreecommitdiffstats
path: root/src/multimedia/camera
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/camera')
-rw-r--r--src/multimedia/camera/qcamera.h8
-rw-r--r--src/multimedia/camera/qcameraexposure.h8
-rw-r--r--src/multimedia/camera/qcameraimagecapture.h4
3 files changed, 10 insertions, 10 deletions
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index 1c626748e..7d7063650 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -165,10 +165,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 c71bb8575..e0924ca60 100644
--- a/src/multimedia/camera/qcameraexposure.h
+++ b/src/multimedia/camera/qcameraexposure.h
@@ -135,9 +135,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);
@@ -168,7 +168,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 190dabb15..3f3c6bd26 100644
--- a/src/multimedia/camera/qcameraimagecapture.h
+++ b/src/multimedia/camera/qcameraimagecapture.h
@@ -87,7 +87,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;
@@ -104,7 +104,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);