From 7cf364f270de5a582ad92ec7c3277837e58c045a Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Wed, 25 Sep 2019 21:59:14 -0400 Subject: [PATCH] elementary: rename Efl.Ui.Collection_Event to Efl.Ui.Item_Clickable Summary: Depends on D10171 Reviewers: zmike, segfaultxavi, bu5hm4n, SanghyeonLee, lauromoura, felipealmeida Reviewed By: zmike, SanghyeonLee Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T8266 Differential Revision: https://phab.enlightenment.org/D10175 --- src/lib/elementary/Efl_Ui.h | 2 +- src/lib/elementary/efl_ui_collection.eo | 2 +- src/lib/elementary/efl_ui_collection_view.eo | 2 +- src/lib/elementary/efl_ui_item.c | 2 +- .../{efl_ui_collection_events.eo => efl_ui_item_clickable.eo} | 2 +- src/lib/elementary/meson.build | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/lib/elementary/{efl_ui_collection_events.eo => efl_ui_item_clickable.eo} (92%) diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h index 29ef99383e..80cdde78b5 100644 --- a/src/lib/elementary/Efl_Ui.h +++ b/src/lib/elementary/Efl_Ui.h @@ -307,7 +307,7 @@ typedef Eo Efl_Ui_Spotlight_Indicator; # include # include # include -# include +# include # include # include # include diff --git a/src/lib/elementary/efl_ui_collection.eo b/src/lib/elementary/efl_ui_collection.eo index 28ecb4975d..a57e07b028 100644 --- a/src/lib/elementary/efl_ui_collection.eo +++ b/src/lib/elementary/efl_ui_collection.eo @@ -4,7 +4,7 @@ class Efl.Ui.Collection extends Efl.Ui.Layout_Base implements Efl.Ui.Multi_Selectable, Efl.Ui.Focus.Manager_Sub, Efl.Ui.Widget_Focus_Manager, - Efl.Ui.Collection_Events + Efl.Ui.Item_Clickable composites Efl.Ui.Scrollable, Efl.Ui.Scrollbar, diff --git a/src/lib/elementary/efl_ui_collection_view.eo b/src/lib/elementary/efl_ui_collection_view.eo index ac379d94e8..9278cd04c7 100644 --- a/src/lib/elementary/efl_ui_collection_view.eo +++ b/src/lib/elementary/efl_ui_collection_view.eo @@ -4,7 +4,7 @@ class Efl.Ui.Collection_View extends Efl.Ui.Layout_Base implements Efl.Ui.Multi_Selectable_Async, Efl.Ui.Focus.Manager_Sub, Efl.Ui.Widget_Focus_Manager, - Efl.Ui.Collection_Events + Efl.Ui.Item_Clickable composites Efl.Ui.Scrollable, Efl.Ui.Scrollbar, Efl.Ui.Multi_Selectable_Async { [[This widget displays a list of items in an arrangement controlled by an external @.position_manager diff --git a/src/lib/elementary/efl_ui_item.c b/src/lib/elementary/efl_ui_item.c index 7cdfe16424..3dce9c3837 100644 --- a/src/lib/elementary/efl_ui_item.c +++ b/src/lib/elementary/efl_ui_item.c @@ -237,5 +237,5 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_item, Efl_Ui_Item_Data) #include "efl_ui_selectable.eo.c" #include "efl_ui_multi_selectable.eo.c" #include "efl_ui_single_selectable.eo.c" -#include "efl_ui_collection_events.eo.c" +#include "efl_ui_item_clickable.eo.c" diff --git a/src/lib/elementary/efl_ui_collection_events.eo b/src/lib/elementary/efl_ui_item_clickable.eo similarity index 92% rename from src/lib/elementary/efl_ui_collection_events.eo rename to src/lib/elementary/efl_ui_item_clickable.eo index 653172564b..7177d24f49 100644 --- a/src/lib/elementary/efl_ui_collection_events.eo +++ b/src/lib/elementary/efl_ui_item_clickable.eo @@ -1,4 +1,4 @@ -interface @beta Efl.Ui.Collection_Events +interface @beta Efl.Ui.Item_Clickable { [[Shared sets of events between @Efl.Ui.Collection and @Efl.Ui.Collection_View.]] event_prefix: efl_ui; diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index 8166aafd95..c2cd86bbc9 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -171,7 +171,7 @@ pub_eo_files = [ 'efl_ui_relative_layout.eo', 'efl_ui_action_connector.eo', 'efl_ui_format.eo', - 'efl_ui_collection_events.eo', + 'efl_ui_item_clickable.eo', 'efl_ui_collection.eo', 'efl_ui_position_manager_entity.eo', 'efl_ui_position_manager_list.eo',