From 3df0b2b0aee9ce0a6150b113571e6b3f9f200b7d Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Thu, 13 Jul 2017 08:51:08 +0200 Subject: simulator: Add missing glue code for health and temperature Change-Id: I5c7e09ae88a3b0c8092aa27a76cdbad546219d40 Reviewed-by: Lorn Potter --- src/systeminfo/simulator/qsysteminfo_simulator.cpp | 12 ++++++++++-- src/systeminfo/simulator/qsysteminfo_simulator_p.h | 2 ++ src/systeminfo/simulator/qsysteminfobackend_simulator.cpp | 1 + src/systeminfo/simulator/qsysteminfodata_simulator.cpp | 9 +++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/systeminfo/simulator/qsysteminfo_simulator.cpp b/src/systeminfo/simulator/qsysteminfo_simulator.cpp index dfde0018..8b5ccbc7 100644 --- a/src/systeminfo/simulator/qsysteminfo_simulator.cpp +++ b/src/systeminfo/simulator/qsysteminfo_simulator.cpp @@ -234,6 +234,8 @@ void QBatteryInfoSimulator::connectNotify(const QMetaMethod &signal) static const QMetaMethod remainingChargingTimeChangedSignal = QMetaMethod::fromSignal(&QBatteryInfoSimulator::remainingChargingTimeChanged); static const QMetaMethod voltageChangedSignal = QMetaMethod::fromSignal(&QBatteryInfoSimulator::voltageChanged); static const QMetaMethod levelStatusChangedSignal = QMetaMethod::fromSignal(&QBatteryInfoSimulator::levelStatusChanged); + static const QMetaMethod healthChangedSignal = QMetaMethod::fromSignal(&QBatteryInfoSimulator::healthChanged); + static const QMetaMethod temperatureChangedSignal = QMetaMethod::fromSignal(&QBatteryInfoSimulator::temperatureChanged); if (batteryInfoSimulatorBackend && (signal == batteryCountChangedSignal || signal == currentFlowChangedSignal @@ -242,7 +244,9 @@ void QBatteryInfoSimulator::connectNotify(const QMetaMethod &signal) || signal == remainingChargingTimeChangedSignal || signal == chargerTypeChangedSignal || signal == chargingStateChangedSignal - || signal == levelStatusChangedSignal)) { + || signal == levelStatusChangedSignal + || signal == healthChangedSignal + || signal == temperatureChangedSignal)) { QMetaMethod sourceSignal = proxyToSourceSignal(signal, batteryInfoSimulatorBackend); connect(batteryInfoSimulatorBackend, sourceSignal, this, signal); } @@ -258,6 +262,8 @@ void QBatteryInfoSimulator::disconnectNotify(const QMetaMethod &signal) static const QMetaMethod remainingChargingTimeChangedSignal = QMetaMethod::fromSignal(&QBatteryInfoSimulator::remainingChargingTimeChanged); static const QMetaMethod voltageChangedSignal = QMetaMethod::fromSignal(&QBatteryInfoSimulator::voltageChanged); static const QMetaMethod levelStatusChangedSignal = QMetaMethod::fromSignal(&QBatteryInfoSimulator::levelStatusChanged); + static const QMetaMethod healthChangedSignal = QMetaMethod::fromSignal(&QBatteryInfoSimulator::healthChanged); + static const QMetaMethod temperatureChangedSignal = QMetaMethod::fromSignal(&QBatteryInfoSimulator::temperatureChanged); if (batteryInfoSimulatorBackend && (signal == batteryCountChangedSignal || signal == currentFlowChangedSignal @@ -266,7 +272,9 @@ void QBatteryInfoSimulator::disconnectNotify(const QMetaMethod &signal) || signal == remainingChargingTimeChangedSignal || signal == chargerTypeChangedSignal || signal == chargingStateChangedSignal - || signal == levelStatusChangedSignal)) { + || signal == levelStatusChangedSignal + || signal == healthChangedSignal + || signal == temperatureChangedSignal)) { QMetaMethod sourceSignal = proxyToSourceSignal(signal, batteryInfoSimulatorBackend); disconnect(batteryInfoSimulatorBackend, sourceSignal, this, signal); } diff --git a/src/systeminfo/simulator/qsysteminfo_simulator_p.h b/src/systeminfo/simulator/qsysteminfo_simulator_p.h index 65e4ac34..6dae0904 100644 --- a/src/systeminfo/simulator/qsysteminfo_simulator_p.h +++ b/src/systeminfo/simulator/qsysteminfo_simulator_p.h @@ -100,6 +100,8 @@ Q_SIGNALS: void remainingChargingTimeChanged(int seconds); void voltageChanged(int voltage); void levelStatusChanged(QBatteryInfo::LevelStatus levelStatus); + void healthChanged(QBatteryInfo::Health health); + void temperatureChanged(float temperature); protected: void connectNotify(const QMetaMethod &signal); diff --git a/src/systeminfo/simulator/qsysteminfobackend_simulator.cpp b/src/systeminfo/simulator/qsysteminfobackend_simulator.cpp index 4d0562ee..5039daaa 100644 --- a/src/systeminfo/simulator/qsysteminfobackend_simulator.cpp +++ b/src/systeminfo/simulator/qsysteminfobackend_simulator.cpp @@ -55,6 +55,7 @@ QBatteryInfoSimulatorBackend::QBatteryInfoSimulatorBackend(QObject *parent) data.chargingState = QBatteryInfo::UnknownChargingState; data.chargerType = QBatteryInfo::UnknownCharger; data.levelStatus = QBatteryInfo::LevelUnknown; + data.health = QBatteryInfo::HealthUnknown; } QBatteryInfoSimulatorBackend::~QBatteryInfoSimulatorBackend() diff --git a/src/systeminfo/simulator/qsysteminfodata_simulator.cpp b/src/systeminfo/simulator/qsysteminfodata_simulator.cpp index 440777a1..c4d3ae20 100644 --- a/src/systeminfo/simulator/qsysteminfodata_simulator.cpp +++ b/src/systeminfo/simulator/qsysteminfodata_simulator.cpp @@ -47,6 +47,9 @@ QDataStream &operator<<(QDataStream &out, const QBatteryInfoData &s) out << static_cast(s.chargingState) << static_cast(s.chargerType) << static_cast(s.levelStatus); + out << static_cast(s.health); + out << s.temperature; + out << static_cast(s.currentFlow) << static_cast(s.maximumCapacity) << static_cast(s.remainingCapacity) << static_cast(s.remainingChargingTime) << static_cast(s.voltage); @@ -63,6 +66,12 @@ QDataStream &operator>>(QDataStream &in, QBatteryInfoData &s) s.chargerType = static_cast(chargerType); s.levelStatus = static_cast(batteryStatus); + qint32 health; + in >> health; + s.health = static_cast(health); + + in >> s.temperature; + qint32 currentFlow, maximumCapacity, remainingCapacity, remainingChargingTime, voltage; in >> currentFlow >> maximumCapacity >> remainingCapacity >> remainingChargingTime >> voltage; -- cgit v1.2.3