[sensors_plus] Vector change to Encodable::List

packages/sensors_plus/sensors_plus_aurora/aurora/include/sensors_plus_aurora/sensors_plus_aurora_plugin.h

@@ -41,8 +41,8 @@ public slots:
 private:
     template<typename T>
     bool RegisterSensorInterface(QString sensor);
-    void EventChannelNull(std::string channel);
+    void EventChannelNull(const std::string &channel);
-    void EventChannelData(std::string channel, std::vector<Encodable> result);
+    void EventChannelData(const std::string &channel, const Encodable::List &result);
 
     void EnableSensorOrientation();
     void DisableSensorOrientation();

packages/sensors_plus/sensors_plus_aurora/aurora/sensors_plus_aurora_plugin.cpp

@@ -156,12 +156,12 @@ bool SensorsPlusAuroraPlugin::RegisterSensorInterface(QString sensor)
     return true;
 }
 
-void SensorsPlusAuroraPlugin::EventChannelNull(std::string channel)
+void SensorsPlusAuroraPlugin::EventChannelNull(const std::string &channel)
 {
     EventChannel(channel, MethodCodecType::Standard).SendEvent(nullptr);
 }
 
-void SensorsPlusAuroraPlugin::EventChannelData(std::string channel, std::vector<Encodable> result)
+void SensorsPlusAuroraPlugin::EventChannelData(const std::string &channel, const Encodable::List &result)
 {
     EventChannel(channel, MethodCodecType::Standard).SendEvent(result);
 }
@@ -203,9 +203,7 @@ void SensorsPlusAuroraPlugin::DisableSensorOrientation()
 
 void SensorsPlusAuroraPlugin::EventSensorOrientation(const Unsigned &data)
 {
-    std::vector<Encodable> result;
+    EventChannelData(KeyChannel::Orientation, Encodable::List {data.x()});
-    result.push_back(data.x());
-    EventChannelData(KeyChannel::Orientation, result);
 }
 
 /**
@@ -247,11 +245,7 @@ void SensorsPlusAuroraPlugin::DisableSensorAccelerometer()
 
 void SensorsPlusAuroraPlugin::EventSensorAccelerometer(const XYZ &data)
 {
-    std::vector<Encodable> result;
+    EventChannelData(KeyChannel::Accelerometer, Encodable::List {data.x(), data.y(), data.z()});
-    result.push_back(data.x());
-    result.push_back(data.y());
-    result.push_back(data.z());
-    EventChannelData(KeyChannel::Accelerometer, result);
 }
 
 /**
@@ -291,10 +285,7 @@ void SensorsPlusAuroraPlugin::DisableSensorCompass()
 
 void SensorsPlusAuroraPlugin::EventSensorCompass(const Compass &data)
 {
-    std::vector<Encodable> result;
+    EventChannelData(KeyChannel::Compass, Encodable::List {data.degrees(), data.level()});
-    result.push_back(data.degrees());
-    result.push_back(data.level());
-    EventChannelData(KeyChannel::Compass, result);
 }
 
 /**
@@ -333,10 +324,10 @@ void SensorsPlusAuroraPlugin::DisableSensorTap()
 
 void SensorsPlusAuroraPlugin::EventSensorTap(const Tap &data)
 {
-    std::vector<Encodable> result;
+    EventChannelData(KeyChannel::Tap, Encodable::List {
-    result.push_back(static_cast<int>(data.direction()));
+        static_cast<int>(data.direction()),
-    result.push_back(static_cast<int>(data.type()));
+        static_cast<int>(data.type())
-    EventChannelData(KeyChannel::Tap, result);
+    });
 }
 
 /**
@@ -376,9 +367,7 @@ void SensorsPlusAuroraPlugin::DisableSensorALS()
 
 void SensorsPlusAuroraPlugin::EventSensorALS(const Unsigned &data)
 {
-    std::vector<Encodable> result;
+    EventChannelData(KeyChannel::ALS, Encodable::List {data.x()});
-    result.push_back(data.x());
-    EventChannelData(KeyChannel::ALS, result);
 }
 
 /**
@@ -418,9 +407,7 @@ void SensorsPlusAuroraPlugin::DisableSensorProximity()
 
 void SensorsPlusAuroraPlugin::EventSensorProximity(const Proximity &data)
 {
-    std::vector<Encodable> result;
+    EventChannelData(KeyChannel::Proximity, Encodable::List {data.withinProximity() ? 1 : 0});
-    result.push_back(data.withinProximity() ? 1 : 0);
-    EventChannelData(KeyChannel::Proximity, result);
 }
 
 /**
@@ -460,11 +447,7 @@ void SensorsPlusAuroraPlugin::DisableSensorRotation()
 
 void SensorsPlusAuroraPlugin::EventSensorRotation(const XYZ &data)
 {
-    std::vector<Encodable> result;
+    EventChannelData(KeyChannel::Rotation, Encodable::List {data.x(), data.y(), data.z()});
-    result.push_back(data.x());
-    result.push_back(data.y());
-    result.push_back(data.z());
-    EventChannelData(KeyChannel::Rotation, result);
 }
 
 /**
@@ -504,11 +487,7 @@ void SensorsPlusAuroraPlugin::DisableSensorMagnetometer()
 
 void SensorsPlusAuroraPlugin::EventSensorMagnetometer(const MagneticField &data)
 {
-    std::vector<Encodable> result;
+    EventChannelData(KeyChannel::Magnetometer, Encodable::List {data.x(), data.y(), data.z()});
-    result.push_back(data.x());
-    result.push_back(data.y());
-    result.push_back(data.z());
-    EventChannelData(KeyChannel::Magnetometer, result);
 }
 
 #include "moc_sensors_plus_aurora_plugin.cpp"