diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:56:51 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:56:51 +0200 |
commit | 7e515c17df4e145c804f5d53458b8ac8845dcbb6 (patch) | |
tree | c6862d33216c87be3e816e9b7fd6d34ed61730b8 /src/plugins/sensors/sensorfw/sensorfwsensorbase.h | |
parent | b9342258fdbd90783f035285db14fa4825d717bc (diff) | |
parent | 4682c6c1fddbf364d428d5b1b1b052e7781905e0 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I78c9a02406695ce145b93a46cfa60961e40fc2dc
Diffstat (limited to 'src/plugins/sensors/sensorfw/sensorfwsensorbase.h')
-rw-r--r-- | src/plugins/sensors/sensorfw/sensorfwsensorbase.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h index 1c2aa0e0..2fc8238d 100644 --- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h +++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h @@ -43,17 +43,18 @@ #ifndef SENSORFWSENSORBASE_H #define SENSORFWSENSORBASE_H -#include <qsensorbackend.h> +#include <QtSensors/qsensorbackend.h> #include <sensormanagerinterface.h> #include <abstractsensor_i.h> -#include <QAmbientLightSensor> -#include <QIRProximitySensor> -#include <QTapSensor> -#include <QProximitySensor> +#include <QtSensors/QAmbientLightSensor> +#include <QtSensors/QIRProximitySensor> +#include <QtSensors/QTapSensor> +#include <QtSensors/QProximitySensor> class SensorfwSensorBase : public QSensorBackend { + Q_OBJECT public: SensorfwSensorBase(QSensor *sensor); virtual ~SensorfwSensorBase(); @@ -170,6 +171,12 @@ private: bool doConnectAfterCheck(); int m_efficientBufferSize, m_maxBufferSize; + QDBusServiceWatcher *watcher; + bool m_available; + bool running; +private slots: + void connectToSensord(); + void sensordUnregistered(); }; #endif |