diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-12-01 18:09:26 -0600 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-12-07 18:53:38 +0000 |
| commit | 90c1107698fdd19f0b2b75923ad08046d7c65966 (patch) | |
| tree | 195ef5c89acc0ca14ec149a26de5826e16eca3b6 | |
| parent | 962bded90f0ffb7390b4a2a1a5a895156aa5f541 (diff) | |
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>
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index ab8fd6510a..0d2bd72d75 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -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) |