DockRegistry doesn't depend on QtWidgets anymore

src/private/DockRegistry.cpp

@@ -26,8 +26,6 @@
 #include "controllers/DockWidget.h"
 #include "controllers/DockWidget_p.h"
 
-#include "qtwidgets/views/Frame_qtwidgets.h"
-
 #include <QPointer>
 #include <QDebug>
 #include <QGuiApplication>
@@ -670,9 +668,10 @@ bool DockRegistry::eventFilter(QObject *watched, QEvent *event)
         }
     } else if (event->type() == QEvent::MouseButtonPress) {
         // When clicking on a MDI Frame we raise the window
-        if (auto frameView = firstParentOfType<Views::Frame_qtwidgets>(watched)) {
-            if (frameView->frame()->isMDI())
-                frameView->raise();
+        if (Controller *c = View::firstParentOfType(watched, Type::Frame)) {
+            auto frame = static_cast<Frame*>(c);
+            if (frame->isMDI())
+                frame->view()->raise();
         }
 
         // The following code is for hididng the overlay

src/private/Utils_p.h

@@ -269,32 +269,6 @@ inline bool scalingFactorIsSupported(qreal factor)
 #endif
 }
 
-template<typename T>
-inline T *firstParentOfType(const QObject *child)
-{
-    auto p = const_cast<QObject *>(child);
-    while (p) {
-        if (auto candidate = qobject_cast<T *>(p))
-            return candidate;
-
-        if (qobject_cast<const QWindow *>(p)) {
-            // Ignore QObject hierarchies spanning though multiple windows
-            return nullptr;
-        }
-
-#ifdef KDDOCKWIDGETS_QTWIDGETS
-        // Ignore QObject hierarchies spanning though multiple windows
-        if (auto w = qobject_cast<QWidget *>(p))
-            if (w->isWindow())
-                return nullptr;
-#endif
-
-        p = p->parent();
-    }
-
-    return nullptr;
-}
-
 };
 
 #endif