diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 11:06:12 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 22:30:59 +0200 |
| commit | 0475460102411979ab51c365cb2bec2c05b69cb4 (patch) | |
| tree | 73b7dbe85249da2bd339cd19b0c584894d3901c7 /src/corelib/time/qtimezoneprivate_p.h | |
| parent | e114e580e751b5deb19ab489a8b11f830ff6356f (diff) | |
Use QList instead of QVector in corelib
Applied to headers only. Source file to be changed separately.
Omitted statemachine for now to avoid conflicts.
Omitted qmetatype.h for now - to be handled later.
Task-number: QTBUG-84469
Change-Id: I317376037a62467c313467d92955ad0b7473aa97
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/time/qtimezoneprivate_p.h')
| -rw-r--r-- | src/corelib/time/qtimezoneprivate_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/time/qtimezoneprivate_p.h b/src/corelib/time/qtimezoneprivate_p.h index f1b7fea1f9..3f08fc15a6 100644 --- a/src/corelib/time/qtimezoneprivate_p.h +++ b/src/corelib/time/qtimezoneprivate_p.h @@ -52,9 +52,9 @@ // We mean it. // +#include "qlist.h" #include "qtimezone.h" #include "private/qlocale_p.h" -#include "qvector.h" #if QT_CONFIG(icu) #include <unicode/ucal.h> @@ -85,7 +85,7 @@ public: int standardTimeOffset; int daylightTimeOffset; }; - typedef QVector<Data> DataList; + typedef QList<Data> DataList; // Create null time zone QTimeZonePrivate(); @@ -294,8 +294,8 @@ Q_DECL_CONSTEXPR inline bool operator!=(const QTzTransitionRule &lhs, const QTzT // cached, avoiding the need to re-parse them from disk constantly. struct QTzTimeZoneCacheEntry { - QVector<QTzTransitionTime> m_tranTimes; - QVector<QTzTransitionRule> m_tranRules; + QList<QTzTransitionTime> m_tranTimes; + QList<QTzTransitionRule> m_tranRules; QList<QByteArray> m_abbreviations; QByteArray m_posixRule; }; @@ -344,14 +344,14 @@ public: private: void init(const QByteArray &ianaId); - QVector<QTimeZonePrivate::Data> getPosixTransitions(qint64 msNear) const; + QList<QTimeZonePrivate::Data> getPosixTransitions(qint64 msNear) const; Data dataForTzTransition(QTzTransitionTime tran) const; #if QT_CONFIG(icu) mutable QSharedDataPointer<QTimeZonePrivate> m_icu; #endif QTzTimeZoneCacheEntry cached_data; - QVector<QTzTransitionTime> tranCache() const { return cached_data.m_tranTimes; } + QList<QTzTransitionTime> tranCache() const { return cached_data.m_tranTimes; } }; #endif // Q_OS_UNIX |