Mir

Code review comment for lp:~andreas-pokorny/mir/load-all-supported-input-platforms

Alan Griffiths (alan-griffiths) wrote :

Nits:

+#include "mir/module_deleter.h"

 #include <memory>
 #include <string>
+#include <vector>

The other changes to src/include/server/mir/default_server_configuration.h don't justify these additions.

~~~~

- virtual std::shared_ptr<input::Platform> the_input_platform();
     virtual std::shared_ptr<dispatch::MultiplexingDispatchable> the_input_reading_multiplexer();
     virtual std::shared_ptr<input::InputDeviceRegistry> the_input_device_registry();
     virtual std::shared_ptr<input::InputDeviceHub> the_input_device_hub();
@@ -384,8 +385,7 @@
     CachedPtr<input::CompositeEventFilter> composite_event_filter;
     CachedPtr<input::InputManager> input_manager;
     CachedPtr<input::SurfaceInputDispatcher> surface_input_dispatcher;
- CachedPtr<input::DefaultInputDeviceHub> default_input_device_hub; // currently not used by default
- CachedPtr<input::Platform> input_platform; // currently not used by default
+ CachedPtr<input::DefaultInputDeviceHub> default_input_device_hub;

You can also lose the declaration of Platform on line 135.

~~~~~

Probably not something to address in this MP but...

+#ifdef MIR_BUILD_PLATFORM_MESA_X11
+ ON_CALL(mock_x11, XOpenDisplay(_)).WillByDefault(Return(nullptr));
+#endif

Should the test setup really depend on the *build* platform?

review: Needs Fixing

« Back to merge proposal