From fa7e8af014e60883d6fecaacc3f5db1cf0660c19 Mon Sep 17 00:00:00 2001
From: Sergio Martins <sergio.martins@kdab.com>
Date: Sun, 26 Jul 2020 21:53:05 +0100
Subject: [PATCH] qml: Remove QWidget'isms from MultiSplitter

---
 src/private/MultiSplitter.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/private/MultiSplitter.cpp b/src/private/MultiSplitter.cpp
index d6ed5dd0..5967ff1b 100644
--- a/src/private/MultiSplitter.cpp
+++ b/src/private/MultiSplitter.cpp
@@ -43,7 +43,7 @@ MultiSplitter::MultiSplitter(QWidgetOrQuick *parent)
     setRootItem(new Layouting::ItemContainer(this));
     DockRegistry::self()->registerLayout(this);
 
-    setLayoutSize(parent->QWidget::size());
+    setLayoutSize(parent->size());
 
     qCDebug(multisplittercreation()) << "MultiSplitter";
 
@@ -88,7 +88,7 @@ bool MultiSplitter::isInMainWindow() const
 
 MainWindowBase *MultiSplitter::mainWindow() const
 {
-    if (auto pw = QWidget::parentWidget()) {
+    if (auto pw = QWidgetAdapter::parentWidget()) {
         // Note that if pw is a FloatingWindow then pw->parentWidget() can be a MainWindow too, as it's parented
         if (pw->objectName() == QLatin1String("MyCentralWidget"))
             return qobject_cast<MainWindowBase*>(pw->parentWidget());
@@ -99,10 +99,9 @@ MainWindowBase *MultiSplitter::mainWindow() const
 
 FloatingWindow *MultiSplitter::floatingWindow() const
 {
-    return qobject_cast<FloatingWindow*>(QWidget::parentWidget());
+    return qobject_cast<FloatingWindow*>(QWidgetAdapter::parentWidget());
 }
 
-
 bool MultiSplitter::validateInputs(QWidgetOrQuick *widget,
                                          Location location,
                                          const Frame *relativeToFrame, AddingOption option) const
@@ -172,7 +171,7 @@ void MultiSplitter::addWidget(QWidgetOrQuick *w, Location location,
     if (itemForFrame(frame) != nullptr) {
         // Item already exists, remove it.
         // Changing the frame parent will make the item clean itself up. It turns into a placeholder and is removed by unrefOldPlaceholders
-        frame->QWidget::setParent(nullptr); // so ~Item doesn't delete it
+        frame->QWidgetAdapter::setParent(nullptr); // so ~Item doesn't delete it
         frame->setLayoutItem(nullptr); // so Item is destroyed, as there's no refs to it
     }
 
@@ -200,7 +199,6 @@ void MultiSplitter::addWidget(QWidgetOrQuick *w, Location location,
         frame->addWidget(dw, option);
     } else if (auto ms = qobject_cast<MultiSplitter*>(w)) {
         newItem = ms->rootItem();
-        Q_ASSERT(newItem->hostWidget()->asQWidget() != this);
         newItem->setHostWidget(this);
         delete ms;
     }
@@ -333,7 +331,7 @@ void MultiSplitter::restorePlaceholder(DockWidgetBase *dw, Layouting::Item *item
         frame->addWidget(dw);
     }
 
-    frame->QWidget::setVisible(true);
+    frame->QWidgetAdapter::setVisible(true);
 }
 
 void MultiSplitter::layoutEqually()
@@ -448,7 +446,7 @@ bool MultiSplitter::deserialize(const LayoutSaver::MultiSplitter &l)
     m_rootItem->fillFromVariantMap(l.layout, frames);
 
     updateSizeConstraints();
-    m_rootItem->setSize_recursive(QWidget::size());
+    m_rootItem->setSize_recursive(QWidgetAdapter::size());
 
     return true;
 }