1 files changed, 16 insertions, 53 deletions

diff --git a/src/quick/handlers/qquicksinglepointhandler_p.h b/src/quick/handlers/qquicksinglepointhandler_p.h
index 7bf8eff999..b35c5805e1 100644
--- a/src/quick/handlers/qquicksinglepointhandler_p.h
+++ b/src/quick/handlers/qquicksinglepointhandler_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQuick module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QQUICKPOINTERSINGLEHANDLER_H
 #define QQUICKPOINTERSINGLEHANDLER_H
@@ -56,41 +20,40 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICK_PRIVATE_EXPORT QQuickSinglePointHandler : public QQuickPointerDeviceHandler
+class QQuickSinglePointHandlerPrivate;
+
+class Q_QUICK_EXPORT QQuickSinglePointHandler : public QQuickPointerDeviceHandler
 {
     Q_OBJECT
     Q_PROPERTY(QQuickHandlerPoint point READ point NOTIFY pointChanged)
+
 public:
     explicit QQuickSinglePointHandler(QQuickItem *parent = nullptr);
 
-    QQuickHandlerPoint point() const { return m_pointInfo; }
+    QQuickHandlerPoint point() const;
 
 Q_SIGNALS:
     void pointChanged();
 
 protected:
-    bool wantsPointerEvent(QQuickPointerEvent *event) override;
-    void handlePointerEventImpl(QQuickPointerEvent *event) override;
-    virtual void handleEventPoint(QQuickEventPoint *point) = 0;
+    QQuickSinglePointHandler(QQuickSinglePointHandlerPrivate &dd, QQuickItem *parent);
+
+    bool wantsPointerEvent(QPointerEvent *event) override;
+    void handlePointerEventImpl(QPointerEvent *event) override;
+    virtual void handleEventPoint(QPointerEvent *event, QEventPoint &point);
 
-    QQuickEventPoint *currentPoint(QQuickPointerEvent *ev) { return ev->pointById(m_pointInfo.m_id); }
-    void onGrabChanged(QQuickPointerHandler *grabber, QQuickEventPoint::GrabTransition transition, QQuickEventPoint *point) override;
+    QEventPoint &currentPoint(QPointerEvent *ev);
+    void onGrabChanged(QQuickPointerHandler *grabber, QPointingDevice::GrabTransition transition, QPointerEvent *event, QEventPoint &point) override;
 
     void setIgnoreAdditionalPoints(bool v = true);
 
-    void moveTarget(QPointF pos, QQuickEventPoint *point);
+    void moveTarget(QPointF pos, QEventPoint &point);
 
     void setPointId(int id);
 
-    void reset();
-
-private:
-    QQuickHandlerPoint m_pointInfo;
-    bool m_ignoreAdditionalPoints = false;
+    Q_DECLARE_PRIVATE(QQuickSinglePointHandler)
 };
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickSinglePointHandler)
-
 #endif // QQUICKPOINTERSINGLEHANDLER_H