Merge lp:~jpakkane/frame/virtual-destructors into lp:frame

Proposed by Jussi Pakkanen
Status: Merged
Merged at revision: 75
Proposed branch: lp:~jpakkane/frame/virtual-destructors
Merge into: lp:frame
Diff against target: 23 lines (+2/-0)
2 files modified
src/v2/window.h (+1/-0)
src/v2/x11/window_x11.h (+1/-0)
To merge this branch: bzr merge lp:~jpakkane/frame/virtual-destructors
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Chase Douglas (community) Approve
Review via email: mp+98799@code.launchpad.net

Description of the change

Add virtual destructors to classes with virtual methods.

-Weffc++ produces still these kinds of errors, but they are for classes inherited from empty C structs, which won't be an issue.

No tests because this is a non-functionality bug.

To post a comment you must log in.
Revision history for this message
Chase Douglas (chasedouglas) wrote :

Looks fine to me.

review: Approve
Revision history for this message
Stephen M. Webb (bregma) wrote :

I agree.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/v2/window.h'
2--- src/v2/window.h 2012-01-11 15:56:42 +0000
3+++ src/v2/window.h 2012-03-22 08:35:27 +0000
4@@ -35,6 +35,7 @@
5 class Window : public std::enable_shared_from_this<Window> {
6 public:
7 Window();
8+ virtual ~Window() {};
9
10 bool IsTouchOwned(UFTouchId touchid) const;
11 void ReleaseFrames();
12
13=== modified file 'src/v2/x11/window_x11.h'
14--- src/v2/x11/window_x11.h 2012-01-11 15:56:42 +0000
15+++ src/v2/x11/window_x11.h 2012-03-22 08:35:27 +0000
16@@ -42,6 +42,7 @@
17 public:
18 WindowX11(::Window window, const SharedUFDevice& device,
19 Display* display);
20+ virtual ~WindowX11() {};
21
22 bool HandleDeviceEvent(const XIDeviceEvent* event, SharedUFFrame* frame);
23 bool HandleOwnershipEvent(const XITouchOwnershipEvent* event,

Subscribers

People subscribed via source and target branches