From 3980ab479ab08cdd5f1c6c16e4178d1e7d3cf80d Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 3 Nov 2011 16:08:42 +1000 Subject: make sure newSensorGestureAvailable gets signaled signaling needs to begin in the backend singleton Change-Id: I63453a919a0b5c9e1f093c6269bdfc171a592af9 Sanity-Review: Qt Sanity Bot Reviewed-by: Lincoln Ramsay --- src/sensors/gestures/qsensorgesturemanager.cpp | 6 +++--- src/sensors/gestures/qsensorgesturemanagerprivate.cpp | 1 + src/sensors/gestures/qsensorgesturemanagerprivate_p.h | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/sensors/gestures') diff --git a/src/sensors/gestures/qsensorgesturemanager.cpp b/src/sensors/gestures/qsensorgesturemanager.cpp index a0430e15..cdc3f5fd 100644 --- a/src/sensors/gestures/qsensorgesturemanager.cpp +++ b/src/sensors/gestures/qsensorgesturemanager.cpp @@ -68,6 +68,8 @@ Q_GLOBAL_STATIC(QSensorGestureManagerPrivate, sensorGestureManagerPrivate) QSensorGestureManager::QSensorGestureManager(QObject *parent) : QObject(parent) { + connect(sensorGestureManagerPrivate(),SIGNAL(newSensorGestureAvailable()), + this,SIGNAL(newSensorGestureAvailable())); } /*! @@ -88,9 +90,7 @@ QSensorGestureManager::~QSensorGestureManager() bool QSensorGestureManager::registerSensorGestureRecognizer(QSensorGestureRecognizer *recognizer) { bool ok = sensorGestureManagerPrivate()->registerSensorGestureRecognizer(recognizer); - if (ok) - Q_EMIT newSensorGestureAvailable(); - else + if (!ok) delete recognizer; return ok; diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp index 1ac21da2..1a8ffe38 100644 --- a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp +++ b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp @@ -145,6 +145,7 @@ bool QSensorGestureManagerPrivate::registerSensorGestureRecognizer(QSensorGestur Q_ASSERT (!registeredSensorGestures.contains(recognizer->id())); recognizer->setParent(0); registeredSensorGestures.insert(recognizer->id(),recognizer); + Q_EMIT newSensorGestureAvailable(); return true; } diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h b/src/sensors/gestures/qsensorgesturemanagerprivate_p.h index b97894e7..a166fac7 100644 --- a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h +++ b/src/sensors/gestures/qsensorgesturemanagerprivate_p.h @@ -72,6 +72,8 @@ public: QStringList gestureIds(); QStringList knownIds; void initPlugin(QObject *o); +Q_SIGNALS: + void newSensorGestureAvailable(); }; #endif // QSENSORGESTUREMANAGERPRIVATE_P_H -- cgit v1.2.3