whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QDateTimeParser: de-duplicate calls and cache results 

Change-Id: I0d6065fbdd19acff14072ff626585e8a12a3e073
Reviewed-by: Edward Welbourne <edward.welbourne@theqtcompany.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
bb10
Anton Kudryavtsev 2016-04-29 14:36:32 +03:00
parent 834087c324
commit c6618cb885
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/tools/qdatetimeparser.cpp
View File

@ -553,19 +553,20 @@ int QDateTimeParser::sectionSize(int sectionIndex) const
// is the previous value and displayText() is the new value.
// The size difference is always due to leading zeroes.
int sizeAdjustment = 0;
if (displayText().size() != text.size()) {
const int displayTextSize = displayText().size();
if (displayTextSize != text.size()) {
// Any zeroes added before this section will affect our size.
int preceedingZeroesAdded = 0;
if (sectionNodes.size() > 1 && context == DateTimeEdit) {
for (QVector<SectionNode>::ConstIterator sectionIt = sectionNodes.constBegin();
sectionIt != sectionNodes.constBegin() + sectionIndex; ++sectionIt) {
const auto begin = sectionNodes.cbegin();
const auto end = begin + sectionIndex;
for (auto sectionIt = begin; sectionIt != end; ++sectionIt)
preceedingZeroesAdded += sectionIt->zeroesAdded;
}
}
sizeAdjustment = preceedingZeroesAdded;
}
return displayText().size() + sizeAdjustment - sectionPos(sectionIndex) - separators.last().size();
return displayTextSize + sizeAdjustment - sectionPos(sectionIndex) - separators.last().size();
} else {
return sectionPos(sectionIndex + 1) - sectionPos(sectionIndex)
- separators.at(sectionIndex + 1).size();
@ -1164,11 +1165,12 @@ end:
if (newCurrentValue.daysTo(minimum) != 0) {
break;
}
toMin = newCurrentValue.time().msecsTo(minimum.time());
const QTime time = newCurrentValue.time();
toMin = time.msecsTo(minimum.time());
if (newCurrentValue.daysTo(maximum) > 0) {
toMax = -1; // can't get to max
} else {
toMax = newCurrentValue.time().msecsTo(maximum.time());
toMax = time.msecsTo(maximum.time());
}
} else {
toMin = newCurrentValue.daysTo(minimum);