tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=56eee1910239564a607a958f1bdf2a744fa43f21
commit 56eee1910239564a607a958f1bdf2a744fa43f21 Author: Tom Hacohen <t...@stosb.com> Date: Thu May 12 11:14:03 2016 +0100 Efl pack: Fix namespacing to use . and not _. --- src/lib/edje/efl_canvas_layout_internal_box.eo | 20 +++++------ src/lib/edje/efl_canvas_layout_internal_table.eo | 16 ++++----- src/lib/efl/interfaces/efl_pack_grid.eo | 4 +-- src/lib/efl/interfaces/efl_pack_layout.eo | 6 ++-- src/lib/efl/interfaces/efl_pack_linear.eo | 2 +- src/lib/elementary/efl_ui_box.eo | 32 ++++++++--------- src/lib/elementary/efl_ui_box_flow.eo | 4 +-- src/lib/elementary/efl_ui_grid.eo | 42 +++++++++++----------- src/lib/elementary/efl_ui_layout_internal_box.eo | 20 +++++------ src/lib/elementary/efl_ui_layout_internal_table.eo | 16 ++++----- 10 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/lib/edje/efl_canvas_layout_internal_box.eo b/src/lib/edje/efl_canvas_layout_internal_box.eo index 0a5e788..c2998a3 100644 --- a/src/lib/edje/efl_canvas_layout_internal_box.eo +++ b/src/lib/edje/efl_canvas_layout_internal_box.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Layout_Internal.Box (Eo.Base, Efl.Pack_Linear) +class Efl.Canvas.Layout_Internal.Box (Eo.Base, Efl.Pack.Linear) { [[Represents a Box created as part of a layout. @@ -26,14 +26,14 @@ class Efl.Canvas.Layout_Internal.Box (Eo.Base, Efl.Pack_Linear) Efl.Pack.unpack_all; Efl.Pack.unpack; Efl.Pack.pack; - Efl.Pack_Linear.pack_begin; - Efl.Pack_Linear.pack_end; - Efl.Pack_Linear.pack_before; - Efl.Pack_Linear.pack_after; - Efl.Pack_Linear.pack_at; - Efl.Pack_Linear.pack_content_get; - Efl.Pack_Linear.pack_unpack_at; - Efl.Pack_Linear.pack_index_get; - Efl.Pack_Linear.pack_direction.get; + Efl.Pack.Linear.pack_begin; + Efl.Pack.Linear.pack_end; + Efl.Pack.Linear.pack_before; + Efl.Pack.Linear.pack_after; + Efl.Pack.Linear.pack_at; + Efl.Pack.Linear.pack_content_get; + Efl.Pack.Linear.pack_unpack_at; + Efl.Pack.Linear.pack_index_get; + Efl.Pack.Linear.pack_direction.get; } } diff --git a/src/lib/edje/efl_canvas_layout_internal_table.eo b/src/lib/edje/efl_canvas_layout_internal_table.eo index e661b51..129963c 100644 --- a/src/lib/edje/efl_canvas_layout_internal_table.eo +++ b/src/lib/edje/efl_canvas_layout_internal_table.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Layout_Internal.Table (Eo.Base, Efl.Pack_Grid) +class Efl.Canvas.Layout_Internal.Table (Eo.Base, Efl.Pack.Grid) { [[Represents a Table created as part of a layout. @@ -25,12 +25,12 @@ class Efl.Canvas.Layout_Internal.Table (Eo.Base, Efl.Pack_Grid) Efl.Pack.pack_clear; Efl.Pack.unpack_all; Efl.Pack.unpack; - Efl.Pack_Grid.pack_grid; - Efl.Pack_Grid.grid_content_get; - Efl.Pack_Grid.grid_contents_get; - Efl.Pack_Grid.grid_position.get; - Efl.Pack_Grid.grid_size.get; - Efl.Pack_Grid.grid_columns.get; - Efl.Pack_Grid.grid_rows.get; + Efl.Pack.Grid.pack_grid; + Efl.Pack.Grid.grid_content_get; + Efl.Pack.Grid.grid_contents_get; + Efl.Pack.Grid.grid_position.get; + Efl.Pack.Grid.grid_size.get; + Efl.Pack.Grid.grid_columns.get; + Efl.Pack.Grid.grid_rows.get; } } diff --git a/src/lib/efl/interfaces/efl_pack_grid.eo b/src/lib/efl/interfaces/efl_pack_grid.eo index 0e282ba..28f0bfe 100644 --- a/src/lib/efl/interfaces/efl_pack_grid.eo +++ b/src/lib/efl/interfaces/efl_pack_grid.eo @@ -1,6 +1,6 @@ import efl_gfx_types; -interface Efl.Pack_Grid (Efl.Pack_Linear) +interface Efl.Pack.Grid (Efl.Pack.Linear) { [[2D containers aligned on a grid with rows and columns]] legacy_prefix: null; @@ -72,7 +72,7 @@ interface Efl.Pack_Grid (Efl.Pack_Linear) @property grid_directions { [[Primary and secondary up/left/right/down orientations for linear apis. - Default is right and down. Overrides @Efl.Pack_Linear.pack_direction. + Default is right and down. Overrides @Efl.Pack.Linear.pack_direction. ]] set {} get {} diff --git a/src/lib/efl/interfaces/efl_pack_layout.eo b/src/lib/efl/interfaces/efl_pack_layout.eo index a20bae3..8bf3aee 100644 --- a/src/lib/efl/interfaces/efl_pack_layout.eo +++ b/src/lib/efl/interfaces/efl_pack_layout.eo @@ -1,4 +1,4 @@ -interface Efl.Pack_Layout () +interface Efl.Pack.Layout () { [[Low-level APIs for object that can lay their children out. @@ -16,8 +16,8 @@ interface Efl.Pack_Layout () get {} values { /* FIXME: engine is an Eo.Class */ - engine: const(Eo.Base)*; [[Must be an $Efl.Pack_Layout subclass.]] - data: const(void)*; [[Any data to pass along to $Efl.Pack_Layout.layout_do. + engine: const(Eo.Base)*; [[Must be an $Efl.Pack.Layout subclass.]] + data: const(void)*; [[Any data to pass along to $Efl.Pack.Layout.layout_do. Owned by the caller. Depends on the layout engine.]] } } diff --git a/src/lib/efl/interfaces/efl_pack_linear.eo b/src/lib/efl/interfaces/efl_pack_linear.eo index d379fee..8f97f6d 100644 --- a/src/lib/efl/interfaces/efl_pack_linear.eo +++ b/src/lib/efl/interfaces/efl_pack_linear.eo @@ -1,7 +1,7 @@ import efl_orientation; /* FIXME: Efl.Pack.Linear */ -interface Efl.Pack_Linear (Efl.Pack) +interface Efl.Pack.Linear (Efl.Pack) { [[API for containers ]] legacy_prefix: null; diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo index cd80b8c..bf44d66 100644 --- a/src/lib/elementary/efl_ui_box.eo +++ b/src/lib/elementary/efl_ui_box.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Box (Elm.Widget, Efl.Pack_Linear, Efl.Pack_Layout) +class Efl.Ui.Box (Elm.Widget, Efl.Pack.Linear, Efl.Pack.Layout) { legacy_prefix: null; implements { @@ -26,22 +26,22 @@ class Efl.Ui.Box (Elm.Widget, Efl.Pack_Linear, Efl.Pack_Layout) Efl.Pack.pack_padding.set; Efl.Pack.pack_align.get; Efl.Pack.pack_align.set; - Efl.Pack_Linear.pack_begin; - Efl.Pack_Linear.pack_end; - Efl.Pack_Linear.pack_before; - Efl.Pack_Linear.pack_after; - Efl.Pack_Linear.pack_at; - Efl.Pack_Linear.pack_content_get; - Efl.Pack_Linear.pack_unpack_at; - Efl.Pack_Linear.pack_index_get; - Efl.Pack_Linear.pack_direction.set; - Efl.Pack_Linear.pack_direction.get; + Efl.Pack.Linear.pack_begin; + Efl.Pack.Linear.pack_end; + Efl.Pack.Linear.pack_before; + Efl.Pack.Linear.pack_after; + Efl.Pack.Linear.pack_at; + Efl.Pack.Linear.pack_content_get; + Efl.Pack.Linear.pack_unpack_at; + Efl.Pack.Linear.pack_index_get; + Efl.Pack.Linear.pack_direction.set; + Efl.Pack.Linear.pack_direction.get; // Custom layouts - Efl.Pack_Layout.layout_update; - Efl.Pack_Layout.layout_request; - Efl.Pack_Layout.layout_engine.get; - Efl.Pack_Layout.layout_engine.set; - Efl.Pack_Layout.layout_do; + Efl.Pack.Layout.layout_update; + Efl.Pack.Layout.layout_request; + Efl.Pack.Layout.layout_engine.get; + Efl.Pack.Layout.layout_engine.set; + Efl.Pack.Layout.layout_do; } } diff --git a/src/lib/elementary/efl_ui_box_flow.eo b/src/lib/elementary/efl_ui_box_flow.eo index 733e742..cbc25d9 100644 --- a/src/lib/elementary/efl_ui_box_flow.eo +++ b/src/lib/elementary/efl_ui_box_flow.eo @@ -4,7 +4,7 @@ struct Efl.Ui.Box_Flow_Params { max_size: bool; } -class Efl.Ui.Box_Flow (Efl.Ui.Box, Efl.Pack_Layout) +class Efl.Ui.Box_Flow (Efl.Ui.Box, Efl.Pack.Layout) { [[A custom layout engine for @Efl.Ui.Box.]] legacy_prefix: null; @@ -26,6 +26,6 @@ class Efl.Ui.Box_Flow (Efl.Ui.Box, Efl.Pack_Layout) } implements { Eo.Base.constructor; - Efl.Pack_Layout.layout_do; + Efl.Pack.Layout.layout_do; } } diff --git a/src/lib/elementary/efl_ui_grid.eo b/src/lib/elementary/efl_ui_grid.eo index 8ca7c43..3f827f7 100644 --- a/src/lib/elementary/efl_ui_grid.eo +++ b/src/lib/elementary/efl_ui_grid.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Grid (Elm.Widget, Efl.Pack_Grid, Efl.Pack_Layout) +class Efl.Ui.Grid (Elm.Widget, Efl.Pack.Grid, Efl.Pack.Layout) { legacy_prefix: null; implements { @@ -25,27 +25,27 @@ class Efl.Ui.Grid (Elm.Widget, Efl.Pack_Grid, Efl.Pack_Layout) Efl.Pack.pack; Efl.Pack.pack_padding.get; Efl.Pack.pack_padding.set; - Efl.Pack_Grid.pack_grid; - Efl.Pack_Grid.grid_content_get; - Efl.Pack_Grid.grid_contents_get; - Efl.Pack_Grid.grid_position.get; - Efl.Pack_Grid.grid_size.set; - Efl.Pack_Grid.grid_size.get; - Efl.Pack_Grid.grid_columns.set; - Efl.Pack_Grid.grid_columns.get; - Efl.Pack_Grid.grid_rows.set; - Efl.Pack_Grid.grid_rows.get; - Efl.Pack_Grid.grid_directions.set; - Efl.Pack_Grid.grid_directions.get; - Efl.Pack_Linear.pack_end; - Efl.Pack_Linear.pack_direction.set; - Efl.Pack_Linear.pack_direction.get; + Efl.Pack.Grid.pack_grid; + Efl.Pack.Grid.grid_content_get; + Efl.Pack.Grid.grid_contents_get; + Efl.Pack.Grid.grid_position.get; + Efl.Pack.Grid.grid_size.set; + Efl.Pack.Grid.grid_size.get; + Efl.Pack.Grid.grid_columns.set; + Efl.Pack.Grid.grid_columns.get; + Efl.Pack.Grid.grid_rows.set; + Efl.Pack.Grid.grid_rows.get; + Efl.Pack.Grid.grid_directions.set; + Efl.Pack.Grid.grid_directions.get; + Efl.Pack.Linear.pack_end; + Efl.Pack.Linear.pack_direction.set; + Efl.Pack.Linear.pack_direction.get; // Custom layouts - Efl.Pack_Layout.layout_update; - Efl.Pack_Layout.layout_request; - Efl.Pack_Layout.layout_engine.get; - Efl.Pack_Layout.layout_engine.set; - Efl.Pack_Layout.layout_do; + Efl.Pack.Layout.layout_update; + Efl.Pack.Layout.layout_request; + Efl.Pack.Layout.layout_engine.get; + Efl.Pack.Layout.layout_engine.set; + Efl.Pack.Layout.layout_do; } } diff --git a/src/lib/elementary/efl_ui_layout_internal_box.eo b/src/lib/elementary/efl_ui_layout_internal_box.eo index 3ba8b8f..7ba47c6 100644 --- a/src/lib/elementary/efl_ui_layout_internal_box.eo +++ b/src/lib/elementary/efl_ui_layout_internal_box.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Layout_Internal.Box (Eo.Base, Efl.Pack_Linear) +class Efl.Ui.Layout_Internal.Box (Eo.Base, Efl.Pack.Linear) { [[Represents a Box created as part of a layout. @@ -27,14 +27,14 @@ class Efl.Ui.Layout_Internal.Box (Eo.Base, Efl.Pack_Linear) Efl.Pack.unpack_all; Efl.Pack.unpack; Efl.Pack.pack; - Efl.Pack_Linear.pack_begin; - Efl.Pack_Linear.pack_end; - Efl.Pack_Linear.pack_before; - Efl.Pack_Linear.pack_after; - Efl.Pack_Linear.pack_at; - Efl.Pack_Linear.pack_content_get; - Efl.Pack_Linear.pack_unpack_at; - Efl.Pack_Linear.pack_index_get; - Efl.Pack_Linear.pack_direction.get; + Efl.Pack.Linear.pack_begin; + Efl.Pack.Linear.pack_end; + Efl.Pack.Linear.pack_before; + Efl.Pack.Linear.pack_after; + Efl.Pack.Linear.pack_at; + Efl.Pack.Linear.pack_content_get; + Efl.Pack.Linear.pack_unpack_at; + Efl.Pack.Linear.pack_index_get; + Efl.Pack.Linear.pack_direction.get; } } diff --git a/src/lib/elementary/efl_ui_layout_internal_table.eo b/src/lib/elementary/efl_ui_layout_internal_table.eo index cd6b6d2..c17bb77 100644 --- a/src/lib/elementary/efl_ui_layout_internal_table.eo +++ b/src/lib/elementary/efl_ui_layout_internal_table.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Layout_Internal.Table (Eo.Base, Efl.Pack_Grid) +class Efl.Ui.Layout_Internal.Table (Eo.Base, Efl.Pack.Grid) { [[Represents a Table created as part of a layout. @@ -26,12 +26,12 @@ class Efl.Ui.Layout_Internal.Table (Eo.Base, Efl.Pack_Grid) Efl.Pack.pack_clear; Efl.Pack.unpack_all; Efl.Pack.unpack; - Efl.Pack_Grid.pack_grid; - Efl.Pack_Grid.grid_content_get; - Efl.Pack_Grid.grid_contents_get; - Efl.Pack_Grid.grid_position.get; - Efl.Pack_Grid.grid_size.get; - Efl.Pack_Grid.grid_columns.get; - Efl.Pack_Grid.grid_rows.get; + Efl.Pack.Grid.pack_grid; + Efl.Pack.Grid.grid_content_get; + Efl.Pack.Grid.grid_contents_get; + Efl.Pack.Grid.grid_position.get; + Efl.Pack.Grid.grid_size.get; + Efl.Pack.Grid.grid_columns.get; + Efl.Pack.Grid.grid_rows.get; } } --