1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XBEL example: minor simplifications

Browse Source 
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 <juha.vuolle@qt.io>
This commit is contained in:
Edward Welbourne 2023-06-07 16:24:16 +02:00
parent 705e4e63c6
commit 5fd4a65d95
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/corelib/serialization/streambookmarks/mainwindow.cpp
View File

@ -10,12 +10,9 @@
//! [0] //! [0]
MainWindow::MainWindow() MainWindow::MainWindow()
{ {
QStringList labels;
labels << tr("Title") << tr("Location");
treeWidget = new QTreeWidget; treeWidget = new QTreeWidget;
treeWidget->header()->setSectionResizeMode(QHeaderView::Stretch); treeWidget->header()->setSectionResizeMode(QHeaderView::Stretch);
treeWidget->setHeaderLabels(labels); treeWidget->setHeaderLabels(QStringList{ tr("Title"), tr("Location") });
#if !defined(QT_NO_CONTEXTMENU) && !defined(QT_NO_CLIPBOARD) #if !defined(QT_NO_CONTEXTMENU) && !defined(QT_NO_CLIPBOARD)
treeWidget->setContextMenuPolicy(Qt::CustomContextMenu); treeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
connect(treeWidget, &QWidget::customContextMenuRequested, connect(treeWidget, &QWidget::customContextMenuRequested,

11
examples/corelib/serialization/streambookmarks/xbelreader.cpp
View File

@ -69,9 +69,7 @@ void XbelReader::readXBEL()
void XbelReader::readTitle(QTreeWidgetItem *item) void XbelReader::readTitle(QTreeWidgetItem *item)
{ {
Q_ASSERT(xml.isStartElement() && xml.name() == QLatin1String("title")); Q_ASSERT(xml.isStartElement() && xml.name() == QLatin1String("title"));
item->setText(0, xml.readElementText());
QString title = xml.readElementText();
item->setText(0, title);
} }
//! [4] //! [4]
@ -129,12 +127,7 @@ void XbelReader::readBookmark(QTreeWidgetItem *item)
QTreeWidgetItem *XbelReader::createChildItem(QTreeWidgetItem *item) QTreeWidgetItem *XbelReader::createChildItem(QTreeWidgetItem *item)
{ {
QTreeWidgetItem *childItem; QTreeWidgetItem *childItem = item ? new QTreeWidgetItem(item) : new QTreeWidgetItem(treeWidget);
if (item) {
childItem = new QTreeWidgetItem(item);
} else {
childItem = new QTreeWidgetItem(treeWidget);
}
childItem->setData(0, Qt::UserRole, xml.name().toString()); childItem->setData(0, Qt::UserRole, xml.name().toString());
return childItem; return childItem;
} }