philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move MainWindow view into Views namespace

Browse Source
This commit is contained in:
Sergio Martins
2022-03-25 10:40:16 +00:00
parent 0c686c1339
commit 264b08a731
11 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/dockwidgets/MyMainWindow.cpp
View File

@@ -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)

2
examples/dockwidgets/MyMainWindow.h
View File

@@ -14,7 +14,7 @@
#include <kddockwidgets/DockWidget.h>
#include <views_qtwidgets/MainWindow_qtwidgets.h>
class MyMainWindow : public KDDockWidgets::MainWindow
class MyMainWindow : public KDDockWidgets::Views::MainWindow
{
Q_OBJECT
public:

2
examples/mdi_with_docking/main.cpp
View File

@@ -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();

2
examples/minimal/main.cpp
View File

@@ -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();

2
src/MainWindowMDI.cpp
View File

@@ -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)
{
}

3
src/MainWindowMDI.h
View File

@@ -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:

2
src/layoutlinter_main.cpp
View File

@@ -33,7 +33,7 @@ static bool lint(const QString &filename)
};
MainWindowFactoryFunc mwFunc = [](const QString &dwName) {
return static_cast<MainWindowBase *>(new MainWindow(dwName));
return static_cast<MainWindowBase *>(new Views::MainWindow(dwName));
};
KDDockWidgets::Config::self().setDockWidgetFactoryFunc(dwFunc);

1
src/views_qtwidgets/MainWindow_qtwidgets.cpp
View File

@@ -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

4
src/views_qtwidgets/MainWindow_qtwidgets.h
View File

@@ -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

10
tests/tst_docks.cpp
View File

@@ -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<DockDescriptor> 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);

4
tests/utils.cpp
View File

@@ -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<MainWindow>(new MainWindow(mainWindowName, options, parent));
auto ptr = std::unique_ptr<Views::MainWindow>(new Views::MainWindow(mainWindowName, options, parent));
if (show)
ptr->show();
ptr->resize(sz);
@@ -127,7 +127,7 @@ std::unique_ptr<MainWindowBase> KDDockWidgets::Tests::createMainWindow(QVector<D
QTest::qWait(100); // the root object gets sized delayed
#endif
auto m = std::unique_ptr<MainWindow>(new MainWindow(QStringLiteral("MyMainWindow%1").arg(count), MainWindowOption_None, parent));
auto m = std::unique_ptr<Views::MainWindow>(new Views::MainWindow(QStringLiteral("MyMainWindow%1").arg(count), MainWindowOption_None, parent));
auto layout = m->layoutWidget();
m->show();
m->resize(QSize(700, 700));