QDateTimeParser: port some methods to QSV
Almost all methods are already ported Change-Id: I1cabcd868538d86abfbfa5a3e0d166b5296fdd00 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
parent
1ba6209909
commit
079d0cb5c0
@ -1652,7 +1652,7 @@ QDateTimeParser::parse(const QString &input, int position,
|
|||||||
length of overlap in *used (if \a used is non-NULL) and the first entry that
|
length of overlap in *used (if \a used is non-NULL) and the first entry that
|
||||||
overlapped this much in *usedText (if \a usedText is non-NULL).
|
overlapped this much in *usedText (if \a usedText is non-NULL).
|
||||||
*/
|
*/
|
||||||
static int findTextEntry(const QString &text, const ShortVector<QString> &entries, QString *usedText, int *used)
|
static int findTextEntry(QStringView text, const ShortVector<QString> &entries, QString *usedText, int *used)
|
||||||
{
|
{
|
||||||
if (text.isEmpty())
|
if (text.isEmpty())
|
||||||
return -1;
|
return -1;
|
||||||
@ -1689,7 +1689,7 @@ static int findTextEntry(const QString &text, const ShortVector<QString> &entrie
|
|||||||
match. Starting from \a index; str should already by lowered
|
match. Starting from \a index; str should already by lowered
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int QDateTimeParser::findMonth(const QString &str1, int startMonth, int sectionIndex,
|
int QDateTimeParser::findMonth(QStringView str, int startMonth, int sectionIndex,
|
||||||
int year, QString *usedMonth, int *used) const
|
int year, QString *usedMonth, int *used) const
|
||||||
{
|
{
|
||||||
const SectionNode &sn = sectionNode(sectionIndex);
|
const SectionNode &sn = sectionNode(sectionIndex);
|
||||||
@ -1705,11 +1705,11 @@ int QDateTimeParser::findMonth(const QString &str1, int startMonth, int sectionI
|
|||||||
for (int month = startMonth; month <= 12; ++month)
|
for (int month = startMonth; month <= 12; ++month)
|
||||||
monthNames.append(calendar.monthName(l, month, year, type));
|
monthNames.append(calendar.monthName(l, month, year, type));
|
||||||
|
|
||||||
const int index = findTextEntry(str1, monthNames, usedMonth, used);
|
const int index = findTextEntry(str, monthNames, usedMonth, used);
|
||||||
return index < 0 ? index : index + startMonth;
|
return index < 0 ? index : index + startMonth;
|
||||||
}
|
}
|
||||||
|
|
||||||
int QDateTimeParser::findDay(const QString &str1, int startDay, int sectionIndex, QString *usedDay, int *used) const
|
int QDateTimeParser::findDay(QStringView str, int startDay, int sectionIndex, QString *usedDay, int *used) const
|
||||||
{
|
{
|
||||||
const SectionNode &sn = sectionNode(sectionIndex);
|
const SectionNode &sn = sectionNode(sectionIndex);
|
||||||
if (!(sn.type & DaySectionMask)) {
|
if (!(sn.type & DaySectionMask)) {
|
||||||
@ -1724,7 +1724,7 @@ int QDateTimeParser::findDay(const QString &str1, int startDay, int sectionIndex
|
|||||||
for (int day = startDay; day <= 7; ++day)
|
for (int day = startDay; day <= 7; ++day)
|
||||||
daysOfWeek.append(l.dayName(day, type));
|
daysOfWeek.append(l.dayName(day, type));
|
||||||
|
|
||||||
const int index = findTextEntry(str1, daysOfWeek, usedDay, used);
|
const int index = findTextEntry(str, daysOfWeek, usedDay, used);
|
||||||
return index < 0 ? index : index + startDay;
|
return index < 0 ? index : index + startDay;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -170,9 +170,9 @@ private:
|
|||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
ParsedSection parseSection(const QDateTime ¤tValue, int sectionIndex, int offset) const;
|
ParsedSection parseSection(const QDateTime ¤tValue, int sectionIndex, int offset) const;
|
||||||
int findMonth(const QString &str1, int monthstart, int sectionIndex,
|
int findMonth(QStringView str, int monthstart, int sectionIndex,
|
||||||
int year, QString *monthName = nullptr, int *used = nullptr) const;
|
int year, QString *monthName = nullptr, int *used = nullptr) const;
|
||||||
int findDay(const QString &str1, int intDaystart, int sectionIndex,
|
int findDay(QStringView str, int intDaystart, int sectionIndex,
|
||||||
QString *dayName = nullptr, int *used = nullptr) const;
|
QString *dayName = nullptr, int *used = nullptr) const;
|
||||||
ParsedSection findUtcOffset(QStringView str, int mode) const;
|
ParsedSection findUtcOffset(QStringView str, int mode) const;
|
||||||
ParsedSection findTimeZoneName(QStringView str, const QDateTime &when) const;
|
ParsedSection findTimeZoneName(QStringView str, const QDateTime &when) const;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user