← Back to branch summary

~mir-team/mir/in-process-egl+input-conglomeration

« back to all changes in this revision

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

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/server/mir/default_server_configuration.h
97
97
class Logger;
98
98
}
99
99
 
100
 
class DefaultServerConfiguration : public ServerConfiguration
 
100
class DefaultServerConfiguration : public virtual ServerConfiguration
101
101
{
102
102
public:
103
103
    DefaultServerConfiguration(int argc, char const* argv[]);
186
186
     *  @{ */
187
187
    virtual std::shared_ptr<input::android::InputConfiguration> the_input_configuration();
188
188
    virtual std::initializer_list<std::shared_ptr<input::EventFilter> const> the_event_filters();
189
 
 
190
 
    virtual std::shared_ptr<input::CursorListener> the_cursor_listener();
191
189
    virtual std::shared_ptr<shell::InputTargetListener> the_input_target_listener();
192
190
 
193
191
    /** @} */