QBatteryInfo Refactorization Step 2
authorTravis Allen <tallen@blackberry.com>
Tue, 26 Nov 2013 18:35:16 +0000 (13:35 -0500)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 29 Nov 2013 14:32:31 +0000 (15:32 +0100)
commitd6104a92321c2e72b140156fddf0378c9795cdb4
treeb9316e7141374e12174bd9940d7484fade132892
parent2a4badf5a89d4e6778ad43faa25870ff6b81cd35
QBatteryInfo Refactorization Step 2

-Remove EnergyUnit enum
-Change Win32 code to return mAh to conform to all other platforms
-Rename BatteryStatus to LevelState
-Add Health enum and property
-Rename a couple enum values

Change-Id: Ie359036f66f0b1f41d35cd8a574552f2a7b8bf00
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
19 files changed:
src/systeminfo/linux/qbatteryinfo_linux.cpp
src/systeminfo/linux/qbatteryinfo_linux_p.h
src/systeminfo/linux/qbatteryinfo_upower.cpp
src/systeminfo/linux/qbatteryinfo_upower_p.h
src/systeminfo/mac/qbatteryinfo_mac.mm
src/systeminfo/mac/qbatteryinfo_mac_p.h
src/systeminfo/qbatteryinfo.cpp
src/systeminfo/qbatteryinfo.h
src/systeminfo/simulator/qsysteminfo_simulator.cpp
src/systeminfo/simulator/qsysteminfo_simulator_p.h
src/systeminfo/simulator/qsysteminfobackend_simulator.cpp
src/systeminfo/simulator/qsysteminfobackend_simulator_p.h
src/systeminfo/simulator/qsysteminfoconnection_simulator.cpp
src/systeminfo/simulator/qsysteminfodata_simulator.cpp
src/systeminfo/simulator/qsysteminfodata_simulator_p.h
src/systeminfo/windows/qbatteryinfo_win.cpp
src/systeminfo/windows/qbatteryinfo_win_p.h
tests/auto/systeminfo/qbatteryinfo/tst_qbatteryinfo.cpp
tests/manual/sysinfo-tester/main.cpp