From 0fecaaec54977db80f67e6f0e18b237da27cdbfb Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Mon, 17 May 2021 12:26:21 +0200 Subject: [PATCH] QUrl: use QFlags::toInt / qToUnderlying In preparation for blocking QFlags->int conversions. The existing casts to uint are wrong, in the general case, as the enumeration might actually be backed by signed integers; that makes them fail to compile. Port them to toInt(). For symmetry, also use qToUnderlying. Change-Id: I851544f6ba05295fa5f6c5cc355b9de0f1362e2b Reviewed-by: Thiago Macieira --- src/corelib/io/qurl.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 91bb7b7e06f..dffe81e8856 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -313,21 +313,21 @@ constexpr inline QIncompatibleFlag operator|(QUrl::UrlFormattingOption f1, int f // add operators for OR'ing the two types of flags inline QUrl::FormattingOptions &operator|=(QUrl::FormattingOptions &i, QUrl::ComponentFormattingOptions f) -{ i |= QUrl::UrlFormattingOption(uint(f)); return i; } +{ i |= QUrl::UrlFormattingOption(f.toInt()); return i; } constexpr inline QUrl::FormattingOptions operator|(QUrl::UrlFormattingOption i, QUrl::ComponentFormattingOption f) -{ return i | QUrl::UrlFormattingOption(uint(f)); } +{ return i | QUrl::UrlFormattingOption(qToUnderlying(f)); } constexpr inline QUrl::FormattingOptions operator|(QUrl::UrlFormattingOption i, QUrl::ComponentFormattingOptions f) -{ return i | QUrl::UrlFormattingOption(uint(f)); } +{ return i | QUrl::UrlFormattingOption(f.toInt()); } constexpr inline QUrl::FormattingOptions operator|(QUrl::ComponentFormattingOption f, QUrl::UrlFormattingOption i) -{ return i | QUrl::UrlFormattingOption(uint(f)); } +{ return i | QUrl::UrlFormattingOption(qToUnderlying(f)); } constexpr inline QUrl::FormattingOptions operator|(QUrl::ComponentFormattingOptions f, QUrl::UrlFormattingOption i) -{ return i | QUrl::UrlFormattingOption(uint(f)); } +{ return i | QUrl::UrlFormattingOption(f.toInt()); } constexpr inline QUrl::FormattingOptions operator|(QUrl::FormattingOptions i, QUrl::ComponentFormattingOptions f) -{ return i | QUrl::UrlFormattingOption(uint(f)); } +{ return i | QUrl::UrlFormattingOption(f.toInt()); } constexpr inline QUrl::FormattingOptions operator|(QUrl::ComponentFormattingOption f, QUrl::FormattingOptions i) -{ return i | QUrl::UrlFormattingOption(uint(f)); } +{ return i | QUrl::UrlFormattingOption(qToUnderlying(f)); } constexpr inline QUrl::FormattingOptions operator|(QUrl::ComponentFormattingOptions f, QUrl::FormattingOptions i) -{ return i | QUrl::UrlFormattingOption(uint(f)); } +{ return i | QUrl::UrlFormattingOption(f.toInt()); } //inline QUrl::UrlFormattingOption &operator=(const QUrl::UrlFormattingOption &i, QUrl::ComponentFormattingOptions f) //{ i = int(f); f; }