1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also remove 0 initialization from QUrlTwoFlags

Browse Source 
Was overlooked when removed from QFlags

Change-Id: If65ff4a07e2f72589d2c32c2d24366ff9dc2405f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 05bb9b1016d981ac3c31c74dc8bc060402b86fa2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Allan Sandfeld Jensen 2020-11-17 14:46:00 +01:00 committed by Qt Cherry-pick Bot
parent 0c23b8823a
commit 509d191b49
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/io/qurl.h
View File

@ -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; }