From 3171544819cd54af0030b42e1b3c60a7e04a363a Mon Sep 17 00:00:00 2001 From: Daniel Zaoui Date: Tue, 19 Aug 2014 09:04:07 +0300 Subject: [PATCH] Object Items: remove temporary files used for the porting to Eo. --- src/lib/elm_object_item_migration_temp.h | 4 ---- src/lib/elm_widget.h | 4 ++-- src/lib/elm_widget_colorselector.h | 1 - src/lib/elm_widget_ctxpopup.h | 1 - src/lib/elm_widget_dayselector.h | 1 - src/lib/elm_widget_diskselector.h | 1 - src/lib/elm_widget_flipselector.h | 1 - src/lib/elm_widget_gengrid.h | 1 - src/lib/elm_widget_genlist.h | 1 - src/lib/elm_widget_hoversel.h | 1 - src/lib/elm_widget_index.h | 1 - src/lib/elm_widget_list.h | 1 - src/lib/elm_widget_menu.h | 1 - src/lib/elm_widget_multibuttonentry.h | 1 - src/lib/elm_widget_naviframe.h | 1 - src/lib/elm_widget_popup.h | 1 - src/lib/elm_widget_segment_control.h | 1 - src/lib/elm_widget_slideshow.h | 1 - src/lib/elm_widget_toolbar.h | 1 - 19 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 src/lib/elm_object_item_migration_temp.h diff --git a/src/lib/elm_object_item_migration_temp.h b/src/lib/elm_object_item_migration_temp.h deleted file mode 100644 index 4563d26..0000000 --- a/src/lib/elm_object_item_migration_temp.h +++ /dev/null @@ -1,4 +0,0 @@ -#undef VIEW -#undef WIDGET -#define VIEW(X) X->base->view -#define WIDGET(X) X->base->widget diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h index 1423c7b..e38a7a0 100644 --- a/src/lib/elm_widget.h +++ b/src/lib/elm_widget.h @@ -580,8 +580,8 @@ struct _Elm_Widget_Item_Data #define ELM_WIDGET_ITEM_MAGIC 0xef1e1301 EINA_MAGIC; /* simple accessor macros */ -#define VIEW(X) X->base.view -#define WIDGET(X) X->base.widget +#define VIEW(X) X->base->view +#define WIDGET(X) X->base->widget #define EO_OBJ(X) (Elm_Object_Item *)((X)?X->base->eo_obj:NULL) /**< the owner widget that owns this item */ Evas_Object *widget; diff --git a/src/lib/elm_widget_colorselector.h b/src/lib/elm_widget_colorselector.h index 3666fc8..8ee8101 100644 --- a/src/lib/elm_widget_colorselector.h +++ b/src/lib/elm_widget_colorselector.h @@ -4,7 +4,6 @@ #include "Elementary.h" #include "elm_color_item.eo.h" -#include "elm_object_item_migration_temp.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/elm_widget_ctxpopup.h b/src/lib/elm_widget_ctxpopup.h index 608707b..e545a5d 100644 --- a/src/lib/elm_widget_ctxpopup.h +++ b/src/lib/elm_widget_ctxpopup.h @@ -10,7 +10,6 @@ * IT AT RUNTIME. */ -#include "elm_object_item_migration_temp.h" /** * @addtogroup Widget * @{ diff --git a/src/lib/elm_widget_dayselector.h b/src/lib/elm_widget_dayselector.h index 6ce0d7d..17ec8b3 100644 --- a/src/lib/elm_widget_dayselector.h +++ b/src/lib/elm_widget_dayselector.h @@ -4,7 +4,6 @@ #include "Elementary.h" #include "elm_dayselector_item.eo.h" -#include "elm_object_item_migration_temp.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/elm_widget_diskselector.h b/src/lib/elm_widget_diskselector.h index b2e816a..90e67fb 100644 --- a/src/lib/elm_widget_diskselector.h +++ b/src/lib/elm_widget_diskselector.h @@ -9,7 +9,6 @@ * IT AT RUNTIME. */ -#include "elm_object_item_migration_temp.h" /** * @addtogroup Widget * @{ diff --git a/src/lib/elm_widget_flipselector.h b/src/lib/elm_widget_flipselector.h index 0670cee..8bddd9b 100644 --- a/src/lib/elm_widget_flipselector.h +++ b/src/lib/elm_widget_flipselector.h @@ -8,7 +8,6 @@ * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK * IT AT RUNTIME. */ -#include "elm_object_item_migration_temp.h" #include "elm_flipselector_item.eo.h" /** diff --git a/src/lib/elm_widget_gengrid.h b/src/lib/elm_widget_gengrid.h index bb2ff2a..e38156a 100644 --- a/src/lib/elm_widget_gengrid.h +++ b/src/lib/elm_widget_gengrid.h @@ -10,7 +10,6 @@ * IT AT RUNTIME. */ -#include "elm_object_item_migration_temp.h" /** * @addtogroup Widget * @{ diff --git a/src/lib/elm_widget_genlist.h b/src/lib/elm_widget_genlist.h index a8e47ee..94627bb 100644 --- a/src/lib/elm_widget_genlist.h +++ b/src/lib/elm_widget_genlist.h @@ -10,7 +10,6 @@ * IT AT RUNTIME. */ -#include "elm_object_item_migration_temp.h" /** * @addtogroup Widget * @{ diff --git a/src/lib/elm_widget_hoversel.h b/src/lib/elm_widget_hoversel.h index d9b6fee..74255a6 100644 --- a/src/lib/elm_widget_hoversel.h +++ b/src/lib/elm_widget_hoversel.h @@ -4,7 +4,6 @@ #include "Elementary.h" #include "elm_hoversel_item.eo.h" -#include "elm_object_item_migration_temp.h" #include diff --git a/src/lib/elm_widget_index.h b/src/lib/elm_widget_index.h index f0fd20b..381e3de 100644 --- a/src/lib/elm_widget_index.h +++ b/src/lib/elm_widget_index.h @@ -4,7 +4,6 @@ #include "Elementary.h" #include "elm_index_item.eo.h" -#include "elm_object_item_migration_temp.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/elm_widget_list.h b/src/lib/elm_widget_list.h index 15ef822..6ddd4d8 100644 --- a/src/lib/elm_widget_list.h +++ b/src/lib/elm_widget_list.h @@ -10,7 +10,6 @@ * IT AT RUNTIME. */ -#include "elm_object_item_migration_temp.h" /** * @addtogroup Widget * @{ diff --git a/src/lib/elm_widget_menu.h b/src/lib/elm_widget_menu.h index 64c1b84..067daa2 100644 --- a/src/lib/elm_widget_menu.h +++ b/src/lib/elm_widget_menu.h @@ -8,7 +8,6 @@ * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK * IT AT RUNTIME. */ -#include "elm_object_item_migration_temp.h" #include "elm_menu_item.eo.h" /** diff --git a/src/lib/elm_widget_multibuttonentry.h b/src/lib/elm_widget_multibuttonentry.h index 2216e03..ce4c657 100644 --- a/src/lib/elm_widget_multibuttonentry.h +++ b/src/lib/elm_widget_multibuttonentry.h @@ -2,7 +2,6 @@ #define ELM_WIDGET_MULTIBUTTONENTRY_H #include "elm_widget_layout.h" -#include "elm_object_item_migration_temp.h" #include "elm_multibuttonentry_item.eo.h" diff --git a/src/lib/elm_widget_naviframe.h b/src/lib/elm_widget_naviframe.h index f74200c..c02ad05 100644 --- a/src/lib/elm_widget_naviframe.h +++ b/src/lib/elm_widget_naviframe.h @@ -10,7 +10,6 @@ * IT AT RUNTIME. */ -#include "elm_object_item_migration_temp.h" /** * @addtogroup Widget * @{ diff --git a/src/lib/elm_widget_popup.h b/src/lib/elm_widget_popup.h index 682cb6c..95a1a69 100644 --- a/src/lib/elm_widget_popup.h +++ b/src/lib/elm_widget_popup.h @@ -10,7 +10,6 @@ * IT AT RUNTIME. */ -#include "elm_object_item_migration_temp.h" /** * @addtogroup Widget * @{ diff --git a/src/lib/elm_widget_segment_control.h b/src/lib/elm_widget_segment_control.h index c322551..0a53e1a 100644 --- a/src/lib/elm_widget_segment_control.h +++ b/src/lib/elm_widget_segment_control.h @@ -4,7 +4,6 @@ #include "Elementary.h" #include "elm_segment_control_item.eo.h" -#include "elm_object_item_migration_temp.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/elm_widget_slideshow.h b/src/lib/elm_widget_slideshow.h index c29f7bf..39a0b41 100644 --- a/src/lib/elm_widget_slideshow.h +++ b/src/lib/elm_widget_slideshow.h @@ -4,7 +4,6 @@ #include "Elementary.h" #include "elm_slideshow_item.eo.h" -#include "elm_object_item_migration_temp.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/elm_widget_toolbar.h b/src/lib/elm_widget_toolbar.h index 7ff9378..2bdd329 100644 --- a/src/lib/elm_widget_toolbar.h +++ b/src/lib/elm_widget_toolbar.h @@ -9,7 +9,6 @@ * IT AT RUNTIME. */ -#include "elm_object_item_migration_temp.h" /** * @addtogroup Widget * @{ -- 2.7.4