Drop Workspace::internalWindows()

src/input.cpp

@@ -1208,10 +1208,14 @@ class InternalWindowEventFilter : public InputEventFilter
     }
     bool keyEvent(KeyEvent *event) override
     {
-        const QList<InternalWindow *> &windows = workspace()->internalWindows();
+        const QList<Window *> windows = workspace()->windows();
         QWindow *found = nullptr;
         for (auto it = windows.crbegin(); it != windows.crend(); ++it) {
-            if (QWindow *w = (*it)->handle()) {
+            auto internal = qobject_cast<InternalWindow *>(*it);
+            if (!internal) {
+                continue;
+            }
+            if (QWindow *w = internal->handle()) {
                 if (!w->isVisible()) {
                     continue;
                 }

src/workspace.cpp

@@ -478,8 +478,8 @@ Workspace::~Workspace()
     }
 
     // We need a shadow copy because windows get removed as we go through them.
-    const QList<InternalWindow *> internalWindows = m_internalWindows;
-    for (InternalWindow *window : internalWindows) {
+    const QList<Window *> windows = m_windows;
+    for (Window *window : windows) {
         window->destroyWindow();
     }
 
@@ -2000,9 +2000,11 @@ Window *Workspace::findInternal(QWindow *w) const
     if (kwinApp()->operationMode() == Application::OperationModeX11) {
         return findUnmanaged(w->winId());
     }
-    for (InternalWindow *window : m_internalWindows) {
-        if (window->handle() == w) {
-            return window;
+    for (Window *window : m_windows) {
+        if (InternalWindow *internal = qobject_cast<InternalWindow *>(window)) {
+            if (internal->handle() == w) {
+                return internal;
+            }
         }
     }
     return nullptr;
@@ -2033,7 +2035,6 @@ void Workspace::updateTabbox()
 void Workspace::addInternalWindow(InternalWindow *window)
 {
     m_windows.append(window);
-    m_internalWindows.append(window);
     addToStack(window);
 
     setupWindowConnections(window);
@@ -2053,7 +2054,6 @@ void Workspace::addInternalWindow(InternalWindow *window)
 void Workspace::removeInternalWindow(InternalWindow *window)
 {
     m_windows.removeOne(window);
-    m_internalWindows.removeOne(window);
 
     updateStackingOrder();
     updateClientArea();

src/workspace.h

@@ -256,14 +256,6 @@ public:
         return m_windows;
     }
 
-    /**
-     * @returns List of all internal windows currently managed by Workspace
-     */
-    const QList<InternalWindow *> &internalWindows() const
-    {
-        return m_internalWindows;
-    }
-
     void stackScreenEdgesUnderOverrideRedirect();
 
     SessionManager *sessionManager() const;
@@ -664,7 +656,6 @@ private:
     QList<X11Window *> m_x11Clients;
     QList<Window *> m_windows;
     QList<Window *> deleted;
-    QList<InternalWindow *> m_internalWindows;
 
     QList<Window *> unconstrained_stacking_order; // Topmost last
     QList<Window *> stacking_order; // Topmost last