1 files changed, 12 insertions, 44 deletions

diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp
index a9e508c666..a3b7b6db00 100644
--- a/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp
+++ b/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 /*
     This file was originally created by qdbusxml2cpp version 0.8
@@ -59,6 +23,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QDBusMenuAdaptor::QDBusMenuAdaptor(QDBusPlatformMenu *topLevelMenu)
     : QDBusAbstractAdaptor(topLevelMenu)
     , m_topLevelMenu(topLevelMenu)
@@ -73,12 +39,12 @@ QDBusMenuAdaptor::~QDBusMenuAdaptor()
 QString QDBusMenuAdaptor::status() const
 {
     qCDebug(qLcMenu);
-    return QLatin1String("normal");
+    return "normal"_L1;
 }
 
 QString QDBusMenuAdaptor::textDirection() const
 {
-    return QLocale().textDirection() == Qt::RightToLeft ? QLatin1String("rtl") : QLatin1String("ltr");
+    return QLocale().textDirection() == Qt::RightToLeft ? "rtl"_L1 : "ltr"_L1;
 }
 
 uint QDBusMenuAdaptor::version() const
@@ -117,12 +83,12 @@ void QDBusMenuAdaptor::Event(int id, const QString &eventId, const QDBusVariant
     Q_UNUSED(data);
     Q_UNUSED(timestamp);
     QDBusPlatformMenuItem *item = QDBusPlatformMenuItem::byId(id);
-    qCDebug(qLcMenu) << id << (item ? item->text() : QLatin1String("")) << eventId;
-    if (item && eventId == QLatin1String("clicked"))
+    qCDebug(qLcMenu) << id << (item ? item->text() : ""_L1) << eventId;
+    if (item && eventId == "clicked"_L1)
         item->trigger();
-    if (item && eventId == QLatin1String("hovered"))
+    if (item && eventId == "hovered"_L1)
         emit item->hovered();
-    if (eventId == QLatin1String("closed")) {
+    if (eventId == "closed"_L1) {
         // There is no explicit AboutToHide method, so map closed event to aboutToHide method
         const QDBusPlatformMenu *menu = nullptr;
         if (item)
@@ -163,3 +129,5 @@ QDBusVariant QDBusMenuAdaptor::GetProperty(int id, const QString &name)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qdbusmenuadaptor_p.cpp"