*/
#include "batteryinfo.h"
-#include <qmbattery.h>
+#include <QBatteryInfo>
#if defined(QT4)
#include <QDeclarativeInfo>
#elif defined(QT5)
#endif
BatteryInfo::BatteryInfo(QObject *parent) :
- QObject(parent), m_battery(0) {
+ QObject(parent),
+ m_battery(0) {
}
return false;
}
- if (m_battery->getChargingState() == MeeGo::QmBattery::StateCharging) {
+ QBatteryInfo::ChargingState state = m_battery->chargingState(0);
+ if (state == QBatteryInfo::Charging) {
return true;
}
return true;
}
- MeeGo::QmBattery::BatteryState state = m_battery->getBatteryState();
-
- if (state == MeeGo::QmBattery::StateOK || state == MeeGo::QmBattery::StateFull) {
+ QBatteryInfo::BatteryStatus state = m_battery->batteryStatus(0);
+ if (state == QBatteryInfo::BatteryOk || state == QBatteryInfo::BatteryFull) {
return false;
}
m_battery = 0;
}
else {
- m_battery = new MeeGo::QmBattery(this);
- QObject::connect(m_battery, SIGNAL(batteryStateChanged(MeeGo::QmBattery::BatteryState)),
+ m_battery = new QBatteryInfo(this);
+
+ QObject::connect(m_battery, SIGNAL(batteryStatusChanged(int, QBatteryInfo::BatteryStatus)),
this, SIGNAL(chargingChanged()));
- QObject::connect(m_battery, SIGNAL(chargingStateChanged(MeeGo::QmBattery::ChargingState)),
+ QObject::connect(m_battery, SIGNAL(chargingStateChanged(int, QBatteryInfo::ChargingState)),
this, SIGNAL(chargingChanged()));
}