Changed DbusEmitter to DataEmitter

sailfishos · Feb 21, 2011 · d5b67e1 · d5b67e1
1 parent a581d5f
commit d5b67e1
Show file tree

Hide file tree

Showing 23 changed files with 56 additions and 56 deletions.
diff --git a/core/core.pro b/core/core.pro
@@ -44,7 +44,7 @@ SOURCES += sensormanager.cpp \
 
 HEADERS += sensormanager.h \
     sensormanager_a.h \
-    dbusemitter.h \
+    dataemitter.h \
     pusher.h \
     ringbuffer.h \
     producer.h \

diff --git a/core/dbusemitter.h → core/dataemitter.h b/core/dbusemitter.h → core/dataemitter.h
@@ -1,6 +1,6 @@
 /**
-   @file dbusemitter.h
-   @brief D-Bus emitter
+   @file dataemitter.h
+   @brief Data emitter
 
    <p>
    Copyright (C) 2009-2010 Nokia Corporation
@@ -24,26 +24,26 @@
    </p>
  */
 
-#ifndef DBUSEMITTER_H
-#define DBUSEMITTER_H
+#ifndef DATAEMITTER_H
+#define DATAEMITTER_H
 
 #include "pusher.h"
 #include "source.h"
 #include "ringbuffer.h"
 
 
 template <class TYPE>
