Merge lp:~ted/ubuntu-app-launch/virtual-destructors into lp:ubuntu-app-launch

Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 288
Merged at revision: 291
Proposed branch: lp:~ted/ubuntu-app-launch/virtual-destructors
Merge into: lp:ubuntu-app-launch
Diff against target: 47 lines (+7/-12)
2 files modified
libubuntu-app-launch/helper.h (+6/-10)
libubuntu-app-launch/registry.h (+1/-2)
To merge this branch: bzr merge lp:~ted/ubuntu-app-launch/virtual-destructors
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Needs Fixing
Charles Kerr (community) Approve
Review via email: mp+316966@code.launchpad.net

Commit message

Add missing virtual destructors

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) :
review: Approve
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libubuntu-app-launch/helper.h'
2--- libubuntu-app-launch/helper.h 2017-01-26 22:46:49 +0000
3+++ libubuntu-app-launch/helper.h 2017-02-10 14:16:26 +0000
4@@ -62,11 +62,9 @@
5 */
6 class Helper
7 {
8- /*
9- protected:
10- Helper() = default;
11- virtual ~Helper() = default;
12- TODO: Next ABI break */
13+protected:
14+ Helper() = default;
15+ virtual ~Helper() = default;
16
17 public:
18 /** \private */
19@@ -93,11 +91,9 @@
20 /** Running instance of a a Helper */
21 class Instance
22 {
23- /*
24- protected:
25- Instance() = default;
26- virtual ~Instance() = default;
27- TODO: Next ABI break */
28+ protected:
29+ Instance() = default;
30+ virtual ~Instance() = default;
31
32 public:
33 /** Check to see if this instance is running */
34
35=== modified file 'libubuntu-app-launch/registry.h'
36--- libubuntu-app-launch/registry.h 2017-01-24 00:09:09 +0000
37+++ libubuntu-app-launch/registry.h 2017-02-10 14:16:26 +0000
38@@ -187,8 +187,7 @@
39
40 protected:
41 Manager() = default;
42- /* virtual ~Manager() = default;
43- TODO: Next ABI break */
44+ virtual ~Manager() = default;
45 };
46
47 /** Set the manager of applications, which gives permissions for them to

Subscribers

People subscribed via source and target branches