1 files changed, 69 insertions, 60 deletions

diff --git a/examples/corelib/serialization/streambookmarks/mainwindow.cpp b/examples/corelib/serialization/streambookmarks/mainwindow.cpp
index 644681d706..a863f77ab7 100644
--- a/examples/corelib/serialization/streambookmarks/mainwindow.cpp
+++ b/examples/corelib/serialization/streambookmarks/mainwindow.cpp
@@ -1,22 +1,33 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-#include <QtWidgets>
-
 #include "mainwindow.h"
 #include "xbelreader.h"
 #include "xbelwriter.h"
 
+#include <QFileDialog>
+#include <QHeaderView>
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QStatusBar>
+#include <QTreeWidget>
+
+#include <QAction>
+#if QT_CONFIG(clipboard)
+#  include <QClipboard>
+#endif
+#include <QDesktopServices>
+#include <QApplication>
+#include <QScreen>
+
+using namespace Qt::StringLiterals;
+
 //! [0]
-MainWindow::MainWindow()
+MainWindow::MainWindow() : treeWidget(new QTreeWidget)
 {
-    QStringList labels;
-    labels << tr("Title") << tr("Location");
-
-    treeWidget = new QTreeWidget;
     treeWidget->header()->setSectionResizeMode(QHeaderView::Stretch);
-    treeWidget->setHeaderLabels(labels);
-#if !defined(QT_NO_CONTEXTMENU) && !defined(QT_NO_CLIPBOARD)
+    treeWidget->setHeaderLabels(QStringList{tr("Title"), tr("Location")});
+#if QT_CONFIG(clipboard) && QT_CONFIG(contextmenu)
     treeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(treeWidget, &QWidget::customContextMenuRequested,
             this, &MainWindow::onCustomContextMenuRequested);
@@ -33,7 +44,8 @@ MainWindow::MainWindow()
 }
 //! [0]
 
-#if !defined(QT_NO_CONTEXTMENU) && !defined(QT_NO_CLIPBOARD)
+//! [1]
+#if QT_CONFIG(clipboard) && QT_CONFIG(contextmenu)
 void MainWindow::onCustomContextMenuRequested(const QPoint &pos)
 {
     const QTreeWidgetItem *item = treeWidget->itemAt(pos);
@@ -49,59 +61,77 @@ void MainWindow::onCustomContextMenuRequested(const QPoint &pos)
     else if (action == openAction)
         QDesktopServices::openUrl(QUrl(url));
 }
-#endif // !QT_NO_CONTEXTMENU && !QT_NO_CLIPBOARD
-
+#endif // QT_CONFIG(clipboard) && QT_CONFIG(contextmenu)
 //! [1]
+
+//! [2]
+void MainWindow::createMenus()
+{
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+    QAction *openAct = fileMenu->addAction(tr("&Open..."), this, &MainWindow::open);
+    openAct->setShortcuts(QKeySequence::Open);
+
+    QAction *saveAsAct = fileMenu->addAction(tr("&Save As..."), this, &MainWindow::saveAs);
+    saveAsAct->setShortcuts(QKeySequence::SaveAs);
+
+    QAction *exitAct = fileMenu->addAction(tr("E&xit"), this, &QWidget::close);
+    exitAct->setShortcuts(QKeySequence::Quit);
+
+    menuBar()->addSeparator();
+
+    QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(tr("&About"), this, &MainWindow::about);
+    helpMenu->addAction(tr("About &Qt"), qApp, &QApplication::aboutQt);
+}
+//! [2]
+
+//! [3]
 void MainWindow::open()
 {
-    QString fileName =
-            QFileDialog::getOpenFileName(this, tr("Open Bookmark File"),
-                                         QDir::currentPath(),
-                                         tr("XBEL Files (*.xbel *.xml)"));
-    if (fileName.isEmpty())
+    QFileDialog fileDialog(this, tr("Open Bookmark File"), QDir::currentPath());
+    fileDialog.setMimeTypeFilters({"application/x-xbel"_L1});
+    if (fileDialog.exec() != QDialog::Accepted)
         return;
 
     treeWidget->clear();
 
-
+    const QString fileName = fileDialog.selectedFiles().constFirst();
     QFile file(fileName);
     if (!file.open(QFile::ReadOnly | QFile::Text)) {
         QMessageBox::warning(this, tr("QXmlStream Bookmarks"),
                              tr("Cannot read file %1:\n%2.")
-                             .arg(QDir::toNativeSeparators(fileName),
-                                  file.errorString()));
+                                     .arg(QDir::toNativeSeparators(fileName), file.errorString()));
         return;
     }
 
     XbelReader reader(treeWidget);
     if (!reader.read(&file)) {
-        QMessageBox::warning(this, tr("QXmlStream Bookmarks"),
-                             tr("Parse error in file %1:\n\n%2")
-                             .arg(QDir::toNativeSeparators(fileName),
-                                  reader.errorString()));
+        QMessageBox::warning(
+                this, tr("QXmlStream Bookmarks"),
+                tr("Parse error in file %1:\n\n%2")
+                        .arg(QDir::toNativeSeparators(fileName), reader.errorString()));
     } else {
         statusBar()->showMessage(tr("File loaded"), 2000);
     }
