diff --git a/examples/qtquick/customtitlebar/main.cpp b/examples/qtquick/customtitlebar/main.cpp index e035121d..dbb8df2c 100644 --- a/examples/qtquick/customtitlebar/main.cpp +++ b/examples/qtquick/customtitlebar/main.cpp @@ -53,17 +53,17 @@ int main(int argc, char *argv[]) auto dw1 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #1"); - dw1->setGuestView(QStringLiteral("qrc:/Guest1.qml")); + dw1->setGuestItem(QStringLiteral("qrc:/Guest1.qml")); dw1->resize(QSize(800, 800)); dw1->show(); auto dw2 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #2"); - dw2->setGuestView(QStringLiteral("qrc:/Guest2.qml")); + dw2->setGuestItem(QStringLiteral("qrc:/Guest2.qml")); dw2->resize(QSize(800, 800)); dw2->show(); auto dw3 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #3"); - dw3->setGuestView(QStringLiteral("qrc:/Guest3.qml")); + dw3->setGuestItem(QStringLiteral("qrc:/Guest3.qml")); dw1->dockWidget()->addDockWidgetToContainingWindow(dw3->dockWidget(), KDDockWidgets::Location_OnRight); diff --git a/examples/qtquick/dockwidgets/main.cpp b/examples/qtquick/dockwidgets/main.cpp index cd863261..044b478a 100644 --- a/examples/qtquick/dockwidgets/main.cpp +++ b/examples/qtquick/dockwidgets/main.cpp @@ -94,17 +94,17 @@ int main(int argc, char *argv[]) auto dw1 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #1"); - dw1->setGuestView(QStringLiteral("qrc:/Guest1.qml")); + dw1->setGuestItem(QStringLiteral("qrc:/Guest1.qml")); dw1->resize(QSize(800, 800)); dw1->show(); auto dw2 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #2"); - dw2->setGuestView(QStringLiteral("qrc:/Guest2.qml")); + dw2->setGuestItem(QStringLiteral("qrc:/Guest2.qml")); dw2->resize(QSize(800, 800)); dw2->show(); auto dw3 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #3"); - dw3->setGuestView(QStringLiteral("qrc:/Guest3.qml")); + dw3->setGuestItem(QStringLiteral("qrc:/Guest3.qml")); dw1->dockWidget()->addDockWidgetToContainingWindow(dw3->dockWidget(), KDDockWidgets::Location_OnRight); diff --git a/examples/qtquick/mdi/main.cpp b/examples/qtquick/mdi/main.cpp index a3ea9cc7..daaaaf77 100644 --- a/examples/qtquick/mdi/main.cpp +++ b/examples/qtquick/mdi/main.cpp @@ -39,15 +39,15 @@ int main(int argc, char *argv[]) appEngine.load((QUrl("qrc:/main.qml"))); auto dw1 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #1"); - dw1->setGuestView(QStringLiteral("qrc:/Guest1.qml")); + dw1->setGuestItem(QStringLiteral("qrc:/Guest1.qml")); dw1->resize(QSize(400, 400)); auto dw2 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #2"); - dw2->setGuestView(QStringLiteral("qrc:/Guest2.qml")); + dw2->setGuestItem(QStringLiteral("qrc:/Guest2.qml")); dw2->resize(QSize(400, 400)); auto dw3 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #3"); - dw3->setGuestView(QStringLiteral("qrc:/Guest3.qml")); + dw3->setGuestItem(QStringLiteral("qrc:/Guest3.qml")); auto mainAreaView = KDDockWidgets::DockRegistry::self()->mainDockingAreas().constFirst()->view(); auto mainAreaMDI = static_cast(mainAreaView); diff --git a/src/qtquick/DockWidgetInstantiator.cpp b/src/qtquick/DockWidgetInstantiator.cpp index f48bc76f..0a672447 100644 --- a/src/qtquick/DockWidgetInstantiator.cpp +++ b/src/qtquick/DockWidgetInstantiator.cpp @@ -226,7 +226,7 @@ void DockWidgetInstantiator::componentComplete() m_dockWidget->setGuestView(Views::asQQuickWrapper(childItems.constFirst())); } else { auto view = this->dockWidget(); - view->setGuestView(m_sourceFilename); + view->setGuestItem(m_sourceFilename); } if (!m_title.isEmpty()) diff --git a/src/qtquick/views/DockWidget_qtquick.cpp b/src/qtquick/views/DockWidget_qtquick.cpp index 9f4b3d1b..f16a9ccb 100644 --- a/src/qtquick/views/DockWidget_qtquick.cpp +++ b/src/qtquick/views/DockWidget_qtquick.cpp @@ -89,20 +89,20 @@ void DockWidget_qtquick::init() }); } -void DockWidget_qtquick::setGuestView(const QString &qmlFilename) +void DockWidget_qtquick::setGuestItem(const QString &qmlFilename) { QQuickItem *guest = createItem(d->m_qmlEngine, qmlFilename); if (!guest) return; - setGuestView(guest); + setGuestItem(guest); } -void DockWidget_qtquick::setGuestView(QQuickItem *widget) +void DockWidget_qtquick::setGuestItem(QQuickItem *item) { - auto wrapper = asQQuickWrapper(widget); + auto wrapper = asQQuickWrapper(item); wrapper->setParent(this); - makeItemFillParent(widget); + makeItemFillParent(item); dockWidget()->setGuestView(wrapper); } diff --git a/src/qtquick/views/DockWidget_qtquick.h b/src/qtquick/views/DockWidget_qtquick.h index d3857eeb..950b4d31 100644 --- a/src/qtquick/views/DockWidget_qtquick.h +++ b/src/qtquick/views/DockWidget_qtquick.h @@ -66,11 +66,10 @@ public: ~DockWidget_qtquick() override; /// Sets the DockWidget's guest item - /// Similar to Controllers::DockWidget::setGuestView(QQuickItem*) - void setGuestView(const QString &qmlFilename); + void setGuestItem(const QString &qmlFilename); /// @reimp - Q_INVOKABLE void setGuestView(QQuickItem *); + Q_INVOKABLE void setGuestItem(QQuickItem *); /// @reimp QSize minSize() const override;