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

tests: Make createMainWindow return MainWindowBase

Browse Source 
Instead of QMainWindow, so it works with qml too
This commit is contained in:
Sergio Martins
2020-08-12 23:59:22 +01:00
parent 41d1ea8f61
commit d3323d824a
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/tst_docks.cpp
View File

@@ -547,7 +547,7 @@ DockWidgetBase *createAndNestDockWidget(DropArea *dropArea, Frame *relativeTo, K
return dock;
}
std::unique_ptr<MainWindow> createSimpleNestedMainWindow(DockWidgetBase * *centralDock, DockWidgetBase * *leftDock, DockWidgetBase * *rightDock)
std::unique_ptr<MainWindowBase> createSimpleNestedMainWindow(DockWidgetBase * *centralDock, DockWidgetBase * *leftDock, DockWidgetBase * *rightDock)
{
auto window = createMainWindow({900, 500});
*centralDock = createDockWidget("centralDock", Qt::green);
@@ -773,7 +773,7 @@ void TestDocks::tst_close()
// 2. Test that closing the single frame of a main window doesn't close the main window itself
{
auto m = createMainWindow(QSize(800, 500), MainWindowOption_None); // Remove central frame
QPointer<MainWindow> mainWindowPtr = m.get();
QPointer<MainWindowBase> mainWindowPtr = m.get();
dock1 = createDockWidget("hello", Qt::green);
m->addDockWidget(dock1, Location_OnLeft);
@@ -786,7 +786,7 @@ void TestDocks::tst_close()
// 2.1 Test closing the frame instead
{
auto m = createMainWindow(QSize(800, 500), MainWindowOption_None); // Remove central frame
QPointer<MainWindow> mainWindowPtr = m.get();
QPointer<MainWindowBase> mainWindowPtr = m.get();
dock1 = createDockWidget("hello", Qt::green);
m->addDockWidget(dock1, Location_OnLeft);
@@ -800,7 +800,7 @@ void TestDocks::tst_close()
// 2.2 Repeat, but with a central frame
{
auto m = createMainWindow(QSize(800, 500));
QPointer<MainWindow> mainWindowPtr = m.get();
QPointer<MainWindowBase> mainWindowPtr = m.get();
dock1 = createDockWidget("hello", Qt::green);
m->addDockWidget(dock1, Location_OnLeft);

4
tests/utils.cpp
View File

@@ -47,7 +47,7 @@ void NonClosableWidget::closeEvent(QCloseEvent *ev)
}
#ifdef KDDOCKWIDGETS_QTWIDGETS
std::unique_ptr<KDDockWidgets::MainWindow> KDDockWidgets::Tests::createMainWindow(QSize sz, KDDockWidgets::MainWindowOptions options, const QString &name)
std::unique_ptr<KDDockWidgets::MainWindowBase> KDDockWidgets::Tests::createMainWindow(QSize sz, KDDockWidgets::MainWindowOptions options, const QString &name)
{
static int count = 0;
count++;
@@ -91,7 +91,7 @@ DockWidgetBase *KDDockWidgets::Tests::createDockWidget(const QString &name, QCol
};
#ifdef KDDOCKWIDGETS_QTWIDGETS
std::unique_ptr<MainWindow> KDDockWidgets::Tests::createMainWindow(QVector<DockDescriptor> &docks)
std::unique_ptr<MainWindowBase> KDDockWidgets::Tests::createMainWindow(QVector<DockDescriptor> &docks)
{
static int count = 0;
count++;

4
tests/utils.h
View File

@@ -89,12 +89,12 @@ struct EnsureTopLevelsDeleted
bool shouldBlacklistWarning(const QString &msg, const QString &category = {});
#ifdef KDDOCKWIDGETS_QTWIDGETS
std::unique_ptr<KDDockWidgets::MainWindow> createMainWindow(QSize sz = {600, 600},
std::unique_ptr<MainWindowBase> createMainWindow(QSize sz = {600, 600},
KDDockWidgets::MainWindowOptions options = MainWindowOption_HasCentralFrame, const QString &name = {});
std::unique_ptr<KDDockWidgets::MainWindow> createMainWindow(QVector<DockDescriptor> &docks);
std::unique_ptr<KDDockWidgets::MainWindowBase> createMainWindow(QVector<DockDescriptor> &docks);
#endif
KDDockWidgets::DockWidgetBase *createDockWidget(const QString &name, QWidgetOrQuick *w,
DockWidgetBase::Options options = {}, bool show = true,