diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2021-08-12 14:02:37 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2021-08-18 22:31:17 +0200 |
| commit | 96810e3863272eb5463ba5c07d82544810bdb3f8 (patch) | |
| tree | 87512f7fc5185dc6870531debbdc93b4ef79411a /src | |
| parent | 93745ef34608024db92c90c8e270e441fc346eda (diff) | |
QDateTime: port to QStringTokenizer and QVLA
The code isn't easily linearized to work directly with
QStringTokenizer, which is a forward-only range, but we can at least
remove the (non-error) memory allocations by supplying a
suitably-sized QVLA to tokenize into instead of the default QList.
Change-Id: I1aa11a5fbbe66ede4ec2e5b2090044a39052a241
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/time/qdatetime.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index 9ddd207662..aa14f4525e 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -153,7 +153,8 @@ static ParsedRfcDateTime rfcDateImpl(QStringView s) // or "ddd MMM dd[ hh:mm:ss] yyyy [±hhmm]" - permissive RFC 850, 1036 (read only) ParsedRfcDateTime result; - auto words = QStringView{s}.split(u' ', Qt::SkipEmptyParts); + QVarLengthArray<QStringView, 6> words; + s.tokenize(u' ', Qt::SkipEmptyParts).toContainer(words); if (words.size() < 3 || words.size() > 6) return result; const QChar colon(u':'); @@ -1483,7 +1484,8 @@ QDate QDate::fromString(QStringView string, Qt::DateFormat format) default: case Qt::TextDate: { // Documented as "ddd MMM d yyyy" - auto parts = string.split(u' ', Qt::SkipEmptyParts); + QVarLengthArray<QStringView, 4> parts; + string.tokenize(u' ', Qt::SkipEmptyParts).toContainer(parts); if (parts.count() != 4) return QDate(); @@ -5119,7 +5121,8 @@ QDateTime QDateTime::fromString(QStringView string, Qt::DateFormat format) return QDateTime(date, time, spec, offset); } case Qt::TextDate: { - QList<QStringView> parts = string.split(u' ', Qt::SkipEmptyParts); + QVarLengthArray<QStringView, 6> parts; + string.tokenize(u' ', Qt::SkipEmptyParts).toContainer(parts); // Documented as "ddd MMM d HH:mm:ss yyyy" with optional offset-suffix; // and allow time either before or after year. |