diff --git a/src/controllers/Group.cpp b/src/controllers/Group.cpp index dbcd4eba..da6ded2d 100644 --- a/src/controllers/Group.cpp +++ b/src/controllers/Group.cpp @@ -164,12 +164,12 @@ void Group::setLayout(Layout *dt) void Group::renameTab(int index, const QString &title) { - dynamic_cast(view())->renameTab(index, title); + m_tabBar->renameTab(index, title); } void Group::changeTabIcon(int index, const QIcon &icon) { - dynamic_cast(view())->changeTabIcon(index, icon); + m_tabBar->changeTabIcon(index, icon); } int Group::nonContentsHeight() const @@ -334,7 +334,7 @@ void Group::setCurrentTabIndex(int index) if (m_inCtor || m_inDtor) return; - dynamic_cast(view())->setCurrentTabIndex_impl(index); + m_tabBar->setCurrentIndex(index); } void Group::setCurrentDockWidget(DockWidget *dw) @@ -342,7 +342,7 @@ void Group::setCurrentDockWidget(DockWidget *dw) if (m_inCtor || m_inDtor) return; - dynamic_cast(view())->setCurrentDockWidget_impl(dw); + m_tabBar->setCurrentDockWidget(dw); } void Group::insertDockWidget(DockWidget *dw, int index) @@ -359,7 +359,7 @@ Controllers::DockWidget *Group::dockWidgetAt(int index) const if (m_inCtor || m_inDtor) return nullptr; - return dynamic_cast(view())->dockWidgetAt_impl(index); + return m_tabBar->dockWidgetAt(index); } Controllers::DockWidget *Group::currentDockWidget() const @@ -367,7 +367,7 @@ Controllers::DockWidget *Group::currentDockWidget() const if (m_inCtor || m_inDtor) return nullptr; - return dynamic_cast(view())->currentDockWidget_impl(); + return m_tabBar->currentDockWidget(); } int Group::dockWidgetCount() const diff --git a/src/dummy/views/Group_dummy.cpp b/src/dummy/views/Group_dummy.cpp index 8c45fda8..a50c063b 100644 --- a/src/dummy/views/Group_dummy.cpp +++ b/src/dummy/views/Group_dummy.cpp @@ -59,49 +59,10 @@ void Group_dummy::removeWidget_impl(Controllers::DockWidget *) { } -int Group_dummy::indexOfDockWidget_impl(const Controllers::DockWidget *) -{ - return 0; -} - -int Group_dummy::currentIndex() const -{ - return 0; -} - -void Group_dummy::setCurrentTabIndex_impl(int) -{ -} - -void Group_dummy::setCurrentDockWidget_impl(Controllers::DockWidget *) -{ -} - void Group_dummy::insertDockWidget_impl(Controllers::DockWidget *, int) { } -Controllers::DockWidget *Group_dummy::dockWidgetAt_impl(int) const -{ - return nullptr; -} - -Controllers::DockWidget *Group_dummy::currentDockWidget_impl() const -{ - return nullptr; -} - -void Group_dummy::renameTab(int, const QString &) -{ - // Not needed for QtQuick. Our model reacts to titleChanged() -} - -void Group_dummy::changeTabIcon(int index, const QIcon &) -{ - Q_UNUSED(index); - qDebug() << Q_FUNC_INFO << "Not implemented"; -} - QSize Group_dummy::minSize() const { const QSize contentsSize = m_group->dockWidgetsMinSize(); diff --git a/src/dummy/views/Group_dummy.h b/src/dummy/views/Group_dummy.h index 5879ff81..cb441389 100644 --- a/src/dummy/views/Group_dummy.h +++ b/src/dummy/views/Group_dummy.h @@ -32,25 +32,13 @@ public: explicit Group_dummy(Controllers::Group *controller, View *parent = nullptr); ~Group_dummy() override; - /// @reimp QSize minSize() const override; - - /// @reimp QSize maxSizeHint() const override; - QRect dragRect() const override; - int currentIndex() const; protected: void removeWidget_impl(Controllers::DockWidget *) override; - int indexOfDockWidget_impl(const Controllers::DockWidget *) override; - void setCurrentTabIndex_impl(int index) override; - void setCurrentDockWidget_impl(Controllers::DockWidget *) override; void insertDockWidget_impl(Controllers::DockWidget *, int index) override; - Controllers::DockWidget *dockWidgetAt_impl(int index) const override; - Controllers::DockWidget *currentDockWidget_impl() const override; - void renameTab(int index, const QString &) override; - void changeTabIcon(int index, const QIcon &) override; int nonContentsHeight() const override; private: diff --git a/src/qtquick/views/Group_qtquick.cpp b/src/qtquick/views/Group_qtquick.cpp index a7a7884a..31643251 100644 --- a/src/qtquick/views/Group_qtquick.cpp +++ b/src/qtquick/views/Group_qtquick.cpp @@ -113,26 +113,11 @@ void Group_qtquick::removeWidget_impl(Controllers::DockWidget *dw) disconnect(m_connections.take(dw)); } -int Group_qtquick::indexOfDockWidget_impl(const Controllers::DockWidget *dw) -{ - return m_group->indexOfDockWidget(dw); -} - int Group_qtquick::currentIndex() const { return m_group->currentIndex(); } -void Group_qtquick::setCurrentTabIndex_impl(int index) -{ - setCurrentDockWidget_impl(m_group->dockWidgetAt(index)); -} - -void Group_qtquick::setCurrentDockWidget_impl(Controllers::DockWidget *dw) -{ - m_group->tabBar()->setCurrentDockWidget(dw); -} - void Group_qtquick::insertDockWidget_impl(Controllers::DockWidget *dw, int index) { QPointer oldFrame = dw->d->group(); @@ -148,7 +133,7 @@ void Group_qtquick::insertDockWidget_impl(Controllers::DockWidget *dw, int index }); m_connections[dw] = conn; - setCurrentDockWidget_impl(dw); + m_group->setCurrentDockWidget(dw); if (oldFrame && oldFrame->beingDeletedLater()) { // give it a push and delete it immediately. @@ -166,27 +151,6 @@ void Group_qtquick::insertDockWidget_impl(Controllers::DockWidget *dw, int index } } -Controllers::DockWidget *Group_qtquick::dockWidgetAt_impl(int index) const -{ - return tabBarView()->dockWidgetAt(index); -} - -Controllers::DockWidget *Group_qtquick::currentDockWidget_impl() const -{ - return stackView()->currentDockWidget(); -} - -void Group_qtquick::renameTab(int, const QString &) -{ - // Not needed for QtQuick. Our model reacts to titleChanged() -} - -void Group_qtquick::changeTabIcon(int index, const QIcon &) -{ - Q_UNUSED(index); - qDebug() << Q_FUNC_INFO << "Not implemented"; -} - void Group_qtquick::setStackLayout(QQuickItem *stackLayout) { if (m_stackLayout || !stackLayout) { diff --git a/src/qtquick/views/Group_qtquick.h b/src/qtquick/views/Group_qtquick.h index 8bdaa88d..57a34325 100644 --- a/src/qtquick/views/Group_qtquick.h +++ b/src/qtquick/views/Group_qtquick.h @@ -68,14 +68,7 @@ public: protected: void removeWidget_impl(Controllers::DockWidget *) override; - int indexOfDockWidget_impl(const Controllers::DockWidget *) override; - void setCurrentTabIndex_impl(int index) override; - void setCurrentDockWidget_impl(Controllers::DockWidget *) override; void insertDockWidget_impl(Controllers::DockWidget *, int index) override; - Controllers::DockWidget *dockWidgetAt_impl(int index) const override; - Controllers::DockWidget *currentDockWidget_impl() const override; - void renameTab(int index, const QString &) override; - void changeTabIcon(int index, const QIcon &) override; Q_INVOKABLE void setStackLayout(QQuickItem *); diff --git a/src/qtwidgets/views/Group_qtwidgets.cpp b/src/qtwidgets/views/Group_qtwidgets.cpp index 4eb5201a..8941c1bb 100644 --- a/src/qtwidgets/views/Group_qtwidgets.cpp +++ b/src/qtwidgets/views/Group_qtwidgets.cpp @@ -79,16 +79,6 @@ void Group_qtwidgets::free_impl() delete this; } -void Group_qtwidgets::renameTab(int index, const QString &text) -{ - m_group->tabBar()->renameTab(index, text); -} - -void Group_qtwidgets::changeTabIcon(int index, const QIcon &icon) -{ - m_group->tabBar()->changeTabIcon(index, icon); -} - int Group_qtwidgets::nonContentsHeight() const { Controllers::TitleBar *tb = m_group->titleBar(); @@ -97,16 +87,6 @@ int Group_qtwidgets::nonContentsHeight() const return (tb->isVisible() ? tb->height() : 0) + (tabBar->isVisible() ? tabBar->height() : 0); } -int Group_qtwidgets::indexOfDockWidget_impl(const Controllers::DockWidget *dw) -{ - return m_group->tabBar()->indexOfDockWidget(dw); -} - -void Group_qtwidgets::setCurrentDockWidget_impl(Controllers::DockWidget *dw) -{ - m_group->tabBar()->setCurrentDockWidget(dw); -} - void Group_qtwidgets::insertDockWidget_impl(Controllers::DockWidget *dw, int index) { m_group->stack()->insertDockWidget(dw, index); @@ -117,21 +97,6 @@ void Group_qtwidgets::removeWidget_impl(Controllers::DockWidget *dw) m_group->tabBar()->removeDockWidget(dw); } -void Group_qtwidgets::setCurrentTabIndex_impl(int index) -{ - m_group->tabBar()->setCurrentIndex(index); -} - -KDDockWidgets::Controllers::DockWidget *Group_qtwidgets::currentDockWidget_impl() const -{ - return m_group->stack()->currentDockWidget(); -} - -KDDockWidgets::Controllers::DockWidget *Group_qtwidgets::dockWidgetAt_impl(int index) const -{ - return m_group->tabBar()->dockWidgetAt(index); -} - void Group_qtwidgets::paintEvent(QPaintEvent *) { if (freed()) diff --git a/src/qtwidgets/views/Group_qtwidgets.h b/src/qtwidgets/views/Group_qtwidgets.h index 773b714c..44479f56 100644 --- a/src/qtwidgets/views/Group_qtwidgets.h +++ b/src/qtwidgets/views/Group_qtwidgets.h @@ -27,15 +27,8 @@ public: explicit Group_qtwidgets(Controllers::Group *controller, QWidget *parent = nullptr); void init() override; - void renameTab(int index, const QString &) override; - void changeTabIcon(int index, const QIcon &) override; void removeWidget_impl(Controllers::DockWidget *) override; - int indexOfDockWidget_impl(const Controllers::DockWidget *) override; - void setCurrentTabIndex_impl(int index) override; - void setCurrentDockWidget_impl(Controllers::DockWidget *) override; void insertDockWidget_impl(Controllers::DockWidget *, int index) override; - Controllers::DockWidget *dockWidgetAt_impl(int index) const override; - Controllers::DockWidget *currentDockWidget_impl() const override; int nonContentsHeight() const override; QRect dragRect() const override; diff --git a/src/views/GroupViewInterface.h b/src/views/GroupViewInterface.h index c54d5a87..e821f28a 100644 --- a/src/views/GroupViewInterface.h +++ b/src/views/GroupViewInterface.h @@ -35,15 +35,8 @@ class DOCKS_EXPORT GroupViewInterface public: explicit GroupViewInterface(Controllers::Group *); virtual ~GroupViewInterface(); - virtual void renameTab(int index, const QString &) = 0; - virtual void changeTabIcon(int index, const QIcon &) = 0; virtual void removeWidget_impl(Controllers::DockWidget *) = 0; - virtual int indexOfDockWidget_impl(const Controllers::DockWidget *) = 0; - virtual void setCurrentTabIndex_impl(int index) = 0; - virtual void setCurrentDockWidget_impl(Controllers::DockWidget *) = 0; virtual void insertDockWidget_impl(Controllers::DockWidget *, int index) = 0; - virtual Controllers::DockWidget *dockWidgetAt_impl(int index) const = 0; - virtual Controllers::DockWidget *currentDockWidget_impl() const = 0; virtual int nonContentsHeight() const = 0; virtual QRect dragRect() const = 0; diff --git a/src/views/StackViewInterface.h b/src/views/StackViewInterface.h index 423dc387..060c563d 100644 --- a/src/views/StackViewInterface.h +++ b/src/views/StackViewInterface.h @@ -22,7 +22,6 @@ QT_END_NAMESPACE namespace KDDockWidgets { namespace Controllers { -class DockWidget; class Stack; }