ubuntu-system-settings

Merge lp:~ken-vandine/ubuntu-system-settings/rtm-lp1358565_initial_lastFullCharge into lp:ubuntu-system-settings/rtm-14.09

Proposed by Ken VanDine on 2015-01-29

Status:	Merged
Approved by:	Sebastien Bacher on 2015-01-29
Approved revision:	975
Merged at revision:	977
Proposed branch:	lp:~ken-vandine/ubuntu-system-settings/rtm-lp1358565_initial_lastFullCharge
Merge into:	lp:ubuntu-system-settings/rtm-14.09
Diff against target:	12 lines (+1/-1) 1 file modified plugins/battery/battery.h (+1/-1)
To merge this branch:	bzr merge lp:~ken-vandine/ubuntu-system-settings/rtm-lp1358565_initial_lastFullCharge
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-01-29
Sebastien Bacher (community)		2015-01-29	Approve on 2015-01-29
Review via email: mp+248006@code.launchpad.net

initialize m_lastFullCharge as NULL

initialize m_lastFullCharge as NULL, preventing a random delta from being computed.

Sebastien Bacher (seb128) wrote on 2015-01-29:

thanks

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-01-29:

review: Approve (continuous-integration)

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'plugins/battery/battery.h'
2	--- plugins/battery/battery.h 2014-11-12 19:05:29 +0000
3	+++ plugins/battery/battery.h 2015-01-29 16:11:33 +0000
4	@@ -59,7 +59,7 @@
5	bool m_powerdRunning;
6	UpDevice *m_device;
7	QString m_deviceString;
8	- int m_lastFullCharge;
9	+ int m_lastFullCharge = NULL;
10	void buildDeviceString();
11	void getLastFullCharge();
12	bool updateLastFullCharge(UpHistoryItem *item, int offset);