diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2021-05-17 12:26:21 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2021-05-23 21:54:29 +0200 |
| commit | 0fecaaec54977db80f67e6f0e18b237da27cdbfb (patch) | |
| tree | 4ba0473198f2020b172018c76e37ac149bb5bcf8 /src/corelib/io/qurl.h | |
| parent | 64bfc927b09b46bb7fc0dc6caf1bf1a4d4133ab4 (diff) | |
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qurl.h')
| -rw-r--r-- | src/corelib/io/qurl.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 91bb7b7e06..dffe81e885 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; } |