Showing the changes to libraries/script-engine/src/ScriptUUID.h (1 of 1 file). Show all
Unified · Split
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <QtScript/QScriptable> |
| 19 | 19 | |
| 20 | 20 | /**jsdoc |
| 21 | − * A UUID (Universally Unique IDentitier) is used to uniquely identify entities, overlays, avatars, and the like. It is | |
| 21 | + * A UUID (Universally Unique IDentifier) is used to uniquely identify entities, overlays, avatars, and the like. It is | |
| 22 | 22 | * represented in JavaScript as a string in the format, <code>{nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn}</code>, where the "n"s are |
| 23 | 23 | * hexadecimal digits. |
| 24 | 24 | * |
| @@ -32,7 +32,6 @@ class ScriptUUID : public QObject, protected QScriptable { · 7 unmodified lines | ||
| 32 | 32 | Q_PROPERTY(QString NULL READ NULL_UUID CONSTANT) // String for use in scripts. |
| 33 | 33 | |
| 34 | 34 | public slots: |
| 35 | − QUuid fromString(const QString& string); | |
| 36 | 35 | /**jsdoc |
| 37 | 36 | * Generates a UUID from a string representation of the UUID. |
| 38 | 37 | * @function Uuid.fromString |
| @@ -48,6 +47,7 @@ public slots: · 9 unmodified lines | ||
| 48 | 47 | * uuid = Uuid.fromString("527c27ea"); |
| 49 | 48 | * print(uuid); // null |
| 50 | 49 | */ |
| 50 | + QUuid fromString(const QString& string); | |
| 51 | 51 | |
| 52 | 52 | /**jsdoc |
| 53 | 53 | * Generates a string representation of a UUID. However, because UUIDs are represented in JavaScript as strings, this is in |