-
 }
-//! [1]
+//! [3]
 
-//! [2]
+//! [4]
 void MainWindow::saveAs()
 {
-    QString fileName =
-            QFileDialog::getSaveFileName(this, tr("Save Bookmark File"),
-                                         QDir::currentPath(),
-                                         tr("XBEL Files (*.xbel *.xml)"));
-    if (fileName.isEmpty())
+    QFileDialog fileDialog(this, tr("Save Bookmark File"), QDir::currentPath());
+    fileDialog.setAcceptMode(QFileDialog::AcceptSave);
+    fileDialog.setDefaultSuffix("xbel"_L1);
+    fileDialog.setMimeTypeFilters({"application/x-xbel"_L1});
+    if (fileDialog.exec() != QDialog::Accepted)
         return;
 
+    const QString fileName = fileDialog.selectedFiles().constFirst();
     QFile file(fileName);
     if (!file.open(QFile::WriteOnly | QFile::Text)) {
         QMessageBox::warning(this, tr("QXmlStream Bookmarks"),
                              tr("Cannot write file %1:\n%2.")
-                             .arg(QDir::toNativeSeparators(fileName),
-                                  file.errorString()));
+                                     .arg(QDir::toNativeSeparators(fileName), file.errorString()));
         return;
     }
 
@@ -109,34 +139,13 @@ void MainWindow::saveAs()
     if (writer.writeFile(&file))
         statusBar()->showMessage(tr("File saved"), 2000);
 }
-//! [2]
-
-//! [3]
-void MainWindow::about()
-{
-   QMessageBox::about(this, tr("About QXmlStream Bookmarks"),
-            tr("The <b>QXmlStream Bookmarks</b> example demonstrates how to use Qt's "
-               "QXmlStream classes to read and write XML documents."));
-}
-//! [3]
+//! [4]
 
 //! [5]
-void MainWindow::createMenus()
+void MainWindow::about()
 {
-    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
-    QAction *openAct = fileMenu->addAction(tr("&Open..."), this, &MainWindow::open);
-    openAct->setShortcuts(QKeySequence::Open);
-
-    QAction *saveAsAct = fileMenu->addAction(tr("&Save As..."), this, &MainWindow::saveAs);
-    saveAsAct->setShortcuts(QKeySequence::SaveAs);
-
-    QAction *exitAct = fileMenu->addAction(tr("E&xit"), this, &QWidget::close);
-    exitAct->setShortcuts(QKeySequence::Quit);
-
-    menuBar()->addSeparator();
-
-    QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
-    helpMenu->addAction(tr("&About"), this, &MainWindow::about);
-    helpMenu->addAction(tr("About &Qt"), qApp, &QCoreApplication::quit);
+    QMessageBox::about(this, tr("About QXmlStream Bookmarks"),
+                       tr("The <b>QXmlStream Bookmarks</b> example demonstrates how to use Qt's "
+                          "QXmlStream classes to read and write XML documents."));
 }
 //! [5]