summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/nfc/nfc.pro1
-rw-r--r--src/nfc/qdeclarativendefrecord.h4
-rw-r--r--src/nfc/qllcpserver.h7
-rw-r--r--src/nfc/qllcpsocket.h4
-rw-r--r--src/nfc/qndeffilter.h6
-rw-r--r--src/nfc/qndefmessage.h6
-rw-r--r--src/nfc/qndefnfctextrecord.h5
-rw-r--r--src/nfc/qndefnfcurirecord.h5
-rw-r--r--src/nfc/qndefrecord.h3
-rw-r--r--src/nfc/qnearfieldmanager.h10
-rw-r--r--src/nfc/qnearfieldtagtype1.h2
-rw-r--r--src/nfc/qnearfieldtagtype2.h2
-rw-r--r--src/nfc/qnearfieldtagtype3.h3
-rw-r--r--src/nfc/qnearfieldtagtype4.h2
-rw-r--r--src/nfc/qnearfieldtarget.h4
15 files changed, 26 insertions, 38 deletions
diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro
index 9d74ac04..95434e6a 100644
--- a/src/nfc/nfc.pro
+++ b/src/nfc/nfc.pro
@@ -9,6 +9,7 @@ DEFINES += QT_BEGIN_MOC_NAMESPACE=\""namespace QtNfc {"\"
DEFINES += QT_END_MOC_NAMESPACE=\""}"\"
PUBLIC_HEADERS += \
+ qnfcglobal.h \
qnearfieldmanager.h \
qnearfieldtarget.h \
qndefrecord.h \
diff --git a/src/nfc/qdeclarativendefrecord.h b/src/nfc/qdeclarativendefrecord.h
index 904c6498..10ca0a07 100644
--- a/src/nfc/qdeclarativendefrecord.h
+++ b/src/nfc/qdeclarativendefrecord.h
@@ -44,8 +44,7 @@
#include <QtCore/QObject>
#include <QtCore/QMetaType>
-
-#include <qndefrecord.h>
+#include <QtNfc/QNdefRecord>
QT_BEGIN_HEADER
@@ -56,6 +55,7 @@ class QDeclarativeNdefRecordPrivate;
class Q_NFC_EXPORT QDeclarativeNdefRecord : public QObject
{
Q_OBJECT
+
Q_DECLARE_PRIVATE(QDeclarativeNdefRecord)
Q_PROPERTY(QString recordType READ recordType WRITE setRecordType NOTIFY recordTypeChanged)
diff --git a/src/nfc/qllcpserver.h b/src/nfc/qllcpserver.h
index 822e1e99..9c130940 100644
--- a/src/nfc/qllcpserver.h
+++ b/src/nfc/qllcpserver.h
@@ -42,11 +42,9 @@
#ifndef QLLCPSERVER_H
#define QLLCPSERVER_H
-#include "qnfcglobal.h"
-
-#include <qllcpsocket.h>
-
#include <QtCore/QObject>
+#include <QtNfc/qnfcglobal.h>
+#include <QtNfc/QLlcpSocket>
QT_BEGIN_HEADER
@@ -57,6 +55,7 @@ class QLlcpServerPrivate;
class Q_NFC_EXPORT QLlcpServer : public QObject
{
Q_OBJECT
+
Q_DECLARE_PRIVATE(QLlcpServer)
public:
diff --git a/src/nfc/qllcpsocket.h b/src/nfc/qllcpsocket.h
index b7fa1349..0f15df5c 100644
--- a/src/nfc/qllcpsocket.h
+++ b/src/nfc/qllcpsocket.h
@@ -42,10 +42,9 @@
#ifndef QLLCPSOCKET_H
#define QLLCPSOCKET_H
-#include "qnfcglobal.h"
-
#include <QtCore/QIODevice>
#include <QtNetwork/QAbstractSocket>
+#include <QtNfc/qnfcglobal.h>
QT_BEGIN_HEADER
@@ -57,6 +56,7 @@ class QLlcpSocketPrivate;
class Q_NFC_EXPORT QLlcpSocket : public QIODevice
{
Q_OBJECT
+
Q_DECLARE_PRIVATE(QLlcpSocket)
friend class QLlcpServerPrivate;
diff --git a/src/nfc/qndeffilter.h b/src/nfc/qndeffilter.h
index f989a275..9461d558 100644
--- a/src/nfc/qndeffilter.h
+++ b/src/nfc/qndeffilter.h
@@ -42,11 +42,9 @@
#ifndef QNDEFFILTER_H
#define QNDEFFILTER_H
-#include "qnfcglobal.h"
-
#include <QtCore/QSharedDataPointer>
-
-#include <qndefrecord.h>
+#include <QtNfc/qnfcglobal.h>
+#include <QtNfc/QNdefRecord>
QT_BEGIN_HEADER
diff --git a/src/nfc/qndefmessage.h b/src/nfc/qndefmessage.h
index fed257b5..003c7bd8 100644
--- a/src/nfc/qndefmessage.h
+++ b/src/nfc/qndefmessage.h
@@ -42,14 +42,12 @@
#ifndef QNDEFMESSAGE_H
#define QNDEFMESSAGE_H
-#include "qnfcglobal.h"
-
-#include <qndefrecord.h>
-
#include <QtCore/QVector>
#include <QtCore/QSet>
#include <QtCore/QList>
#include <QtCore/QMetaType>
+#include <QtNfc/qnfcglobal.h>
+#include <QtNfc/QNdefRecord>
QT_BEGIN_HEADER
diff --git a/src/nfc/qndefnfctextrecord.h b/src/nfc/qndefnfctextrecord.h
index d0f89290..5f9959d6 100644
--- a/src/nfc/qndefnfctextrecord.h
+++ b/src/nfc/qndefnfctextrecord.h
@@ -42,9 +42,8 @@
#ifndef QNDEFNFCTEXTRECORD_H
#define QNDEFNFCTEXTRECORD_H
-#include "qnfcglobal.h"
-
-#include <qndefrecord.h>
+#include <QtNfc/qnfcglobal.h>
+#include <QtNfc/QNdefRecord>
QT_BEGIN_HEADER
diff --git a/src/nfc/qndefnfcurirecord.h b/src/nfc/qndefnfcurirecord.h
index 7212dff8..f7297428 100644
--- a/src/nfc/qndefnfcurirecord.h
+++ b/src/nfc/qndefnfcurirecord.h
@@ -42,9 +42,8 @@
#ifndef QNDEFNFCURIRECORD_H
#define QNDEFNFCURIRECORD_H
-#include "qnfcglobal.h"
-
-#include <qndefrecord.h>
+#include <QtNfc/qnfcglobal.h>
+#include <QtNfc/QNdefRecord>
QT_FORWARD_DECLARE_CLASS(QUrl)
diff --git a/src/nfc/qndefrecord.h b/src/nfc/qndefrecord.h
index fb8b6436..c2781025 100644
--- a/src/nfc/qndefrecord.h
+++ b/src/nfc/qndefrecord.h
@@ -42,10 +42,9 @@
#ifndef QNDEFRECORD_H
#define QNDEFRECORD_H
-#include "qnfcglobal.h"
-
#include <QtCore/QSharedDataPointer>
#include <QtCore/QByteArray>
+#include <QtNfc/qnfcglobal.h>
QT_BEGIN_HEADER
diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h
index 2cf88968..323cc054 100644
--- a/src/nfc/qnearfieldmanager.h
+++ b/src/nfc/qnearfieldmanager.h
@@ -42,13 +42,11 @@
#ifndef QNEARFIELDMANAGER_H
#define QNEARFIELDMANAGER_H
-#include "qnfcglobal.h"
-
#include <QtCore/QObject>
-
-#include <qnearfieldtarget.h>
-#include <qndefrecord.h>
-#include <qndeffilter.h>
+#include <QtNfc/qnfcglobal.h>
+#include <QtNfc/QNearFieldTarget>
+#include <QtNfc/QNdefRecord>
+#include <QtNfc/QNdefFilter>
QT_BEGIN_HEADER
diff --git a/src/nfc/qnearfieldtagtype1.h b/src/nfc/qnearfieldtagtype1.h
index 39cfdfce..6e9616f4 100644
--- a/src/nfc/qnearfieldtagtype1.h
+++ b/src/nfc/qnearfieldtagtype1.h
@@ -42,7 +42,7 @@
#ifndef QNEARFIELDTAGTYPE1_H
#define QNEARFIELDTAGTYPE1_H
-#include <qnearfieldtarget.h>
+#include <QtNfc/QNearFieldTarget>
QT_BEGIN_HEADER
diff --git a/src/nfc/qnearfieldtagtype2.h b/src/nfc/qnearfieldtagtype2.h
index 7e37ac4c..0cc2dcb2 100644
--- a/src/nfc/qnearfieldtagtype2.h
+++ b/src/nfc/qnearfieldtagtype2.h
@@ -42,7 +42,7 @@
#ifndef QNEARFIELDTAGTYPE2_H
#define QNEARFIELDTAGTYPE2_H
-#include <qnearfieldtarget.h>
+#include <QtNfc/QNearFieldTarget>
QT_BEGIN_HEADER
diff --git a/src/nfc/qnearfieldtagtype3.h b/src/nfc/qnearfieldtagtype3.h
index 53886c84..e0f8e6d4 100644
--- a/src/nfc/qnearfieldtagtype3.h
+++ b/src/nfc/qnearfieldtagtype3.h
@@ -42,10 +42,9 @@
#ifndef QNEARFIELDTAGTYPE3_H
#define QNEARFIELDTAGTYPE3_H
-#include <qnearfieldtarget.h>
-
#include <QtCore/QList>
#include <QtCore/QMap>
+#include <QtNfc/QNearFieldTarget>
QT_BEGIN_HEADER
diff --git a/src/nfc/qnearfieldtagtype4.h b/src/nfc/qnearfieldtagtype4.h
index 153e7073..506fdd0a 100644
--- a/src/nfc/qnearfieldtagtype4.h
+++ b/src/nfc/qnearfieldtagtype4.h
@@ -42,7 +42,7 @@
#ifndef QNEARFIELDTAGTYPE4_H
#define QNEARFIELDTAGTYPE4_H
-#include <qnearfieldtarget.h>
+#include <QtNfc/QNearFieldTarget>
QT_BEGIN_HEADER
diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h
index 94e5bacd..27bd0478 100644
--- a/src/nfc/qnearfieldtarget.h
+++ b/src/nfc/qnearfieldtarget.h
@@ -39,16 +39,14 @@
**
****************************************************************************/
-
#ifndef QNEARFIELDTARGET_H
#define QNEARFIELDTARGET_H
-#include "qnfcglobal.h"
-
#include <QtCore/QObject>
#include <QtCore/QList>
#include <QtCore/QMetaType>
#include <QtCore/QSharedDataPointer>
+#include <QtNfc/qnfcglobal.h>
QT_BEGIN_NAMESPACE
class QString;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 16:06:33 +0000