xdg-shell-v5: Suffix classes with v5

To make it easier to distinguish when implementing xdg-shell stable.

Change-Id: I730f3b8411f68b7e5c707b7ba6b94b2563ac500e
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

10 files changed, 92 insertions, 92 deletions

diff --git a/src/plugins/shellintegration/xdg-shell-v5/main.cpp b/src/plugins/shellintegration/xdg-shell-v5/main.cpp
index 3df1beaf9..9345f4401 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/main.cpp
+++ b/src/plugins/shellintegration/xdg-shell-v5/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qwaylandxdgshellintegration_p.h"
+#include "qwaylandxdgshellv5integration_p.h"
 
 #include <QtWaylandClient/private/qwaylandshellintegrationplugin_p.h>
 
@@ -60,7 +60,7 @@ QWaylandShellIntegration *QWaylandXdgShellV5IntegrationPlugin::create(const QStr
     qDebug() << Q_FUNC_INFO;
     Q_UNUSED(key);
     Q_UNUSED(paramList);
-    return new QWaylandXdgShellIntegration();
+    return new QWaylandXdgShellV5Integration();
 }
 
 }
diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopup.cpp b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopupv5.cpp
index 04849355f..542b1628d 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopup.cpp
+++ b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopupv5.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qwaylandxdgpopup_p.h"
+#include "qwaylandxdgpopupv5_p.h"
 
 #include <QtWaylandClient/private/qwaylanddisplay_p.h>
 #include <QtWaylandClient/private/qwaylandwindow_p.h>
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 namespace QtWaylandClient {
 
-QWaylandXdgPopup::QWaylandXdgPopup(struct ::xdg_popup *popup, QWaylandWindow *window)
+QWaylandXdgPopupV5::QWaylandXdgPopupV5(struct ::xdg_popup *popup, QWaylandWindow *window)
     : QWaylandShellSurface(window)
     , QtWayland::xdg_popup(popup)
     , m_window(window)
@@ -56,19 +56,19 @@ QWaylandXdgPopup::QWaylandXdgPopup(struct ::xdg_popup *popup, QWaylandWindow *wi
         m_extendedWindow = new QWaylandExtendedSurface(window);
 }
 
-QWaylandXdgPopup::~QWaylandXdgPopup()
+QWaylandXdgPopupV5::~QWaylandXdgPopupV5()
 {
     xdg_popup_destroy(object());
     delete m_extendedWindow;
 }
 
-void QWaylandXdgPopup::setType(Qt::WindowType type, QWaylandWindow *transientParent)
+void QWaylandXdgPopupV5::setType(Qt::WindowType type, QWaylandWindow *transientParent)
 {
     Q_UNUSED(type);
     Q_UNUSED(transientParent);
 }
 
-void QWaylandXdgPopup::xdg_popup_popup_done()
+void QWaylandXdgPopupV5::xdg_popup_popup_done()
 {
     m_window->window()->close();
 }
diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopup_p.h b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopupv5_p.h
index f7ea05c9e..638b71534 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopup_p.h
+++ b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgpopupv5_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QWAYLANDXDGPOPUP_P_H
-#define QWAYLANDXDGPOPUP_P_H
+#ifndef QWAYLANDXDGPOPUPV5_P_H
+#define QWAYLANDXDGPOPUPV5_P_H
 
 //
 //  W A R N I N G
@@ -67,13 +67,13 @@ namespace QtWaylandClient {
 class QWaylandWindow;
 class QWaylandExtendedSurface;
 
-class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgPopup : public QWaylandShellSurface
+class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgPopupV5 : public QWaylandShellSurface
         , public QtWayland::xdg_popup
 {
     Q_OBJECT
 public:
-    QWaylandXdgPopup(struct ::xdg_popup *popup, QWaylandWindow *window);
-    ~QWaylandXdgPopup() override;
+    QWaylandXdgPopupV5(struct ::xdg_popup *popup, QWaylandWindow *window);
+    ~QWaylandXdgPopupV5() override;
 
     void setType(Qt::WindowType type, QWaylandWindow *transientParent) override;
 
@@ -89,4 +89,4 @@ QT_END_NAMESPACE
 
 }
 
-#endif // QWAYLANDXDGPOPUP_P_H
+#endif // QWAYLANDXDGPOPUPV5_P_H
diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshell.cpp b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5.cpp
index bd76346d2..6a693578c 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshell.cpp
+++ b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5.cpp
@@ -37,9 +37,9 @@
 **
 ****************************************************************************/
 
-#include "qwaylandxdgshell_p.h"
-#include "qwaylandxdgpopup_p.h"
-#include "qwaylandxdgsurface_p.h"
+#include "qwaylandxdgshellv5_p.h"
+#include "qwaylandxdgpopupv5_p.h"
+#include "qwaylandxdgsurfacev5_p.h"
 
 #include <QtCore/QDebug>
 
@@ -52,28 +52,28 @@ QT_BEGIN_NAMESPACE
 
 namespace QtWaylandClient {
 
-QWaylandXdgShell::QWaylandXdgShell(struct ::xdg_shell *shell)
+QWaylandXdgShellV5::QWaylandXdgShellV5(struct ::xdg_shell *shell)
     : QtWayland::xdg_shell(shell)
 {
 }
 
-QWaylandXdgShell::QWaylandXdgShell(struct ::wl_registry *registry, uint32_t id)
+QWaylandXdgShellV5::QWaylandXdgShellV5(struct ::wl_registry *registry, uint32_t id)
     : QtWayland::xdg_shell(registry, id, 1)
 {
     use_unstable_version(QtWayland::xdg_shell::version_current);
 }
 
-QWaylandXdgShell::~QWaylandXdgShell()
+QWaylandXdgShellV5::~QWaylandXdgShellV5()
 {
     xdg_shell_destroy(object());
 }
 
-QWaylandXdgSurface *QWaylandXdgShell::createXdgSurface(QWaylandWindow *window)
+QWaylandXdgSurfaceV5 *QWaylandXdgShellV5::createXdgSurface(QWaylandWindow *window)
 {
-    return new QWaylandXdgSurface(this, window);
+    return new QWaylandXdgSurfaceV5(this, window);
 }
 
-QWaylandXdgPopup *QWaylandXdgShell::createXdgPopup(QWaylandWindow *window, QWaylandInputDevice *inputDevice)
+QWaylandXdgPopupV5 *QWaylandXdgShellV5::createXdgPopup(QWaylandWindow *window, QWaylandInputDevice *inputDevice)
 {
     QWaylandWindow *parentWindow = m_popups.empty() ? window->transientParent() : m_popups.last();
     ::wl_surface *parentSurface = parentWindow->object();
@@ -86,9 +86,9 @@ QWaylandXdgPopup *QWaylandXdgShell::createXdgPopup(QWaylandWindow *window, QWayl
     int x = position.x() + parentWindow->frameMargins().left();
     int y = position.y() + parentWindow->frameMargins().top();
 
-    auto popup = new QWaylandXdgPopup(get_xdg_popup(window->object(), parentSurface, seat, m_popupSerial, x, y), window);
+    auto popup = new QWaylandXdgPopupV5(get_xdg_popup(window->object(), parentSurface, seat, m_popupSerial, x, y), window);
     m_popups.append(window);
-    QObject::connect(popup, &QWaylandXdgPopup::destroyed, [this, window](){
+    QObject::connect(popup, &QWaylandXdgPopupV5::destroyed, [this, window](){
         m_popups.removeOne(window);
         if (m_popups.empty())
             m_popupSerial = 0;
@@ -96,7 +96,7 @@ QWaylandXdgPopup *QWaylandXdgShell::createXdgPopup(QWaylandWindow *window, QWayl
     return popup;
 }
 
-void QWaylandXdgShell::xdg_shell_ping(uint32_t serial)
+void QWaylandXdgShellV5::xdg_shell_ping(uint32_t serial)
 {
     pong(serial);
 }
diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshell_p.h b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5_p.h
index ead1e65d7..ec45bb32c 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshell_p.h
+++ b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QWAYLANDXDGSHELL_H
-#define QWAYLANDXDGSHELL_H
+#ifndef QWAYLANDXDGSHELLV5_H
+#define QWAYLANDXDGSHELLV5_H
 
 //
 //  W A R N I N G
@@ -69,18 +69,18 @@ namespace QtWaylandClient {
 
 class QWaylandWindow;
 class QWaylandInputDevice;
-class QWaylandXdgSurface;
-class QWaylandXdgPopup;
+class QWaylandXdgSurfaceV5;
+class QWaylandXdgPopupV5;
 
-class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgShell : public QtWayland::xdg_shell
+class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgShellV5 : public QtWayland::xdg_shell
 {
 public:
-    QWaylandXdgShell(struct ::xdg_shell *shell);
-    QWaylandXdgShell(struct ::wl_registry *registry, uint32_t id);
-    ~QWaylandXdgShell() override;
+    QWaylandXdgShellV5(struct ::xdg_shell *shell);
+    QWaylandXdgShellV5(struct ::wl_registry *registry, uint32_t id);
+    ~QWaylandXdgShellV5() override;
 
-    QWaylandXdgSurface *createXdgSurface(QWaylandWindow *window);
-    QWaylandXdgPopup *createXdgPopup(QWaylandWindow *window, QWaylandInputDevice *inputDevice);
+    QWaylandXdgSurfaceV5 *createXdgSurface(QWaylandWindow *window);
+    QWaylandXdgPopupV5 *createXdgPopup(QWaylandWindow *window, QWaylandInputDevice *inputDevice);
 
 private:
     void xdg_shell_ping(uint32_t serial) override;
@@ -93,4 +93,4 @@ QT_END_NAMESPACE
 
 }
 
-#endif // QWAYLANDXDGSHELL_H
+#endif // QWAYLANDXDGSHELLV5_H
diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellintegration.cpp b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration.cpp
index 0d0e8aba3..47d748b1c 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellintegration.cpp
+++ b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration.cpp
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
-#include "qwaylandxdgshellintegration_p.h"
-#include "qwaylandxdgsurface_p.h"
-#include "qwaylandxdgpopup_p.h"
-#include "qwaylandxdgshell_p.h"
+#include "qwaylandxdgshellv5integration_p.h"
+#include "qwaylandxdgsurfacev5_p.h"
+#include "qwaylandxdgpopupv5_p.h"
+#include "qwaylandxdgshellv5_p.h"
 
 #include <QtWaylandClient/private/qwaylandwindow_p.h>
 #include <QtWaylandClient/private/qwaylanddisplay_p.h>
@@ -49,11 +49,11 @@ QT_BEGIN_NAMESPACE
 
 namespace QtWaylandClient {
 
-bool QWaylandXdgShellIntegration::initialize(QWaylandDisplay *display)
+bool QWaylandXdgShellV5Integration::initialize(QWaylandDisplay *display)
 {
     Q_FOREACH (QWaylandDisplay::RegistryGlobal global, display->globals()) {
         if (global.interface == QLatin1String("xdg_shell")) {
-            m_xdgShell.reset(new QWaylandXdgShell(display->wl_registry(), global.id));
+            m_xdgShell.reset(new QWaylandXdgShellV5(display->wl_registry(), global.id));
             break;
         }
     }
@@ -66,7 +66,7 @@ bool QWaylandXdgShellIntegration::initialize(QWaylandDisplay *display)
     return QWaylandShellIntegration::initialize(display);
 }
 
-QWaylandShellSurface *QWaylandXdgShellIntegration::createShellSurface(QWaylandWindow *window)
+QWaylandShellSurface *QWaylandXdgShellV5Integration::createShellSurface(QWaylandWindow *window)
 {
     QWaylandInputDevice *inputDevice = window->display()->lastInputDevice();
     if (window->window()->type() == Qt::WindowType::Popup && inputDevice)
@@ -75,10 +75,10 @@ QWaylandShellSurface *QWaylandXdgShellIntegration::createShellSurface(QWaylandWi
         return m_xdgShell->createXdgSurface(window);
 }
 
-void QWaylandXdgShellIntegration::handleKeyboardFocusChanged(QWaylandWindow *newFocus, QWaylandWindow *oldFocus) {
-    if (newFocus && qobject_cast<QWaylandXdgPopup *>(newFocus->shellSurface()))
+void QWaylandXdgShellV5Integration::handleKeyboardFocusChanged(QWaylandWindow *newFocus, QWaylandWindow *oldFocus) {
+    if (newFocus && qobject_cast<QWaylandXdgPopupV5 *>(newFocus->shellSurface()))
         m_display->handleWindowActivated(newFocus);
-    if (oldFocus && qobject_cast<QWaylandXdgPopup *>(oldFocus->shellSurface()))
+    if (oldFocus && qobject_cast<QWaylandXdgPopupV5 *>(oldFocus->shellSurface()))
         m_display->handleWindowDeactivated(oldFocus);
 }
 
diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellintegration_p.h b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration_p.h
index a3ff86cd7..e8c05c9a0 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellintegration_p.h
+++ b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgshellv5integration_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QWAYLANDXDGSHELLINTEGRATION_P_H
-#define QWAYLANDXDGSHELLINTEGRATION_P_H
+#ifndef QWAYLANDXDGSHELLV5INTEGRATION_P_H
+#define QWAYLANDXDGSHELLV5INTEGRATION_P_H
 
 //
 //  W A R N I N G
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include "qwaylandxdgshell_p.h"
+#include "qwaylandxdgshellv5_p.h"
 
 #include <QtWaylandClient/private/qwaylandshellintegration_p.h>
 
@@ -59,22 +59,22 @@ QT_BEGIN_NAMESPACE
 
 namespace QtWaylandClient {
 
-class QWaylandXdgShell;
+class QWaylandXdgShellV5;
 
-class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgShellIntegration : public QWaylandShellIntegration
+class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgShellV5Integration : public QWaylandShellIntegration
 {
 public:
-    QWaylandXdgShellIntegration() {qDebug() << Q_FUNC_INFO;}
+    QWaylandXdgShellV5Integration() {qDebug() << Q_FUNC_INFO;}
     bool initialize(QWaylandDisplay *display) override;
     QWaylandShellSurface *createShellSurface(QWaylandWindow *window) override;
     void handleKeyboardFocusChanged(QWaylandWindow *newFocus, QWaylandWindow *oldFocus) override;
 
 private:
-    QScopedPointer<QWaylandXdgShell> m_xdgShell;
+    QScopedPointer<QWaylandXdgShellV5> m_xdgShell;
 };
 
 }
 
 QT_END_NAMESPACE
 
-#endif // QWAYLANDXDGSHELLINTEGRATION_P_H
+#endif // QWAYLANDXDGSHELLV5INTEGRATION_P_H
diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurface.cpp b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5.cpp
index ec096540a..315dc6231 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurface.cpp
+++ b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5.cpp
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#include "qwaylandxdgsurface_p.h"
-#include "qwaylandxdgshell_p.h"
+#include "qwaylandxdgsurfacev5_p.h"
+#include "qwaylandxdgshellv5_p.h"
 
 #include <QtWaylandClient/private/qwaylanddisplay_p.h>
 #include <QtWaylandClient/private/qwaylanddisplay_p.h>
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 
 namespace QtWaylandClient {
 
-QWaylandXdgSurface::QWaylandXdgSurface(QWaylandXdgShell *shell, QWaylandWindow *window)
+QWaylandXdgSurfaceV5::QWaylandXdgSurfaceV5(QWaylandXdgShellV5 *shell, QWaylandWindow *window)
     : QWaylandShellSurface(window)
     , QtWayland::xdg_surface(shell->get_xdg_surface(window->object()))
     , m_window(window)
@@ -62,7 +62,7 @@ QWaylandXdgSurface::QWaylandXdgSurface(QWaylandXdgShell *shell, QWaylandWindow *
         m_extendedWindow = new QWaylandExtendedSurface(window);
 }
 
-QWaylandXdgSurface::~QWaylandXdgSurface()
+QWaylandXdgSurfaceV5::~QWaylandXdgSurfaceV5()
 {
     if (m_acked.states & Qt::WindowActive)
         window()->display()->handleWindowDeactivated(m_window);
@@ -71,84 +71,84 @@ QWaylandXdgSurface::~QWaylandXdgSurface()
     delete m_extendedWindow;
 }
 
-void QWaylandXdgSurface::resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges)
+void QWaylandXdgSurfaceV5::resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges)
 {
     // May need some conversion if types get incompatibles, ATM they're identical
     enum resize_edge const * const arg = reinterpret_cast<enum resize_edge const * const>(&edges);
     resize(inputDevice, *arg);
 }
 
-void QWaylandXdgSurface::resize(QWaylandInputDevice *inputDevice, enum resize_edge edges)
+void QWaylandXdgSurfaceV5::resize(QWaylandInputDevice *inputDevice, enum resize_edge edges)
 {
     resize(inputDevice->wl_seat(),
            inputDevice->serial(),
            edges);
 }
 
-bool QWaylandXdgSurface::move(QWaylandInputDevice *inputDevice)
+bool QWaylandXdgSurfaceV5::move(QWaylandInputDevice *inputDevice)
 {
     move(inputDevice->wl_seat(),
          inputDevice->serial());
     return true;
 }
 
-void QWaylandXdgSurface::updateTransientParent(QWaylandWindow *parent)
+void QWaylandXdgSurfaceV5::updateTransientParent(QWaylandWindow *parent)
 {
     if (!parent)
         return;
-    auto parentXdgSurface = qobject_cast<QWaylandXdgSurface *>(parent->shellSurface());
+    auto parentXdgSurface = qobject_cast<QWaylandXdgSurfaceV5 *>(parent->shellSurface());
     Q_ASSERT(parentXdgSurface);
     set_parent(parentXdgSurface->object());
 }
 
-void QWaylandXdgSurface::setTitle(const QString & title)
+void QWaylandXdgSurfaceV5::setTitle(const QString & title)
 {
     return QtWayland::xdg_surface::set_title(title);
 }
 
-void QWaylandXdgSurface::setAppId(const QString & appId)
+void QWaylandXdgSurfaceV5::setAppId(const QString & appId)
 {
     return QtWayland::xdg_surface::set_app_id(appId);
 }
 
-void QWaylandXdgSurface::raise()
+void QWaylandXdgSurfaceV5::raise()
 {
     if (m_extendedWindow)
         m_extendedWindow->raise();
 }
 
-void QWaylandXdgSurface::lower()
+void QWaylandXdgSurfaceV5::lower()
 {
     if (m_extendedWindow)
         m_extendedWindow->lower();
 }
 
-void QWaylandXdgSurface::setContentOrientationMask(Qt::ScreenOrientations orientation)
+void QWaylandXdgSurfaceV5::setContentOrientationMask(Qt::ScreenOrientations orientation)
 {
     if (m_extendedWindow)
         m_extendedWindow->setContentOrientationMask(orientation);
 }
 
-void QWaylandXdgSurface::setWindowFlags(Qt::WindowFlags flags)
+void QWaylandXdgSurfaceV5::setWindowFlags(Qt::WindowFlags flags)
 {
     if (m_extendedWindow)
         m_extendedWindow->setWindowFlags(flags);
 }
 
-void QWaylandXdgSurface::sendProperty(const QString &name, const QVariant &value)
+void QWaylandXdgSurfaceV5::sendProperty(const QString &name, const QVariant &value)
 {
     if (m_extendedWindow)
         m_extendedWindow->updateGenericProperty(name, value);
 }
 
-void QWaylandXdgSurface::setType(Qt::WindowType type, QWaylandWindow *transientParent)
+void QWaylandXdgSurfaceV5::setType(Qt::WindowType type, QWaylandWindow *transientParent)
 {
     Q_UNUSED(type)
     if (transientParent)
         updateTransientParent(transientParent);
 }
 
-void QWaylandXdgSurface::applyConfigure()
+void QWaylandXdgSurfaceV5::applyConfigure()
 {
     if (m_pending.isResizing)
         m_normalSize = m_pending.size;
@@ -173,7 +173,7 @@ void QWaylandXdgSurface::applyConfigure()
     m_acked = m_pending;
 }
 
-void QWaylandXdgSurface::requestWindowStates(Qt::WindowStates states)
+void QWaylandXdgSurfaceV5::requestWindowStates(Qt::WindowStates states)
 {
     Qt::WindowStates changedStates = m_acked.states ^ states;
 
@@ -198,12 +198,12 @@ void QWaylandXdgSurface::requestWindowStates(Qt::WindowStates states)
     }
 }
 
-bool QWaylandXdgSurface::wantsDecorations() const
+bool QWaylandXdgSurfaceV5::wantsDecorations() const
 {
     return !(m_pending.states & Qt::WindowFullScreen);
 }
 
-void QWaylandXdgSurface::xdg_surface_configure(int32_t width, int32_t height, struct wl_array *states,uint32_t serial)
+void QWaylandXdgSurfaceV5::xdg_surface_configure(int32_t width, int32_t height, struct wl_array *states,uint32_t serial)
 {
     uint32_t *xdgStates = reinterpret_cast<uint32_t*>(states->data);
     size_t numStates = states->size / sizeof(uint32_t);
@@ -232,7 +232,7 @@ void QWaylandXdgSurface::xdg_surface_configure(int32_t width, int32_t height, st
     m_window->applyConfigureWhenPossible();
 }
 
-void QWaylandXdgSurface::xdg_surface_close()
+void QWaylandXdgSurfaceV5::xdg_surface_close()
 {
 }
 
diff --git a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurface_p.h b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5_p.h
index 0153c80b1..928395779 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurface_p.h
+++ b/src/plugins/shellintegration/xdg-shell-v5/qwaylandxdgsurfacev5_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QWAYLANDXDGSURFACE_H
-#define QWAYLANDXDGSURFACE_H
+#ifndef QWAYLANDXDGSURFACEV5_P_H
+#define QWAYLANDXDGSURFACEV5_P_H
 
 //
 //  W A R N I N G
@@ -70,15 +70,15 @@ namespace QtWaylandClient {
 class QWaylandWindow;
 class QWaylandInputDevice;
 class QWaylandExtendedSurface;
-class QWaylandXdgShell;
+class QWaylandXdgShellV5;
 
-class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgSurface : public QWaylandShellSurface
+class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgSurfaceV5 : public QWaylandShellSurface
         , public QtWayland::xdg_surface
 {
     Q_OBJECT
 public:
-    QWaylandXdgSurface(QWaylandXdgShell *shell, QWaylandWindow *window);
-    ~QWaylandXdgSurface() override;
+    QWaylandXdgSurfaceV5(QWaylandXdgShellV5 *shell, QWaylandWindow *window);
+    ~QWaylandXdgSurfaceV5() override;
 
     using QtWayland::xdg_surface::resize;
     void resize(QWaylandInputDevice *inputDevice, enum resize_edge edges);
@@ -107,7 +107,7 @@ private:
 
 private:
     QWaylandWindow *m_window = nullptr;
-    QWaylandXdgShell* m_shell = nullptr;
+    QWaylandXdgShellV5* m_shell = nullptr;
     struct {
         Qt::WindowStates states = Qt::WindowNoState;
         bool isResizing = false;
@@ -131,4 +131,4 @@ QT_END_NAMESPACE
 
 }
 
-#endif // QWAYLANDXDGSURFACE_H
+#endif // QWAYLANDXDGSURFACEV5_P_H
diff --git a/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro b/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro
index 511699b2d..0e97832e4 100644
--- a/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro
+++ b/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro
@@ -10,17 +10,17 @@ WAYLANDCLIENTSOURCES += \
     ../../../3rdparty/protocol/xdg-shell-unstable-v5.xml
 
 HEADERS += \
-    qwaylandxdgpopup_p.h \
-    qwaylandxdgshell_p.h \
-    qwaylandxdgshellintegration_p.h \
-    qwaylandxdgsurface_p.h \
+    qwaylandxdgpopupv5_p.h \
+    qwaylandxdgshellv5_p.h \
+    qwaylandxdgshellv5integration_p.h \
+    qwaylandxdgsurfacev5_p.h \
 
 SOURCES += \
     main.cpp \
-    qwaylandxdgpopup.cpp \
-    qwaylandxdgshell.cpp \
-    qwaylandxdgshellintegration.cpp \
-    qwaylandxdgsurface.cpp \
+    qwaylandxdgpopupv5.cpp \
+    qwaylandxdgshellv5.cpp \
+    qwaylandxdgshellv5integration.cpp \
+    qwaylandxdgsurfacev5.cpp \
 
 OTHER_FILES += \
     xdg-shell-v5.json