1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shuffle QTimeZone so backend-dependent parts are contiguous

Browse Source 
Coming work shall limit the feature to controlling these parts of the
class, while making the rest visible to all builds.

Change-Id: I602c604c8c66bd4f1816a9dabef19c72527831a5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2022-11-10 18:49:43 +01:00
parent de1895f423
commit c50b20a484
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/corelib/time/qtimezone.h
View File

@ -33,6 +33,28 @@ public:
MaxUtcOffsetSecs = +14 * 3600 MaxUtcOffsetSecs = +14 * 3600
}; };
QTimeZone() noexcept;
explicit QTimeZone(int offsetSeconds);
explicit QTimeZone(const QByteArray &ianaId);
QTimeZone(const QByteArray &zoneId, int offsetSeconds, const QString &name,
const QString &abbreviation, QLocale::Territory territory = QLocale::AnyTerritory,
const QString &comment = QString());
QTimeZone(const QTimeZone &other) noexcept;
QTimeZone(QTimeZone &&other) noexcept;
~QTimeZone();
QTimeZone &operator=(const QTimeZone &other);
QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QTimeZone)
void swap(QTimeZone &other) noexcept
{ d.swap(other.d); }
bool operator==(const QTimeZone &other) const;
bool operator!=(const QTimeZone &other) const;
bool isValid() const;
enum TimeType { enum TimeType {
StandardTime = 0, StandardTime = 0,
DaylightTime = 1, DaylightTime = 1,
@ -55,27 +77,6 @@ public:
}; };
typedef QList<OffsetData> OffsetDataList; typedef QList<OffsetData> OffsetDataList;
QTimeZone() noexcept;
explicit QTimeZone(const QByteArray &ianaId);
explicit QTimeZone(int offsetSeconds);
QTimeZone(const QByteArray &zoneId, int offsetSeconds, const QString &name,
const QString &abbreviation, QLocale::Territory territory = QLocale::AnyTerritory,
const QString &comment = QString());
QTimeZone(const QTimeZone &other) noexcept;
QTimeZone(QTimeZone &&other) noexcept;
~QTimeZone();
QTimeZone &operator=(const QTimeZone &other);
QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QTimeZone)
void swap(QTimeZone &other) noexcept
{ d.swap(other.d); }
bool operator==(const QTimeZone &other) const;
bool operator!=(const QTimeZone &other) const;
bool isValid() const;
QByteArray id() const; QByteArray id() const;
QLocale::Territory territory() const; QLocale::Territory territory() const;
#if QT_DEPRECATED_SINCE(6, 6) #if QT_DEPRECATED_SINCE(6, 6)
@ -143,10 +144,10 @@ public:
#endif #endif
private: private:
QTimeZone(QTimeZonePrivate &dd);
#ifndef QT_NO_DATASTREAM #ifndef QT_NO_DATASTREAM
friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &ds, const QTimeZone &tz); friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &ds, const QTimeZone &tz);
#endif #endif
QTimeZone(QTimeZonePrivate &dd);
friend class QTimeZonePrivate; friend class QTimeZonePrivate;
friend class QDateTime; friend class QDateTime;
friend class QDateTimePrivate; friend class QDateTimePrivate;