From 5fd4a65d95ac1f23af9583da752b1a0fb2646afe Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 7 Jun 2023 16:24:16 +0200 Subject: [PATCH] XBEL example: minor simplifications Pass one function's return as a parameter to another directly. Use a ternary expression rather than conditional initialization. Use initializer-list construction instead of appending to an empty QStringList; and inline the result where it's used. Pick-to: 6.6 6.5 Task-number: QTBUG-111228 Change-Id: I781aedba8dcc4251193b55d82fe684c9b5da241a Reviewed-by: Juha Vuolle --- .../serialization/streambookmarks/mainwindow.cpp | 5 +---- .../serialization/streambookmarks/xbelreader.cpp | 11 ++--------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/examples/corelib/serialization/streambookmarks/mainwindow.cpp b/examples/corelib/serialization/streambookmarks/mainwindow.cpp index 644681d706e..6d645f745ae 100644 --- a/examples/corelib/serialization/streambookmarks/mainwindow.cpp +++ b/examples/corelib/serialization/streambookmarks/mainwindow.cpp @@ -10,12 +10,9 @@ //! [0] MainWindow::MainWindow() { - QStringList labels; - labels << tr("Title") << tr("Location"); - treeWidget = new QTreeWidget; treeWidget->header()->setSectionResizeMode(QHeaderView::Stretch); - treeWidget->setHeaderLabels(labels); + treeWidget->setHeaderLabels(QStringList{ tr("Title"), tr("Location") }); #if !defined(QT_NO_CONTEXTMENU) && !defined(QT_NO_CLIPBOARD) treeWidget->setContextMenuPolicy(Qt::CustomContextMenu); connect(treeWidget, &QWidget::customContextMenuRequested, diff --git a/examples/corelib/serialization/streambookmarks/xbelreader.cpp b/examples/corelib/serialization/streambookmarks/xbelreader.cpp index 6e96cb9a059..864a76308fa 100644 --- a/examples/corelib/serialization/streambookmarks/xbelreader.cpp +++ b/examples/corelib/serialization/streambookmarks/xbelreader.cpp @@ -69,9 +69,7 @@ void XbelReader::readXBEL() void XbelReader::readTitle(QTreeWidgetItem *item) { Q_ASSERT(xml.isStartElement() && xml.name() == QLatin1String("title")); - - QString title = xml.readElementText(); - item->setText(0, title); + item->setText(0, xml.readElementText()); } //! [4] @@ -129,12 +127,7 @@ void XbelReader::readBookmark(QTreeWidgetItem *item) QTreeWidgetItem *XbelReader::createChildItem(QTreeWidgetItem *item) { - QTreeWidgetItem *childItem; - if (item) { - childItem = new QTreeWidgetItem(item); - } else { - childItem = new QTreeWidgetItem(treeWidget); - } + QTreeWidgetItem *childItem = item ? new QTreeWidgetItem(item) : new QTreeWidgetItem(treeWidget); childItem->setData(0, Qt::UserRole, xml.name().toString()); return childItem; }