diff --git a/src/private/DockRegistry.cpp b/src/private/DockRegistry.cpp index 5ef012b5..ce3352f9 100644 --- a/src/private/DockRegistry.cpp +++ b/src/private/DockRegistry.cpp @@ -86,7 +86,7 @@ MultiSplitterLayout *DockRegistry::layoutForItem(const Layouting::Item *item) co if (!item->hostWidget()) return nullptr; - if (auto ms = qobject_cast(item->hostWidget()->asWidget())) + if (auto ms = qobject_cast(item->hostWidget()->asQWidget())) return ms->multiSplitterLayout(); return nullptr; diff --git a/src/private/multisplitter/Item.cpp b/src/private/multisplitter/Item.cpp index 7db51aa4..1b98fb1e 100644 --- a/src/private/multisplitter/Item.cpp +++ b/src/private/multisplitter/Item.cpp @@ -156,13 +156,13 @@ int Item::mapFromRoot(int p, Qt::Orientation o) const QWidget *Item::widget() const { - return m_guest ? m_guest->asWidget() : nullptr; + return m_guest ? m_guest->asQWidget() : nullptr; } void Item::setGuest(Widget *guest) { Q_ASSERT(!guest || !m_guest); - QWidget *newWidget = guest ? guest->asWidget() : nullptr; + QWidget *newWidget = guest ? guest->asQWidget() : nullptr; QWidget *oldWidget = widget(); if (oldWidget) { @@ -212,7 +212,7 @@ QVariantMap Item::toVariantMap() const result[QStringLiteral("isContainer")] = isContainer(); result[QStringLiteral("objectName")] = objectName(); if (m_guest) - result[QStringLiteral("guestId")] = QString::number(qint64(m_guest->asWidget())); // just for coorelation purposes when restoring + result[QStringLiteral("guestId")] = QString::number(qint64(m_guest->asQWidget())); // just for coorelation purposes when restoring return result; } diff --git a/src/private/multisplitter/Separator.cpp b/src/private/multisplitter/Separator.cpp index afcf88a1..56319827 100644 --- a/src/private/multisplitter/Separator.cpp +++ b/src/private/multisplitter/Separator.cpp @@ -53,7 +53,7 @@ struct Separator::Private }; Separator::Separator(Widget *hostWidget) - : QWidget(hostWidget->asWidget()) + : QWidget(hostWidget->asQWidget()) , d(new Private(hostWidget)) { } diff --git a/src/private/multisplitter/Separator_qwidget.cpp b/src/private/multisplitter/Separator_qwidget.cpp index 3d137d6c..e049cf84 100644 --- a/src/private/multisplitter/Separator_qwidget.cpp +++ b/src/private/multisplitter/Separator_qwidget.cpp @@ -36,7 +36,7 @@ class RubberBand : public QRubberBand public: RubberBand(Layouting::Widget *parent) - : QRubberBand(QRubberBand::Line, parent ? parent->asWidget() : nullptr) + : QRubberBand(QRubberBand::Line, parent ? parent->asQWidget() : nullptr) , Layouting::Widget_qwidget(this) { } }; diff --git a/src/private/multisplitter/Widget.h b/src/private/multisplitter/Widget.h index 40fd7340..7ae86dca 100644 --- a/src/private/multisplitter/Widget.h +++ b/src/private/multisplitter/Widget.h @@ -56,7 +56,7 @@ public: virtual ~Widget() {} virtual void setLayoutItem(Item *) = 0; - virtual QWidget *asWidget() const = 0; // TODO: Move down + virtual QWidget *asQWidget() const = 0; // TODO: Move down virtual QSize minSize() const = 0; virtual QSize maxSize() const = 0; virtual QRect geometry() const = 0; diff --git a/src/private/multisplitter/Widget_qwidget.h b/src/private/multisplitter/Widget_qwidget.h index 9a1b37b4..bad36a98 100644 --- a/src/private/multisplitter/Widget_qwidget.h +++ b/src/private/multisplitter/Widget_qwidget.h @@ -43,7 +43,7 @@ public: ~Widget_qwidget() override; - QWidget* asWidget() const override { + QWidget* asQWidget() const override { return m_thisWidget; } diff --git a/src/private/multisplitter/tests/tst_multisplitter.cpp b/src/private/multisplitter/tests/tst_multisplitter.cpp index 30004603..8a96a44a 100644 --- a/src/private/multisplitter/tests/tst_multisplitter.cpp +++ b/src/private/multisplitter/tests/tst_multisplitter.cpp @@ -957,7 +957,7 @@ void TestMultiSplitter::tst_insertAnotherRoot() auto root1 = createRoot(); Item *item1 = createItem(); root1->insertItem(item1, Item::Location_OnRight); - QWidget *host1 = root1->hostWidget()->asWidget(); + QWidget *host1 = root1->hostWidget()->asQWidget(); auto root2 = createRoot(); Item *item2 = createItem(); @@ -965,10 +965,10 @@ void TestMultiSplitter::tst_insertAnotherRoot() root1->insertItem(root2.get(), Item::Location_OnBottom); - QCOMPARE(root1->hostWidget()->asWidget(), host1); - QCOMPARE(root2->hostWidget()->asWidget(), host1); + QCOMPARE(root1->hostWidget()->asQWidget(), host1); + QCOMPARE(root2->hostWidget()->asQWidget(), host1); for (Item *item : root1->items_recursive()) { - QCOMPARE(item->hostWidget()->asWidget(), host1); + QCOMPARE(item->hostWidget()->asQWidget(), host1); QVERIFY(item->isVisible()); } QVERIFY(root1->checkSanity()); @@ -981,7 +981,7 @@ void TestMultiSplitter::tst_insertAnotherRoot() Item *item2 = createItem(); root1->insertItem(item1, Item::Location_OnLeft); root1->insertItem(item2, Item::Location_OnRight); - QWidget *host1 = root1->hostWidget()->asWidget(); + QWidget *host1 = root1->hostWidget()->asQWidget(); auto root2 = createRoot(); Item *item12 = createItem(); @@ -989,10 +989,10 @@ void TestMultiSplitter::tst_insertAnotherRoot() root1->insertItem(root2.get(), Item::Location_OnTop); - QCOMPARE(root1->hostWidget()->asWidget(), host1); - QCOMPARE(root2->hostWidget()->asWidget(), host1); + QCOMPARE(root1->hostWidget()->asQWidget(), host1); + QCOMPARE(root2->hostWidget()->asQWidget(), host1); for (Item *item : root1->items_recursive()) { - QCOMPARE(item->hostWidget()->asWidget(), host1); + QCOMPARE(item->hostWidget()->asQWidget(), host1); QVERIFY(item->isVisible()); } QVERIFY(root1->checkSanity()); @@ -1486,7 +1486,7 @@ void TestMultiSplitter::tst_minSizeChangedBeforeRestore() root->insertItem(item2, Item::Location_OnBottom); const QSize originalSize2 = item2->size(); - auto guest2 = qobject_cast(item2->guest()->asWidget()); + auto guest2 = qobject_cast(item2->guest()->asQWidget()); const QSize newMinSize = originalSize2 + QSize(10, 10); item2->turnIntoPlaceholder(); diff --git a/src/private/widgets/MultiSplitterLayout.cpp b/src/private/widgets/MultiSplitterLayout.cpp index 54f39ac7..fdcac3df 100644 --- a/src/private/widgets/MultiSplitterLayout.cpp +++ b/src/private/widgets/MultiSplitterLayout.cpp @@ -158,7 +158,7 @@ void MultiSplitterLayout::addWidget(QWidgetOrQuick *w, Location location, frame->addWidget(dw, option); } else if (auto ms = qobject_cast(w)) { newItem = ms->multiSplitterLayout()->rootItem(); - Q_ASSERT(newItem->hostWidget()->asWidget() != multiSplitter()); + Q_ASSERT(newItem->hostWidget()->asQWidget() != multiSplitter()); newItem->setHostWidget(m_multiSplitter); delete ms; } diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp index a11ef28a..6c0e2ae2 100644 --- a/tests/tst_docks.cpp +++ b/tests/tst_docks.cpp @@ -2350,7 +2350,7 @@ void TestDocks::tst_setFloatingAfterDraggedFromTabToSideBySide() QCOMPARE(dock2->lastPositions().lastItem(), oldItem2); Item *item2 = fw2->dropArea()->multiSplitterLayout()->itemForFrame(dock2->frame()); QVERIFY(item2); - QCOMPARE(item2->hostWidget()->asWidget(), fw2->dropArea()); + QCOMPARE(item2->hostWidget()->asQWidget(), fw2->dropArea()); QVERIFY(!layout->itemForFrame(dock2->frame())); // Move from tab to bottom