AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make interleaving of QDateTimeParser::Section values evident.

Browse Source 
The actual section members grew up to the internal value, leading to
interleaving of subsequently-added values.  Change existing enum
values to make this go away (class is private, so no BC constraint
forbids this).

Change-Id: If266b557817eae19d375519bf38268f0f2a0d372
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
This commit is contained in:
Edward Welbourne 2016-01-20 14:29:52 +01:00
parent 2564de7b1e
commit a965d505a0
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/tools/qdatetimeparser_p.h
View File

@ -115,17 +115,18 @@ public:
Hour12Section = 0x00010, Hour12Section = 0x00010,
Hour24Section = 0x00020, Hour24Section = 0x00020,
TimeSectionMask = (AmPmSection|MSecSection|SecondSection|MinuteSection|Hour12Section|Hour24Section), TimeSectionMask = (AmPmSection|MSecSection|SecondSection|MinuteSection|Hour12Section|Hour24Section),
Internal = 0x10000,
DaySection = 0x00100, DaySection = 0x00100,
MonthSection = 0x00200, MonthSection = 0x00200,
YearSection = 0x00400, YearSection = 0x00400,
YearSection2Digits = 0x00800, YearSection2Digits = 0x00800,
DayOfWeekSectionShort = 0x01000, DayOfWeekSectionShort = 0x01000,
DayOfWeekSectionLong = 0x20000, DayOfWeekSectionLong = 0x02000,
DateSectionMask = (DaySection|MonthSection|YearSection|YearSection2Digits|DayOfWeekSectionShort|DayOfWeekSectionLong), DateSectionMask = (DaySection|MonthSection|YearSection|YearSection2Digits|DayOfWeekSectionShort|DayOfWeekSectionLong),
FirstSection = 0x02000|Internal,
LastSection = 0x04000|Internal, Internal = 0x10000,
CalendarPopupSection = 0x08000|Internal, FirstSection = 0x20000 | Internal,
LastSection = 0x40000 | Internal,
CalendarPopupSection = 0x80000 | Internal,
NoSectionIndex = -1, NoSectionIndex = -1,
FirstSectionIndex = -2, FirstSectionIndex = -2,