diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-07-26 15:53:16 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-27 15:15:30 +0000 |
| commit | 6fb812f574e1e1a84738531f9e540d24d6825c3a (patch) | |
| tree | d6948b53e7bc583a14022194b90a02d9e36116a2 | |
| parent | 484d1140d2aa138abefb8973029e2c7c5eff1fc3 (diff) | |
QCalendar: Make SystemId constructors with one argument explicit
This avoids unwanted type conversions.
Change-Id: Ie57e80da615c6bc162224fa3816fc21a47ab4b00
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 4679209120f02f2d2dc6a4e7a3129f3501c6024a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/time/qcalendar.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/time/qcalendar.h b/src/corelib/time/qcalendar.h index a723209a1c..cdfed467ae 100644 --- a/src/corelib/time/qcalendar.h +++ b/src/corelib/time/qcalendar.h @@ -135,8 +135,9 @@ public: const size_t id; friend class QCalendarBackend; constexpr bool isInEnum() const { return id <= size_t(QCalendar::System::Last); } - constexpr SystemId(QCalendar::System e) : id(size_t(e)) {} - constexpr SystemId(size_t i) : id(i) {} + constexpr explicit SystemId(QCalendar::System e) : id(size_t(e)) { } + constexpr explicit SystemId(size_t i) : id(i) { } + public: constexpr SystemId() : id(~size_t(0)) {} constexpr size_t index() const noexcept { return id; } |