diff --git a/examples/qtquick/customtitlebar/main.cpp b/examples/qtquick/customtitlebar/main.cpp index 7c4cfee4..e035121d 100644 --- a/examples/qtquick/customtitlebar/main.cpp +++ b/examples/qtquick/customtitlebar/main.cpp @@ -67,7 +67,9 @@ int main(int argc, char *argv[]) dw1->dockWidget()->addDockWidgetToContainingWindow(dw3->dockWidget(), KDDockWidgets::Location_OnRight); - auto mainWindow = KDDockWidgets::DockRegistry::self()->mainwindows().constFirst(); - mainWindow->addDockWidget(dw2->dockWidget(), KDDockWidgets::Location_OnTop); + // Access the main area we created in QML with DockingArea {} + auto mainArea = KDDockWidgets::DockRegistry::self()->mainDockingAreas().constFirst(); + mainArea->addDockWidget(dw2->dockWidget(), KDDockWidgets::Location_OnTop); + return app.exec(); } diff --git a/examples/qtquick/dockwidgets/main.cpp b/examples/qtquick/dockwidgets/main.cpp index 3c7d3a1a..cd863261 100644 --- a/examples/qtquick/dockwidgets/main.cpp +++ b/examples/qtquick/dockwidgets/main.cpp @@ -108,8 +108,9 @@ int main(int argc, char *argv[]) dw1->dockWidget()->addDockWidgetToContainingWindow(dw3->dockWidget(), KDDockWidgets::Location_OnRight); - auto mainWindow = KDDockWidgets::DockRegistry::self()->mainwindows().constFirst(); - mainWindow->addDockWidget(dw2->dockWidget(), KDDockWidgets::Location_OnTop); + // Access the main area we created in QML with DockingArea {} + auto mainArea = KDDockWidgets::DockRegistry::self()->mainDockingAreas().constFirst(); + mainArea->addDockWidget(dw2->dockWidget(), KDDockWidgets::Location_OnTop); return app.exec(); } diff --git a/examples/qtquick/mdi/main.cpp b/examples/qtquick/mdi/main.cpp index 832ef5dc..9c93901c 100644 --- a/examples/qtquick/mdi/main.cpp +++ b/examples/qtquick/mdi/main.cpp @@ -49,12 +49,12 @@ int main(int argc, char *argv[]) auto dw3 = new KDDockWidgets::Views::DockWidget_qtquick("Dock #3"); dw3->setGuestView(QStringLiteral("qrc:/Guest3.qml")); - auto mainWindowView = KDDockWidgets::DockRegistry::self()->mainwindows().constFirst()->view(); - auto mainWindowMDI = static_cast(mainWindowView); + auto mainAreaView = KDDockWidgets::DockRegistry::self()->mainDockingAreas().constFirst()->view(); + auto mainAreaMDI = static_cast(mainAreaView); - mainWindowMDI->addDockWidget(dw1->dockWidget(), QPoint(10, 10)); - mainWindowMDI->addDockWidget(dw2->dockWidget(), QPoint(50, 50)); - mainWindowMDI->addDockWidget(dw3->dockWidget(), QPoint(90, 90)); + mainAreaMDI->addDockWidget(dw1->dockWidget(), QPoint(10, 10)); + mainAreaMDI->addDockWidget(dw2->dockWidget(), QPoint(50, 50)); + mainAreaMDI->addDockWidget(dw3->dockWidget(), QPoint(90, 90)); return app.exec(); diff --git a/src/private/DockRegistry.cpp b/src/private/DockRegistry.cpp index e7e4be4f..f7ee1bd8 100644 --- a/src/private/DockRegistry.cpp +++ b/src/private/DockRegistry.cpp @@ -490,6 +490,11 @@ const Controllers::MainWindow::List DockRegistry::mainwindows() const return m_mainWindows; } +const Controllers::MainWindow::List DockRegistry::mainDockingAreas() const +{ + return m_mainWindows; +} + const QVector DockRegistry::layouts() const { return m_layouts; diff --git a/src/private/DockRegistry_p.h b/src/private/DockRegistry_p.h index 125e3606..d52c7af2 100644 --- a/src/private/DockRegistry_p.h +++ b/src/private/DockRegistry_p.h @@ -100,6 +100,11 @@ public: ///@brief returns all MainWindow instances const Controllers::MainWindow::List mainwindows() const; + /// @brief returns all MainWindow instances + /// Exactly the same as mainwindows(), but with better terminology for QtQuick + /// as we're phasing out the "MainWindow" name there + const Controllers::MainWindow::List mainDockingAreas() const; + ///@brief overload returning only the ones with the specified names const Controllers::MainWindow::List mainWindows(const QStringList &names);