From 1ead71442fbbebc3063ce17f64dcde69b72e6996 Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Sat, 4 Jun 2022 20:40:57 +0100 Subject: [PATCH] qtquick: Remove old rubber band code, this has been ported already --- src/qtquick/views/Separator_qtquick.cpp | 11 ----------- src/qtquick/views/Separator_qtquick.h | 4 ---- src/qtquick/views/Stack_qtquick.cpp | 2 +- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/qtquick/views/Separator_qtquick.cpp b/src/qtquick/views/Separator_qtquick.cpp index c07051f3..ce123272 100644 --- a/src/qtquick/views/Separator_qtquick.cpp +++ b/src/qtquick/views/Separator_qtquick.cpp @@ -39,17 +39,6 @@ bool Separator_qtquick::isVertical() const return m_controller->isVertical(); } -// TODOm2 -// Layouting::Widget *Separator_qtquick::createRubberBand(Layouting::Widget *parent) -// { -// if (!parent) { -// qWarning() << Q_FUNC_INFO << "Parent is required"; -// return nullptr; -// } - -// return new Layouting::Widget_quick(new Layouting::RubberBand(parent)); -// } - void Separator_qtquick::onMousePressed() { if (freed()) diff --git a/src/qtquick/views/Separator_qtquick.h b/src/qtquick/views/Separator_qtquick.h index 4bdec96f..c94290e1 100644 --- a/src/qtquick/views/Separator_qtquick.h +++ b/src/qtquick/views/Separator_qtquick.h @@ -29,10 +29,6 @@ public: bool isVertical() const; void init() override; -protected: - // TODOm2 - // Widget *createRubberBand(Widget *parent) override; - public: // Interface with QML: Q_INVOKABLE void onMousePressed(); diff --git a/src/qtquick/views/Stack_qtquick.cpp b/src/qtquick/views/Stack_qtquick.cpp index 3077396c..bf1a2494 100644 --- a/src/qtquick/views/Stack_qtquick.cpp +++ b/src/qtquick/views/Stack_qtquick.cpp @@ -77,7 +77,7 @@ void Stack_qtquick::setCurrentDockWidget(int index) } } -QObject *Stack_qtquick::tabBarObj() const +QObject *Stack_qtquick::tabBarViewObj() const { return m_tabBar->view()->asQObject(); }