diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2017-05-19 09:05:48 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2017-05-19 09:06:07 +0200 |
commit | ca5490859338f28e30104668a353275d23df1ec6 (patch) | |
tree | 98df1ca5a4cb3852f03496bb0bf4e13d838063a2 /src/nfc/qnearfieldtarget.h | |
parent | 4976498621fb05804201dad52eab2c59d94f0da3 (diff) | |
parent | 4593b79d84b9c8cc818d3c30e3882d699228339f (diff) |
Merge remote-tracking branch 'gerrit/5.9' into btle
Change-Id: Ic8a6a7f8bf36b5604ec758e89091a04e60df993a
Diffstat (limited to 'src/nfc/qnearfieldtarget.h')
-rw-r--r-- | src/nfc/qnearfieldtarget.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h index dc081f5e..641645c3 100644 --- a/src/nfc/qnearfieldtarget.h +++ b/src/nfc/qnearfieldtarget.h @@ -40,9 +40,10 @@ #ifndef QNEARFIELDTARGET_H #define QNEARFIELDTARGET_H -#include <QtCore/QObject> +#include <QtCore/QByteArray> #include <QtCore/QList> #include <QtCore/QMetaType> +#include <QtCore/QObject> #include <QtCore/QSharedDataPointer> #include <QtNfc/qnfcglobal.h> @@ -91,7 +92,8 @@ public: ChecksumMismatchError, InvalidParametersError, NdefReadError, - NdefWriteError + NdefWriteError, + CommandError }; Q_ENUM(Error) @@ -125,6 +127,10 @@ public: virtual Type type() const = 0; virtual AccessMethods accessMethods() const = 0; + bool keepConnection() const; + bool setKeepConnection(bool isPersistent); + bool disconnect(); + bool isProcessingCommand() const; // NdefAccess @@ -133,6 +139,7 @@ public: virtual RequestId writeNdefMessages(const QList<QNdefMessage> &messages); // TagTypeSpecificAccess + int maxCommandLength() const; virtual RequestId sendCommand(const QByteArray &command); virtual RequestId sendCommands(const QList<QByteArray> &commands); @@ -160,7 +167,9 @@ private: QNearFieldTargetPrivate *d_ptr; }; +#if QT_DEPRECATED_SINCE(5, 9) Q_NFC_EXPORT quint16 qNfcChecksum(const char * data, uint len); +#endif Q_DECLARE_OPERATORS_FOR_FLAGS(QNearFieldTarget::AccessMethods) |