diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-08-29 17:34:18 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-08-30 11:53:42 +0000 |
| commit | b55aaa7b94d6fc5841d624245d7b65ecfae592a0 (patch) | |
| tree | b3dbab168fe66de65f25c404bc3e5e6a53d5a627 /src/quick | |
| parent | 34a545c2ab821bbba5229df89f47719eb0219d92 (diff) | |
Remove isValid from QQuickPointerEvent
We don't seem to have any use for invalid points, so let's remove the concept.
The debug code first checks the valid property, but then unconditionally
accesses the event, showing that we never had any invalid event in there
in the first place.
Change-Id: I5f8aac16c519f06a151198902cc98097eafacaa8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickevents.cpp | 5 | ||||
| -rw-r--r-- | src/quick/items/qquickevents_p_p.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp index af2ba232f4..d133729625 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -1374,10 +1374,7 @@ Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const QQuickPointerEvent *e QDebugStateSaver saver(dbg); dbg.nospace(); dbg << "QQuickPointerEvent("; - if (event->isValid()) - dbg << event->timestamp(); - else - dbg << "invalid"; + dbg << event->timestamp(); dbg << " dev:"; QtDebugUtils::formatQEnum(dbg, event->device()->type()); if (event->buttons() != Qt::NoButton) { diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index 0d6e06ac41..48c29f00de 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -417,7 +417,6 @@ public: // helpers for C++ only (during event delivery) virtual const QQuickPointerMouseEvent *asPointerMouseEvent() const { return nullptr; } virtual const QQuickPointerTouchEvent *asPointerTouchEvent() const { return nullptr; } virtual const QQuickPointerTabletEvent *asPointerTabletEvent() const { return nullptr; } - bool isValid() const { return m_event != nullptr; } virtual bool allPointsAccepted() const = 0; virtual bool allUpdatedPointsAccepted() const = 0; virtual bool allPointsGrabbed() const = 0; |