diff --git a/src/View.h b/src/View.h index d1ab335e..144e4537 100644 --- a/src/View.h +++ b/src/View.h @@ -103,10 +103,6 @@ public: /// Override isNull() in our ViewWrapper subclasses and return true if the wrapped gui element was already deleted virtual bool isNull() const; - /// @brief Called by the layouting engine - /// Override it in case your widget needs to know where it is in the layout. Usually only needed by Frame. - virtual void setLayoutItem(Layouting::Item *) {}; - virtual void setParent(View *) = 0; virtual QSize sizeHint() const; virtual QSize minSize() const = 0; diff --git a/src/private/multisplitter/Item.cpp b/src/private/multisplitter/Item.cpp index bf356055..97ded79b 100644 --- a/src/private/multisplitter/Item.cpp +++ b/src/private/multisplitter/Item.cpp @@ -186,7 +186,9 @@ void Item::setGuestView(View *guest) if (m_guest) { m_guest->setParent(m_hostWidget); - m_guest->setLayoutItem(this); + if (Controllers::Frame *frame = asFrameController()) + frame->setLayoutItem(this); + newWidget->installEventFilter(this); { diff --git a/src/qtquick/views/Frame_qtquick.cpp b/src/qtquick/views/Frame_qtquick.cpp index 5230e859..09dcd748 100644 --- a/src/qtquick/views/Frame_qtquick.cpp +++ b/src/qtquick/views/Frame_qtquick.cpp @@ -271,8 +271,3 @@ bool Frame_qtquick::event(QEvent *e) return View_qtquick::event(e); } - -void Frame_qtquick::setLayoutItem(Layouting::Item *item) -{ - m_controller->setLayoutItem(item); -} diff --git a/src/qtquick/views/Frame_qtquick.h b/src/qtquick/views/Frame_qtquick.h index c39cd2ae..4a81a5b4 100644 --- a/src/qtquick/views/Frame_qtquick.h +++ b/src/qtquick/views/Frame_qtquick.h @@ -56,9 +56,6 @@ public: QRect dragRect() const override; - // TODOm3: Move this to a common base class between qtquick and qtwidgets - void setLayoutItem(Layouting::Item *item) override; - // QML interface: bool isMDI() const; KDDockWidgets::Views::TitleBar_qtquick *titleBar() const; diff --git a/src/qtwidgets/views/Frame_qtwidgets.cpp b/src/qtwidgets/views/Frame_qtwidgets.cpp index 8729b192..5740767b 100644 --- a/src/qtwidgets/views/Frame_qtwidgets.cpp +++ b/src/qtwidgets/views/Frame_qtwidgets.cpp @@ -79,12 +79,6 @@ void Frame_qtwidgets::free_impl() delete this; } -void Frame_qtwidgets::setLayoutItem(Layouting::Item *item) -{ - // TODOm2: Remove from View, maybe - m_controller->setLayoutItem(item); -} - void Frame_qtwidgets::renameTab(int index, const QString &text) { m_controller->tabWidget()->renameTab(index, text); diff --git a/src/qtwidgets/views/Frame_qtwidgets.h b/src/qtwidgets/views/Frame_qtwidgets.h index 8aab7b62..43dea189 100644 --- a/src/qtwidgets/views/Frame_qtwidgets.h +++ b/src/qtwidgets/views/Frame_qtwidgets.h @@ -27,8 +27,6 @@ public: explicit Frame_qtwidgets(Controllers::Frame *controller, QWidget *parent = nullptr); void init() override; - void setLayoutItem(Layouting::Item *item) override; - void renameTab(int index, const QString &) override; void changeTabIcon(int index, const QIcon &) override; void removeWidget_impl(Controllers::DockWidget *) override;