From bb5171fb54fb036e9d231c11e8fc7483978b623f Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 6 Jul 2020 21:54:36 +0200 Subject: Remove unused virtual method QWindowPrivate::allowClickThrough MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Always returned true, also in the QWidgetWindowPrivate override. Change-Id: I01d11ae6f85882b52ce397125f994eea663ffcb5 Reviewed-by: Tor Arne Vestbø --- src/gui/kernel/qwindow_p.h | 3 --- src/plugins/platforms/cocoa/qnsview_mouse.mm | 2 -- src/widgets/kernel/qwidgetwindow.cpp | 6 ------ 3 files changed, 11 deletions(-) (limited to 'src') diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index 24a6e8d3c4..5d9de82295 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -129,9 +129,6 @@ public: static Qt::WindowState effectiveState(Qt::WindowStates); - // ### Qt6: unused - virtual bool allowClickThrough(const QPoint &) const { return true; } - QWindow::SurfaceType surfaceType = QWindow::RasterSurface; Qt::WindowFlags windowFlags = Qt::Window; QWindow *parentWindow = nullptr; diff --git a/src/plugins/platforms/cocoa/qnsview_mouse.mm b/src/plugins/platforms/cocoa/qnsview_mouse.mm index ea8e8d60a6..b55ffd4bcc 100644 --- a/src/plugins/platforms/cocoa/qnsview_mouse.mm +++ b/src/plugins/platforms/cocoa/qnsview_mouse.mm @@ -225,8 +225,6 @@ QPointF windowPoint; QPointF screenPoint; [self convertFromScreen:[NSEvent mouseLocation] toWindowPoint: &windowPoint andScreenPoint: &screenPoint]; - if (!qt_window_private(m_platformWindow->window())->allowClickThrough(screenPoint.toPoint())) - return NO; return YES; } diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index 51e785d0aa..d6817caf96 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -115,7 +115,6 @@ public: if (QWidget *widget = q->widget()) QWidgetPrivate::get(widget)->updateContentsRect(); } - bool allowClickThrough(const QPoint &) const override; }; QRectF QWidgetWindowPrivate::closestAcceptableGeometry(const QRectF &rect) const @@ -231,11 +230,6 @@ static inline bool shouldBePropagatedToWidget(QEvent *event) } } -bool QWidgetWindowPrivate::allowClickThrough(const QPoint &) const -{ - return true; -} - bool QWidgetWindow::event(QEvent *event) { if (!m_widget) -- cgit v1.2.3