From 6109d23b4e00941343293ab702710f45be3ff965 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 17 Nov 2020 14:46:00 +0100 Subject: Also remove 0 initialization from QUrlTwoFlags Was overlooked when removed from QFlags Change-Id: If65ff4a07e2f72589d2c32c2d24366ff9dc2405f Reviewed-by: Lars Knoll (cherry picked from commit 05bb9b1016d981ac3c31c74dc8bc060402b86fa2) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/io/qurl.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index c13b21ef44..a78fbfcd3f 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -64,14 +64,13 @@ template class QUrlTwoFlags { int i; - typedef int QUrlTwoFlags:: *Zero; public: + constexpr inline QUrlTwoFlags() : i(0) {} constexpr inline QUrlTwoFlags(E1 f) : i(f) {} constexpr inline QUrlTwoFlags(E2 f) : i(f) {} constexpr inline QUrlTwoFlags(QFlag f) : i(f) {} constexpr inline QUrlTwoFlags(QFlags f) : i(f.operator typename QFlags::Int()) {} constexpr inline QUrlTwoFlags(QFlags f) : i(f.operator typename QFlags::Int()) {} - constexpr inline QUrlTwoFlags(Zero = 0) : i(0) {} inline QUrlTwoFlags &operator&=(int mask) { i &= mask; return *this; } inline QUrlTwoFlags &operator&=(uint mask) { i &= mask; return *this; } -- cgit v1.2.3