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

corelib/time/: clean out assorted over-namespacing

Browse Source 
QDate's constructor can see maxJd() and minJd() without namespace prefix.

QDateTimeParser::SectionNode's name() inherits visibility from
QDateTimeParser of its Section enum's members.

Change-Id: I6315c4ede8875ef725d5b778eebac1e2027cd8b1
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Edward Welbourne 2023-08-08 17:19:55 +02:00
parent 9c07faed2c
commit 4694a1b2ae
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -435,8 +435,8 @@ static int fromOffsetString(QStringView offsetString, bool *valid) noexcept
QDate::QDate(int y, int m, int d) QDate::QDate(int y, int m, int d)
{ {
static_assert(QDate::maxJd() == JulianDayMax); static_assert(maxJd() == JulianDayMax);
static_assert(QDate::minJd() == JulianDayMin); static_assert(minJd() == JulianDayMin);
jd = QGregorianCalendar::julianFromParts(y, m, d).value_or(nullJd()); jd = QGregorianCalendar::julianFromParts(y, m, d).value_or(nullJd());
} }

32
src/corelib/time/qdatetimeparser.cpp
View File

@ -2165,22 +2165,22 @@ bool QDateTimeParser::skipToNextSection(int index, const QDateTime &current, QSt
QString QDateTimeParser::SectionNode::name(QDateTimeParser::Section s) QString QDateTimeParser::SectionNode::name(QDateTimeParser::Section s)
{ {
switch (s) { switch (s) {
case QDateTimeParser::AmPmSection: return "AmPmSection"_L1; case AmPmSection: return "AmPmSection"_L1;
case QDateTimeParser::DaySection: return "DaySection"_L1; case DaySection: return "DaySection"_L1;
case QDateTimeParser::DayOfWeekSectionShort: return "DayOfWeekSectionShort"_L1; case DayOfWeekSectionShort: return "DayOfWeekSectionShort"_L1;
case QDateTimeParser::DayOfWeekSectionLong: return "DayOfWeekSectionLong"_L1; case DayOfWeekSectionLong: return "DayOfWeekSectionLong"_L1;
case QDateTimeParser::Hour24Section: return "Hour24Section"_L1; case Hour24Section: return "Hour24Section"_L1;
case QDateTimeParser::Hour12Section: return "Hour12Section"_L1; case Hour12Section: return "Hour12Section"_L1;
case QDateTimeParser::MSecSection: return "MSecSection"_L1; case MSecSection: return "MSecSection"_L1;
case QDateTimeParser::MinuteSection: return "MinuteSection"_L1; case MinuteSection: return "MinuteSection"_L1;
case QDateTimeParser::MonthSection: return "MonthSection"_L1; case MonthSection: return "MonthSection"_L1;
case QDateTimeParser::SecondSection: return "SecondSection"_L1; case SecondSection: return "SecondSection"_L1;
case QDateTimeParser::TimeZoneSection: return "TimeZoneSection"_L1; case TimeZoneSection: return "TimeZoneSection"_L1;
case QDateTimeParser::YearSection: return "YearSection"_L1; case YearSection: return "YearSection"_L1;
case QDateTimeParser::YearSection2Digits: return "YearSection2Digits"_L1; case YearSection2Digits: return "YearSection2Digits"_L1;
case QDateTimeParser::NoSection: return "NoSection"_L1; case NoSection: return "NoSection"_L1;
case QDateTimeParser::FirstSection: return "FirstSection"_L1; case FirstSection: return "FirstSection"_L1;
case QDateTimeParser::LastSection: return "LastSection"_L1; case LastSection: return "LastSection"_L1;
default: return "Unknown section "_L1 + QString::number(int(s)); default: return "Unknown section "_L1 + QString::number(int(s));
} }
} }