diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-31 12:58:03 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-14 09:47:51 +0200 |
| commit | ed2f5e7cf2df6843bec2260b238cbcb216ea1dca (patch) | |
| tree | 88e9fc1aa5a88887fe4e038a21e3b6fdacbbe2bd /src/corelib/plugin/quuid.h | |
| parent | 533df067e9869522b348d172fee85b2a501540b6 (diff) | |
QUuid: merge toString() overloads and toByteArray() overloads
In each case, simply give WithBraces as default for mode, since that's
what _q_uuidToHex() used internally.
Task-number: QTBUG-85700
Change-Id: I9f6fddb259703917129d4be742bbdd2eb1647f44
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/plugin/quuid.h')
| -rw-r--r-- | src/corelib/plugin/quuid.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index cc5745992c..bfea13f9fc 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -127,11 +127,9 @@ public: static QUuid fromString(QStringView string) noexcept; static QUuid fromString(QLatin1String string) noexcept; explicit QUuid(const char *); - QString toString() const; - QString toString(StringFormat mode) const; // ### Qt6: merge with previous + QString toString(StringFormat mode = WithBraces) const; explicit QUuid(const QByteArray &); - QByteArray toByteArray() const; - QByteArray toByteArray(StringFormat mode) const; // ### Qt6: merge with previous + QByteArray toByteArray(StringFormat mode = WithBraces) const; QByteArray toRfc4122() const; static QUuid fromRfc4122(const QByteArray &); bool isNull() const noexcept; |