1 files changed, 5 insertions, 31 deletions

diff --git a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp
index e527e1a07..c30bf5ae3 100644
--- a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp
+++ b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp
@@ -1,31 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL$
-** 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 or (at your option) 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.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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "vsp2hardwarelayerintegration.h"
 
@@ -68,7 +42,7 @@ Vsp2Layer::Vsp2Layer(QWaylandQuickHardwareLayer *hwLayer, Vsp2HardwareLayerInteg
     connect(hwLayer->waylandItem(), &QWaylandQuickItem::surfaceChanged, this, &Vsp2Layer::handleSurfaceChanged);
     connect(hwLayer->waylandItem(), &QQuickItem::opacityChanged, this, &Vsp2Layer::updateOpacity);
     connect(hwLayer->waylandItem()->window(), &QQuickWindow::afterSynchronizing, this, &Vsp2Layer::updatePosition);
-    hwLayer->disableSceneGraphPainting();
+    hwLayer->setSceneGraphPainting(false);
     QWaylandViewPrivate::get(hwLayer->waylandItem()->view())->independentFrameCallback = true;
     handleSurfaceChanged();
 }
@@ -188,7 +162,7 @@ wl_kms_buffer *Vsp2Layer::nextKmsBuffer()
 
 void Vsp2HardwareLayerIntegration::enableVspLayers()
 {
-    for (auto &layer : qAsConst(m_layers)) {
+    for (auto &layer : std::as_const(m_layers)) {
         Q_ASSERT(!layer->isEnabled());
         layer->enableVspLayer();
     }
@@ -251,7 +225,7 @@ void Vsp2HardwareLayerIntegration::remove(QWaylandQuickHardwareLayer *hwLayer)
 
 void Vsp2HardwareLayerIntegration::sendFrameCallbacks()
 {
-    for (auto &layer : qAsConst(m_layers)) {
+    for (auto &layer : std::as_const(m_layers)) {
         if (auto *surface = layer->hwLayer()->waylandItem()->surface())
             surface->sendFrameCallbacks();
     }