diff --git a/examples/dockwidgets/MyMainWindow.cpp b/examples/dockwidgets/MyMainWindow.cpp index 11793f3c..b498d9d2 100644 --- a/examples/dockwidgets/MyMainWindow.cpp +++ b/examples/dockwidgets/MyMainWindow.cpp @@ -48,7 +48,7 @@ MyMainWindow::MyMainWindow(const QString &uniqueName, KDDockWidgets::MainWindowO bool dockWidget0IsNonClosable, bool nonDockableDockWidget9, bool restoreIsRelative, bool maxSizeForDockWidget8, bool dockwidget5DoesntCloseBeforeRestore, const QString &affinityName, QWidget *parent) - : MainWindow(uniqueName, options, parent) + : KDDockWidgets::Views::MainWindow(uniqueName, options, parent) , m_dockWidget0IsNonClosable(dockWidget0IsNonClosable) , m_dockWidget9IsNonDockable(nonDockableDockWidget9) , m_restoreIsRelative(restoreIsRelative) diff --git a/examples/dockwidgets/MyMainWindow.h b/examples/dockwidgets/MyMainWindow.h index 60de183d..8457ebb6 100644 --- a/examples/dockwidgets/MyMainWindow.h +++ b/examples/dockwidgets/MyMainWindow.h @@ -14,7 +14,7 @@ #include #include -class MyMainWindow : public KDDockWidgets::MainWindow +class MyMainWindow : public KDDockWidgets::Views::MainWindow { Q_OBJECT public: diff --git a/examples/mdi_with_docking/main.cpp b/examples/mdi_with_docking/main.cpp index 217fe482..cc5e3fa4 100644 --- a/examples/mdi_with_docking/main.cpp +++ b/examples/mdi_with_docking/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char **argv) // # 1. Create our main window - KDDockWidgets::MainWindow mainWindow(QStringLiteral("MyMainWindow"), KDDockWidgets::MainWindowOption_HasCentralWidget); + KDDockWidgets::Views::MainWindow mainWindow(QStringLiteral("MyMainWindow"), KDDockWidgets::MainWindowOption_HasCentralWidget); mainWindow.setWindowTitle("Main Window"); mainWindow.resize(1600, 1200); mainWindow.show(); diff --git a/examples/minimal/main.cpp b/examples/minimal/main.cpp index 12786d51..05a4cdad 100644 --- a/examples/minimal/main.cpp +++ b/examples/minimal/main.cpp @@ -37,7 +37,7 @@ int main(int argc, char **argv) // # 1. Create our main window - KDDockWidgets::MainWindow mainWindow(QStringLiteral("MyMainWindow")); + KDDockWidgets::Views::MainWindow mainWindow(QStringLiteral("MyMainWindow")); mainWindow.setWindowTitle("Main Window"); mainWindow.resize(1200, 1200); mainWindow.show(); diff --git a/src/MainWindowMDI.cpp b/src/MainWindowMDI.cpp index bf49d875..c3214c04 100644 --- a/src/MainWindowMDI.cpp +++ b/src/MainWindowMDI.cpp @@ -16,7 +16,7 @@ using namespace KDDockWidgets; using namespace KDDockWidgets::Controllers; MainWindowMDI::MainWindowMDI(const QString &uniqueName, QWidget *parent, Qt::WindowFlags flags) - : KDDockWidgets::MainWindow(uniqueName, MainWindowOption_MDI, parent, flags) + : Views::MainWindow(uniqueName, MainWindowOption_MDI, parent, flags) { } diff --git a/src/MainWindowMDI.h b/src/MainWindowMDI.h index 831ddc88..67cd1d5f 100644 --- a/src/MainWindowMDI.h +++ b/src/MainWindowMDI.h @@ -27,8 +27,9 @@ namespace KDDockWidgets { + /// @brief MainWindow sub-class which uses MDI as a layout -class DOCKS_EXPORT MainWindowMDI : public KDDockWidgets::MainWindow +class DOCKS_EXPORT MainWindowMDI : public Views::MainWindow { Q_OBJECT public: diff --git a/src/layoutlinter_main.cpp b/src/layoutlinter_main.cpp index b36c1309..2f83b88c 100644 --- a/src/layoutlinter_main.cpp +++ b/src/layoutlinter_main.cpp @@ -33,7 +33,7 @@ static bool lint(const QString &filename) }; MainWindowFactoryFunc mwFunc = [](const QString &dwName) { - return static_cast(new MainWindow(dwName)); + return static_cast(new Views::MainWindow(dwName)); }; KDDockWidgets::Config::self().setDockWidgetFactoryFunc(dwFunc); diff --git a/src/views_qtwidgets/MainWindow_qtwidgets.cpp b/src/views_qtwidgets/MainWindow_qtwidgets.cpp index 25b12e16..e435f928 100644 --- a/src/views_qtwidgets/MainWindow_qtwidgets.cpp +++ b/src/views_qtwidgets/MainWindow_qtwidgets.cpp @@ -36,6 +36,7 @@ // clazy:excludeall=ctor-missing-parent-argument,missing-qobject-macro using namespace KDDockWidgets; +using namespace KDDockWidgets::Views; namespace KDDockWidgets { class MyCentralWidget : public QWidget diff --git a/src/views_qtwidgets/MainWindow_qtwidgets.h b/src/views_qtwidgets/MainWindow_qtwidgets.h index a712a568..a617de77 100644 --- a/src/views_qtwidgets/MainWindow_qtwidgets.h +++ b/src/views_qtwidgets/MainWindow_qtwidgets.h @@ -27,6 +27,8 @@ namespace Controllers { class SideBar; } +namespace Views { + /** * @brief The QMainwindow sub-class that the application should use to be able * to dock KDDockWidget::DockWidget instances. @@ -68,7 +70,7 @@ private: class Private; Private *const d; }; - +} } #endif diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp index 375df5d9..ce0d9583 100644 --- a/tests/tst_docks.cpp +++ b/tests/tst_docks.cpp @@ -1499,7 +1499,7 @@ void TestDocks::tst_negativeAnchorPosition3() void TestDocks::tst_negativeAnchorPosition4() { // 1. Tests that we don't get a warning - // Out of bounds position= -5 ; oldPosition= 0 KDDockWidgets::Anchor(0x55e726be9090, name = "left") KDDockWidgets::MainWindow(0x55e726beb8d0) + // Out of bounds position= -5 ; oldPosition= 0 KDDockWidgets::Anchor(0x55e726be9090, name = "left") KDDockWidgets::Views::MainWindow(0x55e726beb8d0) EnsureTopLevelsDeleted e; QVector docks = { { Location_OnLeft, -1, nullptr, InitialVisibilityOption::StartHidden }, { Location_OnTop, -1, nullptr, InitialVisibilityOption::StartVisible }, @@ -5014,7 +5014,7 @@ void TestDocks::tst_dockableMainWindows() auto dock1 = createDockWidget("dock1", new QPushButton("foo")); m1->addDockWidget(dock1, Location_OnTop); - auto m2 = new KDDockWidgets::MainWindow("mainwindow-dockable"); + auto m2 = new KDDockWidgets::Views::MainWindow("mainwindow-dockable"); auto m2Container = createDockWidget("mainwindow-dw", m2); auto menubar = m2->menuBar(); menubar->addMenu("File"); @@ -5330,11 +5330,11 @@ void TestDocks::tst_floatingWindowDeleted() // Tests a case where the empty floating dock widget wouldn't be deleted // Doesn't repro QTBUG-83030 unfortunately, as we already have an event loop running // but let's leave this here nonetheless - class MyMainWindow : public KDDockWidgets::MainWindow + class MyMainWindow : public KDDockWidgets::Views::MainWindow { public: MyMainWindow() - : KDDockWidgets::MainWindow("tst_floatingWindowDeleted", MainWindowOption_None) + : KDDockWidgets::Views::MainWindow("tst_floatingWindowDeleted", MainWindowOption_None) { auto dock1 = new Controllers::DockWidgetBase(QStringLiteral("DockWidget #1")); auto myWidget = new QWidget(); @@ -5362,7 +5362,7 @@ void TestDocks::tst_addToSmallMainWindow6() QWidget container; auto lay = new QVBoxLayout(&container); - MainWindow m("MyMainWindow_tst_addToSmallMainWindow8", MainWindowOption_None); + Views::MainWindow m("MyMainWindow_tst_addToSmallMainWindow8", MainWindowOption_None); lay->addWidget(&m); container.resize(100, 100); Testing::waitForResize(&container); diff --git a/tests/utils.cpp b/tests/utils.cpp index 52a7345e..fe977219 100644 --- a/tests/utils.cpp +++ b/tests/utils.cpp @@ -61,7 +61,7 @@ KDDockWidgets::Tests::createMainWindow(QSize sz, KDDockWidgets::MainWindowOption QTest::qWait(100); // the root object gets sized delayed #endif - auto ptr = std::unique_ptr(new MainWindow(mainWindowName, options, parent)); + auto ptr = std::unique_ptr(new Views::MainWindow(mainWindowName, options, parent)); if (show) ptr->show(); ptr->resize(sz); @@ -127,7 +127,7 @@ std::unique_ptr KDDockWidgets::Tests::createMainWindow(QVector(new MainWindow(QStringLiteral("MyMainWindow%1").arg(count), MainWindowOption_None, parent)); + auto m = std::unique_ptr(new Views::MainWindow(QStringLiteral("MyMainWindow%1").arg(count), MainWindowOption_None, parent)); auto layout = m->layoutWidget(); m->show(); m->resize(QSize(700, 700));