From 4e1ec2d3e9412315e082c7315e4ec530a5f67ab3 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 5 Mar 2019 17:00:37 -0500 Subject: [PATCH] elm_colorselector: remove all legacy usage from eo files this takes the current generated output from eolian for legacy code in efl and adds it to the tree, then removes legacy references from the corresponding eo files. in the case where the entire eo file was for a legacy object, that eo file has been removed from the tree ref T7724 Reviewed-by: Cedric BAIL Differential Revision: https://phab.enlightenment.org/D8161 --- src/Makefile_Elementary.am | 5 ++++- src/bin/elementary/test_bg.c | 2 +- src/bin/elementary/test_gfx_filters.c | 2 +- src/lib/elementary/elm_color_class.c | 2 +- src/lib/elementary/elm_colorselector.c | 2 +- src/lib/elementary/elm_colorselector_eo.c | 2 +- src/lib/elementary/elm_colorselector_legacy.h | 2 +- src/lib/elementary/elm_widget_colorselector.h | 2 +- src/lib/elementary/meson.build | 3 ++- 9 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index d6a4141652..dbe59af06a 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -187,7 +187,6 @@ elm_private_eolian_files = \ elm_legacy_eolian_files = \ lib/elementary/efl_ui_clock_legacy.eo \ lib/elementary/elm_interface_fileselector.eo \ - lib/elementary/elm_colorselector.eo \ lib/elementary/elm_conformant.eo \ lib/elementary/elm_ctxpopup.eo \ lib/elementary/elm_dayselector.eo \ @@ -339,6 +338,8 @@ lib/elementary/elm_code_widget_eo.legacy.c \ lib/elementary/elm_code_widget_legacy_eo.c \ lib/elementary/elm_color_item_eo.legacy.c \ lib/elementary/elm_color_item_eo.c \ +lib/elementary/elm_colorselector_eo.legacy.c \ +lib/elementary/elm_colorselector_eo.c \ lib/elementary/elm_hoversel_eo.c \ lib/elementary/elm_hoversel_item_eo.c \ lib/elementary/elm_hoversel_item_eo.legacy.c @@ -406,6 +407,8 @@ lib/elementary/elm_code_widget_legacy_eo.h \ lib/elementary/elm_code_widget_legacy_eo.legacy.h \ lib/elementary/elm_color_item_eo.h \ lib/elementary/elm_color_item_eo.legacy.h \ +lib/elementary/elm_colorselector_eo.h \ +lib/elementary/elm_colorselector_eo.legacy.h \ lib/elementary/elm_hoversel_eo.h \ lib/elementary/elm_hoversel_eo.legacy.h \ lib/elementary/elm_hoversel_item_eo.h \ diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c index c7c7f1902a..73a5a90ce7 100644 --- a/src/bin/elementary/test_bg.c +++ b/src/bin/elementary/test_bg.c @@ -3,7 +3,7 @@ #endif #include -#include "elm_colorselector.eo.h" +#include "elm_colorselector_eo.h" static void _cb_size_radio_changed(void *data, Evas_Object *obj, void *event EINA_UNUSED) diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c index 774140d77b..32513b7c41 100644 --- a/src/bin/elementary/test_gfx_filters.c +++ b/src/bin/elementary/test_gfx_filters.c @@ -3,7 +3,7 @@ #endif #include -#include "elm_colorselector.eo.h" +#include "elm_colorselector_eo.h" static const int default_font_size = 48; diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c index 54b6f5686c..6c87d6f6f2 100644 --- a/src/lib/elementary/elm_color_class.c +++ b/src/lib/elementary/elm_color_class.c @@ -5,7 +5,7 @@ #include #include "elm_priv.h" #include "elm_color_class.h" -#include "elm_colorselector.eo.h" +#include "elm_colorselector_eo.h" //static Eldbus_Proxy *cc_proxy; //static Ecore_Event_Handler *h1; diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index c101fd3c5d..9ac78ee517 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -2749,5 +2749,5 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(elm_colorselector, Elm_Colorselector_Data) ELM_LAYOUT_SIZING_EVAL_OPS(elm_colorselector), \ EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_colorselector) -#include "elm_colorselector.eo.c" +#include "elm_colorselector_eo.c" #include "elm_color_item_eo.c" diff --git a/src/lib/elementary/elm_colorselector_eo.c b/src/lib/elementary/elm_colorselector_eo.c index 543a9a4ab4..2fd6bbd1a8 100644 --- a/src/lib/elementary/elm_colorselector_eo.c +++ b/src/lib/elementary/elm_colorselector_eo.c @@ -148,4 +148,4 @@ static const Efl_Class_Description _elm_colorselector_class_desc = { EFL_DEFINE_CLASS(elm_colorselector_class_get, &_elm_colorselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_CLICKABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); -#include "elm_colorselector.eo.legacy.c" +#include "elm_colorselector_eo.legacy.c" diff --git a/src/lib/elementary/elm_colorselector_legacy.h b/src/lib/elementary/elm_colorselector_legacy.h index 27008db78e..a707951be6 100644 --- a/src/lib/elementary/elm_colorselector_legacy.h +++ b/src/lib/elementary/elm_colorselector_legacy.h @@ -8,4 +8,4 @@ */ EAPI Evas_Object *elm_colorselector_add(Evas_Object *parent); -#include "elm_colorselector.eo.legacy.h" +#include "elm_colorselector_eo.legacy.h" diff --git a/src/lib/elementary/elm_widget_colorselector.h b/src/lib/elementary/elm_widget_colorselector.h index 6e7223aacd..535f5ae0fd 100644 --- a/src/lib/elementary/elm_widget_colorselector.h +++ b/src/lib/elementary/elm_widget_colorselector.h @@ -3,7 +3,7 @@ #include "Elementary.h" #include "elm_color_item_eo.h" -#include "elm_colorselector.eo.h" +#include "elm_colorselector_eo.h" /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index 0b370d7d33..8d34e0b7cf 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -1,7 +1,6 @@ pub_legacy_eo_files = [ 'efl_ui_clock_legacy.eo', 'elm_interface_fileselector.eo', - 'elm_colorselector.eo', 'elm_conformant.eo', 'elm_ctxpopup.eo', 'elm_dayselector.eo', @@ -732,6 +731,8 @@ elementary_pub_headers = [ 'elm_code_widget_legacy_eo.legacy.h', 'elm_color_item_eo.h', 'elm_color_item_eo.legacy.h', + 'elm_colorselector_eo.h', + 'elm_colorselector_eo.legacy.h', 'elm_hoversel_eo.h', 'elm_hoversel_eo.legacy.h', 'elm_hoversel_item_eo.h',