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

Prefer QStringView's operator[] over its at()

Browse Source 
Change-Id: Ibe2c450aa69ac7ea6db1e6a2174e17f31b4be9a3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
This commit is contained in:
Edward Welbourne 2020-09-18 17:43:12 +02:00
parent 978039651e
commit d6aa7c338d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/time/qdatetime.cpp
View File

@ -161,8 +161,8 @@ static ParsedRfcDateTime rfcDateImpl(QStringView s)
QDate date; QDate date;
const auto isShortName = [](QStringView name) { const auto isShortName = [](QStringView name) {
return (name.length() == 3 && name.at(0).isUpper() return (name.length() == 3 && name[0].isUpper()
&& name.at(1).isLower() && name.at(2).isLower()); && name[1].isLower() && name[2].isLower());
}; };
/* Reject entirely (return) if the string is malformed; however, if the date /* Reject entirely (return) if the string is malformed; however, if the date
@ -174,7 +174,7 @@ static ParsedRfcDateTime rfcDateImpl(QStringView s)
bool rfcX22 = true; bool rfcX22 = true;
if (words.at(0).endsWith(u',')) { if (words.at(0).endsWith(u',')) {
dayName = words.takeFirst().chopped(1); dayName = words.takeFirst().chopped(1);
} else if (!words.at(0).at(0).isDigit()) { } else if (!words.at(0)[0].isDigit()) {
dayName = words.takeFirst(); dayName = words.takeFirst();
rfcX22 = false; rfcX22 = false;
} // else: dayName is not specified (so we can only be RFC *22) } // else: dayName is not specified (so we can only be RFC *22)
@ -228,7 +228,7 @@ static ParsedRfcDateTime rfcDateImpl(QStringView s)
QTime time; QTime time;
if (words.size() && words.at(0).contains(colon)) { if (words.size() && words.at(0).contains(colon)) {
const QStringView when = words.takeFirst(); const QStringView when = words.takeFirst();
if (when.at(2) != colon || (when.size() == 8 ? when.at(5) != colon : when.size() > 5)) if (when[2] != colon || (when.size() == 8 ? when[5] != colon : when.size() > 5))
return result; return result;
const int hour = when.left(2).toInt(&ok); const int hour = when.left(2).toInt(&ok);
if (!ok) if (!ok)
@ -249,9 +249,9 @@ static ParsedRfcDateTime rfcDateImpl(QStringView s)
if (words.size() || !(zone.size() == 3 || zone.size() == 5)) if (words.size() || !(zone.size() == 3 || zone.size() == 5))
return result; return result;
bool negate = false; bool negate = false;
if (zone.at(0) == u'-') if (zone[0] == u'-')
negate = true; negate = true;
else if (zone.at(0) != u'+') else if (zone[0] != u'+')
return result; return result;
const int hour = zone.mid(1, 2).toInt(&ok); const int hour = zone.mid(1, 2).toInt(&ok);
if (!ok) if (!ok)
@ -296,7 +296,7 @@ static int fromOffsetString(QStringView offsetString, bool *valid) noexcept
int sign; int sign;
// First char must be + or - // First char must be + or -
const QChar signChar = offsetString.at(0); const QChar signChar = offsetString[0];
if (signChar == u'+') if (signChar == u'+')
sign = 1; sign = 1;
else if (signChar == u'-') else if (signChar == u'-')