From 5ac46a5368102502ba85e3404672b950975b6214 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Wed, 15 Feb 2017 12:53:39 +0100 Subject: Mark accessors as const Change-Id: I32afa9f74e428ee7c19369aad173c72f193f526f Reviewed-by: Oliver Wolff Reviewed-by: Titta Heikkala --- tradeshow/iot-sensortag/demodataproviderpool.cpp | 40 +++++++++--------- tradeshow/iot-sensortag/demodataproviderpool.h | 40 +++++++++--------- tradeshow/iot-sensortag/sensortagdataprovider.cpp | 51 ++++++++++++----------- tradeshow/iot-sensortag/sensortagdataprovider.h | 50 +++++++++++----------- 4 files changed, 91 insertions(+), 90 deletions(-) (limited to 'tradeshow') diff --git a/tradeshow/iot-sensortag/demodataproviderpool.cpp b/tradeshow/iot-sensortag/demodataproviderpool.cpp index c4c6ff3..ccaf7fd 100644 --- a/tradeshow/iot-sensortag/demodataproviderpool.cpp +++ b/tradeshow/iot-sensortag/demodataproviderpool.cpp @@ -76,7 +76,7 @@ QString DemoCloudProvider::versionString() const return QString(); } -double DemoCloudProvider::getRelativeHumidity() +double DemoCloudProvider::getRelativeHumidity() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Humidity) @@ -85,7 +85,7 @@ double DemoCloudProvider::getRelativeHumidity() return 0; } -double DemoCloudProvider::getInfraredAmbientTemperature() +double DemoCloudProvider::getInfraredAmbientTemperature() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::AmbientTemperature) @@ -94,7 +94,7 @@ double DemoCloudProvider::getInfraredAmbientTemperature() return 0; } -double DemoCloudProvider::getInfraredObjectTemperature() +double DemoCloudProvider::getInfraredObjectTemperature() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::ObjectTemperature) @@ -103,7 +103,7 @@ double DemoCloudProvider::getInfraredObjectTemperature() return 0; } -double DemoCloudProvider::getLightIntensityLux() +double DemoCloudProvider::getLightIntensityLux() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Light) @@ -112,7 +112,7 @@ double DemoCloudProvider::getLightIntensityLux() return 0; } -double DemoCloudProvider::getBarometerCelsiusTemperature() +double DemoCloudProvider::getBarometerCelsiusTemperature() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::AirPressure) @@ -121,7 +121,7 @@ double DemoCloudProvider::getBarometerCelsiusTemperature() return 0; } -double DemoCloudProvider::getBarometerTemperatureAverage() +double DemoCloudProvider::getBarometerTemperatureAverage() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::AirPressure) @@ -130,7 +130,7 @@ double DemoCloudProvider::getBarometerTemperatureAverage() return 0; } -double DemoCloudProvider::getBarometer_hPa() +double DemoCloudProvider::getBarometer_hPa() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::AirPressure) @@ -139,7 +139,7 @@ double DemoCloudProvider::getBarometer_hPa() return 0; } -float DemoCloudProvider::getGyroscopeX_degPerSec() +float DemoCloudProvider::getGyroscopeX_degPerSec() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Magnetometer) @@ -148,7 +148,7 @@ float DemoCloudProvider::getGyroscopeX_degPerSec() return 0; } -float DemoCloudProvider::getGyroscopeY_degPerSec() +float DemoCloudProvider::getGyroscopeY_degPerSec() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Magnetometer) @@ -157,7 +157,7 @@ float DemoCloudProvider::getGyroscopeY_degPerSec() return 0; } -float DemoCloudProvider::getGyroscopeZ_degPerSec() +float DemoCloudProvider::getGyroscopeZ_degPerSec() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Magnetometer) @@ -166,7 +166,7 @@ float DemoCloudProvider::getGyroscopeZ_degPerSec() return 0; } -float DemoCloudProvider::getAccelometer_xAxis() +float DemoCloudProvider::getAccelometer_xAxis() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Accelometer) @@ -175,7 +175,7 @@ float DemoCloudProvider::getAccelometer_xAxis() return 0; } -float DemoCloudProvider::getAccelometer_yAxis() +float DemoCloudProvider::getAccelometer_yAxis() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Accelometer) @@ -184,7 +184,7 @@ float DemoCloudProvider::getAccelometer_yAxis() return 0; } -float DemoCloudProvider::getAccelometer_zAxis() +float DemoCloudProvider::getAccelometer_zAxis() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Accelometer) @@ -193,7 +193,7 @@ float DemoCloudProvider::getAccelometer_zAxis() return 0; } -float DemoCloudProvider::getMagnetometerMicroT_xAxis() +float DemoCloudProvider::getMagnetometerMicroT_xAxis() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Magnetometer) @@ -202,7 +202,7 @@ float DemoCloudProvider::getMagnetometerMicroT_xAxis() return 0; } -float DemoCloudProvider::getMagnetometerMicroT_yAxis() +float DemoCloudProvider::getMagnetometerMicroT_yAxis() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Magnetometer) @@ -211,7 +211,7 @@ float DemoCloudProvider::getMagnetometerMicroT_yAxis() return 0; } -float DemoCloudProvider::getMagnetometerMicroT_zAxis() +float DemoCloudProvider::getMagnetometerMicroT_zAxis() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Magnetometer) @@ -220,7 +220,7 @@ float DemoCloudProvider::getMagnetometerMicroT_zAxis() return 0; } -float DemoCloudProvider::getRotationX() +float DemoCloudProvider::getRotationX() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Rotation) @@ -229,7 +229,7 @@ float DemoCloudProvider::getRotationX() return 0; } -float DemoCloudProvider::getRotationY() +float DemoCloudProvider::getRotationY() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Rotation) @@ -238,7 +238,7 @@ float DemoCloudProvider::getRotationY() return 0; } -float DemoCloudProvider::getRotationZ() +float DemoCloudProvider::getRotationZ() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Rotation) @@ -247,7 +247,7 @@ float DemoCloudProvider::getRotationZ() return 0; } -float DemoCloudProvider::getAltitude() +float DemoCloudProvider::getAltitude() const { for (SensorTagDataProvider *p : qAsConst(m_dataProviders)) { if (p->tagType() & SensorTagDataProvider::Altitude) diff --git a/tradeshow/iot-sensortag/demodataproviderpool.h b/tradeshow/iot-sensortag/demodataproviderpool.h index 9692508..24a2136 100644 --- a/tradeshow/iot-sensortag/demodataproviderpool.h +++ b/tradeshow/iot-sensortag/demodataproviderpool.h @@ -87,26 +87,26 @@ public: QString sensorType() const override; QString versionString() const override; - double getRelativeHumidity() override; - double getInfraredAmbientTemperature() override; - double getInfraredObjectTemperature() override; - double getLightIntensityLux() override; - double getBarometerCelsiusTemperature() override; - double getBarometerTemperatureAverage() override; - double getBarometer_hPa() override; - float getGyroscopeX_degPerSec() override; - float getGyroscopeY_degPerSec() override; - float getGyroscopeZ_degPerSec() override; - float getAccelometer_xAxis() override; - float getAccelometer_yAxis() override; - float getAccelometer_zAxis() override; - float getMagnetometerMicroT_xAxis() override; - float getMagnetometerMicroT_yAxis() override; - float getMagnetometerMicroT_zAxis() override; - float getRotationX() override; - float getRotationY() override; - float getRotationZ() override; - float getAltitude() override; + double getRelativeHumidity() const override; + double getInfraredAmbientTemperature() const override; + double getInfraredObjectTemperature() const override; + double getLightIntensityLux() const override; + double getBarometerCelsiusTemperature() const override; + double getBarometerTemperatureAverage() const override; + double getBarometer_hPa() const override; + float getGyroscopeX_degPerSec() const override; + float getGyroscopeY_degPerSec() const override; + float getGyroscopeZ_degPerSec() const override; + float getAccelometer_xAxis() const override; + float getAccelometer_yAxis() const override; + float getAccelometer_zAxis() const override; + float getMagnetometerMicroT_xAxis() const override; + float getMagnetometerMicroT_yAxis() const override; + float getMagnetometerMicroT_zAxis() const override; + float getRotationX() const override; + float getRotationY() const override; + float getRotationZ() const override; + float getAltitude() const override; QList m_dataProviders; }; diff --git a/tradeshow/iot-sensortag/sensortagdataprovider.cpp b/tradeshow/iot-sensortag/sensortagdataprovider.cpp index 10c85a2..4ca749c 100644 --- a/tradeshow/iot-sensortag/sensortagdataprovider.cpp +++ b/tradeshow/iot-sensortag/sensortagdataprovider.cpp @@ -105,126 +105,127 @@ SensorTagDataProvider::SensorTagDataProvider(QString id, QObject* parent) { } -QString SensorTagDataProvider::getRelativeHumidityString() +QString SensorTagDataProvider::getRelativeHumidityString() const { return QString::number(humidity) + QLatin1String("%"); } -double SensorTagDataProvider::getRelativeHumidity() +double SensorTagDataProvider::getRelativeHumidity() const { return humidity; } -double SensorTagDataProvider::getInfraredAmbientTemperature() +double SensorTagDataProvider::getInfraredAmbientTemperature() const { return irAmbientTemperature; } -double SensorTagDataProvider::getInfraredObjectTemperature() +double SensorTagDataProvider::getInfraredObjectTemperature() const { return irObjectTemperature; } -QString SensorTagDataProvider::getLightIntensityLuxString() +QString SensorTagDataProvider::getLightIntensityLuxString() const { return QString::number(lightIntensityLux) + QLatin1String(" Lux"); } -double SensorTagDataProvider::getLightIntensityLux() +double SensorTagDataProvider::getLightIntensityLux() const { return lightIntensityLux; } -double SensorTagDataProvider::getBarometerCelsiusTemperature() +double SensorTagDataProvider::getBarometerCelsiusTemperature() const { return barometerCelsiusTemperature; } -QString SensorTagDataProvider::getBarometerCelsiusTemperatureString() +QString SensorTagDataProvider::getBarometerCelsiusTemperatureString() const { return QString::number(barometerCelsiusTemperature) + QString("\u00B0C"); } -double SensorTagDataProvider::getBarometerTemperatureAverage() +double SensorTagDataProvider::getBarometerTemperatureAverage() const { return barometerTemperatureAverage; } -QString SensorTagDataProvider::getBarometer_hPaString() +QString SensorTagDataProvider::getBarometer_hPaString() const { return QString::number(barometerHPa) + QLatin1String(" hPa"); } -double SensorTagDataProvider::getBarometer_hPa() + +double SensorTagDataProvider::getBarometer_hPa() const { return barometerHPa; } -float SensorTagDataProvider::getGyroscopeX_degPerSec() +float SensorTagDataProvider::getGyroscopeX_degPerSec() const { return gyroscopeX_degPerSec; } -float SensorTagDataProvider::getGyroscopeY_degPerSec() +float SensorTagDataProvider::getGyroscopeY_degPerSec() const { return gyroscopeY_degPerSec; } -float SensorTagDataProvider::getGyroscopeZ_degPerSec() +float SensorTagDataProvider::getGyroscopeZ_degPerSec() const { return gyroscopeZ_degPerSec; } -float SensorTagDataProvider::getAccelometer_xAxis() +float SensorTagDataProvider::getAccelometer_xAxis() const { return accelometerX; } -float SensorTagDataProvider::getAccelometer_yAxis() +float SensorTagDataProvider::getAccelometer_yAxis() const { return accelometerY; } -float SensorTagDataProvider::getAccelometer_zAxis() +float SensorTagDataProvider::getAccelometer_zAxis() const { return accelometerZ; } -float SensorTagDataProvider::getMagnetometerMicroT_xAxis() +float SensorTagDataProvider::getMagnetometerMicroT_xAxis() const { return magnetometerMicroT_xAxis; } -float SensorTagDataProvider::getMagnetometerMicroT_yAxis() +float SensorTagDataProvider::getMagnetometerMicroT_yAxis() const { return magnetometerMicroT_yAxis; } -float SensorTagDataProvider::getMagnetometerMicroT_zAxis() +float SensorTagDataProvider::getMagnetometerMicroT_zAxis() const { return magnetometerMicroT_zAxis; } -float SensorTagDataProvider::getRotationX() +float SensorTagDataProvider::getRotationX() const { return rotation_x; } -float SensorTagDataProvider::getRotationY() +float SensorTagDataProvider::getRotationY() const { return rotation_y; } -float SensorTagDataProvider::getRotationZ() +float SensorTagDataProvider::getRotationZ() const { return rotation_z; } -int SensorTagDataProvider::getRotationUpdateInterval() +int SensorTagDataProvider::getRotationUpdateInterval() const { return intervalRotation; } -float SensorTagDataProvider::getAltitude() +float SensorTagDataProvider::getAltitude() const { return altitude; } diff --git a/tradeshow/iot-sensortag/sensortagdataprovider.h b/tradeshow/iot-sensortag/sensortagdataprovider.h index 9f079e9..3f55386 100644 --- a/tradeshow/iot-sensortag/sensortagdataprovider.h +++ b/tradeshow/iot-sensortag/sensortagdataprovider.h @@ -105,31 +105,31 @@ public: virtual bool startDataFetching() {return false;} virtual void endDataFetching() {} - QString getRelativeHumidityString(); - virtual double getRelativeHumidity(); - virtual double getInfraredAmbientTemperature(); - virtual double getInfraredObjectTemperature(); - QString getLightIntensityLuxString(); - virtual double getLightIntensityLux(); - virtual double getBarometerCelsiusTemperature(); - QString getBarometerCelsiusTemperatureString(); - virtual double getBarometerTemperatureAverage(); - QString getBarometer_hPaString(); - virtual double getBarometer_hPa(); - virtual float getGyroscopeX_degPerSec(); - virtual float getGyroscopeY_degPerSec(); - virtual float getGyroscopeZ_degPerSec(); - virtual float getAccelometer_xAxis(); - virtual float getAccelometer_yAxis(); - virtual float getAccelometer_zAxis(); - virtual float getMagnetometerMicroT_xAxis(); - virtual float getMagnetometerMicroT_yAxis(); - virtual float getMagnetometerMicroT_zAxis(); - virtual float getRotationX(); - virtual float getRotationY(); - virtual float getRotationZ(); - int getRotationUpdateInterval(); - virtual float getAltitude(); + QString getRelativeHumidityString() const; + virtual double getRelativeHumidity() const; + virtual double getInfraredAmbientTemperature() const; + virtual double getInfraredObjectTemperature() const; + QString getLightIntensityLuxString() const; + virtual double getLightIntensityLux() const; + virtual double getBarometerCelsiusTemperature() const; + QString getBarometerCelsiusTemperatureString() const; + virtual double getBarometerTemperatureAverage() const; + QString getBarometer_hPaString() const; + virtual double getBarometer_hPa() const; + virtual float getGyroscopeX_degPerSec() const; + virtual float getGyroscopeY_degPerSec() const; + virtual float getGyroscopeZ_degPerSec() const; + virtual float getAccelometer_xAxis() const; + virtual float getAccelometer_yAxis() const; + virtual float getAccelometer_zAxis() const; + virtual float getMagnetometerMicroT_xAxis() const; + virtual float getMagnetometerMicroT_yAxis() const; + virtual float getMagnetometerMicroT_zAxis() const; + virtual float getRotationX() const; + virtual float getRotationY() const; + virtual float getRotationZ() const; + int getRotationUpdateInterval() const; + virtual float getAltitude() const; Q_INVOKABLE virtual int tagType() const; void setTagType(int tagType); -- cgit v1.2.3