Merge lp:~nick-dedekind/qtubuntu-sensors/lp1351109.destroy-haptic-instance into lp:qtubuntu-sensors

Proposed by Nick Dedekind
Status: Merged
Approved by: Gerry Boland
Approved revision: 88
Merged at revision: 89
Proposed branch: lp:~nick-dedekind/qtubuntu-sensors/lp1351109.destroy-haptic-instance
Merge into: lp:qtubuntu-sensors
Diff against target: 42 lines (+9/-1)
3 files modified
debian/control (+1/-1)
plugins/feedback/core_feedback.cpp (+7/-0)
plugins/feedback/core_feedback.h (+1/-0)
To merge this branch: bzr merge lp:~nick-dedekind/qtubuntu-sensors/lp1351109.destroy-haptic-instance
Reviewer Review Type Date Requested Status
Gerry Boland (community) Needs Fixing
Review via email: mp+272755@code.launchpad.net

Commit message

Use API for destroying haptic sensor instance.

Description of the change

Use API for destroying haptic sensor instance. (LP:#1351109)

Depends on
https://code.launchpad.net/~nick-dedekind/platform-api/lp1351109.destroy-haptic-instance/+merge/273190

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :
review: Approve (tentative)
Revision history for this message
Gerry Boland (gerboland) wrote :
review: Approve
Revision history for this message
Gerry Boland (gerboland) wrote :

- libubuntu-application-api-dev (>= 2.3.0),
+ libubuntu-application-api-dev (>= 3.0.1),

Please revert this change

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-06-23 16:02:15 +0000
3+++ debian/control 2015-09-29 13:50:39 +0000
4@@ -5,7 +5,7 @@
5 Build-Depends: debhelper (>= 9),
6 cmake,
7 libgtest-dev,
8- libubuntu-application-api-dev (>= 2.3.0),
9+ libubuntu-application-api-dev (>= 3.0.1),
10 libprocess-cpp-dev (>= 0.0.1+14.04.20131212),
11 ubuntu-application-api3-test,
12 pkg-config,
13
14=== modified file 'plugins/feedback/core_feedback.cpp'
15--- plugins/feedback/core_feedback.cpp 2014-06-24 23:01:10 +0000
16+++ plugins/feedback/core_feedback.cpp 2015-09-29 13:50:39 +0000
17@@ -42,6 +42,13 @@
18 ua_sensors_haptic_enable(m_vibrator);
19 }
20
21+core::Feedback::~Feedback()
22+{
23+ if (m_vibrator) {
24+ ua_sensors_haptic_destroy(m_vibrator);
25+ }
26+}
27+
28 QFeedbackInterface::PluginPriority core::Feedback::pluginPriority()
29 {
30 return PluginHighPriority;
31
32=== modified file 'plugins/feedback/core_feedback.h'
33--- plugins/feedback/core_feedback.h 2014-06-24 12:17:06 +0000
34+++ plugins/feedback/core_feedback.h 2015-09-29 13:50:39 +0000
35@@ -37,6 +37,7 @@
36
37 public:
38 Feedback();
39+ virtual ~Feedback();
40
41 // From QFeedbackHapticsInterface
42 virtual PluginPriority pluginPriority();

Subscribers

People subscribed via source and target branches