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

Simplify parsing of a line to remove [...] enclosure 

Use a view of the line, within the larger data buffer, to avoid some
complications.

Change-Id: Iaf79068487ac6b92fe9e415fb63f6b0e9ad0c5a2
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
bb10
Edward Welbourne 2022-03-22 15:02:20 +01:00
parent d9531593a2
commit ad7a738e6d
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/corelib/io/qsettings.cpp
View File

@ -1634,21 +1634,19 @@ bool QConfFileSettingsPrivate::readIniFile(QByteArrayView data,
dataPos = 3;
while (readIniLine(data, dataPos, lineStart, lineLen, equalsPos)) {
char ch = data.at(lineStart);
if (ch == '[') {
QByteArrayView line = data.sliced(lineStart, lineLen);
if (line.startsWith('[')) {
FLUSH_CURRENT_SECTION();
// this is a section
QByteArrayView iniSection;
qsizetype idx = data.indexOf(']', lineStart);
if (idx == -1 || idx >= lineStart + lineLen) {
// This starts a new section.
qsizetype idx = line.indexOf(']');
Q_ASSERT(idx == -1 || idx > 0); // line[0] is '[', not ']'.
Q_ASSERT(idx < lineLen); // (including -1 < lineLen, if no ']' present.)
if (idx < 0) {
ok = false;
iniSection = data.sliced(lineStart + 1, lineLen - 1);
} else {
iniSection = data.sliced(lineStart + 1, idx - lineStart - 1);
idx = lineLen; // so line.first(idx) is just line
}
iniSection = iniSection.trimmed();
QByteArrayView iniSection = line.first(idx).sliced(1).trimmed();
if (iniSection.compare("general", Qt::CaseInsensitive) == 0) {
currentSection.clear();