From 6386bafb40f9d172f80d20cac824b7018e0a37a4 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Wed, 10 Dec 2014 13:30:11 +0100
Subject: Use categorized logging for QGestureManager.

Task-number: QTBUG-40461
Task-number: QTBUG-15768
Task-number: QTBUG-38925
Change-Id: I4b422b2b041a44ee8c24683ab2947cccfe422126
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
 src/widgets/kernel/qgesturemanager.cpp | 53 +++++++++++++++-------------------
 1 file changed, 24 insertions(+), 29 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp
index f0aceaacf7..0dcb88fb39 100644
--- a/src/widgets/kernel/qgesturemanager.cpp
+++ b/src/widgets/kernel/qgesturemanager.cpp
@@ -51,18 +51,14 @@
 #endif
 
 #include "qdebug.h"
-
-// #define GESTURE_DEBUG
-#ifndef GESTURE_DEBUG
-# define DEBUG if (0) qDebug
-#else
-# define DEBUG qDebug
-#endif
+#include <QtCore/QLoggingCategory>
 
 #ifndef QT_NO_GESTURES
 
 QT_BEGIN_NAMESPACE
 
+Q_LOGGING_CATEGORY(lcGestureManager, "qt.widgets.gestures")
+
 #if !defined(Q_OS_OSX)
 static inline int panTouchPoints()
 {
@@ -231,9 +227,8 @@ QGesture *QGestureManager::getState(QObject *object, QGestureRecognizer *recogni
         // if the recognizer didn't fill in the gesture type, then this
         // is a custom gesture with autogenerated id and we fill it.
         state->d_func()->gestureType = type;
-#if defined(GESTURE_DEBUG)
-        state->setObjectName(QString::number((int)type));
-#endif
+        if (lcGestureManager().isDebugEnabled())
+            state->setObjectName(QString::number((int)type));
     }
     m_objectGestures[QGestureManager::ObjectGesture(object, type)].append(state);
     m_gestureToRecognizer[state] = recognizer;
@@ -275,26 +270,26 @@ bool QGestureManager::filterEventThroughContexts(const QMultiMap<QObject *,
             QGestureRecognizer::Result recognizerState = recognizerResult & QGestureRecognizer::ResultState_Mask;
             QGestureRecognizer::Result resultHint = recognizerResult & QGestureRecognizer::ResultHint_Mask;
             if (recognizerState == QGestureRecognizer::TriggerGesture) {
-                DEBUG() << "QGestureManager:Recognizer: gesture triggered: " << state;
+                qCDebug(lcGestureManager) << "QGestureManager:Recognizer: gesture triggered: " << state << event;
                 triggeredGestures << state;
             } else if (recognizerState == QGestureRecognizer::FinishGesture) {
-                DEBUG() << "QGestureManager:Recognizer: gesture finished: " << state;
+                qCDebug(lcGestureManager) << "QGestureManager:Recognizer: gesture finished: " << state << event;
                 finishedGestures << state;
             } else if (recognizerState == QGestureRecognizer::MayBeGesture) {
-                DEBUG() << "QGestureManager:Recognizer: maybe gesture: " << state;
+                qCDebug(lcGestureManager) << "QGestureManager:Recognizer: maybe gesture: " << state << event;
                 newMaybeGestures << state;
             } else if (recognizerState == QGestureRecognizer::CancelGesture) {
-                DEBUG() << "QGestureManager:Recognizer: not gesture: " << state;
+                qCDebug(lcGestureManager) << "QGestureManager:Recognizer: not gesture: " << state << event;
                 notGestures << state;
             } else if (recognizerState == QGestureRecognizer::Ignore) {
-                DEBUG() << "QGestureManager:Recognizer: ignored the event: " << state;
+                qCDebug(lcGestureManager) << "QGestureManager:Recognizer: ignored the event: " << state << event;
             } else {
-                DEBUG() << "QGestureManager:Recognizer: hm, lets assume the recognizer"
-                        << "ignored the event: " << state;
+                qCDebug(lcGestureManager) << "QGestureManager:Recognizer: hm, lets assume the recognizer"
+                        << "ignored the event: " << state << event;
             }
             if (resultHint & QGestureRecognizer::ConsumeEventHint) {
-                DEBUG() << "QGestureManager: we were asked to consume the event: "
-                        << state;
+                qCDebug(lcGestureManager) << "QGestureManager: we were asked to consume the event: "
+                        << state << event;
                 consumeEventHint = true;
             }
         }
@@ -363,7 +358,7 @@ bool QGestureManager::filterEventThroughContexts(const QMultiMap<QObject *,
         if (!m_activeGestures.isEmpty() || !m_maybeGestures.isEmpty() ||
             !startedGestures.isEmpty() || !triggeredGestures.isEmpty() ||
             !finishedGestures.isEmpty() || !canceledGestures.isEmpty()) {
-            DEBUG() << "QGestureManager::filterEventThroughContexts:"
+            qCDebug(lcGestureManager) << "QGestureManager::filterEventThroughContexts:"
                     << "\n\tactiveGestures:" << m_activeGestures
                     << "\n\tmaybeGestures:" << m_maybeGestures
                     << "\n\tstarted:" << startedGestures
@@ -381,7 +376,7 @@ bool QGestureManager::filterEventThroughContexts(const QMultiMap<QObject *,
             if (undeliveredGestures.contains(g))
                 continue;
             if (g->gestureCancelPolicy() == QGesture::CancelAllInContext) {
-                DEBUG() << "lets try to cancel some";
+                qCDebug(lcGestureManager) << "lets try to cancel some";
                 // find gestures in context in Qt::GestureStarted or Qt::GestureUpdated state and cancel them
                 cancelGesturesForChildren(g);
             }
@@ -421,7 +416,7 @@ void QGestureManager::cancelGesturesForChildren(QGesture *original)
         QWidget *widget = m_gestureTargets.value(*iter);
         // note that we don't touch the gestures for our originatingWidget
         if (widget != originatingWidget && originatingWidget->isAncestorOf(widget)) {
-            DEBUG() << "  found a gesture to cancel" << (*iter);
+            qCDebug(lcGestureManager) << "  found a gesture to cancel" << (*iter);
             (*iter)->d_func()->state = Qt::GestureCanceled;
             cancelledGestures << *iter;
             iter = m_activeGestures.erase(iter);
@@ -648,7 +643,7 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures,
                 normalStartedGestures[target].append(gesture);
             }
         } else {
-            DEBUG() << "QGestureManager::deliverEvent: could not find the target for gesture"
+            qCDebug(lcGestureManager) << "QGestureManager::deliverEvent: could not find the target for gesture"
                     << gesture->gestureType();
             qWarning("QGestureManager::deliverEvent: could not find the target for gesture");
             undeliveredGestures->insert(gesture);
@@ -656,7 +651,7 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures,
     }
 
     getGestureTargets(startedGestures, &conflictedGestures, &normalStartedGestures);
-    DEBUG() << "QGestureManager::deliverEvents:"
+    qCDebug(lcGestureManager) << "QGestureManager::deliverEvents:"
             << "\nstarted: " << startedGestures
             << "\nconflicted: " << conflictedGestures
             << "\nnormal: " << normalStartedGestures
@@ -667,7 +662,7 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures,
         e = conflictedGestures.constEnd(); it != e; ++it) {
         QWidget *receiver = it.key();
         QList<QGesture *> gestures = it.value();
-        DEBUG() << "QGestureManager::deliverEvents: sending GestureOverride to"
+        qCDebug(lcGestureManager) << "QGestureManager::deliverEvents: sending GestureOverride to"
                 << receiver
                 << "gestures:" << gestures;
         QGestureEvent event(gestures);
@@ -683,13 +678,13 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures,
             if (eventAccepted || event.isAccepted(gesture)) {
                 QWidget *w = event.m_targetWidgets.value(gesture->gestureType(), 0);
                 Q_ASSERT(w);
-                DEBUG() << "override event: gesture was accepted:" << gesture << w;
+                qCDebug(lcGestureManager) << "override event: gesture was accepted:" << gesture << w;
                 QList<QGesture *> &gestures = normalStartedGestures[w];
                 gestures.append(gesture);
                 // override the target
                 m_gestureTargets[gesture] = w;
             } else {
-                DEBUG() << "override event: gesture wasn't accepted. putting back:" << gesture;
+                qCDebug(lcGestureManager) << "override event: gesture wasn't accepted. putting back:" << gesture;
                 QList<QGesture *> &gestures = normalStartedGestures[receiver];
                 gestures.append(gesture);
             }
@@ -700,7 +695,7 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures,
     for (GesturesPerWidget::const_iterator it = normalStartedGestures.constBegin(),
         e = normalStartedGestures.constEnd(); it != e; ++it) {
         if (!it.value().isEmpty()) {
-            DEBUG() << "QGestureManager::deliverEvents: sending to" << it.key()
+            qCDebug(lcGestureManager) << "QGestureManager::deliverEvents: sending to" << it.key()
                     << "gestures:" << it.value();
             QGestureEvent event(it.value());
             QApplication::sendEvent(it.key(), &event);
@@ -710,7 +705,7 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures,
                     (eventAccepted || event.isAccepted(gesture))) {
                     QWidget *w = event.m_targetWidgets.value(gesture->gestureType(), 0);
                     Q_ASSERT(w);
-                    DEBUG() << "started gesture was delivered and accepted by" << w;
+                    qCDebug(lcGestureManager) << "started gesture was delivered and accepted by" << w;
                     m_gestureTargets[gesture] = w;
                 }
             }
-- 
cgit v1.2.3