summaryrefslogtreecommitdiffstats
path: root/src/corelib/plugin/quuid.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2021-07-07 08:06:38 +0200
committerMarc Mutz <marc.mutz@kdab.com>2021-07-08 01:49:26 +0200
commitbd62dc13919556c6dc564df25cbf0ddf456c05e7 (patch)
tree82b0431103efbd6647af0fcc7bbd51eebada330f /src/corelib/plugin/quuid.h
parent3818046204164c4ec9851ef3043f1c1fc2932f72 (diff)
QUuid: clean up pre C++11 constructors
All compilers Qt 6 supports support C++11 Uniform Initialization now. Change-Id: I1ddcc506347db1770c535047ebe2547ff33d843e Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/plugin/quuid.h')
-rw-r--r--src/corelib/plugin/quuid.h26
1 files changed, 0 insertions, 26 deletions
diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h
index 87966ad891..c5cf3a8add 100644
--- a/src/corelib/plugin/quuid.h
+++ b/src/corelib/plugin/quuid.h
@@ -91,37 +91,11 @@ public:
Id128 = 3
};
-#if defined(Q_COMPILER_UNIFORM_INIT) && !defined(Q_CLANG_QDOC)
-
constexpr QUuid() noexcept : data1(0), data2(0), data3(0), data4{0,0,0,0,0,0,0,0} {}
constexpr QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3,
uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) noexcept
: data1(l), data2(w1), data3(w2), data4{b1, b2, b3, b4, b5, b6, b7, b8} {}
-#else
- QUuid() noexcept
- {
- data1 = 0;
- data2 = 0;
- data3 = 0;
- for (int i = 0; i < 8; i++)
- data4[i] = 0;
- }
- QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3, uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) noexcept
- {
- data1 = l;
- data2 = w1;
- data3 = w2;
- data4[0] = b1;
- data4[1] = b2;
- data4[2] = b3;
- data4[3] = b4;
- data4[4] = b5;
- data4[5] = b6;
- data4[6] = b7;
- data4[7] = b8;
- }
-#endif
explicit QUuid(const QString &);
static QUuid fromString(QStringView string) noexcept;