From 4b03570f2ab82889305db88092b8612af5d812a0 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Mon, 21 Aug 2017 14:30:13 +0200
Subject: Rename qnfcglobal.h to qtnfcglobal.h

... and deprecate the former. By doing so we get the header
file in line with other modules - see qtnetworkglobal.h for
example.

The include is not used in the examples so it is removed
there.

Change-Id: If6d30e7a821b60f12768a963990937c46f21f4c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 src/nfc/qnearfieldtarget.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nfc/qnearfieldtarget.h')

diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h
index 641645c3..330164f5 100644
--- a/src/nfc/qnearfieldtarget.h
+++ b/src/nfc/qnearfieldtarget.h
@@ -45,7 +45,7 @@
 #include <QtCore/QMetaType>
 #include <QtCore/QObject>
 #include <QtCore/QSharedDataPointer>
-#include <QtNfc/qnfcglobal.h>
+#include <QtNfc/qtnfcglobal.h>
 
 QT_BEGIN_NAMESPACE
 class QString;
-- 
cgit v1.2.3


From 844382001f8deaa7fcc9faac779b24188f35329b Mon Sep 17 00:00:00 2001
From: Kevin Funk <kfunk@kde.org>
Date: Sun, 24 Sep 2017 23:54:54 +0200
Subject: Replace Q_NULLPTR with nullptr

Change-Id: Ica194c2568465a94d851ddeaf62ca71b33fe4464
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/nfc/qnearfieldtarget.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nfc/qnearfieldtarget.h')

diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h
index 330164f5..e51960f7 100644
--- a/src/nfc/qnearfieldtarget.h
+++ b/src/nfc/qnearfieldtarget.h
@@ -118,7 +118,7 @@ public:
         QSharedDataPointer<RequestIdPrivate> d;
     };
 
-    explicit QNearFieldTarget(QObject *parent = Q_NULLPTR);
+    explicit QNearFieldTarget(QObject *parent = nullptr);
     virtual ~QNearFieldTarget();
 
     virtual QByteArray uid() const = 0;
-- 
cgit v1.2.3