diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2024-01-29 17:55:56 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2024-02-01 21:50:50 +0100 |
| commit | 007d207ed9b027d5175a8413eb44cb5cf63c6465 (patch) | |
| tree | 06eb2ea5c9a282736a21dda05f1444529dfec094 /src/corelib/time | |
| parent | 62b3720a207ef0c6cfafaa0ecc26dd3cbbf400d0 (diff) | |
Make QTZP Windows ID data class methods constexpr
They can be so might as well be.
Change-Id: I98d9458fb700be297e65dda3fae9b5afd3133150
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/time')
| -rw-r--r-- | src/corelib/time/qtimezoneprivate_data_p.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/time/qtimezoneprivate_data_p.h b/src/corelib/time/qtimezoneprivate_data_p.h index 255a461064..c8eda2d02d 100644 --- a/src/corelib/time/qtimezoneprivate_data_p.h +++ b/src/corelib/time/qtimezoneprivate_data_p.h @@ -44,8 +44,8 @@ struct QZoneData quint16 windowsIdKey; // Windows ID Key quint16 territory; // Territory of IANA ID's, AnyTerritory means No Territory quint16 ianaIdIndex; // All IANA ID's for the Windows ID and Country, space separated - inline QLatin1StringView id() const; // Space-joined list of IANA IDs - inline auto ids() const { return id().tokenize(u' '); } + constexpr QLatin1StringView id() const; // Space-joined list of IANA IDs + constexpr auto ids() const { return id().tokenize(u' '); } }; struct QWindowsData @@ -54,15 +54,15 @@ struct QWindowsData quint16 windowsIdIndex; // Windows ID Literal quint16 ianaIdIndex; // IANA IDs for the Windows ID qint32 offsetFromUtc; // Standard Time Offset from UTC, used for quick look-ups - inline QByteArrayView windowsId() const; - inline QByteArrayView ianaId() const; // Space-joined list of IANA IDs + constexpr QByteArrayView windowsId() const; + constexpr QByteArrayView ianaId() const; // Space-joined list of IANA IDs }; struct QUtcData { quint16 ianaIdIndex; // IANA IDs qint32 offsetFromUtc; // Offset form UTC is seconds - inline QByteArrayView id() const; // Space-joined list of IANA IDs + constexpr QByteArrayView id() const; // Space-joined list of IANA IDs }; /* @@ -1375,11 +1375,11 @@ static constexpr char ianaIdData[] = { }; // GENERATED PART ENDS HERE -inline QByteArrayView QWindowsData::windowsId() const { return windowsIdData + windowsIdIndex; } +constexpr QByteArrayView QWindowsData::windowsId() const { return windowsIdData + windowsIdIndex; } // Each of the following returns a space-joined sequence of IANA IDs: -inline QByteArrayView QWindowsData::ianaId() const { return ianaIdData + ianaIdIndex; } -inline QByteArrayView QUtcData::id() const { return ianaIdData + ianaIdIndex; } -inline QLatin1StringView QZoneData::id() const +constexpr QByteArrayView QWindowsData::ianaId() const { return ianaIdData + ianaIdIndex; } +constexpr QByteArrayView QUtcData::id() const { return ianaIdData + ianaIdIndex; } +constexpr QLatin1StringView QZoneData::id() const { return QLatin1StringView(ianaIdData + ianaIdIndex); } QT_END_NAMESPACE |