philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finally remove View::asQWidget()

Browse Source 
Soon we can start the QtQuick port to the new architecture
This commit is contained in:
Sergio Martins
2022-04-26 00:00:23 +01:00
parent 00bee2edcb
commit 420a85943a
8 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/View.cpp
View File

@@ -68,11 +68,6 @@ QObject *View::asQObject() const
return m_thisObj;
}
QWidget *View::asQWidget() const
{
return qobject_cast<QWidget *>(m_thisObj);
}
QObject *View::parent() const
{
return m_thisObj->parent();

1
src/View.h
View File

@@ -62,7 +62,6 @@ public:
virtual void init() {};
QObject *asQObject() const;
QWidget *asQWidget() const; // TODOv2: Remove
QObject *parent() const;
/// @brief Returns this view's controller

2
src/qtwidgets/DebugWindow.cpp
View File

@@ -220,7 +220,7 @@ DebugWindow::DebugWindow(QWidget *parent)
if (mainWindows.isEmpty())
return;
auto mainwindow = mainWindows.at(0);
auto centralWidget = qobject_cast<QMainWindow *>(mainwindow->view()->asQWidget())->centralWidget();
auto centralWidget = qobject_cast<QMainWindow *>(Views::MainWindow_qtwidgets::asQWidget(mainwindow))->centralWidget();
centralWidget->setParent(nullptr, Qt::Window);
if (!centralWidget->isVisible()) {
centralWidget->show();

12
src/qtwidgets/FrameworkWidgetFactory_qtwidgets.cpp
View File

@@ -62,22 +62,22 @@ View *DefaultWidgetFactory_qtwidgets::createFrame(Controllers::Frame *controller
FrameOptions) const
{
// TODOv2: Remove options
return new Views::Frame_qtwidgets(controller, parent ? parent->asQWidget() : nullptr);
return new Views::Frame_qtwidgets(controller, Views::View_qtwidgets<QWidget>::asQWidget(parent));
}
View *DefaultWidgetFactory_qtwidgets::createTitleBar(Controllers::TitleBar *titleBar, Controllers::Frame *frame) const
{
return new Views::TitleBar_qtwidgets(titleBar, frame->view()->asQWidget());
return new Views::TitleBar_qtwidgets(titleBar, Views::View_qtwidgets<QWidget>::asQWidget(frame));
}
View *DefaultWidgetFactory_qtwidgets::createTitleBar(Controllers::TitleBar *titleBar, Controllers::FloatingWindow *fw) const
{
return new Views::TitleBar_qtwidgets(titleBar, fw ? fw->view()->asQWidget() : nullptr);
return new Views::TitleBar_qtwidgets(titleBar, Views::View_qtwidgets<QWidget>::asQWidget(fw));
}
View *DefaultWidgetFactory_qtwidgets::createTabBar(Controllers::TabBar *tabBar, View *parent) const
{
return new Views::TabBar_qtwidgets(tabBar, parent->asQWidget());
return new Views::TabBar_qtwidgets(tabBar, Views::View_qtwidgets<QWidget>::asQWidget(parent));
}
View *DefaultWidgetFactory_qtwidgets::createTabWidget(Controllers::Stack *controller, Controllers::Frame *parent) const
@@ -93,7 +93,7 @@ View *DefaultWidgetFactory_qtwidgets::createSeparator(Controllers::Separator *co
View *DefaultWidgetFactory_qtwidgets::createFloatingWindow(Controllers::FloatingWindow *controller,
Controllers::MainWindow *parent, Qt::WindowFlags windowFlags) const
{
auto mainwindow = qobject_cast<QMainWindow *>(parent ? parent->view()->asQWidget() : nullptr);
auto mainwindow = qobject_cast<QMainWindow *>(Views::View_qtwidgets<QWidget>::asQWidget(parent));
return new Views::FloatingWindow_qtwidgets(controller, mainwindow, windowFlags);
}
@@ -124,7 +124,7 @@ QWidgetOrQuick *DefaultWidgetFactory_qtwidgets::createRubberBand(View *parent) c
View *DefaultWidgetFactory_qtwidgets::createSideBar(Controllers::SideBar *controller,
Controllers::MainWindow *parent) const
{
return new Views::SideBar_qtwidgets(controller, parent->view()->asQWidget());
return new Views::SideBar_qtwidgets(controller, Views::View_qtwidgets<QWidget>::asQWidget(parent));
}
QAbstractButton *DefaultWidgetFactory_qtwidgets::createTitleBarButton(QWidget *parent, TitleBarButtonType type) const

8
src/qtwidgets/views/Frame_qtwidgets.cpp
View File

@@ -62,9 +62,9 @@ void Frame_qtwidgets::init()
auto vlayout = new VBoxLayout(this);
vlayout->setContentsMargins(0, 0, 0, 0);
vlayout->setSpacing(0);
vlayout->addWidget(m_controller->titleBar()->view()->asQWidget());
vlayout->addWidget(asQWidget(m_controller->titleBar()));
auto tabWidget = m_controller->tabWidget();
vlayout->addWidget(tabWidget->view()->asQWidget());
vlayout->addWidget(asQWidget(m_controller->tabWidget()));
tabWidget->setTabBarAutoHide(!m_controller->alwaysShowsTabs());
@@ -98,7 +98,7 @@ void Frame_qtwidgets::changeTabIcon(int index, const QIcon &icon)
int Frame_qtwidgets::nonContentsHeight() const
{
Controllers::TitleBar *tb = m_controller->titleBar();
QWidget *tabBar = m_controller->tabBar()->view()->asQWidget();
QWidget *tabBar = asQWidget(m_controller->tabBar());
return (tb->isVisible() ? tb->height() : 0) + (tabBar->isVisible() ? tabBar->height() : 0);
}
@@ -214,7 +214,7 @@ QRect Frame_qtwidgets::dragRect() const
return rect;
if (Config::self().flags() & Config::Flag_HideTitleBarWhenTabsVisible) {
auto tabBar = qobject_cast<QTabBar *>(m_controller->tabBar()->view()->asQWidget());
auto tabBar = qobject_cast<QTabBar *>(asQWidget(m_controller->tabBar()));
rect.setHeight(tabBar->height());
rect.setWidth(QWidget::width() - tabBar->width());
rect.moveTopLeft(QPoint(tabBar->width(), tabBar->y()));

10
src/qtwidgets/views/MainWindow_qtwidgets.cpp
View File

@@ -82,15 +82,15 @@ public:
updateMargins();
if (m_supportsAutoHide) {
m_layout->addWidget(q->sideBar(SideBarLocation::West)->view()->asQWidget());
m_layout->addWidget(View_qtwidgets::asQWidget(q->sideBar(SideBarLocation::West)->view()));
auto innerVLayout = new QVBoxLayout();
innerVLayout->setSpacing(0);
innerVLayout->setContentsMargins(0, 0, 0, 0);
innerVLayout->addWidget(q->sideBar(SideBarLocation::North)->view()->asQWidget());
innerVLayout->addWidget(qobject_cast<QWidget *>(m_controller->layoutWidget()->view()->asQObject()));
innerVLayout->addWidget(q->sideBar(SideBarLocation::South)->view()->asQWidget());
innerVLayout->addWidget(View_qtwidgets::asQWidget(q->sideBar(SideBarLocation::North)));
innerVLayout->addWidget(View_qtwidgets::asQWidget(m_controller->layoutWidget()));
innerVLayout->addWidget(View_qtwidgets::asQWidget(q->sideBar(SideBarLocation::South)));
m_layout->addLayout(innerVLayout);
m_layout->addWidget(q->sideBar(SideBarLocation::East)->view()->asQWidget());
m_layout->addWidget(View_qtwidgets::asQWidget(q->sideBar(SideBarLocation::East)));
} else {
m_layout->addWidget(qobject_cast<QWidget *>(m_controller->layoutWidget()->view()->asQObject()));
}

10
src/qtwidgets/views/Stack_qtwidgets.cpp
View File

@@ -27,7 +27,7 @@ using namespace KDDockWidgets;
using namespace KDDockWidgets::Views;
Stack_qtwidgets::Stack_qtwidgets(Controllers::Stack *controller, Controllers::Frame *parent)
: View_qtwidgets<QTabWidget>(controller, Type::Separator, parent ? parent->view()->asQWidget() : nullptr)
: View_qtwidgets<QTabWidget>(controller, Type::Separator, View_qtwidgets::asQWidget(parent))
, m_stack(controller)
{
}
@@ -74,12 +74,12 @@ int Stack_qtwidgets::numDockWidgets() const
void Stack_qtwidgets::removeDockWidget(Controllers::DockWidget *dw)
{
removeTab(indexOf(dw->view()->asQWidget()));
removeTab(indexOf(View_qtwidgets::asQWidget(dw)));
}
int Stack_qtwidgets::indexOfDockWidget(const Controllers::DockWidget *dw) const
{
return indexOf(dw->view()->asQWidget());
return indexOf(View_qtwidgets::asQWidget(dw->view()));
}
void Stack_qtwidgets::mouseDoubleClickEvent(QMouseEvent *ev)
@@ -119,7 +119,7 @@ void Stack_qtwidgets::setCurrentDockWidget(int index)
bool Stack_qtwidgets::insertDockWidget(int index, Controllers::DockWidget *dw,
const QIcon &icon, const QString &title)
{
insertTab(index, dw->view()->asQWidget(), icon, title);
insertTab(index, View_qtwidgets::asQWidget(dw), icon, title);
return true;
}
@@ -225,7 +225,7 @@ void Stack_qtwidgets::showContextMenu(QPoint pos)
QTabBar *Stack_qtwidgets::tabBar() const
{
return static_cast<QTabBar *>(m_stack->tabBar()->view()->asQWidget());
return static_cast<QTabBar *>(View_qtwidgets::asQWidget((m_stack->tabBar())));
}
void Stack_qtwidgets::setDocumentMode(bool is)

5
src/qtwidgets/views/View_qtwidgets.h
View File

@@ -429,11 +429,16 @@ public:
static QWidget *asQWidget(View *view)
{
if (!view)
return nullptr;
return qobject_cast<QWidget *>(view->asQObject());
}
static QWidget *asQWidget(Controller *controller)
{
if (!controller)
return nullptr;
return asQWidget(controller->view());
}