Mir

Merge lp:~alan-griffiths/mir/delete-dead-code into lp:mir

Proposed by Alan Griffiths on 2015-11-10

Status:	Merged
Merged at revision:	3101
Proposed branch:	lp:~alan-griffiths/mir/delete-dead-code
Merge into:	lp:mir
Diff against target:	32 lines (+1/-3) 2 files modified include/server/mir/shell/system_compositor_window_manager.h (+1/-1) src/include/server/mir/default_server_configuration.h (+0/-2)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/delete-dead-code
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-11-13
Andreas Pokorny (community)			Approve on 2015-11-13
Alexandros Frantzis (community)		2015-11-10	Approve on 2015-11-12
Review via email: mp+277094@code.launchpad.net

shell, playground: PlacementStrategy was removed back in 0.14 but there were a couple of remaining mentions.

shell, playground: PlacementStrategy was removed back in 0.14 but there were a couple of remaining mentions.

PS Jenkins bot (ps-jenkins) wrote on 2015-11-10:

review: Needs Fixing (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2015-11-10:

One of our current (krillin) test failures:

/bin/bash: line 1: 7219 Segmentation fault (core dumped) mir_demo_server --test-client /usr/bin/mir_demo_client_fingerpaint

Alexandros Frantzis (afrantzis) wrote on 2015-11-12:

Looks good.

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-11-13:

review: Needs Fixing (continuous-integration)

Andreas Pokorny (andreas-pokorny) wrote on 2015-11-13:

lgtm

review: Approve

Alan Griffiths (alan-griffiths) wrote on 2015-11-13:

PS Jenkins bot (ps-jenkins) wrote on 2015-11-13:

review: Needs Fixing (continuous-integration)

3101. By Alan Griffiths on 2015-11-13: shell, playground: PlacementStrategy was removed back in 0.14 but there were a couple of remaining mentions.

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'include/server/mir/shell/system_compositor_window_manager.h'
2	--- include/server/mir/shell/system_compositor_window_manager.h 2015-10-29 22:07:47 +0000
3	+++ include/server/mir/shell/system_compositor_window_manager.h 2015-11-10 09:58:02 +0000
4	@@ -23,7 +23,7 @@
5
6	namespace mir
7	{
8	-namespace scene { class PlacementStrategy; class SessionCoordinator; }
9	+namespace scene { class SessionCoordinator; }
10	namespace shell
11	{
12	class FocusController;
13
14	=== modified file 'src/include/server/mir/default_server_configuration.h'
15	--- src/include/server/mir/default_server_configuration.h 2015-11-04 07:43:28 +0000
16	+++ src/include/server/mir/default_server_configuration.h 2015-11-10 09:58:02 +0000
17	@@ -100,7 +100,6 @@
18	class BufferStreamFactory;
19	class MediatingDisplayChanger;
20	class PixelBuffer;
21	-class PlacementStrategy;
22	class SessionContainer;
23	class SessionEventSink;
24	class SessionEventHandlerRegister;
25	@@ -425,7 +424,6 @@
26	CachedPtr<scene::SurfaceFactory> surface_factory;
27	CachedPtr<scene::SessionContainer> session_container;
28	CachedPtr<scene::SurfaceCoordinator> surface_coordinator;
29	- CachedPtr<scene::PlacementStrategy> placement_strategy;
30	CachedPtr<scene::SessionListener> session_listener;
31	CachedPtr<scene::PixelBuffer> pixel_buffer;
32	CachedPtr<scene::SnapshotStrategy> snapshot_strategy;