1 files changed, 34 insertions, 15 deletions

diff --git a/examples/xml/dombookmarks/mainwindow.cpp b/examples/xml/dombookmarks/mainwindow.cpp
index 6a03a57bb0..5e6c68ce8d 100644
--- a/examples/xml/dombookmarks/mainwindow.cpp
+++ b/examples/xml/dombookmarks/mainwindow.cpp
@@ -1,11 +1,21 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-#include <QtWidgets>
-
 #include "mainwindow.h"
 #include "xbeltree.h"
 
+#include <QApplication>
+#include <QFileDialog>
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QStatusBar>
+
+#include <QAction>
+#include <QScreen>
+
+using namespace Qt::StringLiterals;
+
+//! [0]
 MainWindow::MainWindow()
 {
     xbelTree = new XbelTree;
@@ -19,19 +29,20 @@ MainWindow::MainWindow()
     const QSize availableSize = screen()->availableGeometry().size();
     resize(availableSize.width() / 2, availableSize.height() / 3);
 }
+//! [0]
 
+//! [1]
 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;
 
+    const QString fileName = fileDialog.selectedFiles().constFirst();
     QFile file(fileName);
     if (!file.open(QFile::ReadOnly | QFile::Text)) {
-        QMessageBox::warning(this, tr("SAX Bookmarks"),
+        QMessageBox::warning(this, tr("DOM Bookmarks"),
                              tr("Cannot read file %1:\n%2.")
                              .arg(QDir::toNativeSeparators(fileName),
                                   file.errorString()));
@@ -41,19 +52,22 @@ void MainWindow::open()
     if (xbelTree->read(&file))
         statusBar()->showMessage(tr("File loaded"), 2000);
 }
+//! [1]
 
+//! [2]
 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("SAX Bookmarks"),
+        QMessageBox::warning(this, tr("DOM Bookmarks"),
                              tr("Cannot write file %1:\n%2.")
                              .arg(QDir::toNativeSeparators(fileName),
                                   file.errorString()));
@@ -63,7 +77,9 @@ void MainWindow::saveAs()
     if (xbelTree->write(&file))
         statusBar()->showMessage(tr("File saved"), 2000);
 }
+//! [2]
 
+//! [3]
 void MainWindow::about()
 {
    QMessageBox::about(this, tr("About DOM Bookmarks"),
@@ -71,7 +87,9 @@ void MainWindow::about()
                          "use Qt's DOM classes to read and write XML "
                          "documents."));
 }
+//! [3]
 
+//! [4]
 void MainWindow::createMenus()
 {
     QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
@@ -88,5 +106,6 @@ void MainWindow::createMenus()
 
     QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
     helpMenu->addAction(tr("&About"), this, &MainWindow::about);
-    helpMenu->addAction(tr("About &Qt"), qApp, &QCoreApplication::quit);
+    helpMenu->addAction(tr("About &Qt"), qApp, &QApplication::aboutQt);
 }
+//! [4]