1 files changed, 12 insertions, 48 deletions

diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/qeglfsx11integration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/qeglfsx11integration.cpp
index 07b2de7c58..8f491274d5 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/qeglfsx11integration.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/qeglfsx11integration.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 "qeglfsx11integration.h"
 #include <QThread>
@@ -61,7 +25,7 @@ private:
     QEglFSX11Integration *m_integration;
 };
 
-QAtomicInt running;
+Q_CONSTINIT static QBasicAtomicInt running = Q_BASIC_ATOMIC_INITIALIZER(0);
 
 void EventReader::run()
 {
@@ -75,7 +39,7 @@ void EventReader::run()
             if (client->format == 32
                 && client->type == atoms[Atoms::WM_PROTOCOLS]
                 && client->data.data32[0] == atoms[Atoms::WM_DELETE_WINDOW]) {
-                QWindow *window = m_integration->platformWindow() ? m_integration->platformWindow()->window() : 0;
+                QWindow *window = m_integration->platformWindow() ? m_integration->platformWindow()->window() : nullptr;
                 if (window)
                     QWindowSystemInterface::handleCloseEvent(window);
             }
@@ -106,7 +70,7 @@ void QEglFSX11Integration::sendConnectionEvent(xcb_atom_t a)
 
 void QEglFSX11Integration::platformInit()
 {
-    m_display = XOpenDisplay(0);
+    m_display = XOpenDisplay(nullptr);
     if (Q_UNLIKELY(!m_display))
         qFatal("Could not open display");
 
@@ -121,7 +85,7 @@ void QEglFSX11Integration::platformInit()
     xcb_create_window(m_connection, XCB_COPY_FROM_PARENT,
                       m_connectionEventListener, it.data->root,
                       0, 0, 1, 1, 0, XCB_WINDOW_CLASS_INPUT_ONLY,
-                      it.data->root_visual, 0, 0);
+                      it.data->root_visual, 0, nullptr);
 
     m_eventReader = new EventReader(this);
     m_eventReader->start();
@@ -135,11 +99,11 @@ void QEglFSX11Integration::platformDestroy()
 
     m_eventReader->wait();
     delete m_eventReader;
-    m_eventReader = 0;
+    m_eventReader = nullptr;
 
     XCloseDisplay(DISPLAY);
-    m_display = 0;
-    m_connection = 0;
+    m_display = nullptr;
+    m_connection = nullptr;
 }
 
 EGLNativeDisplayType QEglFSX11Integration::platformDisplay() const
@@ -151,7 +115,7 @@ QSize QEglFSX11Integration::screenSize() const
 {
     if (m_screenSize.isEmpty()) {
         QList<QByteArray> env = qgetenv("EGLFS_X11_SIZE").split('x');
-        if (env.length() == 2) {
+        if (env.size() == 2) {
             m_screenSize = QSize(env.at(0).toInt(), env.at(1).toInt());
         } else {
             XWindowAttributes a;
@@ -175,7 +139,7 @@ EGLNativeWindowType QEglFSX11Integration::createNativeWindow(QPlatformWindow *pl
     xcb_create_window(m_connection, XCB_COPY_FROM_PARENT, m_window, it.data->root,
                       0, 0, size.width(), size.height(), 0,
                       XCB_WINDOW_CLASS_INPUT_OUTPUT, it.data->root_visual,
-                      0, 0);
+                      0, nullptr);
 
     xcb_intern_atom_cookie_t cookies[Atoms::N_ATOMS];
     static const char *atomNames[Atoms::N_ATOMS] = {
@@ -189,7 +153,7 @@ EGLNativeWindowType QEglFSX11Integration::createNativeWindow(QPlatformWindow *pl
 
     for (int i = 0; i < Atoms::N_ATOMS; ++i) {
         cookies[i] = xcb_intern_atom(m_connection, false, strlen(atomNames[i]), atomNames[i]);
-        xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(m_connection, cookies[i], 0);
+        xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(m_connection, cookies[i], nullptr);
         m_atoms[i] = reply->atom;
         free(reply);
     }