-class DbusEmitter : public RingBufferReader<TYPE>
+class DataEmitter : public RingBufferReader<TYPE>
 {
 public:
-    DbusEmitter(unsigned chunkSize) :
+    DataEmitter(unsigned chunkSize) :
         chunkSize_(chunkSize),
         chunk_(new TYPE[chunkSize])
     {
         addSource(&source_, "source");
     }
 
-    virtual ~DbusEmitter()
+    virtual ~DataEmitter()
     {
         delete[] chunk_;
     }

diff --git a/examples/sensorplugin/samplesensor.cpp b/examples/sensorplugin/samplesensor.cpp
@@ -31,7 +31,7 @@
 
 SampleSensorChannel::SampleSensorChannel(const QString& id) :
         AbstractSensorChannel(id),
-        DbusEmitter<TimedUnsigned>(10),
+        DataEmitter<TimedUnsigned>(10),
         previousSample_(0, 0)
 {
     SensorManager& sm = SensorManager::instance();

diff --git a/examples/sensorplugin/samplesensor.h b/examples/sensorplugin/samplesensor.h
@@ -30,9 +30,9 @@
 #include "abstractsensor.h"
 #include "abstractchain.h"
 
-// Include the dbus adaptor and dbusemitter base class
+// Include the dbus adaptor and dataemitter base class
 #include "samplesensor_a.h"
-#include "dbusemitter.h"
+#include "dataemitter.h"
 
 // Include required datatypes
 #include "timedunsigned.h"
@@ -42,10 +42,10 @@ class Bin;
 template <class TYPE> class BufferReader;
 class FilterBase;
 
-// Sensors inherit also DbusEmitter
+// Sensors inherit also DataEmitter
 class SampleSensorChannel :
         public AbstractSensorChannel,
-        public DbusEmitter<TimedUnsigned>
+        public DataEmitter<TimedUnsigned>
 {
     Q_OBJECT;
 

diff --git a/sensors/accelerometersensor/accelerometersensor.cpp b/sensors/accelerometersensor/accelerometersensor.cpp
@@ -32,7 +32,7 @@
 
 AccelerometerSensorChannel::AccelerometerSensorChannel(const QString& id) :
         AbstractSensorChannel(id),
-        DbusEmitter<AccelerationData>(10),
+        DataEmitter<AccelerationData>(10),
         previousSample_(0,0,0,0)
 {
     SensorManager& sm = SensorManager::instance();

diff --git a/sensors/accelerometersensor/accelerometersensor.h b/sensors/accelerometersensor/accelerometersensor.h
@@ -30,7 +30,7 @@
 #include "abstractsensor.h"
 #include "abstractchain.h"
 #include "accelerometersensor_a.h"
-#include "dbusemitter.h"
+#include "dataemitter.h"
 #include "datatypes/orientationdata.h"
 
 class Bin;
@@ -46,7 +46,7 @@ class FilterBase;
  */
 class AccelerometerSensorChannel :
         public AbstractSensorChannel,
-        public DbusEmitter<AccelerationData>
+        public DataEmitter<AccelerationData>
 {
     Q_OBJECT;
     Q_PROPERTY(XYZ value READ get);

diff --git a/sensors/alssensor/alssensor.cpp b/sensors/alssensor/alssensor.cpp
@@ -36,7 +36,7 @@
 
 ALSSensorChannel::ALSSensorChannel(const QString& id) :
         AbstractSensorChannel(id),
-        DbusEmitter<TimedUnsigned>(10),
+        DataEmitter<TimedUnsigned>(10),
         previousValue_(0,0)
 #ifdef PROVIDE_CONTEXT_INFO
         ,service(QDBusConnection::systemBus()),

diff --git a/sensors/alssensor/alssensor.h b/sensors/alssensor/alssensor.h
@@ -31,7 +31,7 @@
 #include "deviceadaptor.h"
 #include "abstractsensor.h"
 #include "alssensor_a.h"
-#include "dbusemitter.h"
+#include "dataemitter.h"
 #include "datatypes/timedunsigned.h"
 #include "datatypes/unsigned.h"
 
@@ -51,7 +51,7 @@ class FilterBase;
  */
 class ALSSensorChannel :
         public AbstractSensorChannel,
-        public DbusEmitter<TimedUnsigned>
+        public DataEmitter<TimedUnsigned>
 {
     Q_OBJECT;
     Q_PROPERTY(Unsigned lux READ lux);

diff --git a/sensors/compasssensor/compasssensor.cpp b/sensors/compasssensor/compasssensor.cpp
@@ -32,7 +32,7 @@
 
 CompassSensorChannel::CompassSensorChannel(const QString& id) :
         AbstractSensorChannel(id),
-        DbusEmitter<CompassData>(10),
+        DataEmitter<CompassData>(10),
         declinationCorrection_(false),
         declinationAngle_(0),
         compassData(0, -1, -1)

diff --git a/sensors/compasssensor/compasssensor.h b/sensors/compasssensor/compasssensor.h
@@ -30,7 +30,7 @@
 #include "abstractsensor.h"
 #include "abstractchain.h"
 #include "compasssensor_a.h"
-#include "dbusemitter.h"
+#include "dataemitter.h"
 #include "orientationdata.h"
 #include "datatypes/compass.h"
 
@@ -47,7 +47,7 @@ class FilterBase;
  */
 class CompassSensorChannel :
         public AbstractSensorChannel,
-        public DbusEmitter<CompassData>
+        public DataEmitter<CompassData>
 {
     Q_OBJECT;
 

diff --git a/sensors/gyroscopesensor/gyroscopesensor.cpp b/sensors/gyroscopesensor/gyroscopesensor.cpp
@@ -32,7 +32,7 @@
 
 GyroscopeSensorChannel::GyroscopeSensorChannel(const QString& id) :
         AbstractSensorChannel(id),
-        DbusEmitter<TimedXyzData>(10),
+        DataEmitter<TimedXyzData>(10),
         previousSample_()
 {
     SensorManager& sm = SensorManager::instance();

diff --git a/sensors/gyroscopesensor/gyroscopesensor.h b/sensors/gyroscopesensor/gyroscopesensor.h
@@ -31,7 +31,7 @@
 #include "deviceadaptor.h"
 
 #include "gyroscopesensor_a.h"
-#include "dbusemitter.h"
+#include "dataemitter.h"
 
 #include "datatypes/orientationdata.h"
 #include "datatypes/xyz.h"
@@ -42,7 +42,7 @@ class FilterBase;
 
 class GyroscopeSensorChannel :
         public AbstractSensorChannel,
-        public DbusEmitter<TimedXyzData>
+        public DataEmitter<TimedXyzData>
 {
     Q_OBJECT;
     Q_PROPERTY(XYZ value READ get);

diff --git a/sensors/magnetometersensor/magnetometersensor.cpp b/sensors/magnetometersensor/magnetometersensor.cpp
@@ -33,7 +33,7 @@
 
 MagnetometerSensorChannel::MagnetometerSensorChannel(const QString& id) :
         AbstractSensorChannel(id),
-        DbusEmitter<CalibratedMagneticFieldData>(10),
+        DataEmitter<CalibratedMagneticFieldData>(10),
         scaleFilter_(NULL),
         prevMeasurement_()
 {

diff --git a/sensors/magnetometersensor/magnetometersensor.h b/sensors/magnetometersensor/magnetometersensor.h
@@ -30,7 +30,7 @@
 #include "abstractsensor.h"
 #include "abstractchain.h"
 #include "magnetometersensor_a.h"
-#include "dbusemitter.h"
+#include "dataemitter.h"
 #include "deviceadaptor.h"
 #include "datatypes/orientationdata.h"
 
@@ -43,7 +43,7 @@ class FilterBase;
  */
 class MagnetometerSensorChannel :
         public AbstractSensorChannel,
-        public DbusEmitter<CalibratedMagneticFieldData>
+        public DataEmitter<CalibratedMagneticFieldData>
 {
     Q_OBJECT;
     Q_PROPERTY(MagneticField magneticField READ magneticField);

diff --git a/sensors/orientationsensor/orientationsensor.cpp b/sensors/orientationsensor/orientationsensor.cpp
@@ -32,7 +32,7 @@
 
 OrientationSensorChannel::OrientationSensorChannel(const QString& id) :
         AbstractSensorChannel(id),
-        DbusEmitter<PoseData>(10),
+        DataEmitter<PoseData>(10),
         prevOrientation(PoseData::Undefined)
 {
     SensorManager& sm = SensorManager::instance();

diff --git a/sensors/orientationsensor/orientationsensor.h b/sensors/orientationsensor/orientationsensor.h
@@ -29,7 +29,7 @@
 #include "abstractsensor.h"
 #include "abstractchain.h"
 #include "orientationsensor_a.h"
-#include "dbusemitter.h"
+#include "dataemitter.h"
 #include "datatypes/orientationdata.h"
 #include "datatypes/posedata.h"
 #include "datatypes/unsigned.h"
@@ -47,7 +47,7 @@ class FilterBase;
  */
 class OrientationSensorChannel :
         public AbstractSensorChannel,
-        public DbusEmitter<PoseData>
+        public DataEmitter<PoseData>
 {
     Q_OBJECT;
 

diff --git a/sensors/proximitysensor/proximitysensor.cpp b/sensors/proximitysensor/proximitysensor.cpp
@@ -32,7 +32,7 @@
 
 ProximitySensorChannel::ProximitySensorChannel(const QString& id) :
         AbstractSensorChannel(id),
-        DbusEmitter<TimedUnsigned>(10),
+        DataEmitter<TimedUnsigned>(10),
         previousValue_(0, -1)
 {
     SensorManager& sm = SensorManager::instance();

diff --git a/sensors/proximitysensor/proximitysensor.h b/sensors/proximitysensor/proximitysensor.h
@@ -29,7 +29,7 @@
 
 #include "abstractsensor.h"
 #include "proximitysensor_a.h"
-#include "dbusemitter.h"
+#include "dataemitter.h"
 #include "deviceadaptor.h"
 #include "datatypes/timedunsigned.h"
 #include "datatypes/unsigned.h"
@@ -44,7 +44,7 @@ template <class TYPE> class BufferReader;
  */
 class ProximitySensorChannel :
     public AbstractSensorChannel,
-    public DbusEmitter<TimedUnsigned>
+    public DataEmitter<TimedUnsigned>
 {
     Q_OBJECT;
     Q_PROPERTY(Unsigned proximity READ proximity);

diff --git a/sensors/rotationsensor/rotationsensor.cpp b/sensors/rotationsensor/rotationsensor.cpp
@@ -32,7 +32,7 @@
 
 RotationSensorChannel::RotationSensorChannel(const QString& id) :
         AbstractSensorChannel(id),
-        DbusEmitter<TimedXyzData>(10),
+        DataEmitter<TimedXyzData>(10),
         prevRotation_(0,0,0,0),
         hasZ_(false)
 {

diff --git a/sensors/rotationsensor/rotationsensor.h b/sensors/rotationsensor/rotationsensor.h
@@ -29,7 +29,7 @@
 #include "abstractsensor.h"
 #include "abstractchain.h"
 #include "rotationsensor_a.h"
-#include "dbusemitter.h"
+#include "dataemitter.h"
 #include "datatypes/orientationdata.h"
 
 class Bin;
@@ -41,7 +41,7 @@ class FilterBase;
  */
 class RotationSensorChannel :
         public AbstractSensorChannel,
-        public DbusEmitter<TimedXyzData>
+        public DataEmitter<TimedXyzData>
 {
     Q_OBJECT;
     Q_PROPERTY(XYZ rotation READ rotation);

diff --git a/sensors/tapsensor/tapsensor.cpp b/sensors/tapsensor/tapsensor.cpp
@@ -32,7 +32,7 @@
 
 TapSensorChannel::TapSensorChannel(const QString& id) :
         AbstractSensorChannel(id),
-        DbusEmitter<TapData>(10)
+        DataEmitter<TapData>(10)
 {
     SensorManager& sm = SensorManager::instance();
 

diff --git a/sensors/tapsensor/tapsensor.h b/sensors/tapsensor/tapsensor.h
@@ -30,7 +30,7 @@
 
 #include "abstractsensor.h"
 #include "tapsensor_a.h"
-#include "dbusemitter.h"
+#include "dataemitter.h"
 #include "datatypes/tapdata.h"
 #include "deviceadaptor.h"
 
@@ -50,7 +50,7 @@ class FilterBase;
  */
 class TapSensorChannel :
     public AbstractSensorChannel,
-    public DbusEmitter<TapData>
+    public DataEmitter<TapData>
 {
     Q_OBJECT;