summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2013-09-12 10:10:38 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-16 08:33:15 +0200
commite31271a184fe06da8be6cd745a55a6950466d425 (patch)
tree57e9809e95e742fa579f18c58abed7530fd22c51
parent96e099e05e346286dd085c4ed0f17760748395d8 (diff)
Fix qdoc warnings
Change-Id: I5efbf42be944ee3dd0ba245b6ecaf752216d2b90 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
-rw-r--r--src/imports/nfc/qdeclarativendefmimerecord.cpp1
-rw-r--r--src/imports/nfc/qdeclarativendeftextrecord.cpp1
-rw-r--r--src/imports/nfc/qdeclarativendefurirecord.cpp1
-rw-r--r--src/nfc/qnearfieldtarget.cpp12
4 files changed, 5 insertions, 10 deletions
diff --git a/src/imports/nfc/qdeclarativendefmimerecord.cpp b/src/imports/nfc/qdeclarativendefmimerecord.cpp
index 69e25c98..46ba975d 100644
--- a/src/imports/nfc/qdeclarativendefmimerecord.cpp
+++ b/src/imports/nfc/qdeclarativendefmimerecord.cpp
@@ -43,7 +43,6 @@
/*!
\qmltype NdefMimeRecord
- \instantiates QDeclarativeNdefMimeRecord
\brief The NdefMimeRecord type represents an NFC MIME record.
\ingroup connectivity-nfc
diff --git a/src/imports/nfc/qdeclarativendeftextrecord.cpp b/src/imports/nfc/qdeclarativendeftextrecord.cpp
index 5cb6f5e7..7542edf0 100644
--- a/src/imports/nfc/qdeclarativendeftextrecord.cpp
+++ b/src/imports/nfc/qdeclarativendeftextrecord.cpp
@@ -45,7 +45,6 @@
/*!
\qmltype NdefTextRecord
- \instantiates QDeclarativeNdefTextRecord
\brief The NdefTextRecord type represents an NFC RTD-Text NDEF record.
\ingroup nfc-qml
diff --git a/src/imports/nfc/qdeclarativendefurirecord.cpp b/src/imports/nfc/qdeclarativendefurirecord.cpp
index 99f4ab12..00dcd031 100644
--- a/src/imports/nfc/qdeclarativendefurirecord.cpp
+++ b/src/imports/nfc/qdeclarativendefurirecord.cpp
@@ -45,7 +45,6 @@
/*!
\qmltype NdefUriRecord
- \instantiates QDeclarativeNdefUriRecord
\brief The NdefUriRecord type represents an NFC RTD-URI NDEF record.
\ingroup nfc-qml
diff --git a/src/nfc/qnearfieldtarget.cpp b/src/nfc/qnearfieldtarget.cpp
index c559c523..36d1e8c7 100644
--- a/src/nfc/qnearfieldtarget.cpp
+++ b/src/nfc/qnearfieldtarget.cpp
@@ -129,13 +129,6 @@ QT_BEGIN_NAMESPACE
\value NdefWriteError Failed to write NDEF messages to the target.
*/
-/*!
- \fn quint16 qNfcChecksum(const char *data, uint len)
-
- \relates QNearFieldTarget
-
- Returns the NFC checksum of the first \a len bytes of \a data.
-*/
// Copied from qbytearray.cpp
// Modified to initialize the crc with 0x6363 instead of 0xffff and to not invert the final result.
static const quint16 crc_tbl[16] = {
@@ -145,6 +138,11 @@ static const quint16 crc_tbl[16] = {
0xc60c, 0xd68d, 0xe70e, 0xf78f
};
+/*!
+ \relates QNearFieldTarget
+
+ Returns the NFC checksum of the first \a len bytes of \a data.
+*/
quint16 qNfcChecksum(const char *data, uint len)
{
register quint16 crc = 0x6363;