1 files changed, 40 insertions, 43 deletions

diff --git a/src/qdbus/qdbusviewer/mainwindow.cpp b/src/qdbus/qdbusviewer/mainwindow.cpp
index 1f0a7d6b9..ef75dbeb7 100644
--- a/src/qdbus/qdbusviewer/mainwindow.cpp
+++ b/src/qdbus/qdbusviewer/mainwindow.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd and/or its subsidiary(-ies).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd and/or its subsidiary(-ies).
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "mainwindow.h"
 
@@ -40,8 +15,11 @@
 #include <QtDBus/QDBusConnection>
 #include <QtCore/QSettings>
 
+using namespace Qt::StringLiterals;
+
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
+    , systemBusViewer(nullptr)
 {
     QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
     QAction *quitAction = fileMenu->addAction(tr("&Quit"), this, &QWidget::close);
@@ -61,9 +39,13 @@ MainWindow::MainWindow(QWidget *parent)
     setCentralWidget(tabWidget);
 
     sessionBusViewer = new QDBusViewer(QDBusConnection::sessionBus());
-    systemBusViewer = new QDBusViewer(QDBusConnection::systemBus());
     tabWidget->addTab(sessionBusViewer, tr("Session Bus"));
-    tabWidget->addTab(systemBusViewer, tr("System Bus"));
+
+    QDBusConnection connection = QDBusConnection::systemBus();
+    if (connection.isConnected()) {
+        systemBusViewer = new QDBusViewer(connection);
+        tabWidget->addTab(systemBusViewer, tr("System Bus"));
+    }
 
     restoreSettings();
 }
@@ -86,18 +68,29 @@ void MainWindow::about()
 {
     QMessageBox box(this);
 
-    box.setText(QString::fromLatin1("<center><img src=\":/qt-project.org/qdbusviewer/images/qdbusviewer-128.png\">"
-                "<h3>%1</h3>"
-                "<p>Version %2</p></center>"
-                "<p>Copyright (C) %3 The Qt Company Ltd.</p>")
-            .arg(tr("D-Bus Viewer"), QLatin1String(QT_VERSION_STR), QStringLiteral("2020")));
+    box.setText(tr("<center><img src=\":/qt-project.org/qdbusviewer/images/qdbusviewer-128.png\">"
+                   "<h3>%1</h3>"
+                   "<p>Version %2</p></center>"
+                   "<p>Copyright (C) %3 The Qt Company Ltd.</p>")
+                        .arg(tr("D-Bus Viewer"), QLatin1String(QT_VERSION_STR), QString()));
     box.setWindowTitle(tr("D-Bus Viewer"));
     box.exec();
 }
 
-static inline QString windowGeometryKey() { return QStringLiteral("WindowGeometry"); }
-static inline QString sessionTabGroup() { return QStringLiteral("SessionTab"); }
-static inline QString systemTabGroup() { return QStringLiteral("SystemTab"); }
+static inline QString windowGeometryKey()
+{
+    return u"WindowGeometry"_s;
+}
+
+static inline QString sessionTabGroup()
+{
+    return u"SessionTab"_s;
+}
+
+static inline QString systemTabGroup()
+{
+    return u"SystemTab"_s;
+}
 
 void MainWindow::saveSettings()
 {
@@ -109,9 +102,11 @@ void MainWindow::saveSettings()
     sessionBusViewer->saveState(&settings);
     settings.endGroup();
 
-    settings.beginGroup(systemTabGroup());
-    systemBusViewer->saveState(&settings);
-    settings.endGroup();
+    if (systemBusViewer) {
+        settings.beginGroup(systemTabGroup());
+        systemBusViewer->saveState(&settings);
+        settings.endGroup();
+    }
 }
 
 void MainWindow::restoreSettings()
@@ -124,7 +119,9 @@ void MainWindow::restoreSettings()
     sessionBusViewer->restoreState(&settings);
     settings.endGroup();
 
-    settings.beginGroup(systemTabGroup());
-    systemBusViewer->restoreState(&settings);
-    settings.endGroup();
+    if (systemBusViewer) {
+        settings.beginGroup(systemTabGroup());
+        systemBusViewer->restoreState(&settings);
+        settings.endGroup();
+    }
 }