summaryrefslogtreecommitdiffstats
path: root/src/nfc
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-02 16:40:42 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-15 17:50:55 +0000
commit03e694e2702d598d3cfced3a63571d9f0fd66f16 (patch)
tree91a8c7956cf177fb7c86a99c184d407e8e84c968 /src/nfc
parentc25d62cc83b9e8daa8c9b7fd6c03782b500093db (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. 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. Task-number: QTBUG-45291 Change-Id: I375361699615d0fc874e0b96a84543e233eff5f0 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'src/nfc')
-rw-r--r--src/nfc/qnearfieldmanager.h4
-rw-r--r--src/nfc/qnearfieldsharemanager.h2
-rw-r--r--src/nfc/qnearfieldsharetarget.h2
-rw-r--r--src/nfc/qnearfieldtarget.h2
-rw-r--r--src/nfc/qqmlndefrecord.h4
5 files changed, 7 insertions, 7 deletions
diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h
index 416c5e91..8c91a801 100644
--- a/src/nfc/qnearfieldmanager.h
+++ b/src/nfc/qnearfieldmanager.h
@@ -59,8 +59,8 @@ public:
Q_ENUM(TargetAccessMode)
Q_DECLARE_FLAGS(TargetAccessModes, TargetAccessMode)
- explicit QNearFieldManager(QObject *parent = 0);
- explicit QNearFieldManager(QNearFieldManagerPrivate *backend, QObject *parent = 0);
+ explicit QNearFieldManager(QObject *parent = Q_NULLPTR);
+ explicit QNearFieldManager(QNearFieldManagerPrivate *backend, QObject *parent = Q_NULLPTR);
~QNearFieldManager();
bool isAvailable() const;
diff --git a/src/nfc/qnearfieldsharemanager.h b/src/nfc/qnearfieldsharemanager.h
index 264e82b6..03dc4db9 100644
--- a/src/nfc/qnearfieldsharemanager.h
+++ b/src/nfc/qnearfieldsharemanager.h
@@ -47,7 +47,7 @@ class Q_NFC_EXPORT QNearFieldShareManager : public QObject
Q_OBJECT
public:
- explicit QNearFieldShareManager(QObject *parent = 0);
+ explicit QNearFieldShareManager(QObject *parent = Q_NULLPTR);
~QNearFieldShareManager();
enum ShareError {
diff --git a/src/nfc/qnearfieldsharetarget.h b/src/nfc/qnearfieldsharetarget.h
index cc85086f..36f4a5cc 100644
--- a/src/nfc/qnearfieldsharetarget.h
+++ b/src/nfc/qnearfieldsharetarget.h
@@ -63,7 +63,7 @@ Q_SIGNALS:
void shareFinished();
private:
- explicit QNearFieldShareTarget(QNearFieldShareManager::ShareModes modes, QObject *parent = 0);
+ explicit QNearFieldShareTarget(QNearFieldShareManager::ShareModes modes, QObject *parent = Q_NULLPTR);
QNearFieldShareTargetPrivate *d_ptr;
Q_DECLARE_PRIVATE(QNearFieldShareTarget)
diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h
index a7abbe25..d9f6786e 100644
--- a/src/nfc/qnearfieldtarget.h
+++ b/src/nfc/qnearfieldtarget.h
@@ -110,7 +110,7 @@ public:
QSharedDataPointer<RequestIdPrivate> d;
};
- explicit QNearFieldTarget(QObject *parent = 0);
+ explicit QNearFieldTarget(QObject *parent = Q_NULLPTR);
virtual ~QNearFieldTarget();
virtual QByteArray uid() const = 0;
diff --git a/src/nfc/qqmlndefrecord.h b/src/nfc/qqmlndefrecord.h
index 93a3106e..35b2ab5f 100644
--- a/src/nfc/qqmlndefrecord.h
+++ b/src/nfc/qqmlndefrecord.h
@@ -63,8 +63,8 @@ public:
};
Q_ENUM(TypeNameFormat)
- explicit QQmlNdefRecord(QObject *parent = 0);
- explicit QQmlNdefRecord(const QNdefRecord &record, QObject *parent = 0);
+ explicit QQmlNdefRecord(QObject *parent = Q_NULLPTR);
+ explicit QQmlNdefRecord(const QNdefRecord &record, QObject *parent = Q_NULLPTR);
~QQmlNdefRecord();
QString type() const;