fix up a few things in lidsensors

sailfishos · Nov 11, 2016 · 79e88d6 · 79e88d6
1 parent 9fccc9b
commit 79e88d6
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 32 deletions.
diff --git a/core/core.pro b/core/core.pro
@@ -6,6 +6,7 @@ TARGET = sensorfw
 include( ../common-config.pri )
 
 CONFIG += link_pkgconfig
+VERSION = 0.9.0
 
 SENSORFW_INCLUDEPATHS = .. \
                         ../include \

diff --git a/datatypes/liddata.h b/datatypes/liddata.h
@@ -62,4 +62,5 @@ class LidData : public TimedData {
         TimedData(timestamp), type_(type), value_(0) {}
 };
 
+Q_DECLARE_METATYPE(LidData)
 #endif // LidData_H
diff --git a/qt-api/lidsensor_i.cpp b/qt-api/lidsensor_i.cpp
@@ -1,6 +1,6 @@
 /**
-   @file alssensor_i.cpp
-   @brief Interface for ALSSensor
+   @file lidsensor_i.cpp
+   @brief Interface for LidSensor
 
    <p>
    Copyright (C) 2016 Canonical,  Ltd.
@@ -62,15 +62,15 @@ LidSensorChannelInterface* LidSensorChannelInterface::interface(const QString& i
 
 bool LidSensorChannelInterface::dataReceivedImpl()
 {
-    QVector<TimedUnsigned> values;
-    if (!read<TimedUnsigned>(values))
+    QVector<LidData> values;
+    if (!read<LidData>(values))
         return false;
-    foreach(const TimedUnsigned& data, values)
-        emit LidChanged(data);
+    foreach(const LidData &data, values)
+        emit lidChanged(data);
     return true;
 }
 
-Unsigned LidSensorChannelInterface::closed()
+LidData LidSensorChannelInterface::closed()
 {
-    return getAccessor<Unsigned>("closed");
+    return getAccessor<LidData>("closed");
 }
diff --git a/qt-api/lidsensor_i.h b/qt-api/lidsensor_i.h
@@ -28,7 +28,7 @@
 
 #include <QtDBus/QtDBus>
 
-#include "datatypes/unsigned.h"
+#include "datatypes/liddata.h"
 #include "abstractsensor_i.h"
 
 /**
@@ -38,7 +38,7 @@ class LidSensorChannelInterface : public AbstractSensorChannelInterface
 {
     Q_OBJECT
     Q_DISABLE_COPY(LidSensorChannelInterface)
-    Q_PROPERTY(Unsigned closed READ closed)
+    Q_PROPERTY(LidData closed READ closed)
 
 public:
     /**
@@ -60,7 +60,7 @@ class LidSensorChannelInterface : public AbstractSensorChannelInterface
      *
      * @return lid reading.
      */
-    Unsigned closed();
+    LidData closed();
 
     /**
      * Constructor.
@@ -105,7 +105,7 @@ class LidSensorChannelInterface : public AbstractSensorChannelInterface
      *
      * @param value ambient light reading.
      */
