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

Remove last usage of QWidgetOrQuick type

Browse Source
This commit is contained in:
Sergio Martins
2022-05-16 23:04:29 +01:00
parent 1bacb31949
commit cc8ee097a3
5 changed files with 30 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/fwd_headers/kddockwidgets/KDDockWidgets.h
View File

@@ -10,10 +10,3 @@
*/
#include "../../KDDockWidgets.h"
class QWidget;
namespace KDDockWidgets {
// TODO remove
using QWidgetOrQuick = QWidget;
}

6
src/private/DragController.cpp
View File

@@ -741,7 +741,7 @@ bool DragController::eventFilter(QObject *o, QEvent *e)
if (!me)
return MinimalStateMachine::eventFilter(o, e);
auto w = qobject_cast<QWidgetOrQuick *>(o);
auto w = qobject_cast<QWidget *>(o);
if (!w)
return MinimalStateMachine::eventFilter(o, e);
@@ -788,7 +788,7 @@ StateBase *DragController::activeState() const
}
#if defined(Q_OS_WIN)
static QWidgetOrQuick *qtTopLevelForHWND(HWND hwnd)
static QWidget *qtTopLevelForHWND(HWND hwnd)
{
const QList<QWindow *> windows = qApp->topLevelWindows();
for (QWindow *window : windows) {
@@ -822,7 +822,7 @@ static QWidgetOrQuick *qtTopLevelForHWND(HWND hwnd)
return nullptr;
}
static QRect topLevelGeometry(const QWidgetOrQuick *topLevel)
static QRect topLevelGeometry(const QWidget *topLevel)
{
if (auto mainWindow = qobject_cast<const MainWindowBase *>(topLevel))
return mainWindow->windowGeometry();

27
tests/qtwidgets/tst_qtwidgets.cpp
View File

@@ -45,6 +45,33 @@ using namespace KDDockWidgets::Controllers;
using namespace KDDockWidgets::Tests;
using namespace Layouting;
inline Controllers::DockWidget *createDockWidget(const QString &name, QWidget *w,
Controllers::DockWidget::Options options = {},
Controllers::DockWidget::LayoutSaverOptions layoutSaverOptions = {},
bool show = true,
const QString &affinityName = {})
{
w->setFocusPolicy(Qt::StrongFocus);
auto dock = new Controllers::DockWidget(name, options, layoutSaverOptions);
dock->setAffinityName(affinityName);
dock->setGuestView(std::shared_ptr<ViewWrapper>(new Views::ViewWrapper_qtwidgets(w)));
dock->setObjectName(name);
dock->view()->setGeometry(QRect(0, 0, 400, 400));
if (show) {
dock->show();
dock->dptr()->morphIntoFloatingWindow();
dock->view()->activateWindow();
Q_ASSERT(dock->window());
if (Platform::instance()->tests_waitForWindowActive(dock->view()->window(), 1000)) {
return dock;
}
qWarning() << Q_FUNC_INFO << "Couldn't activate window";
return nullptr;
} else {
return dock;
}
};
inline EmbeddedWindow *createEmbeddedMainWindow(QSize sz)
{
static int count = 0;

27
tests/utils.cpp
View File

@@ -60,33 +60,6 @@ KDDockWidgets::Tests::createMainWindow(QSize sz, KDDockWidgets::MainWindowOption
return ptr;
}
Controllers::DockWidget *KDDockWidgets::Tests::createDockWidget(const QString &name, QWidgetOrQuick *w,
Controllers::DockWidget::Options options,
Controllers::DockWidget::LayoutSaverOptions layoutSaverOptions,
bool show,
const QString &affinityName)
{
w->setFocusPolicy(Qt::StrongFocus);
auto dock = new Controllers::DockWidget(name, options, layoutSaverOptions);
dock->setAffinityName(affinityName);
dock->setGuestView(std::shared_ptr<ViewWrapper>(new Views::ViewWrapper_qtwidgets(w)));
dock->setObjectName(name);
dock->view()->setGeometry(QRect(0, 0, 400, 400));
if (show) {
dock->show();
dock->dptr()->morphIntoFloatingWindow();
dock->view()->activateWindow();
Q_ASSERT(dock->window());
if (Platform::instance()->tests_waitForWindowActive(dock->view()->window(), 1000)) {
return dock;
}
qWarning() << Q_FUNC_INFO << "Couldn't activate window";
return nullptr;
} else {
return dock;
}
};
Controllers::DockWidget *KDDockWidgets::Tests::createDockWidget(const QString &name, View *guest,
Controllers::DockWidget::Options options,
Controllers::DockWidget::LayoutSaverOptions layoutSaverOptions,

5
tests/utils.h
View File

@@ -137,11 +137,6 @@ std::unique_ptr<Controllers::MainWindow> createMainWindow(QSize sz = { 1000, 100
std::unique_ptr<Controllers::MainWindow> createMainWindow(QVector<DockDescriptor> &docks);
Controllers::DockWidget *createDockWidget(const QString &name, QWidgetOrQuick *w,
Controllers::DockWidget::Options options = {},
Controllers::DockWidget::LayoutSaverOptions layoutSaverOptions = {},
bool show = true, const QString &affinityName = {});
Controllers::DockWidget *createDockWidget(const QString &name, View *guest,
Controllers::DockWidget::Options options = {},
Controllers::DockWidget::LayoutSaverOptions layoutSaverOptions = {},