diff options
-rw-r--r-- | doc/src/bluetooth-overview.qdoc | 2 | ||||
-rw-r--r-- | doc/src/bluetooth-qml.qdoc | 6 | ||||
-rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp | 2 | ||||
-rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothservice.cpp | 2 | ||||
-rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothsocket.cpp | 2 | ||||
-rw-r--r-- | src/imports/nfc/qdeclarativendeffilter.cpp | 6 | ||||
-rw-r--r-- | src/imports/nfc/qdeclarativendefmimerecord.cpp | 6 | ||||
-rw-r--r-- | src/imports/nfc/qdeclarativendeftextrecord.cpp | 6 | ||||
-rw-r--r-- | src/imports/nfc/qdeclarativendefurirecord.cpp | 4 | ||||
-rw-r--r-- | src/imports/nfc/qdeclarativenearfield.cpp | 6 | ||||
-rw-r--r-- | src/imports/nfc/qdeclarativenearfieldsocket.cpp | 6 | ||||
-rw-r--r-- | src/nfc/qdeclarativendefrecord.cpp | 8 |
12 files changed, 28 insertions, 28 deletions
diff --git a/doc/src/bluetooth-overview.qdoc b/doc/src/bluetooth-overview.qdoc index d8963110..559803c9 100644 --- a/doc/src/bluetooth-overview.qdoc +++ b/doc/src/bluetooth-overview.qdoc @@ -64,7 +64,7 @@ the Bluetooth connection. \section2 QML API - There are a number of QML Elements available in the Qt Bluetooth API. + There are a number of QML Types available in the Qt Bluetooth API. \list \li \l {Bluetooth QML API}{Bluetooth QML API} diff --git a/doc/src/bluetooth-qml.qdoc b/doc/src/bluetooth-qml.qdoc index 6058230f..57e4cf68 100644 --- a/doc/src/bluetooth-qml.qdoc +++ b/doc/src/bluetooth-qml.qdoc @@ -46,15 +46,15 @@ plugins with the flexibility you need. \section1 Getting Started -To import the Bluetooth elements, use the following: +To import the Bluetooth types, use the following: \snippet ../doc/src/snippets/doc_src_qtbluetooth.qml import -After importing the Bluetooth API you can use its elements. This example shows how to connect to a remote RFCOMM (SPP) server using BluetoothSocket: +After importing the Bluetooth API you can use its types. This example shows how to connect to a remote RFCOMM (SPP) server using BluetoothSocket: \snippet ../doc/src/snippets/doc_src_qtbluetooth.qml service -\section1 QML Elements +\section1 QML Types \list \annotatedlist bluetooth-qml diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp index 7f781f84..4a844d1d 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp @@ -55,7 +55,7 @@ \ingroup bluetooth-qml \inmodule QtBluetooth - The BluetoothDiscoveryModel element was introduced in \b{QtBluetooth 5.0}. + The BluetoothDiscoveryModel type was introduced in \b{QtBluetooth 5.0}. BluetoothDiscoveryModel provides a model of connectable services. The contents of the model can be filtered by UUID allowing discovery to be diff --git a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp index 642f7b85..37b3d991 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp @@ -61,7 +61,7 @@ \sa QBluetoothAddress \sa QBluetoothSocket - The BluetoothService element was introduced in \b{QtBluetooth 5.0}. + The BluetoothService type was introduced in \b{QtBluetooth 5.0}. It allows a QML project to get information about a remote service, or describe a service for a BluetoothSocket to connect to. diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp index d903c700..43f9ec9b 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp +++ b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp @@ -65,7 +65,7 @@ \sa QBluetoothSocket \sa QDataStream - The BluetoothSocket element was introduced in \b{QtBluetooth 5.0}. + The BluetoothSocket type was introduced in \b{QtBluetooth 5.0}. It allows a QML class connect to another bluetooth device and send and receive QString from the device. Data is sent and received using a diff --git a/src/imports/nfc/qdeclarativendeffilter.cpp b/src/imports/nfc/qdeclarativendeffilter.cpp index cdc0081e..25c97fe9 100644 --- a/src/imports/nfc/qdeclarativendeffilter.cpp +++ b/src/imports/nfc/qdeclarativendeffilter.cpp @@ -43,7 +43,7 @@ /*! \qmlclass NdefFilter QDeclarativeNdefFilter - \brief The NdefFilter element represents a filtering constraint for NDEF message records. + \brief The NdefFilter type represents a filtering constraint for NDEF message records. \ingroup nfc-qml \inmodule QtNfc @@ -51,9 +51,9 @@ \sa NearField \sa QNdefFilter - The NdefFilter element was introduced in \b {QtNfc 5.0}. + The NdefFilter type was introduced in \b {QtNfc 5.0}. - The NdefFilter element is used with the NearField element to read NDEF messages from NFC Forum + The NdefFilter type is used with the NearField type to read NDEF messages from NFC Forum tags that match a given structure. \code diff --git a/src/imports/nfc/qdeclarativendefmimerecord.cpp b/src/imports/nfc/qdeclarativendefmimerecord.cpp index 1d5a3280..5252d1c3 100644 --- a/src/imports/nfc/qdeclarativendefmimerecord.cpp +++ b/src/imports/nfc/qdeclarativendefmimerecord.cpp @@ -43,16 +43,16 @@ /*! \qmlclass NdefMimeRecord QDeclarativeNdefMimeRecord - \brief The NdefMimeRecord element represents an NFC MIME record. + \brief The NdefMimeRecord type represents an NFC MIME record. \ingroup connectivity-nfc \inmodule QtNfc \inherits NdefRecord - The NdefMimeRecord element was introduced in \b {QtNfc 5.0}. + The NdefMimeRecord type was introduced in \b {QtNfc 5.0}. - The NdefMimeRecord element can contain data with an associated MIME type. The data is + The NdefMimeRecord type can contain data with an associated MIME type. The data is accessible from the uri in the \l {NdefMimeRecord::uri}{uri} property. */ diff --git a/src/imports/nfc/qdeclarativendeftextrecord.cpp b/src/imports/nfc/qdeclarativendeftextrecord.cpp index f55b1e62..a94269cb 100644 --- a/src/imports/nfc/qdeclarativendeftextrecord.cpp +++ b/src/imports/nfc/qdeclarativendeftextrecord.cpp @@ -45,7 +45,7 @@ /*! \qmlclass NdefTextRecord QDeclarativeNdefTextRecord - \brief The NdefTextRecord element represents an NFC RTD-Text NDEF record. + \brief The NdefTextRecord type represents an NFC RTD-Text NDEF record. \ingroup nfc-qml \inmodule QtNfc @@ -54,9 +54,9 @@ \sa QNdefNfcTextRecord - The NdefTextRecord element was introduced in \b {QtNfc 5.0}. + The NdefTextRecord type was introduced in \b {QtNfc 5.0}. - The NdefTextRecord element contains a localized piece of text that can be display to the user. + The NdefTextRecord type contains a localized piece of text that can be display to the user. An NDEF message may contain many text records for different locales, it is up to the application to select the most appropriate one to display to the user. The localeMatch property can be used to determine if the text record has been matched. diff --git a/src/imports/nfc/qdeclarativendefurirecord.cpp b/src/imports/nfc/qdeclarativendefurirecord.cpp index 0eada170..18b72bf8 100644 --- a/src/imports/nfc/qdeclarativendefurirecord.cpp +++ b/src/imports/nfc/qdeclarativendefurirecord.cpp @@ -45,7 +45,7 @@ /*! \qmlclass NdefUriRecord QDeclarativeNdefUriRecord - \brief The NdefUriRecord element represents an NFC RTD-URI NDEF record. + \brief The NdefUriRecord type represents an NFC RTD-URI NDEF record. \ingroup nfc-qml \inmodule QtNfc @@ -54,7 +54,7 @@ \sa QNdefNfcUriRecord - The NdefUriRecord element was introduced in \b {QtNfc 5.0}. + The NdefUriRecord type was introduced in \b {QtNfc 5.0}. */ /*! diff --git a/src/imports/nfc/qdeclarativenearfield.cpp b/src/imports/nfc/qdeclarativenearfield.cpp index 5f7bde4a..e510e8ae 100644 --- a/src/imports/nfc/qdeclarativenearfield.cpp +++ b/src/imports/nfc/qdeclarativenearfield.cpp @@ -51,7 +51,7 @@ /*! \qmlclass NearField QDeclarativeNearField - \brief The NearField element provides access to NDEF messages stored on NFC Forum tags. + \brief The NearField type provides access to NDEF messages stored on NFC Forum tags. \ingroup nfc-qml \inmodule QtNfc @@ -63,9 +63,9 @@ \sa QNdefMessage \sa QNdefRecord - The NearField element was introduced in \b {QtNfc 5.0}. + The NearField type was introduced in \b {QtNfc 5.0}. - The NearField element can be used to read NDEF messages from NFC Forum tags. Set the \l filter + The NearField type can be used to read NDEF messages from NFC Forum tags. Set the \l filter and \l orderMatch properties to match the required NDEF messages. Once an NDEF message is successfully read from a tag the \l messageRecords property is updated. diff --git a/src/imports/nfc/qdeclarativenearfieldsocket.cpp b/src/imports/nfc/qdeclarativenearfieldsocket.cpp index 205ef343..c1b225ef 100644 --- a/src/imports/nfc/qdeclarativenearfieldsocket.cpp +++ b/src/imports/nfc/qdeclarativenearfieldsocket.cpp @@ -45,7 +45,7 @@ /*! \qmlclass NearFieldSocket QDeclarativeNearFieldSocket - \brief The NearFieldSocket element represents an LLCP socket. + \brief The NearFieldSocket type represents an LLCP socket. \ingroup nfc-qml \inmodule QtNfc @@ -53,9 +53,9 @@ \sa QLlcpSocket \sa QLlcpServer - The NearFieldSocket element was introduced in \b {QtNfc 5.0}. + The NearFieldSocket type was introduced in \b {QtNfc 5.0}. - The NearFieldSocket element can be used to create a peer-to-peer connection over NFC LLCP + The NearFieldSocket type can be used to create a peer-to-peer connection over NFC LLCP sockets. NearfieldSocket can be used for both client and server side sockets. */ diff --git a/src/nfc/qdeclarativendefrecord.cpp b/src/nfc/qdeclarativendefrecord.cpp index 8c95ea50..113e13e6 100644 --- a/src/nfc/qdeclarativendefrecord.cpp +++ b/src/nfc/qdeclarativendefrecord.cpp @@ -48,14 +48,14 @@ QTNFC_BEGIN_NAMESPACE /*! \class QDeclarativeNdefRecord - \brief The QDeclarativeNdefRecord class implements the NdefRecord element in QML. + \brief The QDeclarativeNdefRecord class implements the NdefRecord type in QML. \ingroup connectivity-nfc \inmodule QtNfc \sa NdefRecord - The QDeclarativeNdefRecord class is the base class for all NdefRecord elements in QML. To + The QDeclarativeNdefRecord class is the base class for all NdefRecord types in QML. To support a new NDEF record type in QML subclass this class and expose new properties, member functions and signals appropriate for the new record type. The following must be done to create a new NDEF record type in QML: @@ -86,7 +86,7 @@ QTNFC_BEGIN_NAMESPACE /*! \qmlclass NdefRecord QDeclarativeNdefRecord - \brief The NdefRecord element represents a record in an NDEF message. + \brief The NdefRecord type represents a record in an NDEF message. \ingroup nfc-qml \inmodule QtNfc @@ -96,7 +96,7 @@ QTNFC_BEGIN_NAMESPACE \sa QNdefRecord - The NdefRecord element is the base element for all NDEF record elements in QML. It contains + The NdefRecord type is the base type for all NDEF record types in QML. It contains a single property holding the type of record. This class is not intended to be used directly, but extended from C++. |