diff options
author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-03-01 15:52:01 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-06 00:46:19 +0100 |
commit | 940737ffe73114d2983d69f1e1e1a518c4abb2ab (patch) | |
tree | 60abc9f6fc31bdf2f199f269a6fe1409f6c90d4e /src/nfc | |
parent | 5e8cec811c586854a828b23e15885a1ebfed8bcc (diff) |
Remove the usage of deprecated qdoc macros.
QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.
Task-number: QTBUG-24578
Change-Id: I40e6d40c8ca9b5e7b98a16aab3fac57ec84be63d
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'src/nfc')
-rw-r--r-- | src/nfc/qdeclarativendefrecord.cpp | 8 | ||||
-rw-r--r-- | src/nfc/qndefrecord.cpp | 6 | ||||
-rw-r--r-- | src/nfc/qnearfieldmanager.cpp | 12 | ||||
-rw-r--r-- | src/nfc/qnearfieldtagtype3.cpp | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/nfc/qdeclarativendefrecord.cpp b/src/nfc/qdeclarativendefrecord.cpp index 68fb7563..8c95ea50 100644 --- a/src/nfc/qdeclarativendefrecord.cpp +++ b/src/nfc/qdeclarativendefrecord.cpp @@ -61,12 +61,12 @@ QTNFC_BEGIN_NAMESPACE create a new NDEF record type in QML: \list - \o The subclass must have a Q_OBJECT macro in its declaration. - \o The subclass must have an \l {Q_INVOKABLE}{invokable} constructor that takes a + \li The subclass must have a Q_OBJECT macro in its declaration. + \li The subclass must have an \l {Q_INVOKABLE}{invokable} constructor that takes a QNdefRecord and a QObject pointer. - \o The subclass must be declared as an NDEF record by expanding the Q_DECLARE_NDEFRECORD() + \li The subclass must be declared as an NDEF record by expanding the Q_DECLARE_NDEFRECORD() macro in the implementation file of the subclass. - \o The subclass must be registered with QML. + \li The subclass must be registered with QML. \endlist For example the declaration of such a class may look like the following. diff --git a/src/nfc/qndefrecord.cpp b/src/nfc/qndefrecord.cpp index 573b7245..9dd2ff6e 100644 --- a/src/nfc/qndefrecord.cpp +++ b/src/nfc/qndefrecord.cpp @@ -78,7 +78,7 @@ QTNFC_BEGIN_NAMESPACE Specialized NDEF record classes can be easily created with the Q_DECLARE_NDEF_RECORD() and Q_DECLARE_ISRECORDTYPE_FOR_NDEF_RECORD() macros. The following example shows the class - declaration of the hypothetical \i {example.com:f} record type that encapsulates a single int + declaration of the hypothetical \e {example.com:f} record type that encapsulates a single int property foo. \snippet ../doc/src/snippets/nfc.cpp Specialized class definition @@ -122,7 +122,7 @@ QTNFC_BEGIN_NAMESPACE \a className is the name of the specialized class, \a typeNameFormat is the appropriate QNdefRecord::TypeNameFormat for the custom type and \a type is the type without the NID or NSS - prefixes. That is \i {example.com:f} not \i {urn:nfc:ext:example.com:f}. \a initialPayload + prefixes. That is \e {example.com:f} not \e {urn:nfc:ext:example.com:f}. \a initialPayload is the initial payload of an empty record, it must be a QByteArray or a type that can be implicitly converted into a QByteArray. @@ -142,7 +142,7 @@ QTNFC_BEGIN_NAMESPACE \a className is the name of the specialized class, \a typeNameFormat is the appropriate QNdefRecord::TypeNameFormat for the custom type and \a type is the type without the NID or NSS - prefixes. That is \i {example.com:f} not \i {urn:nfc:ext:example.com:f}. + prefixes. That is \e {example.com:f} not \e {urn:nfc:ext:example.com:f}. See the secton on \l {Creating specialized NDEF record classes} for details. diff --git a/src/nfc/qnearfieldmanager.cpp b/src/nfc/qnearfieldmanager.cpp index e08d0ff4..830c4ca5 100644 --- a/src/nfc/qnearfieldmanager.cpp +++ b/src/nfc/qnearfieldmanager.cpp @@ -330,8 +330,8 @@ static QMetaMethod methodForSignature(QObject *object, const char *method) Returns an identifier, which can be used to unregister the handler, on success; otherwise returns -1. - \note The \i target parameter of \a method may not be available on all platforms, in which case - \i target will be 0. + \note The \e target parameter of \a method may not be available on all platforms, in which case + \e target will be 0. */ int QNearFieldManager::registerNdefMessageHandler(QNdefRecord::TypeNameFormat typeNameFormat, @@ -365,8 +365,8 @@ int QNearFieldManager::registerNdefMessageHandler(QNdefRecord::TypeNameFormat ty NDEF message matching a pre-registered message format is received. See the section on \l {Automatically launching NDEF message handlers}. - \note The \i target parameter of \a method may not be available on all platforms, in which case - \i target will be 0. + \note The \e target parameter of \a method may not be available on all platforms, in which case + \e target will be 0. */ int QNearFieldManager::registerNdefMessageHandler(QObject *object, const char *method) { @@ -387,8 +387,8 @@ int QNearFieldManager::registerNdefMessageHandler(QObject *object, const char *m Returns an identifier, which can be used to unregister the handler, on success; otherwise returns -1. - \note The \i target parameter of \a method may not be available on all platforms, in which case - \i target will be 0. + \note The \e target parameter of \a method may not be available on all platforms, in which case + \e target will be 0. */ int QNearFieldManager::registerNdefMessageHandler(const QNdefFilter &filter, QObject *object, const char *method) diff --git a/src/nfc/qnearfieldtagtype3.cpp b/src/nfc/qnearfieldtagtype3.cpp index 9c4a78f2..5b1fabf2 100644 --- a/src/nfc/qnearfieldtagtype3.cpp +++ b/src/nfc/qnearfieldtagtype3.cpp @@ -126,7 +126,7 @@ QNearFieldTarget::RequestId QNearFieldTagType3::writeServiceData(quint16 service } /*! - Sends the \i check request to the target. Requests the service data blocks specified by + Sends the \e check request to the target. Requests the service data blocks specified by \a serviceBlockList. Returns a request id which can be used to track the completion status of the request. @@ -150,7 +150,7 @@ QNearFieldTarget::RequestId QNearFieldTagType3::check(const QMap<quint16, QList< } /*! - Sends the \i update request to the target. Writes \a data to the services and block indexes + Sends the \e update request to the target. Writes \a data to the services and block indexes sepecified by \a serviceBlockList. Returns a request id which can be used to track the completion status of the request. |