~vanvugt/mir/fix-1378706

Viewing changes to include/server/mir/server_configuration.h

Committer: Tarmac
Author(s): Andreas Pokorny
Date: 2014-10-14 11:48:16 UTC
mfrom: (1966.2.7 drop-input-configuration)
Revision ID: tarmac-20141014114816-j8lsm8wknit9ej0z

Drops InputConfiguration. The input configuration code is now part of DefaultServerConfiguration .

Approved by Daniel van Vugt, Alan Griffiths, PS Jenkins bot.

files removed:
include/server/mir/input/input_configuration.h

src/include/server/mir/input/android/default_android_input_configuration.h

src/server/input/android/default_android_input_configuration.cpp

src/server/input/null_input_configuration.cpp

src/server/input/null_input_configuration.h

tests/include/mir_test/fake_event_hub_input_configuration.h

tests/mir_test_doubles/fake_event_hub_input_configuration.cpp

files modified:
include/server/mir/default_server_configuration.h

include/server/mir/server_configuration.h

server-ABI-sha1sums

src/server/display_server.cpp

src/server/input/CMakeLists.txt

src/server/input/android/CMakeLists.txt

src/server/input/default_configuration.cpp

src/server/symbols.map

tests/acceptance-tests/test_client_cursor_api.cpp

tests/acceptance-tests/test_client_input.cpp

tests/include/mir_test_framework/fake_event_hub_server_configuration.h

tests/include/mir_test_framework/input_testing_server_configuration.h

tests/include/mir_test_framework/stubbed_server_configuration.h

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/session_management.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/integration-tests/test_session.cpp

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_framework/fake_event_hub_server_configuration.cpp

tests/mir_test_framework/input_testing_server_options.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

Show diffs side-by-side

added added

removed removed

include/server/mir/server_configuration.h

virtual std::shared_ptr<ServerStatusListener> the_server_status_listener() = 0;

virtual std::shared_ptr<DisplayChanger> the_display_changer() = 0;

virtual std::shared_ptr<graphics::Platform> the_graphics_platform() = 0;

virtual std::shared_ptr<input::InputConfiguration> the_input_configuration() = 0;

virtual std::shared_ptr<EmergencyCleanup> the_emergency_cleanup() = 0;

virtual auto the_fatal_error_strategy() -> void (*)(char const* reason, ...) = 0;

Older »