diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-08-07 09:55:43 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-08-07 14:05:19 +0200 |
| commit | 26c1748497028912f8ab6661ff90bda5df5173b4 (patch) | |
| tree | 8721fecb50a4a4d737805181b4fb92162f257d0a /src/quick/items/qquickevents.cpp | |
| parent | eb2ac8dadf630451e7d8413dc7a125a7d92abd2b (diff) | |
Rename lcPointerGrab logging category
We will remove QQuickPointerEvent and QQuickEventPoint soon anyway, and
this category along with it, because QEventPoint will track its own
exclusive and passive grabbers. But for now, Qt Quick doesn't call
those setters yet, and we have two logging categories: qt.pointer.grab
and qt.quick.pointer.grab. Since they are exported, they can't have
the same C++ names.
Change-Id: I2f58340643887189ecd77d72813633fc9fb5f595
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/quick/items/qquickevents.cpp')
| -rw-r--r-- | src/quick/items/qquickevents.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp index 0f7e613371..66e850f59c 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(lcPointerEvents, "qt.quick.pointer.events") -Q_LOGGING_CATEGORY(lcPointerGrab, "qt.quick.pointer.grab") +Q_LOGGING_CATEGORY(lcPtrGrab, "qt.quick.pointer.grab") /*! \qmltype KeyEvent @@ -779,8 +779,8 @@ void QQuickEventPoint::setGrabberItem(QQuickItem *grabber) QQuickPointerHandler *oldGrabberHandler = grabberPointerHandler(); if (oldGrabberHandler && !oldGrabberHandler->approveGrabTransition(this, grabber)) return; - if (Q_UNLIKELY(lcPointerGrab().isDebugEnabled())) { - qCDebug(lcPointerGrab) << pointDeviceName(this) << "point" << Qt::hex << m_pointId << pointStateString(this) << "@" << m_scenePos + if (Q_UNLIKELY(lcPtrGrab().isDebugEnabled())) { + qCDebug(lcPtrGrab) << pointDeviceName(this) << "point" << Qt::hex << m_pointId << pointStateString(this) << "@" << m_scenePos << ": grab" << m_exclusiveGrabber << "->" << grabber; } QQuickItem *oldGrabberItem = grabberItem(); @@ -818,13 +818,13 @@ QQuickPointerHandler *QQuickEventPoint::grabberPointerHandler() const */ void QQuickEventPoint::setGrabberPointerHandler(QQuickPointerHandler *grabber, bool exclusive) { - if (Q_UNLIKELY(lcPointerGrab().isDebugEnabled())) { + if (Q_UNLIKELY(lcPtrGrab().isDebugEnabled())) { if (exclusive) { if (m_exclusiveGrabber != grabber) - qCDebug(lcPointerGrab) << pointDeviceName(this) << "point" << Qt::hex << m_pointId << pointStateString(this) + qCDebug(lcPtrGrab) << pointDeviceName(this) << "point" << Qt::hex << m_pointId << pointStateString(this) << ": grab (exclusive)" << m_exclusiveGrabber << "->" << grabber; } else { - qCDebug(lcPointerGrab) << pointDeviceName(this) << "point" << Qt::hex << m_pointId << pointStateString(this) + qCDebug(lcPtrGrab) << pointDeviceName(this) << "point" << Qt::hex << m_pointId << pointStateString(this) << ": grab (passive)" << grabber; } } @@ -886,8 +886,8 @@ void QQuickEventPoint::cancelExclusiveGrabImpl(QTouchEvent *cancelEvent) { if (m_exclusiveGrabber.isNull()) return; - if (Q_UNLIKELY(lcPointerGrab().isDebugEnabled())) { - qCDebug(lcPointerGrab) << pointDeviceName(this) << "point" << Qt::hex << m_pointId << pointStateString(this) + if (Q_UNLIKELY(lcPtrGrab().isDebugEnabled())) { + qCDebug(lcPtrGrab) << pointDeviceName(this) << "point" << Qt::hex << m_pointId << pointStateString(this) << ": grab (exclusive)" << m_exclusiveGrabber << "-> nullptr"; } if (auto handler = grabberPointerHandler()) { @@ -909,8 +909,8 @@ void QQuickEventPoint::cancelExclusiveGrabImpl(QTouchEvent *cancelEvent) void QQuickEventPoint::cancelPassiveGrab(QQuickPointerHandler *handler) { if (removePassiveGrabber(handler)) { - if (Q_UNLIKELY(lcPointerGrab().isDebugEnabled())) { - qCDebug(lcPointerGrab) << pointDeviceName(this) << "point" << Qt::hex << m_pointId << pointStateString(this) + if (Q_UNLIKELY(lcPtrGrab().isDebugEnabled())) { + qCDebug(lcPtrGrab) << pointDeviceName(this) << "point" << Qt::hex << m_pointId << pointStateString(this) << ": grab (passive)" << handler << "removed"; } handler->onGrabChanged(handler, CancelGrabPassive, this); |