Merge lp:~aacid/ubuntu-ui-toolkit/initialize_two_variables into lp:ubuntu-ui-toolkit/staging

Proposed by Albert Astals Cid
Status: Merged
Approved by: Andrea Bernabei
Approved revision: 1989
Merged at revision: 1994
Proposed branch: lp:~aacid/ubuntu-ui-toolkit/initialize_two_variables
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 24 lines (+2/-1)
2 files modified
src/Ubuntu/UbuntuGestures/timer.cpp (+1/-0)
src/Ubuntu/UbuntuGestures/touchregistry.h (+1/-1)
To merge this branch: bzr merge lp:~aacid/ubuntu-ui-toolkit/initialize_two_variables
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Andrea Bernabei (community) Approve
Review via email: mp+296295@code.launchpad.net

This proposal supersedes a proposal from 2016-06-02.

Commit message

Initialize two variables

physicallyEnded in the dummy TouchInfo constructor

m_nextTimeoutTime in the FakeTimer

It's not really needed since it's only used in update() if start()
has been called that then initializes m_nextTimeoutTime

But it's always nice to initialize all members

To post a comment you must log in.
Revision history for this message
Andrea Bernabei (faenil) wrote :

lgtm

Revision history for this message
Andrea Bernabei (faenil) wrote :

lgtm

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/UbuntuGestures/timer.cpp'
2--- src/Ubuntu/UbuntuGestures/timer.cpp 2015-11-09 08:31:43 +0000
3+++ src/Ubuntu/UbuntuGestures/timer.cpp 2016-06-02 08:26:40 +0000
4@@ -63,6 +63,7 @@
5 , m_interval(0)
6 , m_singleShot(false)
7 , m_timeSource(timeSource)
8+ , m_nextTimeoutTime(0)
9 {
10 }
11
12
13=== modified file 'src/Ubuntu/UbuntuGestures/touchregistry.h'
14--- src/Ubuntu/UbuntuGestures/touchregistry.h 2015-11-17 11:48:09 +0000
15+++ src/Ubuntu/UbuntuGestures/touchregistry.h 2016-06-02 08:26:40 +0000
16@@ -158,7 +158,7 @@
17
18 class TouchInfo {
19 public:
20- TouchInfo() : id(-1) {}
21+ TouchInfo() : id(-1), physicallyEnded(false) {}
22 TouchInfo(int id);
23 bool isValid() const { return id >= 0; }
24 void reset();

Subscribers

People subscribed via source and target branches