From 688e5da4e71cb5262fcd689e9067070b312a6fc4 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Fri, 10 Apr 2020 12:55:43 +0200 Subject: Remove obsolete storage, constructors and accessors in QEvent subclasses Change-Id: I5c51244031ff40f1972106ad4fe27010c8be1193 Reviewed-by: Volker Hilsheimer --- src/gui/kernel/qwindowsysteminterface.cpp | 83 ++----------------------------- 1 file changed, 3 insertions(+), 80 deletions(-) (limited to 'src/gui/kernel/qwindowsysteminterface.cpp') diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index 5658968de4..42676fbf3e 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -367,31 +367,6 @@ QT_DEFINE_QPA_EVENT_HANDLER(bool, handleCloseEvent, QWindow *window) \a w == 0 means that the event is in global coords only, \a local will be ignored in this case */ -#if QT_DEPRECATED_SINCE(5, 11) -QT_DEFINE_QPA_EVENT_HANDLER(bool, handleMouseEvent, QWindow *window, const QPointF &local, const QPointF &global, Qt::MouseButtons b, - Qt::KeyboardModifiers mods, Qt::MouseEventSource source) -{ - return handleMouseEvent(window, local, global, b, Qt::NoButton, QEvent::None, mods, source); -} - -QT_DEFINE_QPA_EVENT_HANDLER(bool, handleMouseEvent, QWindow *window, ulong timestamp, const QPointF &local, const QPointF &global, Qt::MouseButtons b, - Qt::KeyboardModifiers mods, Qt::MouseEventSource source) -{ - return handleMouseEvent(window, timestamp, local, global, b, Qt::NoButton, QEvent::None, mods, source); -} - -bool QWindowSystemInterface::handleFrameStrutMouseEvent(QWindow *window, const QPointF &local, const QPointF &global, Qt::MouseButtons b, - Qt::KeyboardModifiers mods, Qt::MouseEventSource source) -{ - return handleFrameStrutMouseEvent(window, local, global, b, Qt::NoButton, QEvent::None, mods, source); -} - -bool QWindowSystemInterface::handleFrameStrutMouseEvent(QWindow *window, ulong timestamp, const QPointF &local, const QPointF &global, Qt::MouseButtons b, - Qt::KeyboardModifiers mods, Qt::MouseEventSource source) -{ - return handleFrameStrutMouseEvent(window, timestamp, local, global, b, Qt::NoButton, QEvent::None, mods, source); -} -#endif // QT_DEPRECATED_SINCE(5, 11) QT_DEFINE_QPA_EVENT_HANDLER(bool, handleMouseEvent, QWindow *window, const QPointF &local, const QPointF &global, Qt::MouseButtons state, @@ -548,22 +523,6 @@ QWindowSystemInterfacePrivate::WheelEvent::WheelEvent(QWindow *window, ulong tim { } -#if QT_DEPRECATED_SINCE(5, 10) -bool QWindowSystemInterface::handleWheelEvent(QWindow *window, const QPointF &local, const QPointF &global, int d, Qt::Orientation o, Qt::KeyboardModifiers mods) { - unsigned long time = QWindowSystemInterfacePrivate::eventTime.elapsed(); -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - return handleWheelEvent(window, time, local, global, d, o, mods); -QT_WARNING_POP -} - -bool QWindowSystemInterface::handleWheelEvent(QWindow *window, ulong timestamp, const QPointF &local, const QPointF &global, int d, Qt::Orientation o, Qt::KeyboardModifiers mods) -{ - QPoint point = (o == Qt::Vertical) ? QPoint(0, d) : QPoint(d, 0); - return handleWheelEvent(window, timestamp, local, global, QPoint(), point, mods); -} -#endif // QT_DEPRECATED_SINCE(5, 10) - bool QWindowSystemInterface::handleWheelEvent(QWindow *window, const QPointF &local, const QPointF &global, QPoint pixelDelta, QPoint angleDelta, Qt::KeyboardModifiers mods, Qt::ScrollPhase phase, Qt::MouseEventSource source) { unsigned long time = QWindowSystemInterfacePrivate::eventTime.elapsed(); @@ -688,7 +647,7 @@ QList p.setState(point->state); p.setScreenPos(QHighDpi::fromNativePixels(point->area.center(), window)); - p.setEllipseDiameters(point->area.size()); + p.setEllipseDiameters(QHighDpi::fromNativePixels(point->area.size(), window)); // The local pos and rect are not set, they will be calculated // when the event gets processed by QGuiApplication. @@ -751,6 +710,7 @@ QList p.normalPosition = QHighDpi::toNativeLocalPosition(pt.normalizedPos(), window); QRectF area(QPointF(), pt.ellipseDiameters()); area.moveCenter(pt.screenPos()); + // TODO store ellipseDiameters in QWindowSystemInterface::TouchPoint or just use QTouchEvent::TouchPoint p.area = QHighDpi::toNativePixels(area, window); p.pressure = pt.pressure(); p.state = pt.state(); @@ -899,23 +859,6 @@ QT_DEFINE_QPA_EVENT_HANDLER(void, handleThemeChange, QWindow *window) } #if QT_CONFIG(draganddrop) -#if QT_DEPRECATED_SINCE(5, 11) -QPlatformDragQtResponse QWindowSystemInterface::handleDrag(QWindow *window, const QMimeData *dropData, - const QPoint &p, Qt::DropActions supportedActions) -{ - return QGuiApplicationPrivate::processDrag(window, dropData, p, supportedActions, - QGuiApplication::mouseButtons(), - QGuiApplication::keyboardModifiers()); -} - -QPlatformDropQtResponse QWindowSystemInterface::handleDrop(QWindow *window, const QMimeData *dropData, - const QPoint &p, Qt::DropActions supportedActions) -{ - return QGuiApplicationPrivate::processDrop(window, dropData, p, supportedActions, - QGuiApplication::mouseButtons(), - QGuiApplication::keyboardModifiers()); -} -#endif // QT_DEPRECATED_SINCE(5, 11) /*! Drag and drop events are sent immediately. @@ -997,26 +940,6 @@ bool QWindowSystemInterface::handleTabletEvent(QWindow *window, const QPointF &l xTilt, yTilt, tangentialPressure, rotation, z, uid, modifiers); } -#if QT_DEPRECATED_SINCE(5, 10) -void QWindowSystemInterface::handleTabletEvent(QWindow *window, ulong timestamp, bool down, const QPointF &local, const QPointF &global, - int device, int pointerType, qreal pressure, int xTilt, int yTilt, - qreal tangentialPressure, qreal rotation, int z, qint64 uid, - Qt::KeyboardModifiers modifiers) -{ - handleTabletEvent(window, timestamp, local, global, device, pointerType, (down ? Qt::LeftButton : Qt::NoButton), pressure, - xTilt, yTilt, tangentialPressure, rotation, z, uid, modifiers); -} - -void QWindowSystemInterface::handleTabletEvent(QWindow *window, bool down, const QPointF &local, const QPointF &global, - int device, int pointerType, qreal pressure, int xTilt, int yTilt, - qreal tangentialPressure, qreal rotation, int z, qint64 uid, - Qt::KeyboardModifiers modifiers) -{ - handleTabletEvent(window, local, global, device, pointerType, (down ? Qt::LeftButton : Qt::NoButton), pressure, - xTilt, yTilt, tangentialPressure, rotation, z, uid, modifiers); -} -#endif // QT_DEPRECATED_SINCE(5, 10) - bool QWindowSystemInterface::handleTabletEnterProximityEvent(ulong timestamp, int device, int pointerType, qint64 uid) { QWindowSystemInterfacePrivate::TabletEnterProximityEvent *e = -- cgit v1.2.3