Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid shadowing in QDateTimeParser::findAmPm()

Browse source 
upstream commit:
54ece34283

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-08-08 18:26:48 +00:00
parent 420df9fe9c
commit e03aa32c3f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/tools/qdatetime.cpp
View file

@ -5082,9 +5082,9 @@ int QDateTimeParser::findDay(const QString &str1, int startDay, int sectionIndex
*/ */
int QDateTimeParser::findAmPm(QString &str, int index, int *used) const int QDateTimeParser::findAmPm(QString &str, int sectionIndex, int *used) const
{ {
const SectionNode &s = sectionNode(index); const SectionNode &s = sectionNode(sectionIndex);
if (Q_UNLIKELY(s.type != AmPmSection)) { if (Q_UNLIKELY(s.type != AmPmSection)) {
qWarning("QDateTimeParser::findAmPm Internal error"); qWarning("QDateTimeParser::findAmPm Internal error");
return -1; return -1;
@ -5095,7 +5095,7 @@ int QDateTimeParser::findAmPm(QString &str, int index, int *used) const
return PossibleBoth; return PossibleBoth;
} }
const QLatin1Char space(' '); const QLatin1Char space(' ');
int size = sectionMaxSize(index); int size = sectionMaxSize(sectionIndex);
enum { enum {
amindex = 0, amindex = 0,