summaryrefslogtreecommitdiffstats
path: root/src/corelib/time/qdatetimeparser.cpp
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-09-18 17:25:10 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-10-19 17:44:23 +0200
commit68bfab534e9452f31fa00f8e7586104168159a47 (patch)
tree258d45dd79f2bb796e82ed2a8fe123d127154d69 /src/corelib/time/qdatetimeparser.cpp
parent229c9736bb7738ae181f2db3fa71623b5b3582fb (diff)
Use unchecked substring methods in date-time code
Change-Id: I38b9aaa0335c6168706c2508ed1117fd908e679c Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Diffstat (limited to 'src/corelib/time/qdatetimeparser.cpp')
-rw-r--r--src/corelib/time/qdatetimeparser.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/time/qdatetimeparser.cpp b/src/corelib/time/qdatetimeparser.cpp
index d64b593809..df07e68999 100644
--- a/src/corelib/time/qdatetimeparser.cpp
+++ b/src/corelib/time/qdatetimeparser.cpp
@@ -499,7 +499,7 @@ bool QDateTimeParser::parseFormat(QStringView newFormat)
if (parserType != QMetaType::QTime) {
const SectionNode sn = { MonthSection, i - add, countRepeat(newFormat, i, 4), 0 };
newSectionNodes.append(sn);
- newSeparators.append(unquote(newFormat.mid(index, i - index)));
+ newSeparators.append(unquote(newFormat.first(i).sliced(index)));
i += sn.count - 1;
index = i + 1;
newDisplay |= MonthSection;
@@ -825,7 +825,7 @@ QDateTimeParser::parseSection(const QDateTime &currentValue, int sectionIndex, i
int last = -1, used = -1;
Q_ASSERT(sectiontextSize <= sectionmaxsize);
- QStringView digitsStr = sectionTextRef.left(sectiontextSize);
+ QStringView digitsStr = sectionTextRef.first(sectiontextSize);
for (int digits = sectiontextSize; digits >= 1; --digits) {
digitsStr.truncate(digits);
int tmp = int(loc.toUInt(digitsStr, &ok));
@@ -838,7 +838,7 @@ QDateTimeParser::parseSection(const QDateTime &currentValue, int sectionIndex, i
}
}
if (ok && tmp <= absMax) {
- QDTPDEBUG << sectionTextRef.left(digits) << tmp << digits;
+ QDTPDEBUG << sectionTextRef.first(digits) << tmp << digits;
last = tmp;
used = digits;
break;
@@ -1185,11 +1185,11 @@ QDateTimeParser::scanString(const QDateTime &defaultValue, bool fixup) const
current = &zoneOffset;
if (sect.used > 0) {
// Synchronize with what findTimeZone() found:
- QStringView zoneName = QStringView{m_text}.mid(pos, sect.used);
+ QStringView zoneName = QStringView{m_text}.sliced(pos, sect.used);
Q_ASSERT(!zoneName.isEmpty()); // sect.used > 0
const QStringView offsetStr = zoneName.startsWith(QLatin1String("UTC"))
- ? zoneName.mid(3) : zoneName;
+ ? zoneName.sliced(3) : zoneName;
const bool isUtcOffset = offsetStr.startsWith(QLatin1Char('+'))
|| offsetStr.startsWith(QLatin1Char('-'));
const bool isUtc = zoneName == QLatin1String("Z")
@@ -1246,8 +1246,8 @@ QDateTimeParser::scanString(const QDateTime &defaultValue, bool fixup) const
isSet |= sn.type;
}
- if (QStringView{m_text}.mid(pos) != separators.last()) {
- QDTPDEBUG << "invalid because" << QStringView{m_text}.mid(pos)
+ if (QStringView{m_text}.sliced(pos) != separators.last()) {
+ QDTPDEBUG << "invalid because" << QStringView{m_text}.sliced(pos)
<< "!=" << separators.last() << pos;
return StateNode();
}
@@ -1625,13 +1625,13 @@ QDateTimeParser::ParsedSection QDateTimeParser::findUtcOffset(QStringView str) c
const bool startsWithUtc = str.startsWith(QLatin1String("UTC"));
// Get rid of UTC prefix if it exists
if (startsWithUtc)
- str = str.mid(3);
+ str = str.sliced(3);
const bool negativeSign = str.startsWith(QLatin1Char('-'));
// Must start with a sign:
if (!negativeSign && !str.startsWith(QLatin1Char('+')))
return ParsedSection();
- str = str.mid(1); // drop sign
+ str = str.sliced(1); // drop sign
const int colonPosition = str.indexOf(QLatin1Char(':'));
// Colon that belongs to offset is at most at position 2 (hh:mm)
@@ -1658,7 +1658,7 @@ QDateTimeParser::ParsedSection QDateTimeParser::findUtcOffset(QStringView str) c
str.truncate(i); // The rest of the string is not part of the UTC offset
bool isInt = false;
- const int hours = str.mid(0, hoursLength).toInt(&isInt);
+ const int hours = str.first(hoursLength).toInt(&isInt);
if (!isInt)
return ParsedSection();
const QStringView minutesStr = str.mid(hasColon ? colonPosition + 1 : 2, 2);