diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-12 14:14:02 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-14 15:52:58 +0200 |
| commit | 6f0df02d002356625f10683ef84da7685d92a2c4 (patch) | |
| tree | 46713209af459ebda534c3404f48c5f5c80ba3f8 /src/corelib/global/qoperatingsystemversion.h | |
| parent | 44cce1a2ea9dadd8b2de93f40de34269dda703c0 (diff) | |
Replace Qt CONSTEXPR defines with constexpr
Both normal and relaxed constexpr are required by our new minimum of
C++17.
Change-Id: Ic028b88a2e7a6cb7d5925f3133b9d54859a81744
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/global/qoperatingsystemversion.h')
| -rw-r--r-- | src/corelib/global/qoperatingsystemversion.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index 1a8d38400b..37ace76755 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -85,7 +85,7 @@ public: static const QOperatingSystemVersion AndroidNougat_MR1; static const QOperatingSystemVersion AndroidOreo; - Q_DECL_CONSTEXPR QOperatingSystemVersion(OSType osType, + constexpr QOperatingSystemVersion(OSType osType, int vmajor, int vminor = -1, int vmicro = -1) : m_os(osType), m_major(qMax(-1, vmajor)), @@ -95,7 +95,7 @@ public: static QOperatingSystemVersion current(); - static Q_DECL_CONSTEXPR OSType currentType() + static constexpr OSType currentType() { #if defined(Q_OS_WIN) return Windows; @@ -114,15 +114,15 @@ public: #endif } - Q_DECL_CONSTEXPR int majorVersion() const { return m_major; } - Q_DECL_CONSTEXPR int minorVersion() const { return m_minor; } - Q_DECL_CONSTEXPR int microVersion() const { return m_micro; } + constexpr int majorVersion() const { return m_major; } + constexpr int minorVersion() const { return m_minor; } + constexpr int microVersion() const { return m_micro; } - Q_DECL_CONSTEXPR int segmentCount() const + constexpr int segmentCount() const { return m_micro >= 0 ? 3 : m_minor >= 0 ? 2 : m_major >= 0 ? 1 : 0; } bool isAnyOfType(std::initializer_list<OSType> types) const; - Q_DECL_CONSTEXPR OSType type() const { return m_os; } + constexpr OSType type() const { return m_os; } QString name() const; friend bool operator>(const QOperatingSystemVersion &lhs, const QOperatingSystemVersion &rhs) |