~brandontschaefer/mir/fix-remove-display-test

Viewing changes to include/test/mir/test/doubles/stub_input_device.h

Committer: Tarmac
Author(s): Andreas Pokorny
Date: 2016-12-21 04:39:38 UTC
mfrom: (3855.3.22 rename-input-configuration)
Revision ID: tarmac-20161221043938-b2hyzqum5fyl4fk6

rename a lot of structures from mir::input::... to Mir... to match the c API

The renames are :
    mir::input::InputConfiguration -> MirInputConfiguration
    mir::input::DeviceConfiguration -> MirInputDevice
    mir::input::PointerConfiguration -> MirPointerConfiguration
    mir::input::KeyboardConfiguratoin -> MirKeyboardConfiguration
    mir::input::TouchpadConfiguration -> MirTouchpadConfiguration
    mir::input::TouchscreenConfiguration -> MirTouchscreenConfiguration
.

Approved by Daniel van Vugt, mir-ci-bot, Alan Griffiths.

files renamed:
include/common/mir/input/input_configuration.h => include/common/mir/input/mir_input_configuration.h

include/common/mir/input/input_configuration_serialization.h => include/common/mir/input/mir_input_configuration_serialization.h

include/common/mir/input/keyboard_configuration.h => include/common/mir/input/mir_keyboard_configuration.h

include/common/mir/input/pointer_configuration.h => include/common/mir/input/mir_pointer_configuration.h

include/common/mir/input/touchpad_configuration.h => include/common/mir/input/mir_touchpad_configuration.h

include/common/mir/input/touchscreen_configuration.h => include/common/mir/input/mir_touchscreen_configuration.h

src/common/input/input_configuration.cpp => src/common/input/mir_input_configuration.cpp

src/common/input/input_configuration_serialization.cpp => src/common/input/mir_input_configuration_serialization.cpp

src/common/input/keyboard_configuration.cpp => src/common/input/mir_keyboard_configuration.cpp

src/common/input/pointer_configuration.cpp => src/common/input/mir_pointer_configuration.cpp

src/common/input/touchpad_configuration.cpp => src/common/input/mir_touchpad_configuration.cpp

src/common/input/touchscreen_configuration.cpp => src/common/input/mir_touchscreen_configuration.cpp

files modified:
examples/server_example_input_device_config.cpp

include/server/mir/input/device.h

include/test/mir/test/doubles/stub_input_device.h

src/common/CMakeLists.txt

src/common/symbols.map

src/include/server/mir/server_configuration.h

src/server/frontend/protobuf_input_converter.cpp

src/server/frontend/protobuf_input_converter.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/input/default_device.cpp

src/server/input/default_device.h

src/server/symbols.map

tests/acceptance-tests/test_client_input.cpp

tests/integration-tests/input/test_single_seat_setup.cpp

tests/unit-tests/frontend/test_event_sender.cpp

tests/unit-tests/input/test_default_device.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_key_repeat_dispatcher.cpp

Show diffs side-by-side

added added

removed removed

include/test/mir/test/doubles/stub_input_device.h

#include "mir/input/device.h"

#include "mir/input/device_capability.h"

#include "mir/input/pointer_configuration.h"

#include "mir/input/touchpad_configuration.h"

#include "mir/input/keyboard_configuration.h"

#include "mir/input/mir_pointer_configuration.h"

#include "mir/input/mir_touchpad_configuration.h"

#include "mir/input/mir_keyboard_configuration.h"

#include "mir/optional_value.h"

namespace mir

{

return device_unique_id;

}

mir::optional_value<input::PointerConfiguration> pointer_configuration() const override

{

return {};

}

void apply_pointer_configuration(input::PointerConfiguration const&) override

{

}

mir::optional_value<input::TouchpadConfiguration> touchpad_configuration() const override

{

return {};

}

void apply_touchpad_configuration(input::TouchpadConfiguration const&) override

{

}

mir::optional_value<input::KeyboardConfiguration> keyboard_configuration() const override

{

return {};

}

void apply_keyboard_configuration(input::KeyboardConfiguration const&) override

mir::optional_value<MirPointerConfiguration> pointer_configuration() const override

{

return {};

}

void apply_pointer_configuration(MirPointerConfiguration const&) override

{

}

mir::optional_value<MirTouchpadConfiguration> touchpad_configuration() const override

{

return {};

}

void apply_touchpad_configuration(MirTouchpadConfiguration const&) override

{

}

mir::optional_value<MirKeyboardConfiguration> keyboard_configuration() const override

{

return {};

}

void apply_keyboard_configuration(MirKeyboardConfiguration const&) override

{

}

Older »