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

QString::vasprintf: Extract Method parse_flag_characters

Browse Source 
... and simplify the method afterwards:

Drop the boolean that was used to control program
flow when the code was still part of vasprintf(),
by taking advantage of the fact that we can now
just return from the function to break out of both
the switch and the loop.

Change-Id: I97f050b63c0c309aaed3cb0fe979d53c8d970003
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Marc Mutz 2015-11-04 12:38:59 +01:00
parent 72c68f5f22
commit 139fd9bd0d
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/corelib/tools/qstring.cpp
View File

@ -5866,6 +5866,23 @@ QString &QString::vsprintf(const char *cformat, va_list ap)
return *this = vasprintf(cformat, ap);
}
static uint parse_flag_characters(const char * &c) Q_DECL_NOTHROW
{
uint flags = 0;
while (true) {
switch (*c) {
case '#': flags |= QLocaleData::Alternate; break;
case '0': flags |= QLocaleData::ZeroPadded; break;
case '-': flags |= QLocaleData::LeftAdjusted; break;
case ' ': flags |= QLocaleData::BlankBeforePositive; break;
case '+': flags |= QLocaleData::AlwaysShowSign; break;
case '\'': flags |= QLocaleData::ThousandsGroup; break;
default: return flags;
}
++c;
}
}
/*!
\fn QString::vasprintf(const char *cformat, va_list ap)
\since 5.5
@ -5915,23 +5932,7 @@ QString QString::vasprintf(const char *cformat, va_list ap)
continue;
}
// Parse flag characters
uint flags = 0;
bool no_more_flags = false;
do {
switch (*c) {
case '#': flags |= QLocaleData::Alternate; break;
case '0': flags |= QLocaleData::ZeroPadded; break;
case '-': flags |= QLocaleData::LeftAdjusted; break;
case ' ': flags |= QLocaleData::BlankBeforePositive; break;
case '+': flags |= QLocaleData::AlwaysShowSign; break;
case '\'': flags |= QLocaleData::ThousandsGroup; break;
default: no_more_flags = true; break;
}
if (!no_more_flags)
++c;
} while (!no_more_flags);
uint flags = parse_flag_characters(c);
if (*c == '\0') {
result.append(QLatin1String(escape_start)); // incomplete escape, treat as non-escape text