Merge lp:~jpakkane/indicator-network/virtualdestructors into lp:~unity-api-team/indicator-network/devel

Proposed by Jussi Pakkanen
Status: Merged
Approved by: Antti Kaijanmäki
Approved revision: 337
Merged at revision: 337
Proposed branch: lp:~jpakkane/indicator-network/virtualdestructors
Merge into: lp:~unity-api-team/indicator-network/devel
Diff against target: 37 lines (+5/-0)
3 files modified
network/indicator-menu.h (+2/-0)
network/menuitems/section.h (+2/-0)
network/menumodel-cpp/menu-model.h (+1/-0)
To merge this branch: bzr merge lp:~jpakkane/indicator-network/virtualdestructors
Reviewer Review Type Date Requested Status
Antti Kaijanmäki (community) Approve
Review via email: mp+222034@code.launchpad.net

Commit message

Added virtual destructors to base classes with virtual methods.

Description of the change

Added virtual destructors to base classes with virtual methods.

To post a comment you must log in.
337. By Jussi Pakkanen

This one's for Charles.

Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

LGTM.

Revision history for this message
Antti Kaijanmäki (kaijanmaki) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'network/indicator-menu.h'
2--- network/indicator-menu.h 2014-05-12 11:36:59 +0000
3+++ network/indicator-menu.h 2014-06-05 14:12:36 +0000
4@@ -60,6 +60,8 @@
5 m_rootMenu->append(m_rootItem);
6 }
7
8+ virtual ~IndicatorMenu() {}
9+
10 virtual void
11 addSection(Section::Ptr section)
12 {
13
14=== modified file 'network/menuitems/section.h'
15--- network/menuitems/section.h 2014-04-24 13:24:05 +0000
16+++ network/menuitems/section.h 2014-06-05 14:12:36 +0000
17@@ -29,6 +29,8 @@
18 public:
19 typedef std::shared_ptr<Section> Ptr;
20
21+ virtual ~Section() {}
22+
23 virtual ActionGroup::Ptr actionGroup() = 0;
24 virtual MenuModel::Ptr menuModel() = 0;
25
26
27=== modified file 'network/menumodel-cpp/menu-model.h'
28--- network/menumodel-cpp/menu-model.h 2014-03-13 19:38:45 +0000
29+++ network/menumodel-cpp/menu-model.h 2014-06-05 14:12:36 +0000
30@@ -26,6 +26,7 @@
31 typedef std::shared_ptr<MenuModel> Ptr;
32
33 virtual operator GMenuModel*() = 0;
34+ virtual ~MenuModel() {}
35 };
36
37 #endif

Subscribers

People subscribed via source and target branches

to all changes: