Mir

Merge lp:~alan-griffiths/mir/update-libmirserver-symbols into lp:mir

  1. update-libmirserver-symbols
  2. Merge into development-branch
Proposed by Alan Griffiths on 2015-03-11
Status: Merged
Approved by: Alan Griffiths on 2015-03-13
Approved revision: 2389
Merged at revision: 2399
Proposed branch: lp:~alan-griffiths/mir/update-libmirserver-symbols
Merge into: lp:mir
Prerequisite: lp:~alan-griffiths/mir/DefaultShell-all-gone
Diff against target: 562 lines (+57/-230)
2 files modified
src/server/symbols.map (+54/-230)
tools/process_doxygen_xml.py (+3/-0)
To merge this branch: bzr merge lp:~alan-griffiths/mir/update-libmirserver-symbols
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-03-13
Alexandros Frantzis (community) 2015-03-11 Approve on 2015-03-13
Review via email: mp+252568@code.launchpad.net

Commit Message

Resync the server symbols.map file

Description of the Change

Resync the server symbols.map file

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2388
http://jenkins.qa.ubuntu.com/job/mir-ci/3193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1604
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1603
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1558
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1190
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1190/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1558
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1558/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4574
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18756

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3193/rebuild

review: Approve (continuous-integration)
Alexandros Frantzis (afrantzis) wrote :

8 - mir::compositor::Compositor::start*;
9 - mir::compositor::Compositor::stop*;

Aren't these needed by downstreams?

review: Needs Information
Alan Griffiths (alan-griffiths) wrote :

> 8 - mir::compositor::Compositor::start*;
> 9 - mir::compositor::Compositor::stop*;
>
> Aren't these needed by downstreams?

These are pure virtual functions for which we don't provide an implementation for a non-virtual invocation. So the entry point doesn't exist.

Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve
lp:~alan-griffiths/mir/update-libmirserver-symbols updated on 2015-03-13
2389. By Alan Griffiths on 2015-03-13

merge lp:mir

PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2389
http://jenkins.qa.ubuntu.com/job/mir-ci/3217/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1642
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1641
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1596
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1214
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1214/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1596
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1596/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4607
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18831

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3217/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/server/symbols.map'
2--- src/server/symbols.map 2015-03-05 13:53:45 +0000
3+++ src/server/symbols.map 2015-03-13 10:07:50 +0000
4@@ -10,119 +10,58 @@
5 # ../tools/process_doxygen_xml.py doc/xml/*.xml | grep "^mirserver public" | sed "s/mirserver public: / /" | sort
6 mir::compositor::Compositor::Compositor*;
7 mir::compositor::Compositor::operator*;
8- mir::compositor::Compositor::start*;
9- mir::compositor::Compositor::stop*;
10- mir::compositor::DisplayBufferCompositor::composite*;
11 mir::compositor::DisplayBufferCompositor::?DisplayBufferCompositor*;
12 mir::compositor::DisplayBufferCompositor::DisplayBufferCompositor*;
13- mir::compositor::DisplayBufferCompositorFactory::create_compositor_for*;
14 mir::compositor::DisplayBufferCompositorFactory::?DisplayBufferCompositorFactory*;
15 mir::compositor::DisplayBufferCompositorFactory::DisplayBufferCompositorFactory*;
16 mir::compositor::DisplayBufferCompositorFactory::operator*;
17 mir::compositor::DisplayBufferCompositor::operator*;
18- mir::compositor::DisplayListener::add_display*;
19 mir::compositor::DisplayListener::?DisplayListener*;
20 mir::compositor::DisplayListener::DisplayListener*;
21 mir::compositor::DisplayListener::operator*;
22- mir::compositor::DisplayListener::remove_display*;
23- mir::compositor::Scene::add_observer*;
24- mir::compositor::Scene::register_compositor*;
25- mir::compositor::Scene::remove_observer*;
26 mir::compositor::Scene::Scene*;
27- mir::compositor::Scene::scene_elements_for*;
28- mir::compositor::Scene::frames_pending*;
29- mir::compositor::Scene::unregister_compositor*;
30 mir::frontend::PromptSession::operator*;
31 mir::frontend::PromptSession::?PromptSession*;
32 mir::frontend::PromptSession::PromptSession*;
33- mir::frontend::SessionAuthorizer::configure_display_is_allowed*;
34- mir::frontend::SessionAuthorizer::connection_is_allowed*;
35 mir::frontend::SessionAuthorizer::operator*;
36- mir::frontend::SessionAuthorizer::prompt_session_is_allowed*;
37- mir::frontend::SessionAuthorizer::screencast_is_allowed*;
38 mir::frontend::SessionAuthorizer::?SessionAuthorizer*;
39 mir::frontend::SessionAuthorizer::SessionAuthorizer*;
40 mir::frontend::SessionCredentials::gid*;
41 mir::frontend::SessionCredentials::pid*;
42 mir::frontend::SessionCredentials::SessionCredentials*;
43 mir::frontend::SessionCredentials::uid*;
44- mir::frontend::Session::get_surface*;
45- mir::frontend::SessionMediatorReport::session_configure_display_called*;
46- mir::frontend::SessionMediatorReport::session_configure_surface_called*;
47- mir::frontend::SessionMediatorReport::session_configure_surface_cursor_called*;
48- mir::frontend::SessionMediatorReport::session_connect_called*;
49- mir::frontend::SessionMediatorReport::session_create_surface_called*;
50- mir::frontend::SessionMediatorReport::session_disconnect_called*;
51- mir::frontend::SessionMediatorReport::session_drm_auth_magic_called*;
52- mir::frontend::SessionMediatorReport::session_error*;
53- mir::frontend::SessionMediatorReport::session_exchange_buffer_called*;
54- mir::frontend::SessionMediatorReport::session_next_buffer_called*;
55- mir::frontend::SessionMediatorReport::session_release_surface_called*;
56- mir::frontend::SessionMediatorReport::session_start_prompt_session_called*;
57- mir::frontend::SessionMediatorReport::session_stop_prompt_session_called*;
58- mir::frontend::Session::name*;
59 mir::frontend::Session::operator*;
60 mir::frontend::Session::?Session*;
61 mir::frontend::Session::Session*;
62- mir::frontend::Surface::client_input_fd*;
63- mir::frontend::Surface::client_size*;
64 mir::frontend::Surface::operator*;
65- mir::frontend::Surface::pixel_format*;
66- mir::frontend::Surface::set_cursor_image*;
67- mir::frontend::Surface::supports_input*;
68 mir::frontend::Surface::?Surface*;
69 mir::frontend::Surface::Surface*;
70- mir::frontend::Surface::swap_buffers*;
71- mir::input::CompositeEventFilter::append*;
72- mir::input::CompositeEventFilter::prepend*;
73 mir::input::CursorImages::?CursorImages*;
74 mir::input::CursorImages::CursorImages*;
75- mir::input::CursorImages::image*;
76 mir::input::CursorImages::operator*;
77 mir::input::CursorListener::?CursorListener*;
78 mir::input::CursorListener::CursorListener*;
79- mir::input::CursorListener::cursor_moved_to*;
80 mir::input::CursorListener::operator*;
81 mir::input::EventFilter::?EventFilter*;
82 mir::input::EventFilter::EventFilter*;
83- mir::input::EventFilter::handle*;
84 mir::input::EventFilter::operator*;
85- mir::input::InputChannel::client_fd*;
86 mir::input::InputChannel::InputChannel*;
87 mir::input::InputChannel::operator*;
88- mir::input::InputChannel::server_fd*;
89- mir::input::InputDispatcher::configuration_changed*;
90- mir::input::InputDispatcher::device_reset*;
91- mir::input::InputDispatcher::dispatch*;
92 mir::input::InputDispatcher::?InputDispatcher*;
93- mir::input::InputDispatcher::start*;
94- mir::input::InputDispatcher::stop*;
95 mir::input::InputManager::InputManager*;
96 mir::input::InputManager::operator*;
97- mir::input::InputManager::start*;
98- mir::input::InputManager::stop*;
99- mir::input::Surface::consume*;
100- mir::input::Surface::cursor_image*;
101- mir::input::Surface::input_area_contains*;
102- mir::input::Surface::input_bounds*;
103- mir::input::Surface::input_channel*;
104- mir::input::Surface::name*;
105 mir::input::Surface::operator*;
106- mir::input::Surface::reception_mode*;
107 mir::input::Surface::?Surface*;
108 mir::input::Surface::Surface*;
109- mir::input::TouchVisualizer::disable*;
110- mir::input::TouchVisualizer::enable*;
111 mir::input::TouchVisualizer::operator*;
112 mir::input::TouchVisualizer::?TouchVisualizer*;
113 mir::input::TouchVisualizer::TouchVisualizer*;
114- mir::input::TouchVisualizer::visualize_touches*;
115- mir::MainLoop::run*;
116- mir::MainLoop::stop*;
117+ mir::LockableCallback::?LockableCallback*;
118+ mir::LockableCallback::LockableCallback*;
119+ mir::LockableCallback::operator*;
120 mir::report_exception*;
121 mir::scene::a_surface*;
122 mir::scene::CoordinateTranslator::?CoordinateTranslator*;
123- mir::scene::CoordinateTranslator::surface_to_screen*;
124 mir::scene::NullSessionListener::?NullSessionListener*;
125 mir::scene::NullSessionListener::NullSessionListener*;
126 mir::scene::NullSessionListener::operator*;
127@@ -132,6 +71,7 @@
128 mir::scene::NullSurfaceObserver::cursor_image_set_to*;
129 mir::scene::NullSurfaceObserver::frame_posted*;
130 mir::scene::NullSurfaceObserver::hidden_set_to*;
131+ mir::scene::NullSurfaceObserver::keymap_changed*;
132 mir::scene::NullSurfaceObserver::moved_to*;
133 mir::scene::NullSurfaceObserver::?NullSurfaceObserver*;
134 mir::scene::NullSurfaceObserver::NullSurfaceObserver*;
135@@ -140,98 +80,32 @@
136 mir::scene::NullSurfaceObserver::reception_mode_set_to*;
137 mir::scene::NullSurfaceObserver::resized_to*;
138 mir::scene::NullSurfaceObserver::transformation_set_to*;
139- mir::scene::Observer::end_observation*;
140 mir::scene::Observer::?Observer*;
141 mir::scene::Observer::Observer*;
142 mir::scene::Observer::operator*;
143- mir::scene::Observer::scene_changed*;
144- mir::scene::Observer::surface_added*;
145- mir::scene::Observer::surface_exists*;
146- mir::scene::Observer::surface_removed*;
147- mir::scene::Observer::surfaces_reordered*;
148 mir::scene::operator*;
149 mir::scene::PlacementStrategy::operator*;
150- mir::scene::PlacementStrategy::place*;
151 mir::scene::PlacementStrategy::?PlacementStrategy*;
152 mir::scene::PlacementStrategy::PlacementStrategy*;
153 mir::scene::PromptSessionListener::operator*;
154- mir::scene::PromptSessionListener::prompt_provider_added*;
155- mir::scene::PromptSessionListener::prompt_provider_removed*;
156 mir::scene::PromptSessionListener::?PromptSessionListener*;
157 mir::scene::PromptSessionListener::PromptSessionListener*;
158- mir::scene::PromptSessionListener::resuming*;
159- mir::scene::PromptSessionListener::starting*;
160- mir::scene::PromptSessionListener::stopping*;
161- mir::scene::PromptSessionListener::suspending*;
162- mir::scene::PromptSessionManager::add_prompt_provider*;
163- mir::scene::PromptSessionManager::application_for*;
164- mir::scene::PromptSessionManager::for_each_provider_in*;
165- mir::scene::PromptSessionManager::helper_for*;
166 mir::scene::PromptSessionManager::operator*;
167 mir::scene::PromptSessionManager::?PromptSessionManager*;
168 mir::scene::PromptSessionManager::PromptSessionManager*;
169- mir::scene::PromptSessionManager::remove_session*;
170- mir::scene::PromptSessionManager::resume_prompt_session*;
171- mir::scene::PromptSessionManager::start_prompt_session_for*;
172- mir::scene::PromptSessionManager::stop_prompt_session*;
173- mir::scene::PromptSessionManager::suspend_prompt_session*;
174- mir::scene::PromptSession::resume*;
175- mir::scene::PromptSession::start*;
176- mir::scene::PromptSession::stop*;
177- mir::scene::PromptSession::suspend*;
178- mir::scene::SessionCoordinator::close_session*;
179- mir::scene::SessionCoordinator::open_session*;
180 mir::scene::SessionCoordinator::operator*;
181 mir::scene::SessionCoordinator::?SessionCoordinator*;
182 mir::scene::SessionCoordinator::SessionCoordinator*;
183- mir::scene::SessionCoordinator::set_focus_to*;
184- mir::scene::SessionCoordinator::successor_of*;
185- mir::scene::SessionCoordinator::unset_focus*;
186- mir::scene::Session::create_surface*;
187- mir::scene::Session::default_surface*;
188- mir::scene::Session::destroy_surface*;
189- mir::scene::Session::force_requests_to_complete*;
190- mir::scene::Session::hide*;
191- mir::scene::SessionListener::destroying_surface*;
192- mir::scene::SessionListener::focused*;
193 mir::scene::SessionListener::operator*;
194 mir::scene::SessionListener::?SessionListener*;
195 mir::scene::SessionListener::SessionListener*;
196- mir::scene::SessionListener::starting*;
197- mir::scene::SessionListener::stopping*;
198- mir::scene::SessionListener::surface_created*;
199- mir::scene::SessionListener::unfocused*;
200- mir::scene::Session::process_id*;
201- mir::scene::Session::resume_prompt_session*;
202- mir::scene::Session::send_display_config*;
203- mir::scene::Session::set_lifecycle_state*;
204- mir::scene::Session::show*;
205- mir::scene::Session::start_prompt_session*;
206- mir::scene::Session::stop_prompt_session*;
207- mir::scene::Session::surface*;
208- mir::scene::Session::suspend_prompt_session*;
209- mir::scene::Session::take_snapshot*;
210- mir::scene::Surface::add_observer*;
211- mir::scene::Surface::allow_framedropping*;
212- mir::scene::Surface::alpha*;
213 mir::scene::SurfaceBufferAccess::operator*;
214 mir::scene::SurfaceBufferAccess::?SurfaceBufferAccess*;
215 mir::scene::SurfaceBufferAccess::SurfaceBufferAccess*;
216- mir::scene::SurfaceBufferAccess::with_most_recent_buffer_do*;
217- mir::scene::Surface::buffers_ready_for_compositor*;
218- mir::scene::Surface::client_size*;
219- mir::scene::Surface::compositor_snapshot*;
220- mir::scene::SurfaceConfigurator::attribute_set*;
221 mir::scene::SurfaceConfigurator::operator*;
222- mir::scene::SurfaceConfigurator::select_attribute_value*;
223 mir::scene::SurfaceConfigurator::?SurfaceConfigurator*;
224 mir::scene::SurfaceConfigurator::SurfaceConfigurator*;
225- mir::scene::Surface::configure*;
226- mir::scene::SurfaceCoordinator::add_surface*;
227 mir::scene::SurfaceCoordinator::operator*;
228- mir::scene::SurfaceCoordinator::raise*;
229- mir::scene::SurfaceCoordinator::remove_surface*;
230- mir::scene::SurfaceCoordinator::surface_at*;
231 mir::scene::SurfaceCoordinator::?SurfaceCoordinator*;
232 mir::scene::SurfaceCoordinator::SurfaceCoordinator*;
233 mir::scene::SurfaceCreationParameters::of_buffer_usage*;
234@@ -249,49 +123,10 @@
235 mir::scene::SurfaceCreationParameters::with_parent_id*;
236 mir::scene::SurfaceCreationParameters::with_preferred_orientation*;
237 mir::scene::SurfaceCreationParameters::with_state*;
238- mir::scene::Surface::cursor_image*;
239- mir::scene::Surface::force_requests_to_complete*;
240- mir::scene::Surface::hide*;
241- mir::scene::Surface::input_bounds*;
242- mir::scene::Surface::input_channel*;
243- mir::scene::Surface::move_to*;
244- mir::scene::Surface::name*;
245- mir::scene::SurfaceObserver::alpha_set_to*;
246- mir::scene::SurfaceObserver::attrib_changed*;
247- mir::scene::SurfaceObserver::client_surface_close_requested*;
248- mir::scene::SurfaceObserver::cursor_image_set_to*;
249- mir::scene::SurfaceObserver::frame_posted*;
250- mir::scene::SurfaceObserver::hidden_set_to*;
251- mir::scene::SurfaceObserver::moved_to*;
252 mir::scene::SurfaceObserver::operator*;
253- mir::scene::SurfaceObserver::orientation_set_to*;
254- mir::scene::SurfaceObserver::reception_mode_set_to*;
255- mir::scene::SurfaceObserver::resized_to*;
256 mir::scene::SurfaceObserver::?SurfaceObserver*;
257 mir::scene::SurfaceObserver::SurfaceObserver*;
258- mir::scene::SurfaceObserver::transformation_set_to*;
259- mir::scene::Surface::parent*;
260- mir::scene::Surface::query*;
261- mir::scene::Surface::remove_observer*;
262- mir::scene::Surface::request_client_surface_close*;
263- mir::scene::Surface::resize*;
264- mir::scene::Surface::set_alpha*;
265- mir::scene::Surface::set_cursor_image*;
266- mir::scene::Surface::set_input_region*;
267- mir::scene::Surface::set_orientation*;
268- mir::scene::Surface::set_reception_mode*;
269- mir::scene::Surface::set_transformation*;
270- mir::scene::Surface::show*;
271- mir::scene::Surface::size*;
272- mir::scene::Surface::state*;
273- mir::scene::Surface::take_input_focus*;
274- mir::scene::Surface::top_left*;
275- mir::scene::Surface::type*;
276- mir::scene::Surface::visible*;
277- mir::ServerActionQueue::enqueue*;
278 mir::ServerActionQueue::operator*;
279- mir::ServerActionQueue::pause_processing_for*;
280- mir::ServerActionQueue::resume_processing_for*;
281 mir::ServerActionQueue::?ServerActionQueue*;
282 mir::ServerActionQueue::ServerActionQueue*;
283 mir::Server::add_configuration_option*;
284@@ -325,11 +160,8 @@
285 mir::Server::set_exception_handler*;
286 mir::Server::set_terminator*;
287 mir::ServerStatusListener::operator*;
288- mir::ServerStatusListener::paused*;
289- mir::ServerStatusListener::resumed*;
290 mir::ServerStatusListener::?ServerStatusListener*;
291 mir::ServerStatusListener::ServerStatusListener*;
292- mir::ServerStatusListener::started*;
293 mir::Server::stop*;
294 mir::Server::supported_pixel_formats*;
295 mir::Server::the_composite_event_filter*;
296@@ -364,102 +196,73 @@
297 mir::shell::AbstractShell::close_session*;
298 mir::shell::AbstractShell::create_surface*;
299 mir::shell::AbstractShell::destroy_surface*;
300+ mir::shell::AbstractShell::focused_session*;
301+ mir::shell::AbstractShell::focused_surface*;
302 mir::shell::AbstractShell::focus_next*;
303- mir::shell::AbstractShell::focused_session*;
304- mir::shell::AbstractShell::focused_surface*;
305- mir::shell::AbstractShell::focused_session*;
306 mir::shell::AbstractShell::get_surface_attribute*;
307 mir::shell::AbstractShell::handle*;
308- mir::shell::AbstractShell::handle_surface_created*;
309 mir::shell::AbstractShell::open_session*;
310 mir::shell::AbstractShell::raise*;
311 mir::shell::AbstractShell::remove_display*;
312 mir::shell::AbstractShell::set_focus_to*;
313 mir::shell::AbstractShell::set_surface_attribute*;
314- mir::shell::AbstractShell::setting_focus_to*;
315 mir::shell::AbstractShell::start_prompt_session_for*;
316 mir::shell::AbstractShell::stop_prompt_session*;
317 mir::shell::AbstractShell::surface_at*;
318- mir::shell::DisplayLayout::clip_to_output*;
319 mir::shell::DisplayLayout::?DisplayLayout*;
320 mir::shell::DisplayLayout::DisplayLayout*;
321 mir::shell::DisplayLayout::operator*;
322- mir::shell::DisplayLayout::place_in_output*;
323- mir::shell::DisplayLayout::size_to_output*;
324 mir::shell::FocusController::?FocusController*;
325 mir::shell::FocusController::FocusController*;
326- mir::shell::FocusController::focus_next*;
327- mir::shell::FocusController::focused_session*;
328 mir::shell::FocusController::operator*;
329- mir::shell::FocusController::set_focus_to*;
330- mir::shell::FocusController::surface_at*;
331- mir::shell::GenericShell::add_display*;
332- mir::shell::GenericShell::close_session*;
333- mir::shell::GenericShell::create_surface*;
334- mir::shell::GenericShell::destroy_surface*;
335- mir::shell::GenericShell::GenericShell*;
336- mir::shell::GenericShell::handle*;
337- mir::shell::GenericShell::open_session*;
338- mir::shell::GenericShell::remove_display*;
339- mir::shell::GenericShell::set_surface_attribute*;
340 mir::shell::HostLifecycleEventListener::?HostLifecycleEventListener*;
341 mir::shell::HostLifecycleEventListener::HostLifecycleEventListener*;
342- mir::shell::HostLifecycleEventListener::lifecycle_event_occurred*;
343 mir::shell::HostLifecycleEventListener::operator*;
344- mir::shell::InputTargeter::focus_changed*;
345- mir::shell::InputTargeter::focus_cleared*;
346 mir::shell::InputTargeter::?InputTargeter*;
347 mir::shell::InputTargeter::InputTargeter*;
348 mir::shell::InputTargeter::operator*;
349- mir::shell::Shell::add_display*;
350- mir::shell::Shell::add_prompt_provider_for*;
351- mir::shell::Shell::close_session*;
352- mir::shell::Shell::create_surface*;
353- mir::shell::Shell::destroy_surface*;
354- mir::shell::Shell::get_surface_attribute*;
355- mir::shell::Shell::handle_surface_created*;
356- mir::shell::Shell::open_session*;
357- mir::shell::Shell::remove_display*;
358- mir::shell::Shell::set_surface_attribute*;
359- mir::shell::Shell::start_prompt_session_for*;
360- mir::shell::Shell::stop_prompt_session*;
361+ mir::shell::NullWindowManager::add_display*;
362+ mir::shell::NullWindowManager::add_session*;
363+ mir::shell::NullWindowManager::add_surface*;
364+ mir::shell::NullWindowManager::handle_key_event*;
365+ mir::shell::NullWindowManager::handle_pointer_event*;
366+ mir::shell::NullWindowManager::handle_touch_event*;
367+ mir::shell::NullWindowManager::remove_display*;
368+ mir::shell::NullWindowManager::remove_session*;
369+ mir::shell::NullWindowManager::remove_surface*;
370+ mir::shell::NullWindowManager::set_surface_attribute*;
371 mir::shell::ShellWrapper::add_display*;
372 mir::shell::ShellWrapper::add_prompt_provider_for*;
373 mir::shell::ShellWrapper::close_session*;
374- mir::shell::ShellWrapper::create_display*;
375 mir::shell::ShellWrapper::create_surface*;
376 mir::shell::ShellWrapper::destroy_surface*;
377- mir::shell::ShellWrapper::focus_next*;
378 mir::shell::ShellWrapper::focused_session*;
379 mir::shell::ShellWrapper::focused_surface*;
380+ mir::shell::ShellWrapper::focus_next*;
381 mir::shell::ShellWrapper::get_surface_attribute*;
382 mir::shell::ShellWrapper::handle*;
383- mir::shell::ShellWrapper::handle_surface_created*;
384 mir::shell::ShellWrapper::open_session*;
385 mir::shell::ShellWrapper::raise*;
386 mir::shell::ShellWrapper::remove_display*;
387 mir::shell::ShellWrapper::set_focus_to*;
388 mir::shell::ShellWrapper::set_surface_attribute*;
389- mir::shell::ShellWrapper::surface_at*;
390 mir::shell::ShellWrapper::ShellWrapper*;
391 mir::shell::ShellWrapper::start_prompt_session_for*;
392 mir::shell::ShellWrapper::stop_prompt_session*;
393+ mir::shell::ShellWrapper::surface_at*;
394+ mir::shell::WindowManager::operator*;
395+ mir::shell::WindowManager::?WindowManager*;
396+ mir::shell::WindowManager::WindowManager*;
397 mir::terminate_with_current_exception*;
398 mir::time::Alarm::?Alarm*;
399 mir::time::Alarm::Alarm*;
400- mir::time::Alarm::cancel*;
401+ mir::time::AlarmFactory::?AlarmFactory*;
402+ mir::time::AlarmFactory::AlarmFactory*;
403+ mir::time::AlarmFactory::operator*;
404 mir::time::Alarm::operator*;
405- mir::time::Alarm::reschedule_for*;
406- mir::time::Alarm::reschedule_in*;
407- mir::time::Alarm::state*;
408- mir::time::Timer::create_alarm*;
409- mir::time::Timer::notify_at*;
410- mir::time::Timer::notify_in*;
411- mir::time::Timer::operator*;
412- mir::time::Timer::?Timer*;
413- mir::time::Timer::Timer*;
414 non-virtual?thunk?to?mir::compositor::DisplayBufferCompositor::?DisplayBufferCompositor*;
415 non-virtual?thunk?to?mir::compositor::DisplayBufferCompositorFactory::?DisplayBufferCompositorFactory*;
416+ non-virtual?thunk?to?mir::compositor::DisplayListener::?DisplayListener*;
417 non-virtual?thunk?to?mir::frontend::PromptSession::?PromptSession*;
418 non-virtual?thunk?to?mir::frontend::SessionAuthorizer::?SessionAuthorizer*;
419 non-virtual?thunk?to?mir::frontend::Session::?Session*;
420@@ -470,6 +273,7 @@
421 non-virtual?thunk?to?mir::input::InputDispatcher::?InputDispatcher*;
422 non-virtual?thunk?to?mir::input::Surface::?Surface*;
423 non-virtual?thunk?to?mir::input::TouchVisualizer::?TouchVisualizer*;
424+ non-virtual?thunk?to?mir::LockableCallback::?LockableCallback*;
425 non-virtual?thunk?to?mir::scene::CoordinateTranslator::?CoordinateTranslator*;
426 non-virtual?thunk?to?mir::scene::NullSessionListener::?NullSessionListener*;
427 non-virtual?thunk?to?mir::scene::NullSurfaceObserver::alpha_set_to*;
428@@ -478,6 +282,7 @@
429 non-virtual?thunk?to?mir::scene::NullSurfaceObserver::cursor_image_set_to*;
430 non-virtual?thunk?to?mir::scene::NullSurfaceObserver::frame_posted*;
431 non-virtual?thunk?to?mir::scene::NullSurfaceObserver::hidden_set_to*;
432+ non-virtual?thunk?to?mir::scene::NullSurfaceObserver::keymap_changed*;
433 non-virtual?thunk?to?mir::scene::NullSurfaceObserver::moved_to*;
434 non-virtual?thunk?to?mir::scene::NullSurfaceObserver::?NullSurfaceObserver*;
435 non-virtual?thunk?to?mir::scene::NullSurfaceObserver::orientation_set_to*;
436@@ -501,18 +306,16 @@
437 non-virtual?thunk?to?mir::shell::AbstractShell::close_session*;
438 non-virtual?thunk?to?mir::shell::AbstractShell::create_surface*;
439 non-virtual?thunk?to?mir::shell::AbstractShell::destroy_surface*;
440- non-virtual?thunk?to?mir::shell::AbstractShell::focus_next*;
441 non-virtual?thunk?to?mir::shell::AbstractShell::focused_session*;
442 non-virtual?thunk?to?mir::shell::AbstractShell::focused_surface*;
443+ non-virtual?thunk?to?mir::shell::AbstractShell::focus_next*;
444 non-virtual?thunk?to?mir::shell::AbstractShell::get_surface_attribute*;
445 non-virtual?thunk?to?mir::shell::AbstractShell::handle*;
446- non-virtual?thunk?to?mir::shell::AbstractShell::handle_surface_created*;
447 non-virtual?thunk?to?mir::shell::AbstractShell::open_session*;
448 non-virtual?thunk?to?mir::shell::AbstractShell::raise*;
449 non-virtual?thunk?to?mir::shell::AbstractShell::remove_display*;
450 non-virtual?thunk?to?mir::shell::AbstractShell::set_focus_to*;
451 non-virtual?thunk?to?mir::shell::AbstractShell::set_surface_attribute*;
452- non-virtual?thunk?to?mir::shell::AbstractShell::setting_focus_to*;
453 non-virtual?thunk?to?mir::shell::AbstractShell::start_prompt_session_for*;
454 non-virtual?thunk?to?mir::shell::AbstractShell::stop_prompt_session*;
455 non-virtual?thunk?to?mir::shell::AbstractShell::surface_at*;
456@@ -520,27 +323,41 @@
457 non-virtual?thunk?to?mir::shell::FocusController::?FocusController*;
458 non-virtual?thunk?to?mir::shell::HostLifecycleEventListener::?HostLifecycleEventListener*;
459 non-virtual?thunk?to?mir::shell::InputTargeter::?InputTargeter*;
460+ non-virtual?thunk?to?mir::shell::NullWindowManager::add_display*;
461+ non-virtual?thunk?to?mir::shell::NullWindowManager::add_session*;
462+ non-virtual?thunk?to?mir::shell::NullWindowManager::add_surface*;
463+ non-virtual?thunk?to?mir::shell::NullWindowManager::handle_key_event*;
464+ non-virtual?thunk?to?mir::shell::NullWindowManager::handle_pointer_event*;
465+ non-virtual?thunk?to?mir::shell::NullWindowManager::handle_touch_event*;
466+ non-virtual?thunk?to?mir::shell::NullWindowManager::remove_display*;
467+ non-virtual?thunk?to?mir::shell::NullWindowManager::remove_session*;
468+ non-virtual?thunk?to?mir::shell::NullWindowManager::remove_surface*;
469+ non-virtual?thunk?to?mir::shell::NullWindowManager::set_surface_attribute*;
470 non-virtual?thunk?to?mir::shell::ShellWrapper::add_display*;
471 non-virtual?thunk?to?mir::shell::ShellWrapper::add_prompt_provider_for*;
472 non-virtual?thunk?to?mir::shell::ShellWrapper::close_session*;
473 non-virtual?thunk?to?mir::shell::ShellWrapper::create_surface*;
474 non-virtual?thunk?to?mir::shell::ShellWrapper::destroy_surface*;
475+ non-virtual?thunk?to?mir::shell::ShellWrapper::focused_session*;
476+ non-virtual?thunk?to?mir::shell::ShellWrapper::focused_surface*;
477 non-virtual?thunk?to?mir::shell::ShellWrapper::focus_next*;
478- non-virtual?thunk?to?mir::shell::ShellWrapper::focused_session*;
479 non-virtual?thunk?to?mir::shell::ShellWrapper::get_surface_attribute*;
480 non-virtual?thunk?to?mir::shell::ShellWrapper::handle*;
481- non-virtual?thunk?to?mir::shell::ShellWrapper::handle_surface_created*;
482 non-virtual?thunk?to?mir::shell::ShellWrapper::open_session*;
483+ non-virtual?thunk?to?mir::shell::ShellWrapper::raise*;
484 non-virtual?thunk?to?mir::shell::ShellWrapper::remove_display*;
485 non-virtual?thunk?to?mir::shell::ShellWrapper::set_focus_to*;
486 non-virtual?thunk?to?mir::shell::ShellWrapper::set_surface_attribute*;
487 non-virtual?thunk?to?mir::shell::ShellWrapper::start_prompt_session_for*;
488 non-virtual?thunk?to?mir::shell::ShellWrapper::stop_prompt_session*;
489+ non-virtual?thunk?to?mir::shell::ShellWrapper::surface_at*;
490+ non-virtual?thunk?to?mir::shell::WindowManager::?WindowManager*;
491 non-virtual?thunk?to?mir::time::Alarm::?Alarm*;
492- non-virtual?thunk?to?mir::time::Timer::?Timer*;
493+ non-virtual?thunk?to?mir::time::AlarmFactory::?AlarmFactory*;
494 typeinfo?for?mir::compositor::Compositor;
495 typeinfo?for?mir::compositor::DisplayBufferCompositor;
496 typeinfo?for?mir::compositor::DisplayBufferCompositorFactory;
497+ typeinfo?for?mir::compositor::DisplayListener;
498 typeinfo?for?mir::compositor::Scene;
499 typeinfo?for?mir::frontend::PromptSession;
500 typeinfo?for?mir::frontend::Session;
501@@ -558,6 +375,7 @@
502 typeinfo?for?mir::input::Surface;
503 typeinfo?for?mir::input::TouchVisualizer;
504 typeinfo?for?mir::input::TouchVisualizer::Spot;
505+ typeinfo?for?mir::LockableCallback;
506 typeinfo?for?mir::MainLoop;
507 typeinfo?for?mir::scene::CoordinateTranslator;
508 typeinfo?for?mir::scene::NullSessionListener;
509@@ -586,13 +404,16 @@
510 typeinfo?for?mir::shell::FocusController;
511 typeinfo?for?mir::shell::HostLifecycleEventListener;
512 typeinfo?for?mir::shell::InputTargeter;
513+ typeinfo?for?mir::shell::NullWindowManager;
514 typeinfo?for?mir::shell::Shell;
515 typeinfo?for?mir::shell::ShellWrapper;
516+ typeinfo?for?mir::shell::WindowManager;
517 typeinfo?for?mir::time::Alarm;
518- typeinfo?for?mir::time::Timer;
519+ typeinfo?for?mir::time::AlarmFactory;
520 vtable?for?mir::compositor::Compositor;
521 vtable?for?mir::compositor::DisplayBufferCompositor;
522 vtable?for?mir::compositor::DisplayBufferCompositorFactory;
523+ vtable?for?mir::compositor::DisplayListener;
524 vtable?for?mir::compositor::Scene;
525 vtable?for?mir::frontend::PromptSession;
526 vtable?for?mir::frontend::Session;
527@@ -610,6 +431,7 @@
528 vtable?for?mir::input::Surface;
529 vtable?for?mir::input::TouchVisualizer;
530 vtable?for?mir::input::TouchVisualizer::Spot;
531+ vtable?for?mir::LockableCallback;
532 vtable?for?mir::MainLoop;
533 vtable?for?mir::scene::CoordinateTranslator;
534 vtable?for?mir::scene::NullSessionListener;
535@@ -638,10 +460,12 @@
536 vtable?for?mir::shell::FocusController;
537 vtable?for?mir::shell::HostLifecycleEventListener;
538 vtable?for?mir::shell::InputTargeter;
539+ vtable?for?mir::shell::NullWindowManager;
540 vtable?for?mir::shell::Shell;
541 vtable?for?mir::shell::ShellWrapper;
542+ vtable?for?mir::shell::WindowManager;
543 vtable?for?mir::time::Alarm;
544- vtable?for?mir::time::Timer;
545+ vtable?for?mir::time::AlarmFactory;
546
547 # needed but not picked up by current version of script
548 virtual?thunk?to?mir::shell::AbstractShell::?AbstractShell*;
549
550=== modified file 'tools/process_doxygen_xml.py'
551--- tools/process_doxygen_xml.py 2015-01-21 07:34:50 +0000
552+++ tools/process_doxygen_xml.py 2015-03-13 10:07:50 +0000
553@@ -138,6 +138,9 @@
554 if publish and prot == 'private':
555 if is_function: publish = node.attributes['virt'].value == 'virtual'
556 else: publish = False
557+
558+ if publish and has_element(node, ['argsstring']):
559+ publish = not get_text_for_element(node, 'argsstring').endswith('=0')
560
561 if is_function: print_debug_info(node, ['kind', 'prot', 'static', 'virt'])
562 else: print_debug_info(node, ['kind', 'prot', 'static'])

Subscribers

People subscribed via source and target branches