-    void LidChanged(const Unsigned& value);
+    void lidChanged(const LidData& value);
 };
 
 namespace local {

diff --git a/sensors/humiditysensor/humiditysensor_a.h b/sensors/humiditysensor/humiditysensor_a.h
@@ -1,5 +1,5 @@
 /**
-   @file alssensor_a.h
+   @file humiditysensor_a.h
    @brief D-Bus adaptor for ALSSensor
 
    <p>

diff --git a/sensors/lidsensor/lidplugin.cpp b/sensors/lidsensor/lidplugin.cpp
@@ -42,7 +42,7 @@ void LidPlugin::Init(class Loader& l)
 }
 
 QStringList LidPlugin::Dependencies() {
-    return QString("lidsensor").split(":", QString::SkipEmptyParts);
+    return QString("lidsensoradaptor").split(":", QString::SkipEmptyParts);
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)

diff --git a/sensors/lidsensor/lidsensor.cpp b/sensors/lidsensor/lidsensor.cpp
@@ -1,6 +1,6 @@
 /**
-   @file alssensor.cpp
-   @brief ALSSensor
+   @file lidsensor.cpp
+   @brief LidSensor
 
    <p>
    Copyright (C) 2016 Canonical,  Ltd.

diff --git a/sensors/lidsensor/lidsensor.h b/sensors/lidsensor/lidsensor.h
@@ -1,6 +1,6 @@
 /**
-   @file alssensor.h
-   @brief ALSSensor
+   @file lidsensor.h
+   @brief LidSensor
 
    <p>
    Copyright (C) 2016 Canonical,  Ltd.

diff --git a/sensors/lidsensor/lidsensor_a.cpp b/sensors/lidsensor/lidsensor_a.cpp
@@ -1,6 +1,6 @@
 /**
-   @file alssensor_a.cpp
-   @brief D-Bus adaptor for ALSSensor
+   @file lidsensor_a.cpp
+   @brief D-Bus adaptor for LidSensor
 
    <p>
    Copyright (C) 2016 Canonical,  Ltd.

diff --git a/sensors/lidsensor/lidsensor_a.h b/sensors/lidsensor/lidsensor_a.h
@@ -1,6 +1,6 @@
 /**
-   @file alssensor_a.h
-   @brief D-Bus adaptor for ALSSensor
+   @file lidsensor_a.h
+   @brief D-Bus adaptor for LidSensor
 
    <p>
    Copyright (C) 2016 Canonical,  Ltd.
@@ -36,7 +36,7 @@ class LidSensorChannelAdaptor : public AbstractSensorChannelAdaptor
 {
     Q_OBJECT
     Q_DISABLE_COPY(LidSensorChannelAdaptor)
-    Q_CLASSINFO("D-Bus Interface", "local.lidsensor")
+    Q_CLASSINFO("D-Bus Interface", "local.LidSensor")
     Q_PROPERTY(Unsigned closed READ closed)
 
 public:
@@ -46,7 +46,7 @@ public Q_SLOTS:
     Unsigned closed() const;
 
 Q_SIGNALS:
-    void LidChanged(bool value);
+    void lidChanged(bool value);
 };
 
 #endif
diff --git a/sensors/pressuresensor/pressuresensor.cpp b/sensors/pressuresensor/pressuresensor.cpp
@@ -1,6 +1,6 @@
 /**
-   @file alssensor.cpp
-   @brief ALSSensor
+   @file pressuresensor.cpp
+   @brief PressureSensor
 
    <p>
    Copyright (C) 2016 Canonical LTD.

diff --git a/sensors/pressuresensor/pressuresensor.h b/sensors/pressuresensor/pressuresensor.h
@@ -1,6 +1,6 @@
 /**
-   @file alssensor.h
-   @brief ALSSensor
+   @file pressuresensor.h
+   @brief PressureSensor
 
    <p>
    Copyright (C) 2016 Canonical LTD.

diff --git a/sensors/pressuresensor/pressuresensor_a.cpp b/sensors/pressuresensor/pressuresensor_a.cpp
@@ -1,6 +1,6 @@
 /**
-   @file alssensor_a.cpp
-   @brief D-Bus adaptor for ALSSensor
+   @file pressuresensor_a.cpp
+   @brief D-Bus adaptor for PressureSensor
 
    <p>
    Copyright (C) 2016 Canonical LTD.

diff --git a/sensors/pressuresensor/pressuresensor_a.h b/sensors/pressuresensor/pressuresensor_a.h
@@ -1,6 +1,6 @@
 /**
-   @file alssensor_a.h
-   @brief D-Bus adaptor for ALSSensor
+   @file pressuresensor_a.h
+   @brief D-Bus adaptor for PressureSensor
 
    <p>
    Copyright (C) 2016 Canonical LTD.