QSettings: quick refactor for readability

Helps with debugging the code too, as you can follow what's on the file
with the "ch" variable.

Change-Id: Idd0c85a4e7b64f9c9c7dfffd156c5b7d76cf657b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
bb10
Thiago Macieira 2018-12-01 18:09:26 -06:00
parent 962bded90f
commit 90c1107698
1 changed files with 4 additions and 3 deletions

View File

@ -1599,12 +1599,14 @@ bool QConfFileSettingsPrivate::readIniLine(const QByteArray &data, int &dataPos,
int i = lineStart;
while (i < dataLen) {
while (!(charTraits[uint(uchar(data.at(i)))] & Special)) {
char ch = data.at(i);
while (!(charTraits[uchar(ch)] & Special)) {
if (++i == dataLen)
goto break_out_of_outer_loop;
ch = data.at(i);
}
char ch = data.at(i++);
++i;
if (ch == '=') {
if (!inQuotes && equalsPos == -1)
equalsPos = i - 1;
@ -1631,7 +1633,6 @@ bool QConfFileSettingsPrivate::readIniLine(const QByteArray &data, int &dataPos,
Q_ASSERT(ch == ';');
if (i == lineStart + 1) {
char ch;
while (i < dataLen && (((ch = data.at(i)) != '\n') && ch != '\r'))
++i;
while (i < dataLen && charTraits[uchar(data.at(i))] & Space)