diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-03-26 17:07:27 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-03-27 14:41:18 +0000 |
commit | 01cb3ff9d191a02cf59b1904ed8eaa79fa7e5c9a (patch) | |
tree | 088421ef9a37db61154aa9381ae4b26d7ebdeabb /src/quick | |
parent | 8756ab658ac283850d275dfd315b55904fb02259 (diff) |
QQuickPointerHandler: make classBegin and componentComplete protected
They are public in QQmlParserStatus but don't need to be public here.
Also de-inline the default implementations, because this class will
be public C++ API eventually.
Change-Id: Ic7dfbec853e3d20f45b361401f710dedb5eae416
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/handlers/qquickpointerhandler.cpp | 10 | ||||
-rw-r--r-- | src/quick/handlers/qquickpointerhandler_p.h | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/quick/handlers/qquickpointerhandler.cpp b/src/quick/handlers/qquickpointerhandler.cpp index 959030b8fe..e5b1dc8985 100644 --- a/src/quick/handlers/qquickpointerhandler.cpp +++ b/src/quick/handlers/qquickpointerhandler.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** 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. @@ -245,6 +245,14 @@ void QQuickPointerHandler::setGrabPermissions(GrabPermissions grabPermission) emit grabPermissionChanged(); } +void QQuickPointerHandler::classBegin() +{ +} + +void QQuickPointerHandler::componentComplete() +{ +} + /*! \internal Acquire or give up the exclusive grab of the given \a point, according to diff --git a/src/quick/handlers/qquickpointerhandler_p.h b/src/quick/handlers/qquickpointerhandler_p.h index 9ea6a8b5e2..e2bcce8fc9 100644 --- a/src/quick/handlers/qquickpointerhandler_p.h +++ b/src/quick/handlers/qquickpointerhandler_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** 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. @@ -106,9 +106,6 @@ public: GrabPermissions grabPermissions() const { return static_cast<GrabPermissions>(m_grabPermissions); } void setGrabPermissions(GrabPermissions grabPermissions); - void classBegin() override { } - void componentComplete() override { } - Q_SIGNALS: void enabledChanged(); void activeChanged(); @@ -118,6 +115,9 @@ Q_SIGNALS: void canceled(QQuickEventPoint *point); protected: + void classBegin() override; + void componentComplete() override; + QQuickPointerEvent *currentEvent() { return m_currentEvent; } virtual bool wantsPointerEvent(QQuickPointerEvent *event); virtual void handlePointerEventImpl(QQuickPointerEvent *event); |