diff options
author | Lorn Potter <lorn.potter@nokia.com> | 2012-05-18 13:19:20 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-18 08:07:46 +0200 |
commit | 32e2d98ea438041e7e0c4df7e67053c5ee7527a7 (patch) | |
tree | 857f08a010d230bbb7831281b8ddee4b4473124f /src/sensors/gestures/qsensorgesturemanagerprivate.cpp | |
parent | 8219b470bef74a32b90f1b0289d096285f626d65 (diff) |
fix gestureSignals on simulator builds
remove started and stopped signals and call the manager directly
Change-Id: If2c05576e858c196ab3ba3d786574afbf894ca4b
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src/sensors/gestures/qsensorgesturemanagerprivate.cpp')
-rw-r--r-- | src/sensors/gestures/qsensorgesturemanagerprivate.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp index e3c5f3db..5e2089a9 100644 --- a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp +++ b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp @@ -52,6 +52,8 @@ #include "simulatorgesturescommon_p.h" #endif +Q_GLOBAL_STATIC(QSensorGestureManagerPrivate, sensorGestureManagerPrivate) + QT_BEGIN_NAMESPACE QSensorGestureManagerPrivate::QSensorGestureManagerPrivate(QObject *parent) : @@ -149,11 +151,6 @@ bool QSensorGestureManagerPrivate::loadRecognizer(const QString &recognizerId) delete recognizer; } else { registeredSensorGestures.insert(recognizer->id(),recognizer); - -#ifdef SIMULATOR_BUILD - connect(recognizer, SIGNAL(started()), this, SLOT(recognizerStarted()), Qt::UniqueConnection); - connect(recognizer, SIGNAL(stopped()), this, SLOT(recognizerStopped()), Qt::UniqueConnection); -#endif } } } @@ -221,27 +218,26 @@ void QSensorGestureManagerPrivate::sensorGestureDetected() } } -void QSensorGestureManagerPrivate::recognizerStarted() +void QSensorGestureManagerPrivate::recognizerStarted(const QSensorGestureRecognizer *recognizer) { - QSensorGestureRecognizer *recognizer = qobject_cast<QSensorGestureRecognizer *>(sender()); QStringList list = recognizer->gestureSignals(); list.removeOne(QLatin1String("detected(QString)")); - list.removeOne(QLatin1String("started()")); - list.removeOne(QLatin1String("stopped()")); Q_EMIT newSensorGestures(list); } -void QSensorGestureManagerPrivate::recognizerStopped() +void QSensorGestureManagerPrivate::recognizerStopped(const QSensorGestureRecognizer *recognizer) { - QSensorGestureRecognizer *recognizer = qobject_cast<QSensorGestureRecognizer *>(sender()); QStringList list = recognizer->gestureSignals(); list.removeOne(QLatin1String("detected(QString)")); - list.removeOne(QLatin1String("started()")); - list.removeOne(QLatin1String("stopped()")); Q_EMIT removeSensorGestures(list); } #endif +QSensorGestureManagerPrivate * QSensorGestureManagerPrivate::instance() +{ + return sensorGestureManagerPrivate(); +} + QT_END_NAMESPACE |