diff --git a/src/qtquick/views/DockWidget_qtquick.cpp b/src/qtquick/views/DockWidget_qtquick.cpp index 22ca58cd..7e4b410a 100644 --- a/src/qtquick/views/DockWidget_qtquick.cpp +++ b/src/qtquick/views/DockWidget_qtquick.cpp @@ -9,7 +9,7 @@ Contact KDAB at for commercial licensing options. */ -#include "DockWidget_qtwidgets.h" +#include "DockWidget_qtquick.h" #include #include @@ -25,10 +25,10 @@ using namespace KDDockWidgets; using namespace KDDockWidgets::Controllers; using namespace KDDockWidgets::Views; -class DockWidget_qtwidgets::Private +class DockWidget_qtquick::Private { public: - Private(DockWidget_qtwidgets *q, Controllers::DockWidget *controller) + Private(DockWidget_qtquick *q, Controllers::DockWidget *controller) : layout(new QVBoxLayout(q)) , m_controller(controller) { @@ -43,31 +43,31 @@ public: Controllers::DockWidget *const m_controller; }; -DockWidget_qtwidgets::DockWidget_qtwidgets(Controllers::DockWidget *controller, +DockWidget_qtquick::DockWidget_qtquick(Controllers::DockWidget *controller, Qt::WindowFlags windowFlags) - : View_qtwidgets(controller, Type::DockWidget, nullptr, windowFlags) + : View_qtquick(controller, Type::DockWidget, nullptr, windowFlags) , d(new Private(this, controller)) { } -DockWidget_qtwidgets::~DockWidget_qtwidgets() +DockWidget_qtquick::~DockWidget_qtquick() { delete d; } -void DockWidget_qtwidgets::init() +void DockWidget_qtquick::init() { connect(d->m_controller, &DockWidgetBase::widgetChanged, this, [this](QWidget *w) { d->layout->addWidget(w); }); } -Controllers::DockWidget *DockWidget_qtwidgets::dockWidget() const +Controllers::DockWidget *DockWidget_qtquick::dockWidget() const { return d->m_controller; } -bool DockWidget_qtwidgets::event(QEvent *e) +bool DockWidget_qtquick::event(QEvent *e) { if (e->type() == QEvent::ParentChange) { d->m_controller->onParentChanged(); @@ -80,12 +80,12 @@ bool DockWidget_qtwidgets::event(QEvent *e) return QWidget::event(e); } -void DockWidget_qtwidgets::closeEvent(QCloseEvent *e) +void DockWidget_qtquick::closeEvent(QCloseEvent *e) { d->m_controller->onCloseEvent(e); } -void DockWidget_qtwidgets::resizeEvent(QResizeEvent *e) +void DockWidget_qtquick::resizeEvent(QResizeEvent *e) { d->m_controller->onResize(e->size()); return QWidget::resizeEvent(e); diff --git a/src/qtquick/views/DockWidget_qtquick.h b/src/qtquick/views/DockWidget_qtquick.h index fe84caac..f1e72c3a 100644 --- a/src/qtquick/views/DockWidget_qtquick.h +++ b/src/qtquick/views/DockWidget_qtquick.h @@ -16,18 +16,15 @@ * @author Sérgio Martins \ */ -#ifndef KD_DOCKWIDGET_H -#define KD_DOCKWIDGET_H +#pragma once #include "controllers/DockWidget.h" -#include "View_qtwidgets.h" +#include "View_qtquick.h" QT_BEGIN_NAMESPACE class QCloseEvent; QT_END_NAMESPACE -// clazy:excludeall=ctor-missing-parent-argument - namespace KDDockWidgets { namespace Views { @@ -37,7 +34,7 @@ namespace Views { * * Most of the interface lives in DockWidgetBase, to facilitate sharing with QtQuick. */ -class DOCKS_EXPORT DockWidget_qtwidgets : public View_qtwidgets +class DOCKS_EXPORT DockWidget_qtquick : public View_qtquick { Q_OBJECT public: @@ -52,27 +49,18 @@ public: * when visible, or stays without a parent when hidden. This allows to support docking * to different main windows. */ - explicit DockWidget_qtwidgets(Controllers::DockWidget *controller, - Qt::WindowFlags windowFlags = {}); + explicit DockWidget_qtquick(Controllers::DockWidget *controller, + Qt::WindowFlags windowFlags = {}); ///@brief destructor - ~DockWidget_qtwidgets() override; + ~DockWidget_qtquick() override; Controllers::DockWidget *dockWidget() const; -protected: - void init() override; - bool event(QEvent *) override; - void closeEvent(QCloseEvent *) override; - void resizeEvent(QResizeEvent *) override; - private: - class Private; - Private *const d; + }; } } - -#endif diff --git a/src/qtquick/views/FloatingWindow_qtquick.cpp b/src/qtquick/views/FloatingWindow_qtquick.cpp index d290885b..b75b3c28 100644 --- a/src/qtquick/views/FloatingWindow_qtquick.cpp +++ b/src/qtquick/views/FloatingWindow_qtquick.cpp @@ -9,7 +9,7 @@ Contact KDAB at for commercial licensing options. */ -#include "FloatingWindow_qtwidgets.h" +#include "FloatingWindow_qtquick.h" #include "controllers/FloatingWindow.h" #include "controllers/Frame.h" #include "controllers/TitleBar.h" @@ -20,7 +20,7 @@ #include "private/Logging_p.h" #include "private/Utils_p.h" -#include "TitleBar_qtwidgets.h" +#include "TitleBar_qtquick.h" #include #include @@ -33,15 +33,15 @@ using namespace KDDockWidgets; using namespace KDDockWidgets::Views; -FloatingWindow_qtwidgets::FloatingWindow_qtwidgets(Controllers::FloatingWindow *controller, +FloatingWindow_qtquick::FloatingWindow_qtquick(Controllers::FloatingWindow *controller, QMainWindow *parent, Qt::WindowFlags windowFlags) - : View_qtwidgets(controller, Type::FloatingWindow, parent, windowFlags) + : View_qtquick(controller, Type::FloatingWindow, parent, windowFlags) , m_controller(controller) , m_vlayout(new QVBoxLayout(this)) { } -void FloatingWindow_qtwidgets::paintEvent(QPaintEvent *ev) +void FloatingWindow_qtquick::paintEvent(QPaintEvent *ev) { if (Config::self().disabledPaintEvents() & Config::CustomizableWidget_FloatingWindow) { QWidget::paintEvent(ev); @@ -58,7 +58,7 @@ void FloatingWindow_qtwidgets::paintEvent(QPaintEvent *ev) p.drawRect(rectf.adjusted(halfPenWidth, halfPenWidth, -halfPenWidth, -halfPenWidth)); } -bool FloatingWindow_qtwidgets::event(QEvent *ev) +bool FloatingWindow_qtquick::event(QEvent *ev) { if (ev->type() == QEvent::WindowStateChange) { Q_EMIT m_controller->windowStateChanged(static_cast(ev)); @@ -94,10 +94,10 @@ bool FloatingWindow_qtwidgets::event(QEvent *ev) m_controller->updateSizeConstraints(); // TODO: Move to base class } - return View_qtwidgets::event(ev); + return View_qtquick::event(ev); } -void FloatingWindow_qtwidgets::init() +void FloatingWindow_qtquick::init() { m_vlayout->setSpacing(0); updateMargins(); @@ -110,17 +110,17 @@ void FloatingWindow_qtwidgets::init() }); } -void FloatingWindow_qtwidgets::updateMargins() +void FloatingWindow_qtquick::updateMargins() { m_vlayout->setContentsMargins(QMargins(4, 4, 4, 4) * logicalDpiFactor(this)); } -Controllers::FloatingWindow *FloatingWindow_qtwidgets::floatingWindow() const +Controllers::FloatingWindow *FloatingWindow_qtquick::floatingWindow() const { return m_controller; } -void FloatingWindow_qtwidgets::closeEvent(QCloseEvent *ev) +void FloatingWindow_qtquick::closeEvent(QCloseEvent *ev) { m_controller->onCloseEvent(ev); } diff --git a/src/qtquick/views/FloatingWindow_qtquick.h b/src/qtquick/views/FloatingWindow_qtquick.h index a6592412..d6c5a11d 100644 --- a/src/qtquick/views/FloatingWindow_qtquick.h +++ b/src/qtquick/views/FloatingWindow_qtquick.h @@ -11,7 +11,7 @@ #pragma once -#include "View_qtwidgets.h" +#include "View_qtquick.h" QT_BEGIN_NAMESPACE class QVBoxLayout; @@ -26,13 +26,13 @@ class Frame; namespace KDDockWidgets::Views { -class DOCKS_EXPORT FloatingWindow_qtwidgets : public View_qtwidgets +class DOCKS_EXPORT FloatingWindow_qtquick : public View_qtquick { Q_OBJECT public: - explicit FloatingWindow_qtwidgets(Controllers::FloatingWindow *controller, - QMainWindow *parent = nullptr, - Qt::WindowFlags windowFlags = {}); + explicit FloatingWindow_qtquick(Controllers::FloatingWindow *controller, + QQuickItem *parent = nullptr, + Qt::WindowFlags windowFlags = {}); Controllers::FloatingWindow *floatingWindow() const; @@ -48,6 +48,6 @@ private: QMetaObject::Connection m_screenChangedConnection; void updateMargins(); - Q_DISABLE_COPY(FloatingWindow_qtwidgets) + Q_DISABLE_COPY(FloatingWindow_qtquick) }; -} \ No newline at end of file +} diff --git a/src/qtquick/views/Frame_qtquick.cpp b/src/qtquick/views/Frame_qtquick.cpp index 05e71056..4b259967 100644 --- a/src/qtquick/views/Frame_qtquick.cpp +++ b/src/qtquick/views/Frame_qtquick.cpp @@ -9,10 +9,10 @@ Contact KDAB at for commercial licensing options. */ -#include "Frame_qtwidgets.h" +#include "Frame_qtquick.h" -#include "qtwidgets/views/View_qtwidgets.h" -#include "qtwidgets/views/DockWidget_qtwidgets.h" +#include "qtwidgets/views/View_qtquick.h" +#include "qtwidgets/views/DockWidget_qtquick.h" #include "private/LayoutWidget_p.h" #include "controllers/Frame.h" @@ -31,7 +31,7 @@ using namespace KDDockWidgets::Views; class VBoxLayout : public QVBoxLayout // clazy:exclude=missing-qobject-macro { public: - explicit VBoxLayout(Frame_qtwidgets *parent) + explicit VBoxLayout(Frame_qtquick *parent) : QVBoxLayout(parent) , m_frameWidget(parent) { @@ -46,18 +46,18 @@ public: Q_EMIT m_frameWidget->layoutInvalidated(); } - Frame_qtwidgets *const m_frameWidget; + Frame_qtquick *const m_frameWidget; }; VBoxLayout::~VBoxLayout() = default; -Frame_qtwidgets::Frame_qtwidgets(Controllers::Frame *controller, QWidget *parent) - : View_qtwidgets(controller, Type::Frame, parent) +Frame_qtquick::Frame_qtquick(Controllers::Frame *controller, QWidget *parent) + : View_qtquick(controller, Type::Frame, parent) , m_controller(controller) { } -void Frame_qtwidgets::init() +void Frame_qtquick::init() { auto vlayout = new VBoxLayout(this); vlayout->setContentsMargins(0, 0, 0, 0); @@ -72,30 +72,30 @@ void Frame_qtwidgets::init() setAutoFillBackground(true); } -void Frame_qtwidgets::free_impl() +void Frame_qtquick::free_impl() { // TODO: just use the base class impl, which uses deleteLater() // do it once there's no state here delete this; } -void Frame_qtwidgets::setLayoutItem(Layouting::Item *item) +void Frame_qtquick::setLayoutItem(Layouting::Item *item) { // TODO: Remove from View, maybe m_controller->setLayoutItem(item); } -void Frame_qtwidgets::renameTab(int index, const QString &text) +void Frame_qtquick::renameTab(int index, const QString &text) { m_controller->tabWidget()->renameTab(index, text); } -void Frame_qtwidgets::changeTabIcon(int index, const QIcon &icon) +void Frame_qtquick::changeTabIcon(int index, const QIcon &icon) { m_controller->tabWidget()->changeTabIcon(index, icon); } -int Frame_qtwidgets::nonContentsHeight() const +int Frame_qtquick::nonContentsHeight() const { Controllers::TitleBar *tb = m_controller->titleBar(); QWidget *tabBar = m_controller->tabBar()->view()->asQWidget(); @@ -103,52 +103,52 @@ int Frame_qtwidgets::nonContentsHeight() const return (tb->isVisible() ? tb->height() : 0) + (tabBar->isVisible() ? tabBar->height() : 0); } -int Frame_qtwidgets::indexOfDockWidget_impl(const Controllers::DockWidget *dw) +int Frame_qtquick::indexOfDockWidget_impl(const Controllers::DockWidget *dw) { return m_controller->tabWidget()->indexOfDockWidget(dw); } -void Frame_qtwidgets::setCurrentDockWidget_impl(Controllers::DockWidget *dw) +void Frame_qtquick::setCurrentDockWidget_impl(Controllers::DockWidget *dw) { m_controller->tabWidget()->setCurrentDockWidget(dw); } -int Frame_qtwidgets::currentIndex_impl() const +int Frame_qtquick::currentIndex_impl() const { return m_controller->tabWidget()->currentIndex(); } -void Frame_qtwidgets::insertDockWidget_impl(Controllers::DockWidget *dw, int index) +void Frame_qtquick::insertDockWidget_impl(Controllers::DockWidget *dw, int index) { m_controller->tabWidget()->insertDockWidget(dw, index); } -void Frame_qtwidgets::removeWidget_impl(Controllers::DockWidget *dw) +void Frame_qtquick::removeWidget_impl(Controllers::DockWidget *dw) { m_controller->tabWidget()->removeDockWidget(dw); } -void Frame_qtwidgets::setCurrentTabIndex_impl(int index) +void Frame_qtquick::setCurrentTabIndex_impl(int index) { m_controller->tabWidget()->setCurrentDockWidget(index); } -KDDockWidgets::Controllers::DockWidget *Frame_qtwidgets::currentDockWidget_impl() const +KDDockWidgets::Controllers::DockWidget *Frame_qtquick::currentDockWidget_impl() const { return m_controller->tabWidget()->dockwidgetAt(m_controller->tabWidget()->currentIndex()); } -KDDockWidgets::Controllers::DockWidget *Frame_qtwidgets::dockWidgetAt_impl(int index) const +KDDockWidgets::Controllers::DockWidget *Frame_qtquick::dockWidgetAt_impl(int index) const { return m_controller->tabWidget()->dockwidgetAt(index); } -Controllers::Frame *Frame_qtwidgets::frame() const +Controllers::Frame *Frame_qtquick::frame() const { return m_controller; } -bool Frame_qtwidgets::event(QEvent *e) +bool Frame_qtquick::event(QEvent *e) { if (freed()) return QWidget::event(e); @@ -164,13 +164,13 @@ bool Frame_qtwidgets::event(QEvent *e) return QWidget::event(e); } -void Frame_qtwidgets::closeEvent(QCloseEvent *e) +void Frame_qtquick::closeEvent(QCloseEvent *e) { if (!freed()) m_controller->onCloseEvent(e); } -void Frame_qtwidgets::paintEvent(QPaintEvent *) +void Frame_qtquick::paintEvent(QPaintEvent *) { if (freed()) return; @@ -199,7 +199,7 @@ void Frame_qtwidgets::paintEvent(QPaintEvent *) } } -QSize Frame_qtwidgets::maxSizeHint() const +QSize Frame_qtquick::maxSizeHint() const { if (freed()) return {}; @@ -209,7 +209,7 @@ QSize Frame_qtwidgets::maxSizeHint() const return waste + m_controller->biggestDockWidgetMaxSize(); } -QRect Frame_qtwidgets::dragRect() const +QRect Frame_qtquick::dragRect() const { QRect rect = m_controller->dragRect(); if (rect.isValid()) diff --git a/src/qtquick/views/Frame_qtquick.h b/src/qtquick/views/Frame_qtquick.h index 4ac43b95..22f50e33 100644 --- a/src/qtquick/views/Frame_qtquick.h +++ b/src/qtquick/views/Frame_qtquick.h @@ -11,7 +11,7 @@ #pragma once -#include "View_qtwidgets.h" +#include "View_qtquick.h" #include "views/Frame.h" namespace KDDockWidgets::Controllers { @@ -20,11 +20,11 @@ class Frame; namespace KDDockWidgets::Views { -class DOCKS_EXPORT Frame_qtwidgets : public View_qtwidgets, public Frame +class DOCKS_EXPORT Frame_qtquick : public View_qtquick, public Frame { Q_OBJECT public: - explicit Frame_qtwidgets(Controllers::Frame *controller, QWidget *parent = nullptr); + explicit Frame_qtquick(Controllers::Frame *controller, QQuickItem *parent = nullptr); void init() override; void setLayoutItem(Layouting::Item *item) override; diff --git a/src/qtquick/views/MainWindow_qtquick.cpp b/src/qtquick/views/MainWindow_qtquick.cpp index b76df984..50daaabe 100644 --- a/src/qtquick/views/MainWindow_qtquick.cpp +++ b/src/qtquick/views/MainWindow_qtquick.cpp @@ -16,7 +16,7 @@ * @author Sérgio Martins \ */ -#include "MainWindow_qtwidgets.h" +#include "MainWindow_qtquick.h" #include "Config.h" #include "FrameworkWidgetFactory.h" @@ -52,10 +52,10 @@ public: }; } -class MainWindow_qtwidgets::Private +class MainWindow_qtquick::Private { public: - explicit Private(Controllers::MainWindow *controller, MainWindow_qtwidgets *qq) + explicit Private(Controllers::MainWindow *controller, MainWindow_qtquick *qq) : q(qq) , m_controller(controller) , m_supportsAutoHide(Config::self().flags() & Config::Flag_AutoHideSupport) @@ -106,7 +106,7 @@ public: m_layout->setContentsMargins(m_centerWidgetMargins * factor); } - MainWindow_qtwidgets *const q; + MainWindow_qtquick *const q; Controllers::MainWindow *const m_controller; const bool m_supportsAutoHide; QHash m_sideBars; // TODOv2: Move to controller @@ -119,18 +119,18 @@ MyCentralWidget::~MyCentralWidget() { } -MainWindow_qtwidgets::MainWindow_qtwidgets(Controllers::MainWindow *controller, +MainWindow_qtquick::MainWindow_qtquick(Controllers::MainWindow *controller, QWidget *parent, Qt::WindowFlags flags) - : View_qtwidgets(controller, Type::MainWindow, parent, flags) + : View_qtquick(controller, Type::MainWindow, parent, flags) , d(new Private(controller, this)) { } -MainWindow_qtwidgets::MainWindow_qtwidgets(const QString &uniqueName, +MainWindow_qtquick::MainWindow_qtquick(const QString &uniqueName, MainWindowOptions options, QWidget *parent, Qt::WindowFlags flags) - : View_qtwidgets(new Controllers::MainWindow(this, uniqueName, options), + : View_qtquick(new Controllers::MainWindow(this, uniqueName, options), Type::MainWindow, parent, flags) , d(new Private(static_cast(controller()), this)) { @@ -139,37 +139,37 @@ MainWindow_qtwidgets::MainWindow_qtwidgets(const QString &uniqueName, init(); } -MainWindow_qtwidgets::~MainWindow_qtwidgets() +MainWindow_qtquick::~MainWindow_qtquick() { delete d; } -void MainWindow_qtwidgets::init() +void MainWindow_qtquick::init() { d->init(); } -void MainWindow_qtwidgets::setCentralWidget(QWidget *w) +void MainWindow_qtquick::setCentralWidget(QWidget *w) { QMainWindow::setCentralWidget(w); } -Controllers::SideBar *MainWindow_qtwidgets::sideBar(SideBarLocation location) const +Controllers::SideBar *MainWindow_qtquick::sideBar(SideBarLocation location) const { return d->m_sideBars.value(location); } -void MainWindow_qtwidgets::resizeEvent(QResizeEvent *ev) +void MainWindow_qtquick::resizeEvent(QResizeEvent *ev) { d->m_controller->onResized(ev); } -QMargins MainWindow_qtwidgets::centerWidgetMargins() const +QMargins MainWindow_qtquick::centerWidgetMargins() const { return d->m_centerWidgetMargins; } -void MainWindow_qtwidgets::setCenterWidgetMargins(const QMargins &margins) +void MainWindow_qtquick::setCenterWidgetMargins(const QMargins &margins) { if (d->m_centerWidgetMargins == margins) return; @@ -177,17 +177,17 @@ void MainWindow_qtwidgets::setCenterWidgetMargins(const QMargins &margins) d->updateMargins(); } -QRect MainWindow_qtwidgets::centralAreaGeometry() const +QRect MainWindow_qtquick::centralAreaGeometry() const { return centralWidget()->geometry(); } -Controllers::MainWindow *MainWindow_qtwidgets::mainWindow() const +Controllers::MainWindow *MainWindow_qtquick::mainWindow() const { return d->m_controller; } -void MainWindow_qtwidgets::setContentsMargins(int left, int top, int right, int bottom) +void MainWindow_qtquick::setContentsMargins(int left, int top, int right, int bottom) { QMainWindow::setContentsMargins(left, top, right, bottom); } diff --git a/src/qtquick/views/MainWindow_qtquick.h b/src/qtquick/views/MainWindow_qtquick.h index d36049e6..ce2467d0 100644 --- a/src/qtquick/views/MainWindow_qtquick.h +++ b/src/qtquick/views/MainWindow_qtquick.h @@ -19,7 +19,7 @@ #ifndef KD_MAINWINDOW_H #define KD_MAINWINDOW_H -#include "View_qtwidgets.h" +#include "View_qtquick.h" #include "controllers/MainWindow.h" #include "views/MainWindow.h" @@ -38,11 +38,11 @@ namespace Views { * @brief The QMainwindow sub-class that the application should use to be able * to dock KDDockWidget::DockWidget instances. */ -class DOCKS_EXPORT MainWindow_qtwidgets : public View_qtwidgets, public MainWindow +class DOCKS_EXPORT MainWindow_qtquick : public View_qtquick, public MainWindow { Q_OBJECT public: - typedef QVector List; + typedef QVector List; ///@brief Constructor. Use it as you would use QMainWindow. ///@param uniqueName Mandatory name that should be unique between all MainWindow instances. @@ -50,18 +50,18 @@ public: ///@param options optional MainWindowOptions to use ///@param parent QObject *parent to pass to QMainWindow constructor. ///@param flags Window flags to pass to QMainWindow constructor. - explicit MainWindow_qtwidgets(Controllers::MainWindow *, - QWidget *parent = nullptr, + explicit MainWindow_qtquick(Controllers::MainWindow *, + QQuickItem *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); - explicit MainWindow_qtwidgets(const QString &uniqueName, + explicit MainWindow_qtquick(const QString &uniqueName, MainWindowOptions options = {}, - QWidget *parent = nullptr, + QQuickItem *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); ///@brief Destructor - ~MainWindow_qtwidgets() override; + ~MainWindow_qtquick() override; ///@brief returns the sidebar for the specified location Controllers::SideBar *sideBar(SideBarLocation) const override; diff --git a/src/qtquick/views/Separator_qtquick.cpp b/src/qtquick/views/Separator_qtquick.cpp index fc2d74aa..11f35e2b 100644 --- a/src/qtquick/views/Separator_qtquick.cpp +++ b/src/qtquick/views/Separator_qtquick.cpp @@ -1,4 +1,4 @@ -#include "Separator_qtwidgets.h" +#include "Separator_qtquick.h" /* This file is part of KDDockWidgets. @@ -10,7 +10,7 @@ Contact KDAB at for commercial licensing options. */ -#include "View_qtwidgets.h" +#include "View_qtquick.h" #include "Config.h" #include "private/Logging_p.h" @@ -22,14 +22,14 @@ using namespace KDDockWidgets::Views; -Separator_qtwidgets::Separator_qtwidgets(Controllers::Separator *controller, QWidget *parent) - : View_qtwidgets(controller, Type::Separator, parent) +Separator_qtquick::Separator_qtquick(Controllers::Separator *controller, QWidget *parent) + : View_qtquick(controller, Type::Separator, parent) , m_controller(controller) { setMouseTracking(true); } -void Separator_qtwidgets::paintEvent(QPaintEvent *ev) +void Separator_qtquick::paintEvent(QPaintEvent *ev) { if (freed()) return; @@ -54,7 +54,7 @@ void Separator_qtwidgets::paintEvent(QPaintEvent *ev) QWidget::parentWidget()->style()->drawControl(QStyle::CE_Splitter, &opt, &p, this); } -void Separator_qtwidgets::enterEvent(KDDockWidgets::Qt5Qt6Compat::QEnterEvent *) +void Separator_qtquick::enterEvent(KDDockWidgets::Qt5Qt6Compat::QEnterEvent *) { if (freed()) return; @@ -66,12 +66,12 @@ void Separator_qtwidgets::enterEvent(KDDockWidgets::Qt5Qt6Compat::QEnterEvent *) setCursor(Qt::SizeHorCursor); } -void Separator_qtwidgets::leaveEvent(QEvent *) +void Separator_qtquick::leaveEvent(QEvent *) { setCursor(Qt::ArrowCursor); } -void Separator_qtwidgets::mousePressEvent(QMouseEvent *) +void Separator_qtquick::mousePressEvent(QMouseEvent *) { if (freed()) return; @@ -79,7 +79,7 @@ void Separator_qtwidgets::mousePressEvent(QMouseEvent *) m_controller->onMousePress(); } -void Separator_qtwidgets::mouseMoveEvent(QMouseEvent *ev) +void Separator_qtquick::mouseMoveEvent(QMouseEvent *ev) { if (freed()) return; @@ -87,7 +87,7 @@ void Separator_qtwidgets::mouseMoveEvent(QMouseEvent *ev) m_controller->onMouseMove(mapToParent(ev->pos())); } -void Separator_qtwidgets::mouseReleaseEvent(QMouseEvent *) +void Separator_qtquick::mouseReleaseEvent(QMouseEvent *) { if (freed()) return; @@ -95,7 +95,7 @@ void Separator_qtwidgets::mouseReleaseEvent(QMouseEvent *) m_controller->onMouseReleased(); } -void Separator_qtwidgets::mouseDoubleClickEvent(QMouseEvent *) +void Separator_qtquick::mouseDoubleClickEvent(QMouseEvent *) { if (freed()) return; diff --git a/src/qtquick/views/Separator_qtquick.h b/src/qtquick/views/Separator_qtquick.h index ccba04fb..2e412228 100644 --- a/src/qtquick/views/Separator_qtquick.h +++ b/src/qtquick/views/Separator_qtquick.h @@ -11,7 +11,7 @@ #pragma once -#include "View_qtwidgets.h" +#include "View_qtquick.h" #include "kddockwidgets/Qt5Qt6Compat_p.h" #include @@ -22,11 +22,11 @@ class Separator; namespace KDDockWidgets::Views { -class DOCKS_EXPORT Separator_qtwidgets : public View_qtwidgets +class DOCKS_EXPORT Separator_qtquick : public View_qtquick { Q_OBJECT public: - explicit Separator_qtwidgets(Controllers::Separator *controller, QWidget *parent = nullptr); + explicit Separator_qtquick(Controllers::Separator *controller, QQuickItem *parent = nullptr); protected: void paintEvent(QPaintEvent *) override; diff --git a/src/qtquick/views/SideBar_qtquick.cpp b/src/qtquick/views/SideBar_qtquick.cpp index b6502718..8b2db242 100644 --- a/src/qtquick/views/SideBar_qtquick.cpp +++ b/src/qtquick/views/SideBar_qtquick.cpp @@ -9,7 +9,7 @@ Contact KDAB at for commercial licensing options. */ -#include "SideBar_qtwidgets.h" +#include "SideBar_qtquick.h" #include "controllers/DockWidget.h" #include "controllers/SideBar.h" @@ -26,13 +26,13 @@ using namespace KDDockWidgets; using namespace KDDockWidgets::Views; using namespace KDDockWidgets::Controllers; -SideBar_qtwidgets::SideBar_qtwidgets(Controllers::SideBar *controller, QWidget *parent) - : View_qtwidgets(controller, Type::SideBar, parent) +SideBar_qtquick::SideBar_qtquick(Controllers::SideBar *controller, QWidget *parent) + : View_qtquick(controller, Type::SideBar, parent) , m_controller(controller) { } -void SideBar_qtwidgets::init() +void SideBar_qtquick::init() { if (m_controller->isVertical()) m_layout = new QVBoxLayout(this); @@ -44,7 +44,7 @@ void SideBar_qtwidgets::init() m_layout->addStretch(); } -void SideBar_qtwidgets::addDockWidget_Impl(DockWidgetBase *dw) +void SideBar_qtquick::addDockWidget_Impl(DockWidgetBase *dw) { auto button = createButton(dw, this); button->setText(dw->title()); @@ -62,22 +62,22 @@ void SideBar_qtwidgets::addDockWidget_Impl(DockWidgetBase *dw) m_layout->insertWidget(count - 1, button); } -void SideBar_qtwidgets::removeDockWidget_Impl(DockWidgetBase *) +void SideBar_qtquick::removeDockWidget_Impl(DockWidgetBase *) { // Nothing is needed. Button is removed automatically. } -bool SideBar_qtwidgets::isVertical() const +bool SideBar_qtquick::isVertical() const { return m_controller->isVertical(); } -SideBarButton *SideBar_qtwidgets::createButton(DockWidgetBase *dw, SideBar_qtwidgets *parent) const +SideBarButton *SideBar_qtquick::createButton(DockWidgetBase *dw, SideBar_qtquick *parent) const { return new SideBarButton(dw, parent); } -SideBarButton::SideBarButton(DockWidgetBase *dw, SideBar_qtwidgets *parent) +SideBarButton::SideBarButton(DockWidgetBase *dw, SideBar_qtquick *parent) : QToolButton(parent) , m_sideBar(parent) , m_dockWidget(dw) diff --git a/src/qtquick/views/SideBar_qtquick.h b/src/qtquick/views/SideBar_qtquick.h index 06c444e6..0baea452 100644 --- a/src/qtquick/views/SideBar_qtquick.h +++ b/src/qtquick/views/SideBar_qtquick.h @@ -9,10 +9,9 @@ Contact KDAB at for commercial licensing options. */ -#ifndef KD_SIDEBARWIDGET_P_H -#define KD_SIDEBARWIDGET_P_H +#pragma once -#include "View_qtwidgets.h" +#include "View_qtquick.h" #include "kddockwidgets/docks_export.h" #include "controllers/SideBar.h" #include "views/SideBar.h" @@ -34,30 +33,30 @@ class SideBar; } namespace Views { -class SideBar_qtwidgets; +class SideBar_qtquick; } class SideBarButton : public QToolButton { Q_OBJECT public: - explicit SideBarButton(Controllers::DockWidget *dw, Views::SideBar_qtwidgets *parent); + explicit SideBarButton(Controllers::DockWidget *dw, Views::SideBar_qtquick *parent); bool isVertical() const; void paintEvent(QPaintEvent *) override; QSize sizeHint() const override; private: - Views::SideBar_qtwidgets *const m_sideBar; + Views::SideBar_qtquick *const m_sideBar; const QPointer m_dockWidget; }; namespace Views { -class DOCKS_EXPORT SideBar_qtwidgets : public View_qtwidgets, public SideBar +class DOCKS_EXPORT SideBar_qtquick : public View_qtquick, public SideBar { Q_OBJECT public: - explicit SideBar_qtwidgets(Controllers::SideBar *, QWidget *parent); + explicit SideBar_qtquick(Controllers::SideBar *, QQuickItem *parent); void init() override; bool isVertical() const; // TODO: Move to a potential base class @@ -66,7 +65,7 @@ public: void removeDockWidget_Impl(Controllers::DockWidget *dock) override; // virtual so users can provide their own buttons - virtual SideBarButton *createButton(Controllers::DockWidget *dw, SideBar_qtwidgets *parent) const; + virtual SideBarButton *createButton(Controllers::DockWidget *dw, SideBar_qtquick *parent) const; private: Controllers::SideBar *const m_controller; diff --git a/src/qtquick/views/Stack_qtquick.cpp b/src/qtquick/views/Stack_qtquick.cpp index c62a1e7b..ca6272a5 100644 --- a/src/qtquick/views/Stack_qtquick.cpp +++ b/src/qtquick/views/Stack_qtquick.cpp @@ -9,11 +9,11 @@ Contact KDAB at for commercial licensing options. */ -#include "Stack_qtwidgets.h" +#include "Stack_qtquick.h" #include "Controller.h" #include "controllers/Stack.h" #include "controllers/TitleBar.h" -#include "qtwidgets/views/DockWidget_qtwidgets.h" +#include "qtwidgets/views/DockWidget_qtquick.h" #include "private/DockRegistry_p.h" #include "kddockwidgets/FrameworkWidgetFactory.h" @@ -26,19 +26,19 @@ using namespace KDDockWidgets; using namespace KDDockWidgets::Views; -Stack_qtwidgets::Stack_qtwidgets(Controllers::Stack *controller, Controllers::Frame *parent) - : View_qtwidgets(controller, Type::Separator, parent ? parent->view()->asQWidget() : nullptr) +Stack_qtquick::Stack_qtquick(Controllers::Stack *controller, Controllers::Frame *parent) + : View_qtquick(controller, Type::Separator, parent ? parent->view()->asQWidget() : nullptr) , m_stack(controller) { } -void Stack_qtwidgets::init() +void Stack_qtquick::init() { setTabBar(tabBar()); setTabsClosable(Config::self().flags() & Config::Flag_TabsHaveCloseButton); setContextMenuPolicy(Qt::CustomContextMenu); - connect(this, &QTabWidget::customContextMenuRequested, this, &Stack_qtwidgets::showContextMenu); + connect(this, &QTabWidget::customContextMenuRequested, this, &Stack_qtquick::showContextMenu); // In case tabs closable is set by the factory, a tabClosedRequested() is emitted when the user presses [x] connect(this, &QTabWidget::tabCloseRequested, this, [this](int index) { @@ -67,22 +67,22 @@ void Stack_qtwidgets::init() setDocumentMode(m_stack->options() & StackOption_DocumentMode); } -int Stack_qtwidgets::numDockWidgets() const +int Stack_qtquick::numDockWidgets() const { return count(); } -void Stack_qtwidgets::removeDockWidget(Controllers::DockWidget *dw) +void Stack_qtquick::removeDockWidget(Controllers::DockWidget *dw) { removeTab(indexOf(dw->view()->asQWidget())); } -int Stack_qtwidgets::indexOfDockWidget(const Controllers::DockWidget *dw) const +int Stack_qtquick::indexOfDockWidget(const Controllers::DockWidget *dw) const { return indexOf(dw->view()->asQWidget()); } -void Stack_qtwidgets::mouseDoubleClickEvent(QMouseEvent *ev) +void Stack_qtquick::mouseDoubleClickEvent(QMouseEvent *ev) { if (m_stack->onMouseDoubleClick(ev->pos())) { ev->accept(); @@ -91,7 +91,7 @@ void Stack_qtwidgets::mouseDoubleClickEvent(QMouseEvent *ev) } } -void Stack_qtwidgets::mousePressEvent(QMouseEvent *ev) +void Stack_qtquick::mousePressEvent(QMouseEvent *ev) { QTabWidget::mousePressEvent(ev); @@ -101,55 +101,55 @@ void Stack_qtwidgets::mousePressEvent(QMouseEvent *ev) } } -void Stack_qtwidgets::tabInserted(int) +void Stack_qtquick::tabInserted(int) { m_stack->onTabInserted(); } -void Stack_qtwidgets::tabRemoved(int) +void Stack_qtquick::tabRemoved(int) { m_stack->onTabRemoved(); } -void Stack_qtwidgets::setCurrentDockWidget(int index) +void Stack_qtquick::setCurrentDockWidget(int index) { setCurrentIndex(index); } -bool Stack_qtwidgets::insertDockWidget(int index, Controllers::DockWidget *dw, +bool Stack_qtquick::insertDockWidget(int index, Controllers::DockWidget *dw, const QIcon &icon, const QString &title) { insertTab(index, dw->view()->asQWidget(), icon, title); return true; } -void Stack_qtwidgets::setTabBarAutoHide(bool b) +void Stack_qtquick::setTabBarAutoHide(bool b) { QTabWidget::setTabBarAutoHide(b); } -void Stack_qtwidgets::renameTab(int index, const QString &text) +void Stack_qtquick::renameTab(int index, const QString &text) { setTabText(index, text); } -void Stack_qtwidgets::changeTabIcon(int index, const QIcon &icon) +void Stack_qtquick::changeTabIcon(int index, const QIcon &icon) { setTabIcon(index, icon); } -Controllers::DockWidget *Stack_qtwidgets::dockwidgetAt(int index) const +Controllers::DockWidget *Stack_qtquick::dockwidgetAt(int index) const { - auto view = qobject_cast(widget(index)); + auto view = qobject_cast(widget(index)); return view ? view->dockWidget() : nullptr; } -int Stack_qtwidgets::currentIndex() const +int Stack_qtquick::currentIndex() const { return QTabWidget::currentIndex(); } -void Stack_qtwidgets::setupTabBarButtons() +void Stack_qtquick::setupTabBarButtons() { if (!(Config::self().flags() & Config::Flag_ShowButtonsOnTabBarIfTitleBarHidden)) return; @@ -185,14 +185,14 @@ void Stack_qtwidgets::setupTabBarButtons() }); } -void Stack_qtwidgets::updateMargins() +void Stack_qtquick::updateMargins() { const qreal factor = logicalDpiFactor(this); m_cornerWidgetLayout->setContentsMargins(QMargins(0, 0, 2, 0) * factor); m_cornerWidgetLayout->setSpacing(int(2 * factor)); } -void Stack_qtwidgets::showContextMenu(QPoint pos) +void Stack_qtquick::showContextMenu(QPoint pos) { if (!(Config::self().flags() & Config::Flag_AllowSwitchingTabsViaMenu)) return; @@ -223,17 +223,17 @@ void Stack_qtwidgets::showContextMenu(QPoint pos) menu.exec(mapToGlobal(pos)); } -QTabBar *Stack_qtwidgets::tabBar() const +QTabBar *Stack_qtquick::tabBar() const { return static_cast(m_stack->tabBar()->view()->asQWidget()); } -Controllers::Stack *Stack_qtwidgets::stack() const +Controllers::Stack *Stack_qtquick::stack() const { return m_stack; } -bool Stack_qtwidgets::isPositionDraggable(QPoint p) const +bool Stack_qtquick::isPositionDraggable(QPoint p) const { if (tabPosition() != QTabWidget::North) { qWarning() << Q_FUNC_INFO << "Not implemented yet. Only North is supported"; diff --git a/src/qtquick/views/Stack_qtquick.h b/src/qtquick/views/Stack_qtquick.h index 7db100bb..6dbc5049 100644 --- a/src/qtquick/views/Stack_qtquick.h +++ b/src/qtquick/views/Stack_qtquick.h @@ -12,7 +12,7 @@ #pragma once -#include "View_qtwidgets.h" +#include "View_qtquick.h" #include "views/Stack.h" #include @@ -30,11 +30,11 @@ class Frame; namespace KDDockWidgets { namespace Views { -class DOCKS_EXPORT Stack_qtwidgets : public View_qtwidgets, public Stack +class DOCKS_EXPORT Stack_qtquick : public View_qtquick, public Stack { Q_OBJECT public: - explicit Stack_qtwidgets(Controllers::Stack *controller, + explicit Stack_qtquick(Controllers::Stack *controller, Controllers::Frame *parent = nullptr); Controllers::Stack *stack() const; @@ -73,7 +73,7 @@ private: QAbstractButton *m_closeButton = nullptr; Controllers::Stack *const m_stack; - Q_DISABLE_COPY(Stack_qtwidgets) + Q_DISABLE_COPY(Stack_qtquick) }; } diff --git a/src/qtquick/views/TabBar_qtquick.cpp b/src/qtquick/views/TabBar_qtquick.cpp index d564d274..6dc92ade 100644 --- a/src/qtquick/views/TabBar_qtquick.cpp +++ b/src/qtquick/views/TabBar_qtquick.cpp @@ -9,7 +9,7 @@ Contact KDAB at for commercial licensing options. */ -#include "TabBar_qtwidgets.h" +#include "TabBar_qtquick.h" #include "../controllers/TabBar.h" #include "private/Utils_p.h" #include "private/Logging_p.h" @@ -52,31 +52,31 @@ public: } -TabBar_qtwidgets::TabBar_qtwidgets(Controllers::TabBar *controller, QWidget *parent) - : View_qtwidgets(controller, Type::TabBar, parent) +TabBar_qtquick::TabBar_qtquick(Controllers::TabBar *controller, QWidget *parent) + : View_qtquick(controller, Type::TabBar, parent) , m_controller(controller) { } -int TabBar_qtwidgets::tabAt(QPoint localPos) const +int TabBar_qtquick::tabAt(QPoint localPos) const { return QTabBar::tabAt(localPos); } -Controllers::DockWidget *TabBar_qtwidgets::currentDockWidget() const +Controllers::DockWidget *TabBar_qtquick::currentDockWidget() const { const int index = currentIndex(); return index == -1 ? nullptr : m_controller->dockWidgetAt(index); } -void TabBar_qtwidgets::mousePressEvent(QMouseEvent *e) +void TabBar_qtquick::mousePressEvent(QMouseEvent *e) { m_controller->onMousePress(e->pos()); QTabBar::mousePressEvent(e); } -void TabBar_qtwidgets::mouseMoveEvent(QMouseEvent *e) +void TabBar_qtquick::mouseMoveEvent(QMouseEvent *e) { if (count() > 1) { // Only allow to re-order tabs if we have more than 1 tab, otherwise it's just weird. @@ -84,12 +84,12 @@ void TabBar_qtwidgets::mouseMoveEvent(QMouseEvent *e) } } -void TabBar_qtwidgets::mouseDoubleClickEvent(QMouseEvent *e) +void TabBar_qtquick::mouseDoubleClickEvent(QMouseEvent *e) { m_controller->onMouseDoubleClick(e->pos()); } -bool TabBar_qtwidgets::event(QEvent *ev) +bool TabBar_qtquick::event(QEvent *ev) { // Qt has a bug in QWidgetPrivate::deepestFocusProxy(), it doesn't honour visibility // of the focus scope. Once an hidden widget is focused the chain is broken and tab @@ -110,22 +110,22 @@ bool TabBar_qtwidgets::event(QEvent *ev) return result; } -QString TabBar_qtwidgets::text(int index) const +QString TabBar_qtquick::text(int index) const { return tabText(index); } -QRect TabBar_qtwidgets::rectForTab(int index) const +QRect TabBar_qtquick::rectForTab(int index) const { return QTabBar::tabRect(index); } -void TabBar_qtwidgets::moveTabTo(int from, int to) +void TabBar_qtquick::moveTabTo(int from, int to) { moveTab(from, to); } -bool TabBar_qtwidgets::tabsAreMovable() const +bool TabBar_qtquick::tabsAreMovable() const { return isMovable(); } diff --git a/src/qtquick/views/TabBar_qtquick.h b/src/qtquick/views/TabBar_qtquick.h index e7f5f95c..1bb44e7c 100644 --- a/src/qtquick/views/TabBar_qtquick.h +++ b/src/qtquick/views/TabBar_qtquick.h @@ -11,10 +11,9 @@ #pragma once -#include "View_qtwidgets.h" +#include "View_qtquick.h" #include "views/TabBar.h" -#include QT_BEGIN_NAMESPACE class QMouseEvent; @@ -27,11 +26,11 @@ class DockWidget; namespace KDDockWidgets::Views { -class DOCKS_EXPORT TabBar_qtwidgets : public View_qtwidgets, public TabBar +class DOCKS_EXPORT TabBar_qtquick : public View_qtquick, public TabBar { Q_OBJECT public: - explicit TabBar_qtwidgets(Controllers::TabBar *controller, QWidget *parent = nullptr); + explicit TabBar_qtquick(Controllers::TabBar *controller, QQuickItem *parent = nullptr); Controllers::TabBar *tabBar() const; diff --git a/src/qtquick/views/TitleBar_qtquick.cpp b/src/qtquick/views/TitleBar_qtquick.cpp index 46667244..d74733e4 100644 --- a/src/qtquick/views/TitleBar_qtquick.cpp +++ b/src/qtquick/views/TitleBar_qtquick.cpp @@ -9,7 +9,7 @@ Contact KDAB at for commercial licensing options. */ -#include "TitleBar_qtwidgets.h" +#include "TitleBar_qtquick.h" #include "../controllers/TitleBar.h" #include "private/Utils_p.h" #include "private/Logging_p.h" @@ -90,14 +90,14 @@ QSize Button::sizeHint() const return QSize(m, m); } -TitleBar_qtwidgets::TitleBar_qtwidgets(Controllers::TitleBar *controller, QWidget *parent) - : View_qtwidgets(controller, Type::TitleBar, parent) +TitleBar_qtquick::TitleBar_qtquick(Controllers::TitleBar *controller, QWidget *parent) + : View_qtquick(controller, Type::TitleBar, parent) , m_controller(controller) , m_layout(new QHBoxLayout(this)) { } -void TitleBar_qtwidgets::init() +void TitleBar_qtquick::init() { qCDebug(creation) << "TitleBarWidget" << this; if (m_controller->titleBarIsFocusable()) @@ -165,7 +165,7 @@ void TitleBar_qtwidgets::init() }); } -void TitleBar_qtwidgets::paintEvent(QPaintEvent *) +void TitleBar_qtquick::paintEvent(QPaintEvent *) { if (freed()) return; @@ -187,12 +187,12 @@ void TitleBar_qtwidgets::paintEvent(QPaintEvent *) style()->drawControl(QStyle::CE_DockWidgetTitle, &titleOpt, &p, this); } -void TitleBar_qtwidgets::updateMinimizeButton() +void TitleBar_qtquick::updateMinimizeButton() { m_minimizeButton->setVisible(m_controller->supportsMinimizeButton()); } -void TitleBar_qtwidgets::updateAutoHideButton() +void TitleBar_qtquick::updateAutoHideButton() { if (Config::self().flags() & Config::Flag_AutoHideSupport) { auto factory = Config::self().frameworkWidgetFactory(); @@ -210,7 +210,7 @@ void TitleBar_qtwidgets::updateAutoHideButton() m_autoHideButton->setVisible(m_controller->supportsAutoHideButton()); } -void TitleBar_qtwidgets::updateMaximizeButton() +void TitleBar_qtquick::updateMaximizeButton() { if (auto fw = m_controller->floatingWindow()) { auto factory = Config::self().frameworkWidgetFactory(); @@ -225,7 +225,7 @@ void TitleBar_qtwidgets::updateMaximizeButton() } } -QRect TitleBar_qtwidgets::iconRect() const +QRect TitleBar_qtquick::iconRect() const { if (m_controller->icon().isNull()) { return QRect(0, 0, 0, 0); @@ -234,7 +234,7 @@ QRect TitleBar_qtwidgets::iconRect() const } } -int TitleBar_qtwidgets::buttonAreaWidth() const +int TitleBar_qtquick::buttonAreaWidth() const { int smallestX = width(); @@ -246,14 +246,14 @@ int TitleBar_qtwidgets::buttonAreaWidth() const return width() - smallestX; } -void TitleBar_qtwidgets::updateMargins() +void TitleBar_qtquick::updateMargins() { const qreal factor = logicalDpiFactor(this); m_layout->setContentsMargins(QMargins(2, 2, 2, 2) * factor); m_layout->setSpacing(int(2 * factor)); } -void TitleBar_qtwidgets::mouseDoubleClickEvent(QMouseEvent *e) +void TitleBar_qtquick::mouseDoubleClickEvent(QMouseEvent *e) { if (!m_controller) return; @@ -262,7 +262,7 @@ void TitleBar_qtwidgets::mouseDoubleClickEvent(QMouseEvent *e) m_controller->onDoubleClicked(); } -QSize TitleBar_qtwidgets::sizeHint() const +QSize TitleBar_qtquick::sizeHint() const { // Pass an opt so it scales against the logical dpi of the correct screen (since Qt 5.14) even if the HDPI Qt::AA_ attributes are off. QStyleOption opt; @@ -274,7 +274,7 @@ QSize TitleBar_qtwidgets::sizeHint() const return QSize(0, height); } -void TitleBar_qtwidgets::focusInEvent(QFocusEvent *ev) +void TitleBar_qtquick::focusInEvent(QFocusEvent *ev) { if (!freed()) return; @@ -283,29 +283,29 @@ void TitleBar_qtwidgets::focusInEvent(QFocusEvent *ev) m_controller->focusInEvent(ev); } -Controllers::TitleBar *TitleBar_qtwidgets::titleBar() const +Controllers::TitleBar *TitleBar_qtquick::titleBar() const { return m_controller; } #ifdef DOCKS_DEVELOPER_MODE -bool TitleBar_qtwidgets::isCloseButtonVisible() const +bool TitleBar_qtquick::isCloseButtonVisible() const { return m_closeButton->isVisible(); } -bool TitleBar_qtwidgets::isCloseButtonEnabled() const +bool TitleBar_qtquick::isCloseButtonEnabled() const { return m_closeButton->isEnabled(); } -bool TitleBar_qtwidgets::isFloatButtonVisible() const +bool TitleBar_qtquick::isFloatButtonVisible() const { return m_floatButton->isVisible(); } -bool TitleBar_qtwidgets::isFloatButtonEnabled() const +bool TitleBar_qtquick::isFloatButtonEnabled() const { return m_floatButton->isEnabled(); } diff --git a/src/qtquick/views/TitleBar_qtquick.h b/src/qtquick/views/TitleBar_qtquick.h index 9615b726..5bda3ea1 100644 --- a/src/qtquick/views/TitleBar_qtquick.h +++ b/src/qtquick/views/TitleBar_qtquick.h @@ -11,7 +11,7 @@ #pragma once -#include "View_qtwidgets.h" +#include "View_qtquick.h" #include "controllers/FloatingWindow.h" #include "views/TitleBar.h" @@ -26,11 +26,11 @@ class TitleBar; namespace KDDockWidgets::Views { -class DOCKS_EXPORT TitleBar_qtwidgets : public View_qtwidgets, public Views::TitleBar +class DOCKS_EXPORT TitleBar_qtquick : public View_qtquick, public Views::TitleBar { Q_OBJECT public: - explicit TitleBar_qtwidgets(Controllers::TitleBar *controller, QWidget *parent = nullptr); + explicit TitleBar_qtquick(Controllers::TitleBar *controller, QQuickItem *parent = nullptr); // TODO: void updateMaximizeButton() override; @@ -77,7 +77,7 @@ class Button : public QToolButton { Q_OBJECT public: - explicit Button(QWidget *parent) + explicit Button(QQuickItem *parent) : QToolButton(parent) { setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));