From c6eda9bd804f58ef590f6520e3635eba4d2f064b Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Thu, 11 Jun 2020 14:27:20 +0200 Subject: [PATCH] Rename include/nitpicker_session to gui_session This patch also renames the depot api archive accordingly. Issue #3778 --- repos/demo/include/scout/nitpicker_graphics_backend.h | 2 +- repos/demo/recipes/src/demo/used_apis | 2 +- repos/demo/src/server/nitlog/main.cc | 2 +- repos/gems/include/gems/nitpicker_buffer.h | 2 +- repos/gems/include/gems/wrapped_nitpicker_session.h | 2 +- repos/gems/include/nano3d/scene.h | 2 +- repos/gems/recipes/src/backdrop/used_apis | 2 +- repos/gems/recipes/src/cpu_load_display/used_apis | 2 +- repos/gems/recipes/src/decorator/used_apis | 2 +- repos/gems/recipes/src/menu_view/used_apis | 2 +- repos/gems/recipes/src/nano3d/used_apis | 2 +- repos/gems/recipes/src/nit_fader/used_apis | 2 +- repos/gems/recipes/src/sculpt_manager/used_apis | 2 +- repos/gems/recipes/src/text_area/used_apis | 2 +- repos/gems/recipes/src/themed_decorator/used_apis | 2 +- repos/gems/recipes/src/window_layouter/used_apis | 2 +- repos/gems/recipes/src/wm/used_apis | 2 +- repos/gems/src/app/backdrop/main.cc | 2 +- repos/gems/src/app/decorator/main.cc | 2 +- repos/gems/src/app/menu_view/types.h | 2 +- repos/gems/src/app/sculpt_manager/main.cc | 2 +- repos/gems/src/app/sculpt_manager/nitpicker.cc | 2 +- repos/gems/src/app/sculpt_manager/nitpicker.h | 2 +- repos/gems/src/app/sculpt_manager/types.h | 2 +- repos/gems/src/app/text_area/nitpicker.h | 2 +- repos/gems/src/app/themed_decorator/window.h | 2 +- repos/gems/src/app/window_layouter/main.cc | 2 +- repos/gems/src/server/nit_fader/main.cc | 2 +- repos/gems/src/server/wm/decorator_nitpicker.h | 2 +- repos/gems/src/server/wm/direct_nitpicker.h | 2 +- repos/gems/src/server/wm/layouter_nitpicker.h | 2 +- repos/gems/src/server/wm/main.cc | 2 +- repos/gems/src/server/wm/nitpicker.h | 2 +- .../qt5/qnitpickerviewwidget/qnitpickerviewwidget.h | 2 +- .../qt5/qpa_nitpicker/qnitpickerplatformwindow.h | 2 +- repos/libports/recipes/src/pdf_view/used_apis | 2 +- .../recipes/src/qt5_qnitpickerviewwidget/used_apis | 2 +- repos/libports/recipes/src/qt5_qpa_nitpicker/used_apis | 2 +- repos/libports/recipes/src/qt5_qpluginwidget/used_apis | 2 +- .../libports/recipes/src/test-qpluginwidget/used_apis | 2 +- repos/libports/src/app/pdf_view/main.cc | 2 +- .../platforms/nitpicker/qnitpickerplatformwindow.cpp | 2 +- .../src/plugins/platforms/nitpicker/qnitpickerscreen.h | 2 +- repos/os/include/decorator/types.h | 2 +- repos/os/include/decorator/window.h | 2 +- repos/os/include/decorator/window_stack.h | 2 +- .../{nitpicker_session => gui_session}/capability.h | 10 +++++----- .../{nitpicker_session => gui_session}/client.h | 10 +++++----- .../{nitpicker_session => gui_session}/connection.h | 8 ++++---- .../nitpicker_session.h => gui_session/gui_session.h} | 6 +++--- repos/os/include/loader_session/loader_session.h | 2 +- repos/os/recipes/api/gui_session/content.mk | 2 ++ .../api/{nitpicker_session => gui_session}/hash | 0 repos/os/recipes/api/nitpicker_session/content.mk | 2 -- repos/os/recipes/src/global_keys_handler/used_apis | 2 +- repos/os/recipes/src/loader/used_apis | 2 +- repos/os/recipes/src/nit_fb/used_apis | 2 +- repos/os/recipes/src/nitpicker/used_apis | 2 +- repos/os/recipes/src/test-dynamic_config/used_apis | 2 +- repos/os/recipes/src/test-fault_detection/used_apis | 2 +- repos/os/src/app/global_keys_handler/main.cc | 2 +- repos/os/src/app/pointer/main.cc | 2 +- repos/os/src/app/status_bar/main.cc | 2 +- repos/os/src/server/loader/nitpicker.h | 2 +- repos/os/src/server/nit_fb/main.cc | 2 +- repos/os/src/server/nitpicker/session_component.h | 2 +- repos/os/src/server/nitpicker/view_owner.h | 2 +- repos/os/src/test/nitpicker/test.cc | 2 +- repos/ports/recipes/src/arora/used_apis | 2 +- repos/ports/recipes/src/seoul/used_apis | 2 +- repos/ports/recipes/src/vbox5-nova/used_apis | 2 +- repos/ports/recipes/src/vbox5/used_apis | 2 +- repos/ports/src/app/seoul/console.h | 2 +- repos/ports/src/virtualbox5/frontend/console.h | 2 +- repos/ports/src/virtualbox5/frontend/fb.h | 2 +- 75 files changed, 87 insertions(+), 87 deletions(-) rename repos/os/include/{nitpicker_session => gui_session}/capability.h (59%) rename repos/os/include/{nitpicker_session => gui_session}/client.h (92%) rename repos/os/include/{nitpicker_session => gui_session}/connection.h (92%) rename repos/os/include/{nitpicker_session/nitpicker_session.h => gui_session/gui_session.h} (98%) create mode 100644 repos/os/recipes/api/gui_session/content.mk rename repos/os/recipes/api/{nitpicker_session => gui_session}/hash (100%) delete mode 100644 repos/os/recipes/api/nitpicker_session/content.mk diff --git a/repos/demo/include/scout/nitpicker_graphics_backend.h b/repos/demo/include/scout/nitpicker_graphics_backend.h index 849066e29f..2f133a5a08 100644 --- a/repos/demo/include/scout/nitpicker_graphics_backend.h +++ b/repos/demo/include/scout/nitpicker_graphics_backend.h @@ -15,7 +15,7 @@ #define _INCLUDE__SCOUT__NITPICKER_GRAPHICS_BACKEND_H_ /* Genode includes */ -#include +#include #include #include diff --git a/repos/demo/recipes/src/demo/used_apis b/repos/demo/recipes/src/demo/used_apis index 2ce3f1ba26..a91105fd08 100644 --- a/repos/demo/recipes/src/demo/used_apis +++ b/repos/demo/recipes/src/demo/used_apis @@ -5,4 +5,4 @@ nitpicker_gfx timer_session input_session framebuffer_session -nitpicker_session +gui_session diff --git a/repos/demo/src/server/nitlog/main.cc b/repos/demo/src/server/nitlog/main.cc index f9b1f63f2f..e246b21345 100644 --- a/repos/demo/src/server/nitlog/main.cc +++ b/repos/demo/src/server/nitlog/main.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/repos/gems/include/gems/nitpicker_buffer.h b/repos/gems/include/gems/nitpicker_buffer.h index ff74c495da..ce1f4a9d25 100644 --- a/repos/gems/include/gems/nitpicker_buffer.h +++ b/repos/gems/include/gems/nitpicker_buffer.h @@ -16,7 +16,7 @@ /* Genode includes */ #include -#include +#include #include #include #include diff --git a/repos/gems/include/gems/wrapped_nitpicker_session.h b/repos/gems/include/gems/wrapped_nitpicker_session.h index 307deb02c5..ec7f3aa0fc 100644 --- a/repos/gems/include/gems/wrapped_nitpicker_session.h +++ b/repos/gems/include/gems/wrapped_nitpicker_session.h @@ -22,7 +22,7 @@ /* Genode includes */ #include -#include +#include class Wrapped_nitpicker_session : public Genode::Rpc_object { diff --git a/repos/gems/include/nano3d/scene.h b/repos/gems/include/nano3d/scene.h index 18b71504b7..f916c606df 100644 --- a/repos/gems/include/nano3d/scene.h +++ b/repos/gems/include/nano3d/scene.h @@ -22,7 +22,7 @@ /* Genode includes */ #include #include -#include +#include #include #include #include diff --git a/repos/gems/recipes/src/backdrop/used_apis b/repos/gems/recipes/src/backdrop/used_apis index a21bf7754a..d1f74c5d10 100644 --- a/repos/gems/recipes/src/backdrop/used_apis +++ b/repos/gems/recipes/src/backdrop/used_apis @@ -7,6 +7,6 @@ blit gems nitpicker_gfx vfs -nitpicker_session +gui_session framebuffer_session input_session diff --git a/repos/gems/recipes/src/cpu_load_display/used_apis b/repos/gems/recipes/src/cpu_load_display/used_apis index 08660a5b20..3c332b32d6 100644 --- a/repos/gems/recipes/src/cpu_load_display/used_apis +++ b/repos/gems/recipes/src/cpu_load_display/used_apis @@ -4,6 +4,6 @@ polygon_gfx nano3d gems input_session -nitpicker_session +gui_session framebuffer_session timer_session diff --git a/repos/gems/recipes/src/decorator/used_apis b/repos/gems/recipes/src/decorator/used_apis index d0d9e8f2ff..57489b102e 100644 --- a/repos/gems/recipes/src/decorator/used_apis +++ b/repos/gems/recipes/src/decorator/used_apis @@ -4,6 +4,6 @@ nitpicker_gfx scout_gfx gems input_session -nitpicker_session +gui_session framebuffer_session report_session diff --git a/repos/gems/recipes/src/menu_view/used_apis b/repos/gems/recipes/src/menu_view/used_apis index 5f95031c9b..6fa47b8795 100644 --- a/repos/gems/recipes/src/menu_view/used_apis +++ b/repos/gems/recipes/src/menu_view/used_apis @@ -8,7 +8,7 @@ gems nitpicker_gfx scout_gfx vfs -nitpicker_session +gui_session framebuffer_session input_session timer_session diff --git a/repos/gems/recipes/src/nano3d/used_apis b/repos/gems/recipes/src/nano3d/used_apis index f72748f505..9164ca7a90 100644 --- a/repos/gems/recipes/src/nano3d/used_apis +++ b/repos/gems/recipes/src/nano3d/used_apis @@ -3,7 +3,7 @@ os blit framebuffer_session input_session -nitpicker_session +gui_session timer_session nano3d polygon_gfx diff --git a/repos/gems/recipes/src/nit_fader/used_apis b/repos/gems/recipes/src/nit_fader/used_apis index b309a00a41..fbbf4d2996 100644 --- a/repos/gems/recipes/src/nit_fader/used_apis +++ b/repos/gems/recipes/src/nit_fader/used_apis @@ -3,7 +3,7 @@ os blit framebuffer_session input_session -nitpicker_session +gui_session timer_session nitpicker_gfx scout_gfx diff --git a/repos/gems/recipes/src/sculpt_manager/used_apis b/repos/gems/recipes/src/sculpt_manager/used_apis index 124c351ec4..685de8b9d4 100644 --- a/repos/gems/recipes/src/sculpt_manager/used_apis +++ b/repos/gems/recipes/src/sculpt_manager/used_apis @@ -8,7 +8,7 @@ block_session usb_session framebuffer_session platform_session -nitpicker_session +gui_session terminal_session rtc_session input_session diff --git a/repos/gems/recipes/src/text_area/used_apis b/repos/gems/recipes/src/text_area/used_apis index 52dfa42c41..89cebe3fde 100644 --- a/repos/gems/recipes/src/text_area/used_apis +++ b/repos/gems/recipes/src/text_area/used_apis @@ -4,6 +4,6 @@ vfs report_session file_system_session timer_session -nitpicker_session +gui_session input_session framebuffer_session diff --git a/repos/gems/recipes/src/themed_decorator/used_apis b/repos/gems/recipes/src/themed_decorator/used_apis index ba0dacbfcf..f310efb240 100644 --- a/repos/gems/recipes/src/themed_decorator/used_apis +++ b/repos/gems/recipes/src/themed_decorator/used_apis @@ -10,6 +10,6 @@ zlib gems vfs input_session -nitpicker_session +gui_session framebuffer_session report_session diff --git a/repos/gems/recipes/src/window_layouter/used_apis b/repos/gems/recipes/src/window_layouter/used_apis index 401ba72d01..6daff80b7e 100644 --- a/repos/gems/recipes/src/window_layouter/used_apis +++ b/repos/gems/recipes/src/window_layouter/used_apis @@ -2,6 +2,6 @@ base os input_session report_session -nitpicker_session +gui_session framebuffer_session timer_session diff --git a/repos/gems/recipes/src/wm/used_apis b/repos/gems/recipes/src/wm/used_apis index 2490f3f026..9e8d5dc44b 100644 --- a/repos/gems/recipes/src/wm/used_apis +++ b/repos/gems/recipes/src/wm/used_apis @@ -2,6 +2,6 @@ base os gems input_session -nitpicker_session +gui_session framebuffer_session report_session diff --git a/repos/gems/src/app/backdrop/main.cc b/repos/gems/src/app/backdrop/main.cc index 4862f094cf..d3e6840d19 100644 --- a/repos/gems/src/app/backdrop/main.cc +++ b/repos/gems/src/app/backdrop/main.cc @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/repos/gems/src/app/decorator/main.cc b/repos/gems/src/app/decorator/main.cc index 23a2fb195a..b55812afd6 100644 --- a/repos/gems/src/app/decorator/main.cc +++ b/repos/gems/src/app/decorator/main.cc @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/repos/gems/src/app/menu_view/types.h b/repos/gems/src/app/menu_view/types.h index 50ed7d5935..9011d8282e 100644 --- a/repos/gems/src/app/menu_view/types.h +++ b/repos/gems/src/app/menu_view/types.h @@ -15,7 +15,7 @@ #define _TYPES_H_ /* Genode includes */ -#include +#include #include #include #include diff --git a/repos/gems/src/app/sculpt_manager/main.cc b/repos/gems/src/app/sculpt_manager/main.cc index 27d3212f1b..afdc30de00 100644 --- a/repos/gems/src/app/sculpt_manager/main.cc +++ b/repos/gems/src/app/sculpt_manager/main.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include diff --git a/repos/gems/src/app/sculpt_manager/nitpicker.cc b/repos/gems/src/app/sculpt_manager/nitpicker.cc index 983539495b..69045bfb33 100644 --- a/repos/gems/src/app/sculpt_manager/nitpicker.cc +++ b/repos/gems/src/app/sculpt_manager/nitpicker.cc @@ -15,7 +15,7 @@ /* Genode includes */ #include -#include +#include #include struct Nitpicker::Session_component : Rpc_object diff --git a/repos/gems/src/app/sculpt_manager/nitpicker.h b/repos/gems/src/app/sculpt_manager/nitpicker.h index 97635a7298..494fc686e0 100644 --- a/repos/gems/src/app/sculpt_manager/nitpicker.h +++ b/repos/gems/src/app/sculpt_manager/nitpicker.h @@ -16,7 +16,7 @@ /* Genode includes */ #include -#include +#include #include /* local includes */ diff --git a/repos/gems/src/app/sculpt_manager/types.h b/repos/gems/src/app/sculpt_manager/types.h index cf29f14422..4cea3d31b2 100644 --- a/repos/gems/src/app/sculpt_manager/types.h +++ b/repos/gems/src/app/sculpt_manager/types.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/repos/gems/src/app/text_area/nitpicker.h b/repos/gems/src/app/text_area/nitpicker.h index 6eb447e3b2..42e00d2d51 100644 --- a/repos/gems/src/app/text_area/nitpicker.h +++ b/repos/gems/src/app/text_area/nitpicker.h @@ -17,7 +17,7 @@ /* Genode includes */ #include #include -#include +#include /* local includes */ #include diff --git a/repos/gems/src/app/themed_decorator/window.h b/repos/gems/src/app/themed_decorator/window.h index 64ecea26e8..e9286e5002 100644 --- a/repos/gems/src/app/themed_decorator/window.h +++ b/repos/gems/src/app/themed_decorator/window.h @@ -17,7 +17,7 @@ /* Genode includes */ #include #include -#include +#include #include #include diff --git a/repos/gems/src/app/window_layouter/main.cc b/repos/gems/src/app/window_layouter/main.cc index 28ae457797..112b31aefe 100644 --- a/repos/gems/src/app/window_layouter/main.cc +++ b/repos/gems/src/app/window_layouter/main.cc @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/repos/gems/src/server/nit_fader/main.cc b/repos/gems/src/server/nit_fader/main.cc index e5607940de..0dd73bcfd2 100644 --- a/repos/gems/src/server/nit_fader/main.cc +++ b/repos/gems/src/server/nit_fader/main.cc @@ -13,7 +13,7 @@ /* Genode includes */ #include -#include +#include #include #include #include diff --git a/repos/gems/src/server/wm/decorator_nitpicker.h b/repos/gems/src/server/wm/decorator_nitpicker.h index 54e334f3ec..5477917729 100644 --- a/repos/gems/src/server/wm/decorator_nitpicker.h +++ b/repos/gems/src/server/wm/decorator_nitpicker.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/repos/gems/src/server/wm/direct_nitpicker.h b/repos/gems/src/server/wm/direct_nitpicker.h index 77f602bfa5..b66775e3e4 100644 --- a/repos/gems/src/server/wm/direct_nitpicker.h +++ b/repos/gems/src/server/wm/direct_nitpicker.h @@ -16,7 +16,7 @@ /* Genode includes */ #include -#include +#include namespace Wm { class Direct_nitpicker_session; } diff --git a/repos/gems/src/server/wm/layouter_nitpicker.h b/repos/gems/src/server/wm/layouter_nitpicker.h index 3768fe8f94..1487a244f8 100644 --- a/repos/gems/src/server/wm/layouter_nitpicker.h +++ b/repos/gems/src/server/wm/layouter_nitpicker.h @@ -16,7 +16,7 @@ /* Genode includes */ #include -#include +#include namespace Wm { struct Layouter_nitpicker_session; diff --git a/repos/gems/src/server/wm/main.cc b/repos/gems/src/server/wm/main.cc index de95b140b1..67aa5a3da5 100644 --- a/repos/gems/src/server/wm/main.cc +++ b/repos/gems/src/server/wm/main.cc @@ -12,7 +12,7 @@ */ /* Genode includes */ -#include +#include #include #include #include diff --git a/repos/gems/src/server/wm/nitpicker.h b/repos/gems/src/server/wm/nitpicker.h index 70556569f1..2a6f099b21 100644 --- a/repos/gems/src/server/wm/nitpicker.h +++ b/repos/gems/src/server/wm/nitpicker.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/repos/libports/include/qt5/qnitpickerviewwidget/qnitpickerviewwidget.h b/repos/libports/include/qt5/qnitpickerviewwidget/qnitpickerviewwidget.h index 4497e868cb..948e1d97e6 100644 --- a/repos/libports/include/qt5/qnitpickerviewwidget/qnitpickerviewwidget.h +++ b/repos/libports/include/qt5/qnitpickerviewwidget/qnitpickerviewwidget.h @@ -19,7 +19,7 @@ #include #endif -#include +#include class QEmbeddedViewWidget : public QWidget diff --git a/repos/libports/include/qt5/qpa_nitpicker/qnitpickerplatformwindow.h b/repos/libports/include/qt5/qpa_nitpicker/qnitpickerplatformwindow.h index 1a423904b6..f44a4278e1 100644 --- a/repos/libports/include/qt5/qpa_nitpicker/qnitpickerplatformwindow.h +++ b/repos/libports/include/qt5/qpa_nitpicker/qnitpickerplatformwindow.h @@ -18,7 +18,7 @@ /* Genode includes */ #include -#include +#include /* EGL includes */ #include diff --git a/repos/libports/recipes/src/pdf_view/used_apis b/repos/libports/recipes/src/pdf_view/used_apis index a3f390cd76..7b5df31052 100644 --- a/repos/libports/recipes/src/pdf_view/used_apis +++ b/repos/libports/recipes/src/pdf_view/used_apis @@ -3,5 +3,5 @@ framebuffer_session input_session libc mupdf -nitpicker_session +gui_session os diff --git a/repos/libports/recipes/src/qt5_qnitpickerviewwidget/used_apis b/repos/libports/recipes/src/qt5_qnitpickerviewwidget/used_apis index 12de6362de..866c13713b 100644 --- a/repos/libports/recipes/src/qt5_qnitpickerviewwidget/used_apis +++ b/repos/libports/recipes/src/qt5_qnitpickerviewwidget/used_apis @@ -3,7 +3,7 @@ framebuffer_session input_session libc mesa -nitpicker_session +gui_session os qoost qt5_core diff --git a/repos/libports/recipes/src/qt5_qpa_nitpicker/used_apis b/repos/libports/recipes/src/qt5_qpa_nitpicker/used_apis index 40871d68d1..e547a356d9 100644 --- a/repos/libports/recipes/src/qt5_qpa_nitpicker/used_apis +++ b/repos/libports/recipes/src/qt5_qpa_nitpicker/used_apis @@ -5,7 +5,7 @@ freetype input_session libc mesa -nitpicker_session +gui_session os qoost qt5_core diff --git a/repos/libports/recipes/src/qt5_qpluginwidget/used_apis b/repos/libports/recipes/src/qt5_qpluginwidget/used_apis index 101cfbcc6d..881562e4a8 100644 --- a/repos/libports/recipes/src/qt5_qpluginwidget/used_apis +++ b/repos/libports/recipes/src/qt5_qpluginwidget/used_apis @@ -4,7 +4,7 @@ input_session libc loader_session mesa -nitpicker_session +gui_session os qoost qt5_core diff --git a/repos/libports/recipes/src/test-qpluginwidget/used_apis b/repos/libports/recipes/src/test-qpluginwidget/used_apis index 7315763d55..928487bd0d 100644 --- a/repos/libports/recipes/src/test-qpluginwidget/used_apis +++ b/repos/libports/recipes/src/test-qpluginwidget/used_apis @@ -4,7 +4,7 @@ input_session libc loader_session mesa -nitpicker_session +gui_session os qoost qt5_core diff --git a/repos/libports/src/app/pdf_view/main.cc b/repos/libports/src/app/pdf_view/main.cc index e520535b83..d2544b21c8 100644 --- a/repos/libports/src/app/pdf_view/main.cc +++ b/repos/libports/src/app/pdf_view/main.cc @@ -22,7 +22,7 @@ #include #include #include -#include +#include /* MuPDF includes */ extern "C" { diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.cpp index e5230ffee4..548b252ebc 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.cpp +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.cpp @@ -15,7 +15,7 @@ /* Genode includes */ #include -#include +#include /* Qt includes */ #include diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerscreen.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerscreen.h index 1f1f6c767b..6ca05e6cc3 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerscreen.h +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerscreen.h @@ -16,7 +16,7 @@ #define _QNITPICKERSCREEN_H_ /* Genode includes */ -#include +#include /* Qt includes */ #include diff --git a/repos/os/include/decorator/types.h b/repos/os/include/decorator/types.h index d3bb7b0175..9fe7097d29 100644 --- a/repos/os/include/decorator/types.h +++ b/repos/os/include/decorator/types.h @@ -15,7 +15,7 @@ #define _INCLUDE__DECORATOR__TYPES_H_ /* Genode includes */ -#include +#include #include #include #include diff --git a/repos/os/include/decorator/window.h b/repos/os/include/decorator/window.h index 8c5f6262aa..c4e8193be7 100644 --- a/repos/os/include/decorator/window.h +++ b/repos/os/include/decorator/window.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include /* decorator includes */ diff --git a/repos/os/include/decorator/window_stack.h b/repos/os/include/decorator/window_stack.h index fe11f06540..7a2a2b8119 100644 --- a/repos/os/include/decorator/window_stack.h +++ b/repos/os/include/decorator/window_stack.h @@ -15,7 +15,7 @@ #define _INCLUDE__DECORATOR__WINDOW_STACK_H_ /* Genode includes */ -#include +#include #include /* local includes */ diff --git a/repos/os/include/nitpicker_session/capability.h b/repos/os/include/gui_session/capability.h similarity index 59% rename from repos/os/include/nitpicker_session/capability.h rename to repos/os/include/gui_session/capability.h index 6a57890352..a90a0437c1 100644 --- a/repos/os/include/nitpicker_session/capability.h +++ b/repos/os/include/gui_session/capability.h @@ -1,5 +1,5 @@ /* - * \brief Nitpicker-session capability type + * \brief GUI-session capability type * \author Norman Feske * \date 2008-08-16 */ @@ -11,15 +11,15 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _INCLUDE__NITPICKER_SESSION__CAPABILITY_H_ -#define _INCLUDE__NITPICKER_SESSION__CAPABILITY_H_ +#ifndef _INCLUDE__GUI_SESSION__CAPABILITY_H_ +#define _INCLUDE__GUI_SESSION__CAPABILITY_H_ #include -#include +#include namespace Nitpicker { typedef Genode::Capability Session_capability; } -#endif /* _INCLUDE__NITPICKER_SESSION__CAPABILITY_H_ */ +#endif /* _INCLUDE__GUI_SESSION__CAPABILITY_H_ */ diff --git a/repos/os/include/nitpicker_session/client.h b/repos/os/include/gui_session/client.h similarity index 92% rename from repos/os/include/nitpicker_session/client.h rename to repos/os/include/gui_session/client.h index 0dd54fb43e..eec5707992 100644 --- a/repos/os/include/nitpicker_session/client.h +++ b/repos/os/include/gui_session/client.h @@ -1,5 +1,5 @@ /* - * \brief Client-side nitpicker session interface + * \brief Client-side GUI session interface * \author Norman Feske * \date 2006-08-23 */ @@ -11,10 +11,10 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _INCLUDE__NITPICKER_SESSION__CLIENT_H_ -#define _INCLUDE__NITPICKER_SESSION__CLIENT_H_ +#ifndef _INCLUDE__GUI_SESSION__CLIENT_H_ +#define _INCLUDE__GUI_SESSION__CLIENT_H_ -#include +#include #include #include @@ -112,4 +112,4 @@ class Nitpicker::Session_client : public Genode::Rpc_client } }; -#endif /* _INCLUDE__NITPICKER_SESSION__CLIENT_H_ */ +#endif /* _INCLUDE__GUI_SESSION__CLIENT_H_ */ diff --git a/repos/os/include/nitpicker_session/connection.h b/repos/os/include/gui_session/connection.h similarity index 92% rename from repos/os/include/nitpicker_session/connection.h rename to repos/os/include/gui_session/connection.h index abdba27481..8f10bfcefd 100644 --- a/repos/os/include/nitpicker_session/connection.h +++ b/repos/os/include/gui_session/connection.h @@ -11,10 +11,10 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _INCLUDE__NITPICKER_SESSION__CONNECTION_H_ -#define _INCLUDE__NITPICKER_SESSION__CONNECTION_H_ +#ifndef _INCLUDE__GUI_SESSION__CONNECTION_H_ +#define _INCLUDE__GUI_SESSION__CONNECTION_H_ -#include +#include #include #include #include @@ -99,4 +99,4 @@ class Nitpicker::Connection : public Genode::Connection, Framebuffer::Session *framebuffer() { return &_framebuffer; } }; -#endif /* _INCLUDE__NITPICKER_SESSION__CONNECTION_H_ */ +#endif /* _INCLUDE__GUI_SESSION__CONNECTION_H_ */ diff --git a/repos/os/include/nitpicker_session/nitpicker_session.h b/repos/os/include/gui_session/gui_session.h similarity index 98% rename from repos/os/include/nitpicker_session/nitpicker_session.h rename to repos/os/include/gui_session/gui_session.h index e54c669887..7e2057c1c1 100644 --- a/repos/os/include/nitpicker_session/nitpicker_session.h +++ b/repos/os/include/gui_session/gui_session.h @@ -13,8 +13,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _INCLUDE__NITPICKER_SESSION__NITPICKER_SESSION_H_ -#define _INCLUDE__NITPICKER_SESSION__NITPICKER_SESSION_H_ +#ifndef _INCLUDE__GUI_SESSION__GUI_SESSION_H_ +#define _INCLUDE__GUI_SESSION__GUI_SESSION_H_ #include #include @@ -361,4 +361,4 @@ struct Nitpicker::Session : Genode::Session Rpc_mode_sigh, Rpc_buffer, Rpc_focus, Rpc_session_control); }; -#endif /* _INCLUDE__NITPICKER_SESSION__NITPICKER_SESSION_H_ */ +#endif /* _INCLUDE__GUI_SESSION__GUI_SESSION_H_ */ diff --git a/repos/os/include/loader_session/loader_session.h b/repos/os/include/loader_session/loader_session.h index dbce653a6b..8dd0851b2f 100644 --- a/repos/os/include/loader_session/loader_session.h +++ b/repos/os/include/loader_session/loader_session.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/repos/os/recipes/api/gui_session/content.mk b/repos/os/recipes/api/gui_session/content.mk new file mode 100644 index 0000000000..f4d5acd23d --- /dev/null +++ b/repos/os/recipes/api/gui_session/content.mk @@ -0,0 +1,2 @@ +MIRRORED_FROM_REP_DIR := include/gui_session +include $(REP_DIR)/recipes/api/session.inc diff --git a/repos/os/recipes/api/nitpicker_session/hash b/repos/os/recipes/api/gui_session/hash similarity index 100% rename from repos/os/recipes/api/nitpicker_session/hash rename to repos/os/recipes/api/gui_session/hash diff --git a/repos/os/recipes/api/nitpicker_session/content.mk b/repos/os/recipes/api/nitpicker_session/content.mk deleted file mode 100644 index abd8b9e6f7..0000000000 --- a/repos/os/recipes/api/nitpicker_session/content.mk +++ /dev/null @@ -1,2 +0,0 @@ -MIRRORED_FROM_REP_DIR := include/nitpicker_session -include $(REP_DIR)/recipes/api/session.inc diff --git a/repos/os/recipes/src/global_keys_handler/used_apis b/repos/os/recipes/src/global_keys_handler/used_apis index ff88ea8abe..d20bad69ee 100644 --- a/repos/os/recipes/src/global_keys_handler/used_apis +++ b/repos/os/recipes/src/global_keys_handler/used_apis @@ -3,5 +3,5 @@ os input_session timer_session framebuffer_session -nitpicker_session +gui_session report_session diff --git a/repos/os/recipes/src/loader/used_apis b/repos/os/recipes/src/loader/used_apis index 9f58b403fb..d46b347afe 100644 --- a/repos/os/recipes/src/loader/used_apis +++ b/repos/os/recipes/src/loader/used_apis @@ -3,4 +3,4 @@ os framebuffer_session input_session loader_session -nitpicker_session +gui_session diff --git a/repos/os/recipes/src/nit_fb/used_apis b/repos/os/recipes/src/nit_fb/used_apis index 934d9a3fdc..4cd0bd4519 100644 --- a/repos/os/recipes/src/nit_fb/used_apis +++ b/repos/os/recipes/src/nit_fb/used_apis @@ -1,5 +1,5 @@ base os -nitpicker_session +gui_session input_session framebuffer_session diff --git a/repos/os/recipes/src/nitpicker/used_apis b/repos/os/recipes/src/nitpicker/used_apis index e343a60de4..28a4992ba9 100644 --- a/repos/os/recipes/src/nitpicker/used_apis +++ b/repos/os/recipes/src/nitpicker/used_apis @@ -5,5 +5,5 @@ blit input_session timer_session framebuffer_session -nitpicker_session +gui_session report_session diff --git a/repos/os/recipes/src/test-dynamic_config/used_apis b/repos/os/recipes/src/test-dynamic_config/used_apis index 55e9470fb2..d2e11505b0 100644 --- a/repos/os/recipes/src/test-dynamic_config/used_apis +++ b/repos/os/recipes/src/test-dynamic_config/used_apis @@ -2,6 +2,6 @@ base os input_session framebuffer_session -nitpicker_session +gui_session loader_session timer_session diff --git a/repos/os/recipes/src/test-fault_detection/used_apis b/repos/os/recipes/src/test-fault_detection/used_apis index 7535e9f9af..1e6ef720b0 100644 --- a/repos/os/recipes/src/test-fault_detection/used_apis +++ b/repos/os/recipes/src/test-fault_detection/used_apis @@ -1,6 +1,6 @@ base os loader_session -nitpicker_session +gui_session framebuffer_session input_session diff --git a/repos/os/src/app/global_keys_handler/main.cc b/repos/os/src/app/global_keys_handler/main.cc index 6d8af78eef..e253f0e65f 100644 --- a/repos/os/src/app/global_keys_handler/main.cc +++ b/repos/os/src/app/global_keys_handler/main.cc @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/repos/os/src/app/pointer/main.cc b/repos/os/src/app/pointer/main.cc index f47eb6c317..9e7c313071 100644 --- a/repos/os/src/app/pointer/main.cc +++ b/repos/os/src/app/pointer/main.cc @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/repos/os/src/app/status_bar/main.cc b/repos/os/src/app/status_bar/main.cc index c2fb851981..39107c7e70 100644 --- a/repos/os/src/app/status_bar/main.cc +++ b/repos/os/src/app/status_bar/main.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include diff --git a/repos/os/src/server/loader/nitpicker.h b/repos/os/src/server/loader/nitpicker.h index d790563ecd..f5125b0590 100644 --- a/repos/os/src/server/loader/nitpicker.h +++ b/repos/os/src/server/loader/nitpicker.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include /* local includes */ #include diff --git a/repos/os/src/server/nit_fb/main.cc b/repos/os/src/server/nit_fb/main.cc index d63ae4e7a4..04cb33ffb8 100644 --- a/repos/os/src/server/nit_fb/main.cc +++ b/repos/os/src/server/nit_fb/main.cc @@ -12,7 +12,7 @@ */ /* Genode includes */ -#include +#include #include #include #include diff --git a/repos/os/src/server/nitpicker/session_component.h b/repos/os/src/server/nitpicker/session_component.h index 65434c3914..27e362b375 100644 --- a/repos/os/src/server/nitpicker/session_component.h +++ b/repos/os/src/server/nitpicker/session_component.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include /* local includes */ #include "canvas.h" diff --git a/repos/os/src/server/nitpicker/view_owner.h b/repos/os/src/server/nitpicker/view_owner.h index 424edef655..4b387cea88 100644 --- a/repos/os/src/server/nitpicker/view_owner.h +++ b/repos/os/src/server/nitpicker/view_owner.h @@ -22,7 +22,7 @@ /* Genode includes */ #include #include -#include +#include #include /* local includes */ diff --git a/repos/os/src/test/nitpicker/test.cc b/repos/os/src/test/nitpicker/test.cc index 49e6125112..24c6782272 100644 --- a/repos/os/src/test/nitpicker/test.cc +++ b/repos/os/src/test/nitpicker/test.cc @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/repos/ports/recipes/src/arora/used_apis b/repos/ports/recipes/src/arora/used_apis index 8b6bc482af..e31221805b 100644 --- a/repos/ports/recipes/src/arora/used_apis +++ b/repos/ports/recipes/src/arora/used_apis @@ -4,7 +4,7 @@ input_session libc loader_session mesa -nitpicker_session +gui_session os qt5_core qt5_gui diff --git a/repos/ports/recipes/src/seoul/used_apis b/repos/ports/recipes/src/seoul/used_apis index a00ee1b6b6..2e86176e37 100644 --- a/repos/ports/recipes/src/seoul/used_apis +++ b/repos/ports/recipes/src/seoul/used_apis @@ -3,7 +3,7 @@ libc os blit nitpicker_gfx -nitpicker_session +gui_session framebuffer_session input_session timer_session diff --git a/repos/ports/recipes/src/vbox5-nova/used_apis b/repos/ports/recipes/src/vbox5-nova/used_apis index 8ceb0e3ef1..d45e7350cd 100644 --- a/repos/ports/recipes/src/vbox5-nova/used_apis +++ b/repos/ports/recipes/src/vbox5-nova/used_apis @@ -7,7 +7,7 @@ input_session libc libiconv nic_session -nitpicker_session +gui_session os report_session rtc_session diff --git a/repos/ports/recipes/src/vbox5/used_apis b/repos/ports/recipes/src/vbox5/used_apis index 7b56461173..1d1f4b4975 100644 --- a/repos/ports/recipes/src/vbox5/used_apis +++ b/repos/ports/recipes/src/vbox5/used_apis @@ -6,7 +6,7 @@ input_session libc libiconv nic_session -nitpicker_session +gui_session os report_session rtc_session diff --git a/repos/ports/src/app/seoul/console.h b/repos/ports/src/app/seoul/console.h index 9463896310..e3ef0142e6 100644 --- a/repos/ports/src/app/seoul/console.h +++ b/repos/ports/src/app/seoul/console.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/repos/ports/src/virtualbox5/frontend/console.h b/repos/ports/src/virtualbox5/frontend/console.h index ddcbcca92e..993b9ce4af 100644 --- a/repos/ports/src/virtualbox5/frontend/console.h +++ b/repos/ports/src/virtualbox5/frontend/console.h @@ -20,7 +20,7 @@ #include #include #define Framebuffer Fb_Genode -#include +#include #undef Framebuffer #include #include diff --git a/repos/ports/src/virtualbox5/frontend/fb.h b/repos/ports/src/virtualbox5/frontend/fb.h index dce00fe4eb..578f9abccd 100644 --- a/repos/ports/src/virtualbox5/frontend/fb.h +++ b/repos/ports/src/virtualbox5/frontend/fb.h @@ -14,7 +14,7 @@ /* Genode includes */ #define Framebuffer Fb_Genode #include -#include +#include #undef Framebuffer #include