From 6f0bca5593278fc801700437c9143adc8bcb9e24 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Mon, 6 Nov 2023 15:50:19 +0200
Subject: [PATCH] Revert "Add a (temporary) way to attach popups to layer
 surfaces"

This reverts commit fdab1544fb0dc1af245d36927fe4ab830b0ef2c0.

Qt 6.6 is out with all the necessary multi-shell apis.
---
 src/interfaces/window.cpp | 18 ------------------
 src/interfaces/window.h   |  8 --------
 2 files changed, 26 deletions(-)

diff --git a/src/interfaces/window.cpp b/src/interfaces/window.cpp
index 4f56bfc..5dbd8cc 100644
--- a/src/interfaces/window.cpp
+++ b/src/interfaces/window.cpp
@@ -6,9 +6,6 @@
 
 #include "window.h"
 #include "../qwaylandlayershellintegration_p.h"
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
-#include "../qwaylandlayersurface_p.h"
-#endif
 
 #include <layershellqt_logging.h>
 
@@ -141,21 +138,6 @@ void Window::setCloseOnDismissed(bool close)
     d->closeOnDismissed = close;
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
-void Window::attachPopup(QWindow *window, xdg_popup *popup)
-{
-    auto waylandWindow = dynamic_cast<QtWaylandClient::QWaylandWindow *>(window->handle());
-    if (!waylandWindow) {
-        return;
-    }
-
-    auto shellSurface = dynamic_cast<QWaylandLayerSurface *>(waylandWindow->shellSurface());
-    if (shellSurface) {
-        shellSurface->get_popup(popup);
-    }
-}
-#endif
-
 Window::Window(QWindow *window)
     : QObject(window)
     , d(new WindowPrivate(window))
diff --git a/src/interfaces/window.h b/src/interfaces/window.h
index 3f3ae80..8a5bf95 100644
--- a/src/interfaces/window.h
+++ b/src/interfaces/window.h
@@ -14,10 +14,6 @@
 
 #include "layershellqt_export.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
-struct xdg_popup;
-#endif
-
 namespace LayerShellQt
 {
 class WindowPrivate;
@@ -120,10 +116,6 @@ public:
      */
     static Window *get(QWindow *window);
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
-    static void attachPopup(QWindow *window, xdg_popup *popup);
-#endif
-
     static Window *qmlAttachedProperties(QObject *object);
 
 Q_SIGNALS: