summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2016-04-26 09:58:56 +0200
committerAlex Blasche <alexander.blasche@theqtcompany.com>2016-04-26 09:21:28 +0000
commitff632b6696048919a91844ded21c2b7941380647 (patch)
treee5097b2ab7579639b28fc0fb42e67bba53e9b0c0 /src
parentdedff12a896d51c469d2af82664b86a10f8fa7fe (diff)
Improve QBluetoothUuid(QString) ctor documentation
It highlights the optional curly braces and the connection to QUuid. Task-number: QTBUG-52685 Change-Id: Iebfa84dc7f83fd2ef0aa02cb5e21b3f62de84d24 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/bluetooth/qbluetoothuuid.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp
index 3c8dc786..ace936f9 100644
--- a/src/bluetooth/qbluetoothuuid.cpp
+++ b/src/bluetooth/qbluetoothuuid.cpp
@@ -602,9 +602,12 @@ QT_WARNING_POP
}
/*!
- Constructs a new Bluetooth UUID from the \a uuid string.
-
- The string must be in the form XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX.
+ Creates a QBluetoothUuid object from the string \a uuid,
+ which must be formatted as five hex fields separated by '-',
+ e.g., "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}" where 'x' is a hex digit.
+ The curly braces shown here are optional, but it is normal to include them.
+ If the conversion fails, a null UUID is created. See \l QUuid::toString() for an
+ explanation of how the five hex fields map to the public data members in QUuid.
*/
QBluetoothUuid::QBluetoothUuid(const QString &uuid)
: QUuid(uuid)