summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-17 14:46:00 +0100
committerLars Knoll <lars.knoll@qt.io>2020-11-27 12:26:51 +0000
commit05bb9b1016d981ac3c31c74dc8bc060402b86fa2 (patch)
tree96a532f8daa86e4fee6d78e96fb78b10f7611e4a /src
parent16fa6e2f62c8850e319624332ecceef835c5847b (diff)
Also remove 0 initialization from QUrlTwoFlags
Was overlooked when removed from QFlags Pick-to: 6.0 6.0.0 Change-Id: If65ff4a07e2f72589d2c32c2d24366ff9dc2405f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qurl.h3
1 files changed, 1 insertions, 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 <typename E1, typename E2>
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<E1> f) : i(f.operator typename QFlags<E1>::Int()) {}
constexpr inline QUrlTwoFlags(QFlags<E2> f) : i(f.operator typename QFlags<E2>::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; }