From 42ed558fd594dc1ff621cee6b0cc72afeef5481d Mon Sep 17 00:00:00 2001 From: Xavi Artigas Date: Fri, 6 Apr 2018 12:28:01 +0200 Subject: [PATCH] Efl.Pack_* (from Efl.Pack.*) Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail --- src/lib/edje/efl_canvas_layout_part_box.eo | 18 +++++----- .../edje/efl_canvas_layout_part_invalid.eo | 34 +++++++++---------- src/lib/edje/efl_canvas_layout_part_table.eo | 16 ++++----- src/lib/efl/interfaces/efl_pack_layout.eo | 2 +- src/lib/efl/interfaces/efl_pack_linear.eo | 2 +- src/lib/efl/interfaces/efl_pack_table.eo | 2 +- src/lib/elementary/efl_ui_box.eo | 22 ++++++------ src/lib/elementary/efl_ui_box_flow.eo | 4 +-- src/lib/elementary/efl_ui_box_stack.eo | 4 +-- src/lib/elementary/efl_ui_flip.eo | 18 +++++----- src/lib/elementary/efl_ui_layout_part_box.eo | 18 +++++----- .../elementary/efl_ui_layout_part_table.eo | 16 ++++----- src/lib/elementary/efl_ui_pager.eo | 18 +++++----- src/lib/elementary/efl_ui_table.eo | 24 ++++++------- src/lib/elementary/efl_ui_table_static.eo | 2 +- 15 files changed, 100 insertions(+), 100 deletions(-) diff --git a/src/lib/edje/efl_canvas_layout_part_box.eo b/src/lib/edje/efl_canvas_layout_part_box.eo index 879a655b14..02be0707c8 100644 --- a/src/lib/edje/efl_canvas_layout_part_box.eo +++ b/src/lib/edje/efl_canvas_layout_part_box.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Layout_Part_Box (Efl.Canvas.Layout_Part, Efl.Pack.Linear, +class Efl.Canvas.Layout_Part_Box (Efl.Canvas.Layout_Part, Efl.Pack_Linear, Efl.Ui.Direction) { [[Represents a Box created as part of a layout. @@ -15,14 +15,14 @@ class Efl.Canvas.Layout_Part_Box (Efl.Canvas.Layout_Part, 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_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.Ui.Direction.direction { get; [[Returns $default if unknown.]] } } } diff --git a/src/lib/edje/efl_canvas_layout_part_invalid.eo b/src/lib/edje/efl_canvas_layout_part_invalid.eo index 494dd9a8cd..fd8e57c22b 100644 --- a/src/lib/edje/efl_canvas_layout_part_invalid.eo +++ b/src/lib/edje/efl_canvas_layout_part_invalid.eo @@ -1,8 +1,8 @@ import edje_types; class Efl.Canvas.Layout_Part_Invalid (Efl.Canvas.Layout_Part, Efl.Content, - Efl.Pack.Linear, Efl.Ui.Direction, - Efl.Pack.Table, Efl.Text, + Efl.Pack_Linear, Efl.Ui.Direction, + Efl.Pack_Table, Efl.Text, Efl.Text.Markup, Efl.Text.Cursor) { [[Common class for part proxy objects for @Efl.Canvas.Layout. @@ -55,22 +55,22 @@ class Efl.Canvas.Layout_Part_Invalid (Efl.Canvas.Layout_Part, Efl.Content, 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_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.Ui.Direction.direction { get; [[Returns $default if unknown.]] } // Efl.Canvas.Layout_Part_Table - Efl.Pack.Table.pack_table; - Efl.Pack.Table.table_content_get; - Efl.Pack.Table.table_contents_get; - Efl.Pack.Table.table_position { get; } - Efl.Pack.Table.table_size { get; } - Efl.Pack.Table.table_columns { get; } - Efl.Pack.Table.table_rows { get; } + Efl.Pack_Table.pack_table; + Efl.Pack_Table.table_content_get; + Efl.Pack_Table.table_contents_get; + Efl.Pack_Table.table_position { get; } + Efl.Pack_Table.table_size { get; } + Efl.Pack_Table.table_columns { get; } + Efl.Pack_Table.table_rows { get; } } } diff --git a/src/lib/edje/efl_canvas_layout_part_table.eo b/src/lib/edje/efl_canvas_layout_part_table.eo index e3d8a56661..877438527e 100644 --- a/src/lib/edje/efl_canvas_layout_part_table.eo +++ b/src/lib/edje/efl_canvas_layout_part_table.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Layout_Part_Table (Efl.Canvas.Layout_Part, Efl.Pack.Table) +class Efl.Canvas.Layout_Part_Table (Efl.Canvas.Layout_Part, Efl.Pack_Table) { [[Represents a Table created as part of a layout. @@ -13,12 +13,12 @@ class Efl.Canvas.Layout_Part_Table (Efl.Canvas.Layout_Part, Efl.Pack.Table) Efl.Pack.pack_clear; Efl.Pack.unpack_all; Efl.Pack.unpack; - Efl.Pack.Table.pack_table; - Efl.Pack.Table.table_content_get; - Efl.Pack.Table.table_contents_get; - Efl.Pack.Table.table_position { get; } - Efl.Pack.Table.table_size { get; } - Efl.Pack.Table.table_columns { get; } - Efl.Pack.Table.table_rows { get; } + Efl.Pack_Table.pack_table; + Efl.Pack_Table.table_content_get; + Efl.Pack_Table.table_contents_get; + Efl.Pack_Table.table_position { get; } + Efl.Pack_Table.table_size { get; } + Efl.Pack_Table.table_columns { get; } + Efl.Pack_Table.table_rows { get; } } } diff --git a/src/lib/efl/interfaces/efl_pack_layout.eo b/src/lib/efl/interfaces/efl_pack_layout.eo index 5cb35d851b..caf5548efd 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. diff --git a/src/lib/efl/interfaces/efl_pack_linear.eo b/src/lib/efl/interfaces/efl_pack_linear.eo index 1b293036d9..d9bb90234c 100644 --- a/src/lib/efl/interfaces/efl_pack_linear.eo +++ b/src/lib/efl/interfaces/efl_pack_linear.eo @@ -1,4 +1,4 @@ -interface Efl.Pack.Linear (Efl.Pack) +interface Efl.Pack_Linear (Efl.Pack) { [[API for containers ]] eo_prefix: efl_pack; diff --git a/src/lib/efl/interfaces/efl_pack_table.eo b/src/lib/efl/interfaces/efl_pack_table.eo index 8d4b1cff34..335b269b36 100644 --- a/src/lib/efl/interfaces/efl_pack_table.eo +++ b/src/lib/efl/interfaces/efl_pack_table.eo @@ -1,7 +1,7 @@ import efl_gfx_types; import efl_ui_direction; -interface Efl.Pack.Table (Efl.Pack.Linear) +interface Efl.Pack_Table (Efl.Pack_Linear) { [[2D containers aligned on a table with rows and columns]] eo_prefix: efl_pack; diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo index e0a028028e..90e31ef8d5 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 (Efl.Ui.Widget, Efl.Pack.Linear, Efl.Pack.Layout, +class Efl.Ui.Box (Efl.Ui.Widget, Efl.Pack_Linear, Efl.Pack_Layout, Efl.Ui.Direction) { [[The box widget. @@ -28,15 +28,15 @@ class Efl.Ui.Box (Efl.Ui.Widget, Efl.Pack.Linear, Efl.Pack.Layout, Efl.Pack.pack; Efl.Pack.pack_padding { get; set; } Efl.Pack.pack_align { get; 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.Layout.layout_update; - Efl.Pack.Layout.layout_request; + 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_Layout.layout_update; + Efl.Pack_Layout.layout_request; } } diff --git a/src/lib/elementary/efl_ui_box_flow.eo b/src/lib/elementary/efl_ui_box_flow.eo index fa3ac14397..c0cb2610a4 100644 --- a/src/lib/elementary/efl_ui_box_flow.eo +++ b/src/lib/elementary/efl_ui_box_flow.eo @@ -1,4 +1,4 @@ -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.]] methods { @@ -20,6 +20,6 @@ class Efl.Ui.Box_Flow (Efl.Ui.Box, Efl.Pack.Layout) } } implements { - Efl.Pack.Layout.layout_update; + Efl.Pack_Layout.layout_update; } } diff --git a/src/lib/elementary/efl_ui_box_stack.eo b/src/lib/elementary/efl_ui_box_stack.eo index 3168bb16c3..05b01cf232 100644 --- a/src/lib/elementary/efl_ui_box_stack.eo +++ b/src/lib/elementary/efl_ui_box_stack.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Box_Stack (Efl.Ui.Box, Efl.Pack.Layout) +class Efl.Ui.Box_Stack (Efl.Ui.Box, Efl.Pack_Layout) { [[A custom layout engine for @Efl.Ui.Box that stacks items. @@ -6,6 +6,6 @@ class Efl.Ui.Box_Stack (Efl.Ui.Box, Efl.Pack.Layout) ]] data: null; implements { - Efl.Pack.Layout.layout_update; + Efl.Pack_Layout.layout_update; } } diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo index 9e55aa1e34..abb9c879cd 100644 --- a/src/lib/elementary/efl_ui_flip.eo +++ b/src/lib/elementary/efl_ui_flip.eo @@ -26,7 +26,7 @@ enum Efl.Ui.Flip.Interaction page [[Page interaction]] } -class Efl.Ui.Flip (Efl.Ui.Widget, Efl.Pack.Linear, Efl.Part) +class Efl.Ui.Flip (Efl.Ui.Widget, Efl.Pack_Linear, Efl.Part) { [[Efl UI flip class]] legacy_prefix: elm_flip; @@ -237,14 +237,14 @@ class Efl.Ui.Flip (Efl.Ui.Widget, Efl.Pack.Linear, Efl.Part) Efl.Part.part; 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_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; } events { animate,begin; [[Called when flip animation begins]] diff --git a/src/lib/elementary/efl_ui_layout_part_box.eo b/src/lib/elementary/efl_ui_layout_part_box.eo index 215bee7fd4..299d176a32 100644 --- a/src/lib/elementary/efl_ui_layout_part_box.eo +++ b/src/lib/elementary/efl_ui_layout_part_box.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Layout.Part.Box (Efl.Object, Efl.Pack.Linear, +class Efl.Ui.Layout.Part.Box (Efl.Object, Efl.Pack_Linear, Efl.Ui.Direction) { [[Represents a Box created as part of a layout. @@ -28,13 +28,13 @@ class Efl.Ui.Layout.Part.Box (Efl.Object, 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_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; } } diff --git a/src/lib/elementary/efl_ui_layout_part_table.eo b/src/lib/elementary/efl_ui_layout_part_table.eo index adef75ac60..46954eda4b 100644 --- a/src/lib/elementary/efl_ui_layout_part_table.eo +++ b/src/lib/elementary/efl_ui_layout_part_table.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Layout.Part.Table (Efl.Object, Efl.Pack.Table) +class Efl.Ui.Layout.Part.Table (Efl.Object, Efl.Pack_Table) { [[Represents a Table created as part of a layout. @@ -25,12 +25,12 @@ class Efl.Ui.Layout.Part.Table (Efl.Object, Efl.Pack.Table) Efl.Pack.pack_clear; Efl.Pack.unpack_all; Efl.Pack.unpack; - Efl.Pack.Table.pack_table; - Efl.Pack.Table.table_content_get; - Efl.Pack.Table.table_contents_get; - Efl.Pack.Table.table_position { get; } - Efl.Pack.Table.table_size { get; } - Efl.Pack.Table.table_columns { get; } - Efl.Pack.Table.table_rows { get; } + Efl.Pack_Table.pack_table; + Efl.Pack_Table.table_content_get; + Efl.Pack_Table.table_contents_get; + Efl.Pack_Table.table_position { get; } + Efl.Pack_Table.table_size { get; } + Efl.Pack_Table.table_columns { get; } + Efl.Pack_Table.table_rows { get; } } } diff --git a/src/lib/elementary/efl_ui_pager.eo b/src/lib/elementary/efl_ui_pager.eo index 75d050dc1c..4bd61b08c5 100644 --- a/src/lib/elementary/efl_ui_pager.eo +++ b/src/lib/elementary/efl_ui_pager.eo @@ -5,7 +5,7 @@ enum Efl.Ui.Pager.Loop enabled } -class Efl.Ui.Pager (Efl.Ui.Layout, Efl.Pack.Linear) +class Efl.Ui.Pager (Efl.Ui.Layout, Efl.Pack_Linear) { [[Pager widget @@ -89,13 +89,13 @@ class Efl.Ui.Pager (Efl.Ui.Layout, Efl.Pack.Linear) Efl.Pack.pack_clear; //TODO Efl.Pack.unpack_all; //TODO Efl.Pack.unpack; //TODO - 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_index_get; - Efl.Pack.Linear.pack_unpack_at; //TODO + 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_index_get; + Efl.Pack_Linear.pack_unpack_at; //TODO } } diff --git a/src/lib/elementary/efl_ui_table.eo b/src/lib/elementary/efl_ui_table.eo index 7782c43c3d..03d1f98234 100644 --- a/src/lib/elementary/efl_ui_table.eo +++ b/src/lib/elementary/efl_ui_table.eo @@ -1,4 +1,4 @@ -class Efl.Ui.Table (Efl.Ui.Widget, Efl.Pack.Table, Efl.Pack.Layout, +class Efl.Ui.Table (Efl.Ui.Widget, Efl.Pack_Table, Efl.Pack_Layout, Efl.Ui.Direction) { [[Efl UI table class]] @@ -15,16 +15,16 @@ class Efl.Ui.Table (Efl.Ui.Widget, Efl.Pack.Table, Efl.Pack.Layout, Efl.Pack.unpack; Efl.Pack.pack; Efl.Pack.pack_padding { get; set; } - Efl.Pack.Table.pack_table; - Efl.Pack.Table.table_content_get; - Efl.Pack.Table.table_contents_get; - Efl.Pack.Table.table_position { get; } - Efl.Pack.Table.table_size { get; set; } - Efl.Pack.Table.table_columns { get; set; } - Efl.Pack.Table.table_rows { get; set; } - Efl.Pack.Table.table_direction { get; set; } - Efl.Pack.Linear.pack_end; - Efl.Pack.Layout.layout_update; - Efl.Pack.Layout.layout_request; + Efl.Pack_Table.pack_table; + Efl.Pack_Table.table_content_get; + Efl.Pack_Table.table_contents_get; + Efl.Pack_Table.table_position { get; } + Efl.Pack_Table.table_size { get; set; } + Efl.Pack_Table.table_columns { get; set; } + Efl.Pack_Table.table_rows { get; set; } + Efl.Pack_Table.table_direction { get; set; } + Efl.Pack_Linear.pack_end; + Efl.Pack_Layout.layout_update; + Efl.Pack_Layout.layout_request; } } diff --git a/src/lib/elementary/efl_ui_table_static.eo b/src/lib/elementary/efl_ui_table_static.eo index 337c2a0e04..966a5dd196 100644 --- a/src/lib/elementary/efl_ui_table_static.eo +++ b/src/lib/elementary/efl_ui_table_static.eo @@ -4,6 +4,6 @@ class Efl.Ui.Table_Static (Efl.Ui.Table) data: null; implements { Efl.Object.constructor; - Efl.Pack.Layout.layout_update; + Efl.Pack_Layout.layout_update; } }