From 463036a2d21693d6e644a26b730c8bb0aec0020f Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 3 Mar 2016 10:28:05 +0100 Subject: Make more ctors explicit Added explicit where it was missing. 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. Change-Id: Ib360290b0d01d9690703945f4fbf7efe946c5a59 Reviewed-by: Lars Knoll --- src/publishsubscribe/qvaluespacepublisher.h | 4 ++-- src/publishsubscribe/qvaluespacesubscriber.h | 4 ++-- src/serviceframework/qremoteserviceregister.h | 2 +- src/serviceframework/qservicereply.h | 2 +- src/systeminfo/qbatteryinfo.h | 4 ++-- src/systeminfo/qdeviceinfo.h | 2 +- src/systeminfo/qnetworkinfo.h | 2 +- src/systeminfo/qscreensaver.h | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/publishsubscribe/qvaluespacepublisher.h b/src/publishsubscribe/qvaluespacepublisher.h index 4d09e3df..4baa4d69 100644 --- a/src/publishsubscribe/qvaluespacepublisher.h +++ b/src/publishsubscribe/qvaluespacepublisher.h @@ -49,8 +49,8 @@ class Q_PUBLISHSUBSCRIBE_EXPORT QValueSpacePublisher : public QObject public: explicit QValueSpacePublisher(const QString &path, QObject *parent = Q_NULLPTR); - QValueSpacePublisher(QValueSpace::LayerOptions filter, const QString &path, QObject *parent = Q_NULLPTR); - QValueSpacePublisher(const QUuid &uuid, const QString &path, QObject *parent = Q_NULLPTR); + explicit QValueSpacePublisher(QValueSpace::LayerOptions filter, const QString &path, QObject *parent = Q_NULLPTR); + explicit QValueSpacePublisher(const QUuid &uuid, const QString &path, QObject *parent = Q_NULLPTR); virtual ~QValueSpacePublisher(); bool isConnected() const; diff --git a/src/publishsubscribe/qvaluespacesubscriber.h b/src/publishsubscribe/qvaluespacesubscriber.h index 6496b445..d806f73d 100644 --- a/src/publishsubscribe/qvaluespacesubscriber.h +++ b/src/publishsubscribe/qvaluespacesubscriber.h @@ -53,8 +53,8 @@ class Q_PUBLISHSUBSCRIBE_EXPORT QValueSpaceSubscriber : public QObject public: explicit QValueSpaceSubscriber(QObject *parent = Q_NULLPTR); explicit QValueSpaceSubscriber(const QString &path, QObject *parent = Q_NULLPTR); - QValueSpaceSubscriber(QValueSpace::LayerOptions filter, const QString &path, QObject *parent = Q_NULLPTR); - QValueSpaceSubscriber(const QUuid &uuid, const QString &path, QObject *parent = Q_NULLPTR); + explicit QValueSpaceSubscriber(QValueSpace::LayerOptions filter, const QString &path, QObject *parent = Q_NULLPTR); + explicit QValueSpaceSubscriber(const QUuid &uuid, const QString &path, QObject *parent = Q_NULLPTR); virtual ~QValueSpaceSubscriber(); bool isConnected() const; diff --git a/src/serviceframework/qremoteserviceregister.h b/src/serviceframework/qremoteserviceregister.h index 4ea5c738..6f65a4b2 100644 --- a/src/serviceframework/qremoteserviceregister.h +++ b/src/serviceframework/qremoteserviceregister.h @@ -109,7 +109,7 @@ public: #endif }; - QRemoteServiceRegister(QObject* parent = Q_NULLPTR); + explicit QRemoteServiceRegister(QObject* parent = Q_NULLPTR); ~QRemoteServiceRegister(); template diff --git a/src/serviceframework/qservicereply.h b/src/serviceframework/qservicereply.h index 4e45bed6..55fcac3c 100644 --- a/src/serviceframework/qservicereply.h +++ b/src/serviceframework/qservicereply.h @@ -83,7 +83,7 @@ class Q_SERVICEFW_EXPORT QServiceReply : public QServiceReplyBase { Q_OBJECT public: - QServiceReply(QObject *p = Q_NULLPTR) + explicit QServiceReply(QObject *p = Q_NULLPTR) : QServiceReplyBase(p), m_proxyObject(Q_NULLPTR) { diff --git a/src/systeminfo/qbatteryinfo.h b/src/systeminfo/qbatteryinfo.h index cf839c6c..4ca11581 100644 --- a/src/systeminfo/qbatteryinfo.h +++ b/src/systeminfo/qbatteryinfo.h @@ -100,8 +100,8 @@ public: HealthBad }; - QBatteryInfo(QObject *parent = Q_NULLPTR); - QBatteryInfo(int batteryIndex, QObject *parent = Q_NULLPTR); + explicit QBatteryInfo(QObject *parent = Q_NULLPTR); + explicit QBatteryInfo(int batteryIndex, QObject *parent = Q_NULLPTR); virtual ~QBatteryInfo(); int batteryCount() const; diff --git a/src/systeminfo/qdeviceinfo.h b/src/systeminfo/qdeviceinfo.h index b6f8df0d..8f831b4a 100644 --- a/src/systeminfo/qdeviceinfo.h +++ b/src/systeminfo/qdeviceinfo.h @@ -101,7 +101,7 @@ public: Firmware }; - QDeviceInfo(QObject *parent = Q_NULLPTR); + explicit QDeviceInfo(QObject *parent = Q_NULLPTR); virtual ~QDeviceInfo(); QDeviceInfo::LockTypeFlags activatedLocks() const; diff --git a/src/systeminfo/qnetworkinfo.h b/src/systeminfo/qnetworkinfo.h index 4a305cde..b2904db5 100644 --- a/src/systeminfo/qnetworkinfo.h +++ b/src/systeminfo/qnetworkinfo.h @@ -84,7 +84,7 @@ public: // ,Connected //desktop }; - QNetworkInfo(QObject *parent = Q_NULLPTR); + explicit QNetworkInfo(QObject *parent = Q_NULLPTR); virtual ~QNetworkInfo(); int networkInterfaceCount(QNetworkInfo::NetworkMode mode) const; diff --git a/src/systeminfo/qscreensaver.h b/src/systeminfo/qscreensaver.h index bf4d3be2..acf371c1 100644 --- a/src/systeminfo/qscreensaver.h +++ b/src/systeminfo/qscreensaver.h @@ -48,7 +48,7 @@ class Q_SYSTEMINFO_EXPORT QScreenSaver : public QObject Q_PROPERTY(bool screenSaverEnabled READ screenSaverEnabled WRITE setScreenSaverEnabled) public: - QScreenSaver(QObject *parent = Q_NULLPTR); + explicit QScreenSaver(QObject *parent = Q_NULLPTR); virtual ~QScreenSaver(); bool screenSaverEnabled() const; -- cgit v1.2.3