1 files changed, 12 insertions, 32 deletions

diff --git a/tests/auto/client/shared/xdgshell.cpp b/tests/auto/client/shared/xdgshell.cpp
index 13acc01e2..2c1639851 100644
--- a/tests/auto/client/shared/xdgshell.cpp
+++ b/tests/auto/client/shared/xdgshell.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite 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) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "xdgshell.h"
 
@@ -39,7 +14,7 @@ XdgWmBase::XdgWmBase(CoreCompositor *compositor, int version)
 XdgToplevel *XdgWmBase::toplevel(int i)
 {
     int j = 0;
-    for (auto *xdgSurface : qAsConst(m_xdgSurfaces)) {
+    for (auto *xdgSurface : std::as_const(m_xdgSurfaces)) {
         if (auto *toplevel = xdgSurface->m_toplevel) {
             if (j == i)
                 return toplevel;
@@ -52,7 +27,7 @@ XdgToplevel *XdgWmBase::toplevel(int i)
 XdgPopup *XdgWmBase::popup(int i)
 {
     int j = 0;
-    for (auto *xdgSurface : qAsConst(m_xdgSurfaces)) {
+    for (auto *xdgSurface : std::as_const(m_xdgSurfaces)) {
         if (auto *popup = xdgSurface->m_popup) {
             if (j == i)
                 return popup;
@@ -83,7 +58,7 @@ XdgSurface::XdgSurface(XdgWmBase *xdgWmBase, Surface *surface, wl_client *client
 {
     QVERIFY(!surface->m_pending.buffer);
     QVERIFY(!surface->m_committed.buffer);
-    connect(this, &XdgSurface::toplevelCreated, xdgWmBase, &XdgWmBase::toplevelCreated);
+    connect(this, &XdgSurface::toplevelCreated, xdgWmBase, &XdgWmBase::toplevelCreated, Qt::DirectConnection);
     connect(surface, &Surface::attach, this, &XdgSurface::verifyConfigured);
     connect(surface, &Surface::commit, this, [this] {
         m_committed = m_pending;
@@ -168,12 +143,17 @@ XdgToplevel::XdgToplevel(XdgSurface *xdgSurface, int id, int version)
     connect(surface(), &Surface::commit, this, [this] { m_committed = m_pending; });
 }
 
-void XdgToplevel::sendConfigure(const QSize &size, const QVector<uint> &states)
+void XdgToplevel::sendConfigureBounds(const QSize &size)
+{
+    send_configure_bounds(size.width(), size.height());
+}
+
+void XdgToplevel::sendConfigure(const QSize &size, const QList<uint> &states)
 {
     send_configure(size.width(), size.height(), toByteArray(states));
 }
 
-uint XdgToplevel::sendCompleteConfigure(const QSize &size, const QVector<uint> &states)
+uint XdgToplevel::sendCompleteConfigure(const QSize &size, const QList<uint> &states)
 {
     sendConfigure(size, states);
     return m_xdgSurface->sendConfigure();