1 files changed, 11 insertions, 45 deletions

diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
index e9f41e1a5c..f87766cf1b 100644
--- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
+++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins 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
 
 #include "qlinuxfbintegration.h"
 #include "qlinuxfbscreen.h"
@@ -72,11 +36,13 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QLinuxFbIntegration::QLinuxFbIntegration(const QStringList &paramList)
     : m_primaryScreen(nullptr),
       m_fontDb(new QGenericUnixFontDatabase),
       m_services(new QGenericUnixServices),
-      m_kbdMgr(0)
+      m_kbdMgr(nullptr)
 {
 #if QT_CONFIG(kms)
     if (qEnvironmentVariableIntValue("QT_QPA_FB_DRM") != 0)
@@ -152,7 +118,7 @@ void QLinuxFbIntegration::createInputHandlers()
 {
 #if QT_CONFIG(libinput)
     if (!qEnvironmentVariableIntValue("QT_QPA_FB_NO_LIBINPUT")) {
-        new QLibInputHandler(QLatin1String("libinput"), QString());
+        new QLibInputHandler("libinput"_L1, QString());
         return;
     }
 #endif
@@ -160,16 +126,16 @@ void QLinuxFbIntegration::createInputHandlers()
 #if QT_CONFIG(tslib)
     bool useTslib = qEnvironmentVariableIntValue("QT_QPA_FB_TSLIB");
     if (useTslib)
-        new QTsLibMouseHandler(QLatin1String("TsLib"), QString());
+        new QTsLibMouseHandler("TsLib"_L1, QString());
 #endif
 
 #if QT_CONFIG(evdev)
-    m_kbdMgr = new QEvdevKeyboardManager(QLatin1String("EvdevKeyboard"), QString(), this);
-    new QEvdevMouseManager(QLatin1String("EvdevMouse"), QString(), this);
+    m_kbdMgr = new QEvdevKeyboardManager("EvdevKeyboard"_L1, QString(), this);
+    new QEvdevMouseManager("EvdevMouse"_L1, QString(), this);
 #if QT_CONFIG(tslib)
     if (!useTslib)
 #endif
-        new QEvdevTouchManager(QLatin1String("EvdevTouch"), QString() /* spec */, this);
+        new QEvdevTouchManager("EvdevTouch"_L1, QString() /* spec */, this);
 #endif
 }
 
@@ -181,7 +147,7 @@ QPlatformNativeInterface *QLinuxFbIntegration::nativeInterface() const
 QFunctionPointer QLinuxFbIntegration::platformFunction(const QByteArray &function) const
 {
     Q_UNUSED(function);
-    return 0;
+    return nullptr;
 }
 
 #if QT_CONFIG(evdev)