1
=== modified file 'src/server/frontend/wayland/wayland_default_configuration.cpp'
2
--- src/server/frontend/wayland/wayland_default_configuration.cpp	2017-09-07 00:33:58 +0000
3
+++ src/server/frontend/wayland/wayland_default_configuration.cpp	2017-09-11 09:06:24 +0000
4
@@ -19,7 +19,7 @@
5
19
#include "mir/default_server_configuration.h"
19
#include "mir/default_server_configuration.h"
6
20
#include "wayland_connector.h"
20
#include "wayland_connector.h"
7
21
21
9
22
#include "../../scene/mediating_display_changer.h"
22
#include "mir/frontend/display_changer.h"
10
23
#include "mir/graphics/platform.h"
23
#include "mir/graphics/platform.h"
11
24
24
12
25
namespace mf = mir::frontend;
25
namespace mf = mir::frontend;
13
@@ -32,7 +32,7 @@
14
32
        {
32
        {
15
33
            return std::make_shared<mf::WaylandConnector>(
33
            return std::make_shared<mf::WaylandConnector>(
16
34
                the_frontend_shell(),
34
                the_frontend_shell(),
18
35
                *the_mediating_display_changer(),
35
                *the_frontend_display_changer(),
19
36
                the_buffer_allocator());
36
                the_buffer_allocator());
20
37
        });
37
        });
21
38
}
38
}
Status:	Merged
Merged at revision:	4247
Proposed branch:	lp:~alan-griffiths/mir/tidy-code
Merge into:	lp:mir
Diff against target:	21 lines (+2/-2) 1 file modified src/server/frontend/wayland/wayland_default_configuration.cpp (+2/-2)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/tidy-code
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration	2017-09-07	Needs Fixing on 2017-09-12
Chris Halse Rogers			Approve on 2017-09-11
Gerry Boland (community)		2017-09-07	Approve on 2017-09-11
Review via email: mp+330375@code.launchpad.net
1	=== modified file 'src/server/frontend/wayland/wayland_default_configuration.cpp'
2	--- src/server/frontend/wayland/wayland_default_configuration.cpp 2017-09-07 00:33:58 +0000
3	+++ src/server/frontend/wayland/wayland_default_configuration.cpp 2017-09-11 09:06:24 +0000
4	@@ -19,7 +19,7 @@
5	19	#include "mir/default_server_configuration.h"	19	#include "mir/default_server_configuration.h"
6	20	#include "wayland_connector.h"	20	#include "wayland_connector.h"
7	21		21
9	22	#include "../../scene/mediating_display_changer.h"	22	#include "mir/frontend/display_changer.h"
10	23	#include "mir/graphics/platform.h"	23	#include "mir/graphics/platform.h"
11	24		24
12	25	namespace mf = mir::frontend;	25	namespace mf = mir::frontend;
13	@@ -32,7 +32,7 @@
14	32	{	32	{
15	33	return std::make_shared<mf::WaylandConnector>(	33	return std::make_shared<mf::WaylandConnector>(
16	34	the_frontend_shell(),	34	the_frontend_shell(),
18	35	*the_mediating_display_changer(),	35	*the_frontend_display_changer(),
19	36	the_buffer_allocator());	36	the_buffer_allocator());
20	37	});	37	});
21	38	}	38	}