From f339262217fefbdf8ba29d5f44691a3cc6ca5d0e Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 8 Jun 2023 18:33:50 +0200 Subject: [PATCH] XBEL stream reader: shuffle order of functions Put readBookmark() first of the constituent parts, as it's the most intelligible (albeit currently undocumented) and gives some clue to the purpose of readTitle(), which is next. Task-number: QTBUG-111228 Change-Id: I91d3d6bf8adc3f3001c90274bb62a9da6bf05362 Reviewed-by: Ievgenii Meshcheriakov (cherry picked from commit b610c7aa89dd6224fbf58983ad8c2a391b2a559e) --- .../streambookmarks/xbelreader.cpp | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/corelib/serialization/streambookmarks/xbelreader.cpp b/examples/corelib/serialization/streambookmarks/xbelreader.cpp index 0c50cd6bbac..88ed256cb77 100644 --- a/examples/corelib/serialization/streambookmarks/xbelreader.cpp +++ b/examples/corelib/serialization/streambookmarks/xbelreader.cpp @@ -68,6 +68,24 @@ void XbelReader::readXBEL() } //! [3] +void XbelReader::readBookmark(QTreeWidgetItem *item) +{ + Q_ASSERT(xml.isStartElement() && xml.name() == "bookmark"_L1); + + QTreeWidgetItem *bookmark = createChildItem(item); + bookmark->setFlags(bookmark->flags() | Qt::ItemIsEditable); + bookmark->setIcon(0, bookmarkIcon); + bookmark->setText(0, QObject::tr("Unknown title")); + bookmark->setText(1, xml.attributes().value("href"_L1).toString()); + + while (xml.readNextStartElement()) { + if (xml.name() == "title"_L1) + readTitle(bookmark); + else + xml.skipCurrentElement(); + } +} + //! [4] void XbelReader::readTitle(QTreeWidgetItem *item) { @@ -112,24 +130,6 @@ void XbelReader::readFolder(QTreeWidgetItem *item) } } -void XbelReader::readBookmark(QTreeWidgetItem *item) -{ - Q_ASSERT(xml.isStartElement() && xml.name() == "bookmark"_L1); - - QTreeWidgetItem *bookmark = createChildItem(item); - bookmark->setFlags(bookmark->flags() | Qt::ItemIsEditable); - bookmark->setIcon(0, bookmarkIcon); - bookmark->setText(0, QObject::tr("Unknown title")); - bookmark->setText(1, xml.attributes().value("href"_L1).toString()); - - while (xml.readNextStartElement()) { - if (xml.name() == "title"_L1) - readTitle(bookmark); - else - xml.skipCurrentElement(); - } -} - QTreeWidgetItem *XbelReader::createChildItem(QTreeWidgetItem *item) { QTreeWidgetItem *childItem = item ? new QTreeWidgetItem(item) : new QTreeWidgetItem(treeWidget);