From 2d75ee6c831ecab52e94313675d48a318ef592e2 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Wed, 9 Nov 2011 09:07:58 +1000 Subject: make one public way to control recognizer Since pointers to the recognizers can be gotten from the manager, the methods to control the recognizers that have reference counting should be the public accessable ones. Make the virtual methods protected. Change-Id: I176315272ded9d5917133ec7cd329c537445b190 Sanity-Review: Qt Sanity Bot Reviewed-by: Lincoln Ramsay Reviewed-by: Alex --- src/sensors/gestures/qsensorgesturerecognizer.cpp | 1 - src/sensors/gestures/qsensorgesturerecognizer.h | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/sensors/gestures/qsensorgesturerecognizer.cpp b/src/sensors/gestures/qsensorgesturerecognizer.cpp index e635ee3a..95d52beb 100644 --- a/src/sensors/gestures/qsensorgesturerecognizer.cpp +++ b/src/sensors/gestures/qsensorgesturerecognizer.cpp @@ -128,7 +128,6 @@ QSensorGestureRecognizer::QSensorGestureRecognizer(QObject *parent) */ QSensorGestureRecognizer::~QSensorGestureRecognizer() { - Q_ASSERT(d_ptr->count == 0); delete d_ptr; } diff --git a/src/sensors/gestures/qsensorgesturerecognizer.h b/src/sensors/gestures/qsensorgesturerecognizer.h index a6726d64..336fddc3 100644 --- a/src/sensors/gestures/qsensorgesturerecognizer.h +++ b/src/sensors/gestures/qsensorgesturerecognizer.h @@ -62,10 +62,6 @@ public: virtual bool isActive() = 0; - virtual void create() = 0; - virtual bool start() = 0; - virtual bool stop() = 0; - void startBackend(); void stopBackend(); void createBackend(); @@ -75,6 +71,11 @@ public: Q_SIGNALS: void detected(const QString &); +protected: + virtual void create() = 0; + virtual bool start() = 0; + virtual bool stop() = 0; + private: QSensorGestureRecognizerPrivate * d_ptr; }; -- cgit v1.2.3