From e2145a47fc95b2e69f02a4f1ab024c6be957e76b Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sun, 2 May 2021 03:04:29 +0200 Subject: [PATCH] QUrl: code tidies Change some casts of enumeration/flag types from int to uint. In fact, the enumerations (and flags) in question are *defined* to be backed by unsigned int. Change-Id: I757ded61a26fe979deeaa1e5a524478102960ffe Reviewed-by: Thiago Macieira --- src/corelib/io/qurl.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index f777a1a629..b6a4e58e78 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -303,25 +303,25 @@ constexpr inline QUrl::FormattingOptions operator|(QUrl::UrlFormattingOption f1, constexpr inline QUrl::FormattingOptions operator|(QUrl::UrlFormattingOption f1, QUrl::FormattingOptions f2) { return f2 | f1; } constexpr inline QIncompatibleFlag operator|(QUrl::UrlFormattingOption f1, int f2) -{ return QIncompatibleFlag(int(f1) | f2); } +{ return QIncompatibleFlag(uint(f1) | f2); } // add operators for OR'ing the two types of flags inline QUrl::FormattingOptions &operator|=(QUrl::FormattingOptions &i, QUrl::ComponentFormattingOptions f) -{ i |= QUrl::UrlFormattingOption(int(f)); return i; } +{ i |= QUrl::UrlFormattingOption(uint(f)); return i; } constexpr inline QUrl::FormattingOptions operator|(QUrl::UrlFormattingOption i, QUrl::ComponentFormattingOption f) -{ return i | QUrl::UrlFormattingOption(int(f)); } +{ return i | QUrl::UrlFormattingOption(uint(f)); } constexpr inline QUrl::FormattingOptions operator|(QUrl::UrlFormattingOption i, QUrl::ComponentFormattingOptions f) -{ return i | QUrl::UrlFormattingOption(int(f)); } +{ return i | QUrl::UrlFormattingOption(uint(f)); } constexpr inline QUrl::FormattingOptions operator|(QUrl::ComponentFormattingOption f, QUrl::UrlFormattingOption i) -{ return i | QUrl::UrlFormattingOption(int(f)); } +{ return i | QUrl::UrlFormattingOption(uint(f)); } constexpr inline QUrl::FormattingOptions operator|(QUrl::ComponentFormattingOptions f, QUrl::UrlFormattingOption i) -{ return i | QUrl::UrlFormattingOption(int(f)); } +{ return i | QUrl::UrlFormattingOption(uint(f)); } constexpr inline QUrl::FormattingOptions operator|(QUrl::FormattingOptions i, QUrl::ComponentFormattingOptions f) -{ return i | QUrl::UrlFormattingOption(int(f)); } +{ return i | QUrl::UrlFormattingOption(uint(f)); } constexpr inline QUrl::FormattingOptions operator|(QUrl::ComponentFormattingOption f, QUrl::FormattingOptions i) -{ return i | QUrl::UrlFormattingOption(int(f)); } +{ return i | QUrl::UrlFormattingOption(uint(f)); } constexpr inline QUrl::FormattingOptions operator|(QUrl::ComponentFormattingOptions f, QUrl::FormattingOptions i) -{ return i | QUrl::UrlFormattingOption(int(f)); } +{ return i | QUrl::UrlFormattingOption(uint(f)); } //inline QUrl::UrlFormattingOption &operator=(const QUrl::UrlFormattingOption &i, QUrl::ComponentFormattingOptions f) //{ i = int(f); f; }