From 711ff56a6467b90a4a3a9794200d6144b08c904a Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 9 Jul 2021 07:58:08 +0200 Subject: QUuid: remove Windows-only pre-C++11 constructor implementation Amends bd62dc13919556c6dc564df25cbf0ddf456c05e7. Change-Id: Iba10e7d70e7bd9d7c6068632dd2f429a52945463 Reviewed-by: Edward Welbourne --- src/corelib/plugin/quuid.h | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/corelib/plugin/quuid.h') diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index c5cf3a8add..98ecced530 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -132,21 +132,10 @@ public: #if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) // On Windows we have a type GUID that is used by the platform API, so we // provide convenience operators to cast from and to this type. -#if defined(Q_COMPILER_UNIFORM_INIT) && !defined(Q_CLANG_QDOC) constexpr QUuid(const GUID &guid) noexcept : data1(guid.Data1), data2(guid.Data2), data3(guid.Data3), data4{guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]} {} -#else - QUuid(const GUID &guid) noexcept - { - data1 = guid.Data1; - data2 = guid.Data2; - data3 = guid.Data3; - for (int i = 0; i < 8; i++) - data4[i] = guid.Data4[i]; - } -#endif constexpr QUuid &operator=(const GUID &guid) noexcept { -- cgit v1.2.3