QtNfc: Get rid of NearFieldTarget class

Use QNearFieldTarget class directly after making
QNearFieldManagerPrivateImpl a friend.

Task-number: QTBUG-103357
Change-Id: I3488c7c23e3a050f3f74cbd3edd39e39bf851ea8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

7 files changed, 8 insertions, 15 deletions

diff --git a/src/nfc/qnearfieldmanager_android.cpp b/src/nfc/qnearfieldmanager_android.cpp
index 44764f5d..e1900c3e 100644
--- a/src/nfc/qnearfieldmanager_android.cpp
+++ b/src/nfc/qnearfieldmanager_android.cpp
@@ -99,7 +99,7 @@ void QNearFieldManagerPrivateImpl::onTargetDetected(QNearFieldTargetPrivateImpl
         return;
     }
 
-    Q_EMIT targetDetected(new NearFieldTarget(target, this));
+    Q_EMIT targetDetected(new QNearFieldTarget(target, this));
 }
 
 void QNearFieldManagerPrivateImpl::onTargetLost(QNearFieldTargetPrivateImpl *target)
diff --git a/src/nfc/qnearfieldmanager_android_p.h b/src/nfc/qnearfieldmanager_android_p.h
index a2291b03..c31992af 100644
--- a/src/nfc/qnearfieldmanager_android_p.h
+++ b/src/nfc/qnearfieldmanager_android_p.h
@@ -65,7 +65,6 @@ QT_BEGIN_NAMESPACE
 
 typedef QList<QNdefMessage> QNdefMessageList;
 
-class NearFieldTarget;
 class QByteArray;
 class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivate, public AndroidNfc::AndroidNfcListenerInterface
 {
diff --git a/src/nfc/qnearfieldmanager_ios.mm b/src/nfc/qnearfieldmanager_ios.mm
index dcae40dc..9764b377 100644
--- a/src/nfc/qnearfieldmanager_ios.mm
+++ b/src/nfc/qnearfieldmanager_ios.mm
@@ -153,7 +153,7 @@ void QNearFieldManagerPrivateImpl::onTagDiscovered(void *tag)
     detectedTargets += target;
     connect(target, &QNearFieldTargetPrivateImpl::targetLost,
             this, &QNearFieldManagerPrivateImpl::onTargetLost);
-    Q_EMIT targetDetected(new NearFieldTarget(target, this));
+    Q_EMIT targetDetected(new QNearFieldTarget(target, this));
 }
 
 void QNearFieldManagerPrivateImpl::onTargetLost(QNearFieldTargetPrivateImpl *target)
diff --git a/src/nfc/qnearfieldmanager_pcsc.cpp b/src/nfc/qnearfieldmanager_pcsc.cpp
index 78dd374e..3a9b4b9a 100644
--- a/src/nfc/qnearfieldmanager_pcsc.cpp
+++ b/src/nfc/qnearfieldmanager_pcsc.cpp
@@ -157,7 +157,7 @@ void QNearFieldManagerPrivateImpl::onCardInserted(QPcscCard *card, const QByteAr
     connect(card, &QPcscCard::ndefMessageRead, priv,
             &QNearFieldTargetPrivateImpl::onNdefMessageRead);
 
-    auto target = new NearFieldTarget(priv, this);
+    auto target = new QNearFieldTarget(priv, this);
 
     Q_EMIT targetDetected(target);
 
diff --git a/src/nfc/qnearfieldtarget.cpp b/src/nfc/qnearfieldtarget.cpp
index 9992b046..1788f7d9 100644
--- a/src/nfc/qnearfieldtarget.cpp
+++ b/src/nfc/qnearfieldtarget.cpp
@@ -424,6 +424,9 @@ QNearFieldTarget::QNearFieldTarget(QNearFieldTargetPrivate *backend, QObject *pa
 {
     Q_D(QNearFieldTarget);
 
+    d->q_ptr = this;
+    d->setParent(this);
+
     qRegisterMetaType<QNearFieldTarget::RequestId>();
     qRegisterMetaType<QNearFieldTarget::Error>();
     qRegisterMetaType<QNdefMessage>();
diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h
index bc8475f4..a26941cb 100644
--- a/src/nfc/qnearfieldtarget.h
+++ b/src/nfc/qnearfieldtarget.h
@@ -52,12 +52,14 @@ QT_BEGIN_NAMESPACE
 
 class QNdefMessage;
 class QNearFieldTargetPrivate;
+class QNearFieldManagerPrivateImpl;
 
 class Q_NFC_EXPORT QNearFieldTarget : public QObject
 {
     Q_OBJECT
 
     Q_DECLARE_PRIVATE(QNearFieldTarget)
+    friend class QNearFieldManagerPrivateImpl;
 
 public:
     enum Type {
diff --git a/src/nfc/qnearfieldtarget_p.h b/src/nfc/qnearfieldtarget_p.h
index 9a383280..2bfb3395 100644
--- a/src/nfc/qnearfieldtarget_p.h
+++ b/src/nfc/qnearfieldtarget_p.h
@@ -113,17 +113,6 @@ protected:
     void reportError(QNearFieldTarget::Error error, const QNearFieldTarget::RequestId &id);
 };
 
-class NearFieldTarget : public QNearFieldTarget
-{
-public:
-    NearFieldTarget(QNearFieldTargetPrivate *backend, QObject *parent = nullptr)
-    : QNearFieldTarget(backend, parent)
-    {
-        backend->q_ptr = this;
-        backend->setParent(this);
-    }
-};
-
 QT_END_NAMESPACE
 
 #endif // QNEARFIELDTARGET_P_H