From: Shinwoo Kim Date: Thu, 1 Feb 2018 05:37:12 +0000 (+0900) Subject: Use ERR instead of CRI if *DATA_GET* returns NULL X-Git-Tag: submit/sandbox/upgrade/efl120/20180319.053334~68 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F21%2F168921%2F2;p=platform%2Fupstream%2Fefl.git Use ERR instead of CRI if *DATA_GET* returns NULL Change-Id: Ie16a5416e05fbc8a81a0f626c7efb8bb8ec1d650 --- diff --git a/src/lib/elementary/efl_ui_bg_widget_private.h b/src/lib/elementary/efl_ui_bg_widget_private.h index e09c266..0ef56c1 100644 --- a/src/lib/elementary/efl_ui_bg_widget_private.h +++ b/src/lib/elementary/efl_ui_bg_widget_private.h @@ -41,7 +41,7 @@ Efl_Ui_Bg_Widget_Data * sd = efl_data_scope_get(o, EFL_UI_BG_WIDGET_CLASS) EFL_UI_BG_WIDGET_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -50,7 +50,7 @@ Efl_Ui_Bg_Widget_Data * sd = efl_data_scope_get(o, EFL_UI_BG_WIDGET_CLASS) EFL_UI_BG_WIDGET_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/efl_ui_button_private.h b/src/lib/elementary/efl_ui_button_private.h index 49bfcdb..2532620 100644 --- a/src/lib/elementary/efl_ui_button_private.h +++ b/src/lib/elementary/efl_ui_button_private.h @@ -47,7 +47,7 @@ typedef struct _Efl_Ui_button_Data ELM_BUTTON_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -56,7 +56,7 @@ typedef struct _Efl_Ui_button_Data ELM_BUTTON_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/efl_ui_check_private.h b/src/lib/elementary/efl_ui_check_private.h index ecd179f..e44c603 100644 --- a/src/lib/elementary/efl_ui_check_private.h +++ b/src/lib/elementary/efl_ui_check_private.h @@ -40,7 +40,7 @@ struct _Efl_Ui_Check_Data EFL_UI_CHECK_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -49,7 +49,7 @@ struct _Efl_Ui_Check_Data EFL_UI_CHECK_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/efl_ui_clock_private.h b/src/lib/elementary/efl_ui_clock_private.h index 0163eea..51ef2bb 100644 --- a/src/lib/elementary/efl_ui_clock_private.h +++ b/src/lib/elementary/efl_ui_clock_private.h @@ -130,7 +130,7 @@ struct _Format_Map EFL_UI_CLOCK_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -139,7 +139,7 @@ struct _Format_Map EFL_UI_CLOCK_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/efl_ui_image_zoomable_private.h b/src/lib/elementary/efl_ui_image_zoomable_private.h index 1f867a9..7ccbf25 100644 --- a/src/lib/elementary/efl_ui_image_zoomable_private.h +++ b/src/lib/elementary/efl_ui_image_zoomable_private.h @@ -167,7 +167,7 @@ struct _Efl_Ui_Image_Zoomable_Pan_Data EFL_UI_IMAGE_ZOOMABLE_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -176,7 +176,7 @@ struct _Efl_Ui_Image_Zoomable_Pan_Data EFL_UI_IMAGE_ZOOMABLE_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/efl_ui_list_private.h b/src/lib/elementary/efl_ui_list_private.h index 5cd1fb3..e42fb80 100644 --- a/src/lib/elementary/efl_ui_list_private.h +++ b/src/lib/elementary/efl_ui_list_private.h @@ -117,7 +117,7 @@ struct _Efl_Ui_List_Slice EFL_UI_LIST_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -126,7 +126,7 @@ struct _Efl_Ui_List_Slice EFL_UI_LIST_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/efl_ui_multibuttonentry_private.h b/src/lib/elementary/efl_ui_multibuttonentry_private.h index 8310f19..694126f 100644 --- a/src/lib/elementary/efl_ui_multibuttonentry_private.h +++ b/src/lib/elementary/efl_ui_multibuttonentry_private.h @@ -128,7 +128,7 @@ struct _Efl_Ui_Multibuttonentry_Data EFL_UI_MULTIBUTTONENTRY_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -137,7 +137,7 @@ struct _Efl_Ui_Multibuttonentry_Data Efl_Ui_Multibuttonentry_Data * ptr = efl_data_scope_get(o, EFL_UI_MULTIBUTTONENTRY_CLASS); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/efl_ui_pan.c b/src/lib/elementary/efl_ui_pan.c index f6c065a..67c063b 100644 --- a/src/lib/elementary/efl_ui_pan.c +++ b/src/lib/elementary/efl_ui_pan.c @@ -16,7 +16,7 @@ EFL_UI_PAN_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return __VA_ARGS__; \ } diff --git a/src/lib/elementary/efl_ui_panes_private.h b/src/lib/elementary/efl_ui_panes_private.h index c675237..a95c3ba 100644 --- a/src/lib/elementary/efl_ui_panes_private.h +++ b/src/lib/elementary/efl_ui_panes_private.h @@ -61,7 +61,7 @@ struct _Efl_Ui_Panes_Data EFL_UI_PANES_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -70,7 +70,7 @@ struct _Efl_Ui_Panes_Data EFL_UI_PANES_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/efl_ui_radio_private.h b/src/lib/elementary/efl_ui_radio_private.h index 0cce85f..8e41183 100644 --- a/src/lib/elementary/efl_ui_radio_private.h +++ b/src/lib/elementary/efl_ui_radio_private.h @@ -52,7 +52,7 @@ struct _Efl_Ui_Radio_Data ELM_RADIO_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -61,7 +61,7 @@ struct _Efl_Ui_Radio_Data ELM_RADIO_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/efl_ui_scroller.c b/src/lib/elementary/efl_ui_scroller.c index 83e3f96..43885ba 100644 --- a/src/lib/elementary/efl_ui_scroller.c +++ b/src/lib/elementary/efl_ui_scroller.c @@ -24,7 +24,7 @@ EFL_UI_SCROLLER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return __VA_ARGS__; \ } diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 43146f5..0a7af70 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -157,7 +157,7 @@ struct _Item_Obj EFL_UI_TEXT_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -166,7 +166,7 @@ struct _Item_Obj EFL_UI_TEXT_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/efl_ui_video_private.h b/src/lib/elementary/efl_ui_video_private.h index c38ddb7..4a2c0b9 100644 --- a/src/lib/elementary/efl_ui_video_private.h +++ b/src/lib/elementary/efl_ui_video_private.h @@ -44,7 +44,7 @@ struct _Efl_Ui_Video_Data EFL_UI_VIDEO_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -53,7 +53,7 @@ struct _Efl_Ui_Video_Data EFL_UI_VIDEO_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/efl_ui_widget_flip.h b/src/lib/elementary/efl_ui_widget_flip.h index 11c2abd..469fef4 100644 --- a/src/lib/elementary/efl_ui_widget_flip.h +++ b/src/lib/elementary/efl_ui_widget_flip.h @@ -90,7 +90,7 @@ struct _Vertex3 EFL_UI_FLIP_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -99,7 +99,7 @@ struct _Vertex3 EFL_UI_FLIP_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/efl_ui_widget_frame.h b/src/lib/elementary/efl_ui_widget_frame.h index ddd7f70..ca4321d 100644 --- a/src/lib/elementary/efl_ui_widget_frame.h +++ b/src/lib/elementary/efl_ui_widget_frame.h @@ -42,7 +42,7 @@ struct _Efl_Ui_Frame_Data EFL_UI_FRAME_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -51,7 +51,7 @@ struct _Efl_Ui_Frame_Data EFL_UI_FRAME_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/efl_ui_widget_image.h b/src/lib/elementary/efl_ui_widget_image.h index e5c45eb..48e9952 100644 --- a/src/lib/elementary/efl_ui_widget_image.h +++ b/src/lib/elementary/efl_ui_widget_image.h @@ -117,7 +117,7 @@ struct _Efl_Ui_Image_Data EFL_UI_IMAGE_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -126,7 +126,7 @@ struct _Efl_Ui_Image_Data EFL_UI_IMAGE_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index f96021a..3a60e46 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -61,7 +61,7 @@ static int _paused_windows = 0; ELM_WIN_DATA_GET(o, ptr); \ if (!ptr) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, efl_class_name_get(o)); \ return __VA_ARGS__; \ } diff --git a/src/lib/elementary/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c index ae3b353..0dec106 100644 --- a/src/lib/elementary/elm_gesture_layer.c +++ b/src/lib/elementary/elm_gesture_layer.c @@ -63,7 +63,7 @@ _glayer_buf_dup(void *buf, size_t size) ELM_GESTURE_LAYER_DATA_GET(o, ptr); \ if (!ptr) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -72,7 +72,7 @@ _glayer_buf_dup(void *buf, size_t size) ELM_GESTURE_LAYER_DATA_GET(o, ptr); \ if (!ptr) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h index 0ac0afa..48689a7 100644 --- a/src/lib/elementary/elm_widget.h +++ b/src/lib/elementary/elm_widget.h @@ -889,7 +889,7 @@ Efl_Canvas_Object * _efl_ui_widget_bg_get(Efl_Ui_Widget *obj); ptr = efl_data_scope_get(o, EFL_UI_WIDGET_CLASS); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("no widget data for object %p (%s)", \ + ERR("no widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return __VA_ARGS__; \ } diff --git a/src/lib/elementary/elm_widget_actionslider.h b/src/lib/elementary/elm_widget_actionslider.h index ad86e1f..4668d0b 100644 --- a/src/lib/elementary/elm_widget_actionslider.h +++ b/src/lib/elementary/elm_widget_actionslider.h @@ -45,7 +45,7 @@ struct _Elm_Actionslider_Data ELM_ACTIONSLIDER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -54,7 +54,7 @@ struct _Elm_Actionslider_Data ELM_ACTIONSLIDER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_bg.h b/src/lib/elementary/elm_widget_bg.h index 0f867ef..c7acb2a 100644 --- a/src/lib/elementary/elm_widget_bg.h +++ b/src/lib/elementary/elm_widget_bg.h @@ -47,7 +47,7 @@ struct _Elm_Bg_Data ELM_BG_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -56,7 +56,7 @@ struct _Elm_Bg_Data ELM_BG_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_box.h b/src/lib/elementary/elm_widget_box.h index a41ddc1..a4f5348 100644 --- a/src/lib/elementary/elm_widget_box.h +++ b/src/lib/elementary/elm_widget_box.h @@ -76,7 +76,7 @@ struct _Transition_Animation_Data ELM_BOX_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -85,7 +85,7 @@ struct _Transition_Animation_Data ELM_BOX_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_bubble.h b/src/lib/elementary/elm_widget_bubble.h index 7182ad3..5931bd2 100644 --- a/src/lib/elementary/elm_widget_bubble.h +++ b/src/lib/elementary/elm_widget_bubble.h @@ -41,7 +41,7 @@ struct _Elm_Bubble_Data ELM_BUBBLE_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -50,7 +50,7 @@ struct _Elm_Bubble_Data ELM_BUBBLE_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_clipper.h b/src/lib/elementary/elm_widget_clipper.h index 39ae195..6be7914 100644 --- a/src/lib/elementary/elm_widget_clipper.h +++ b/src/lib/elementary/elm_widget_clipper.h @@ -45,7 +45,7 @@ struct _Elm_Clipper_Data ELM_CLIPPER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -54,7 +54,7 @@ struct _Elm_Clipper_Data ELM_CLIPPER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_clock.h b/src/lib/elementary/elm_widget_clock.h index 4aec62d..195dab4 100644 --- a/src/lib/elementary/elm_widget_clock.h +++ b/src/lib/elementary/elm_widget_clock.h @@ -66,7 +66,7 @@ struct _Elm_Clock_Data ELM_CLOCK_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -75,7 +75,7 @@ struct _Elm_Clock_Data ELM_CLOCK_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_colorselector.h b/src/lib/elementary/elm_widget_colorselector.h index d92d95c..d4f95f8 100644 --- a/src/lib/elementary/elm_widget_colorselector.h +++ b/src/lib/elementary/elm_widget_colorselector.h @@ -122,7 +122,7 @@ struct _Elm_Color_Name ELM_COLORSELECTOR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -131,7 +131,7 @@ struct _Elm_Color_Name ELM_COLORSELECTOR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_combobox.h b/src/lib/elementary/elm_widget_combobox.h index fa0de30..bdbaaae 100644 --- a/src/lib/elementary/elm_widget_combobox.h +++ b/src/lib/elementary/elm_widget_combobox.h @@ -53,7 +53,7 @@ struct _Elm_Combobox_Data ELM_COMBOBOX_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -62,7 +62,7 @@ struct _Elm_Combobox_Data ELM_COMBOBOX_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_conform.h b/src/lib/elementary/elm_widget_conform.h index 2fe6f78..c7a703e 100644 --- a/src/lib/elementary/elm_widget_conform.h +++ b/src/lib/elementary/elm_widget_conform.h @@ -116,7 +116,7 @@ struct _Elm_Conformant_Mod_Api ELM_CONFORMANT_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -125,7 +125,7 @@ struct _Elm_Conformant_Mod_Api ELM_CONFORMANT_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_ctxpopup.h b/src/lib/elementary/elm_widget_ctxpopup.h index 256f461..53156b2 100644 --- a/src/lib/elementary/elm_widget_ctxpopup.h +++ b/src/lib/elementary/elm_widget_ctxpopup.h @@ -78,7 +78,7 @@ struct _Elm_Ctxpopup_Data ELM_CTXPOPUP_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -87,7 +87,7 @@ struct _Elm_Ctxpopup_Data ELM_CTXPOPUP_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_dayselector.h b/src/lib/elementary/elm_widget_dayselector.h index 9dd8784..ee552e3 100644 --- a/src/lib/elementary/elm_widget_dayselector.h +++ b/src/lib/elementary/elm_widget_dayselector.h @@ -55,7 +55,7 @@ struct _Elm_Dayselector_Item_Data ELM_DAYSELECTOR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -64,7 +64,7 @@ struct _Elm_Dayselector_Item_Data ELM_DAYSELECTOR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_diskselector.h b/src/lib/elementary/elm_widget_diskselector.h index 37a1ecc..25d0f377 100644 --- a/src/lib/elementary/elm_widget_diskselector.h +++ b/src/lib/elementary/elm_widget_diskselector.h @@ -77,7 +77,7 @@ struct _Elm_Diskselector_Item_Data ELM_DISKSELECTOR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -86,7 +86,7 @@ struct _Elm_Diskselector_Item_Data ELM_DISKSELECTOR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_entry.h b/src/lib/elementary/elm_widget_entry.h index f9be17e..fedf09d 100644 --- a/src/lib/elementary/elm_widget_entry.h +++ b/src/lib/elementary/elm_widget_entry.h @@ -194,7 +194,7 @@ typedef enum _Length_Unit ELM_ENTRY_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -203,7 +203,7 @@ typedef enum _Length_Unit ELM_ENTRY_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_fileselector.h b/src/lib/elementary/elm_widget_fileselector.h index 6cf369c..db0de2c 100644 --- a/src/lib/elementary/elm_widget_fileselector.h +++ b/src/lib/elementary/elm_widget_fileselector.h @@ -166,7 +166,7 @@ struct _Elm_Fileselector_Filter ELM_FILESELECTOR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -175,7 +175,7 @@ struct _Elm_Fileselector_Filter ELM_FILESELECTOR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_fileselector_button.h b/src/lib/elementary/elm_widget_fileselector_button.h index 329c941..e055ae1 100644 --- a/src/lib/elementary/elm_widget_fileselector_button.h +++ b/src/lib/elementary/elm_widget_fileselector_button.h @@ -65,7 +65,7 @@ struct _Elm_Fileselector_Button_Data ELM_FILESELECTOR_BUTTON_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -74,7 +74,7 @@ struct _Elm_Fileselector_Button_Data ELM_FILESELECTOR_BUTTON_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_fileselector_entry.h b/src/lib/elementary/elm_widget_fileselector_entry.h index 50691b2..83d4005 100644 --- a/src/lib/elementary/elm_widget_fileselector_entry.h +++ b/src/lib/elementary/elm_widget_fileselector_entry.h @@ -47,7 +47,7 @@ struct _Elm_Fileselector_Entry_Data ELM_FILESELECTOR_ENTRY_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -56,7 +56,7 @@ struct _Elm_Fileselector_Entry_Data ELM_FILESELECTOR_ENTRY_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_flipselector.h b/src/lib/elementary/elm_widget_flipselector.h index 2d983d7..bf0af41 100644 --- a/src/lib/elementary/elm_widget_flipselector.h +++ b/src/lib/elementary/elm_widget_flipselector.h @@ -65,7 +65,7 @@ struct _Elm_Flipselector_Item_Data ELM_FLIPSELECTOR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -74,7 +74,7 @@ struct _Elm_Flipselector_Item_Data ELM_FLIPSELECTOR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_gengrid.h b/src/lib/elementary/elm_widget_gengrid.h index 951d070..6cc8073 100644 --- a/src/lib/elementary/elm_widget_gengrid.h +++ b/src/lib/elementary/elm_widget_gengrid.h @@ -228,7 +228,7 @@ struct _Elm_Gengrid_Pan_Data ELM_GENGRID_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -237,7 +237,7 @@ struct _Elm_Gengrid_Pan_Data ELM_GENGRID_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_genlist.h b/src/lib/elementary/elm_widget_genlist.h index 368c517..512a1dd 100644 --- a/src/lib/elementary/elm_widget_genlist.h +++ b/src/lib/elementary/elm_widget_genlist.h @@ -347,7 +347,7 @@ struct _Elm_Genlist_Filter ELM_GENLIST_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -356,7 +356,7 @@ struct _Elm_Genlist_Filter ELM_GENLIST_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_glview.h b/src/lib/elementary/elm_widget_glview.h index cee7603..d561c09 100644 --- a/src/lib/elementary/elm_widget_glview.h +++ b/src/lib/elementary/elm_widget_glview.h @@ -61,7 +61,7 @@ struct _Elm_Glview_Data ELM_GLVIEW_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -70,7 +70,7 @@ struct _Elm_Glview_Data ELM_GLVIEW_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_hover.h b/src/lib/elementary/elm_widget_hover.h index 41bc315..5d32dbd 100644 --- a/src/lib/elementary/elm_widget_hover.h +++ b/src/lib/elementary/elm_widget_hover.h @@ -62,7 +62,7 @@ struct _Elm_Hover_Data ELM_HOVER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -71,7 +71,7 @@ struct _Elm_Hover_Data ELM_HOVER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_hoversel.h b/src/lib/elementary/elm_widget_hoversel.h index f21ae34..eb78671 100644 --- a/src/lib/elementary/elm_widget_hoversel.h +++ b/src/lib/elementary/elm_widget_hoversel.h @@ -71,7 +71,7 @@ struct _Elm_Hoversel_Item_Data ELM_HOVERSEL_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -80,7 +80,7 @@ struct _Elm_Hoversel_Item_Data ELM_HOVERSEL_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_icon.h b/src/lib/elementary/elm_widget_icon.h index 210cfd1..929f7e3 100644 --- a/src/lib/elementary/elm_widget_icon.h +++ b/src/lib/elementary/elm_widget_icon.h @@ -67,7 +67,7 @@ struct _Elm_Icon_Data ELM_ICON_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -76,7 +76,7 @@ struct _Elm_Icon_Data ELM_ICON_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_index.h b/src/lib/elementary/elm_widget_index.h index 1b6c1a3..16582e2 100644 --- a/src/lib/elementary/elm_widget_index.h +++ b/src/lib/elementary/elm_widget_index.h @@ -86,7 +86,7 @@ struct _Elm_Index_Omit ELM_INDEX_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -95,7 +95,7 @@ struct _Elm_Index_Omit ELM_INDEX_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_inwin.h b/src/lib/elementary/elm_widget_inwin.h index 3e3beb3..0cf7e1b 100644 --- a/src/lib/elementary/elm_widget_inwin.h +++ b/src/lib/elementary/elm_widget_inwin.h @@ -39,7 +39,7 @@ struct _Elm_Inwin_Smart_Data ELM_INWIN_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -48,7 +48,7 @@ struct _Elm_Inwin_Smart_Data ELM_INWIN_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_label.h b/src/lib/elementary/elm_widget_label.h index 6778a62..54b7c0d 100644 --- a/src/lib/elementary/elm_widget_label.h +++ b/src/lib/elementary/elm_widget_label.h @@ -43,7 +43,7 @@ struct _Elm_Label_Data ELM_LABEL_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -52,7 +52,7 @@ struct _Elm_Label_Data ELM_LABEL_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_list.h b/src/lib/elementary/elm_widget_list.h index fc98f14..8f42f5e 100644 --- a/src/lib/elementary/elm_widget_list.h +++ b/src/lib/elementary/elm_widget_list.h @@ -103,7 +103,7 @@ struct _Elm_List_Item_Data ELM_LIST_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -112,7 +112,7 @@ struct _Elm_List_Item_Data ELM_LIST_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_map.h b/src/lib/elementary/elm_widget_map.h index 56ebf2c..1cd4c18 100644 --- a/src/lib/elementary/elm_widget_map.h +++ b/src/lib/elementary/elm_widget_map.h @@ -516,7 +516,7 @@ struct _Elm_Map_Pan_Data ELM_MAP_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -525,7 +525,7 @@ struct _Elm_Map_Pan_Data ELM_MAP_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_mapbuf.h b/src/lib/elementary/elm_widget_mapbuf.h index c6742dd..be1400e 100644 --- a/src/lib/elementary/elm_widget_mapbuf.h +++ b/src/lib/elementary/elm_widget_mapbuf.h @@ -53,7 +53,7 @@ struct _Elm_Mapbuf_Data ELM_MAPBUF_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -62,7 +62,7 @@ struct _Elm_Mapbuf_Data ELM_MAPBUF_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_menu.h b/src/lib/elementary/elm_widget_menu.h index 0403a67..be2daee 100644 --- a/src/lib/elementary/elm_widget_menu.h +++ b/src/lib/elementary/elm_widget_menu.h @@ -78,7 +78,7 @@ struct _Elm_Menu_Item_Data ELM_MENU_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -87,7 +87,7 @@ struct _Elm_Menu_Item_Data ELM_MENU_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_naviframe.h b/src/lib/elementary/elm_widget_naviframe.h index 2fe134e..ab2cdfd 100644 --- a/src/lib/elementary/elm_widget_naviframe.h +++ b/src/lib/elementary/elm_widget_naviframe.h @@ -117,7 +117,7 @@ struct _Elm_Naviframe_Mod_Api ELM_NAVIFRAME_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -126,7 +126,7 @@ struct _Elm_Naviframe_Mod_Api ELM_NAVIFRAME_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_notify.h b/src/lib/elementary/elm_widget_notify.h index e8d0a83..6cde33c 100644 --- a/src/lib/elementary/elm_widget_notify.h +++ b/src/lib/elementary/elm_widget_notify.h @@ -58,7 +58,7 @@ struct _Elm_Notify_Data ELM_NOTIFY_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -67,7 +67,7 @@ struct _Elm_Notify_Data ELM_NOTIFY_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_panel.h b/src/lib/elementary/elm_widget_panel.h index 25586a5..2011e1d 100644 --- a/src/lib/elementary/elm_widget_panel.h +++ b/src/lib/elementary/elm_widget_panel.h @@ -63,7 +63,7 @@ struct _Elm_Panel_Data ELM_PANEL_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -72,7 +72,7 @@ struct _Elm_Panel_Data ELM_PANEL_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_photo.h b/src/lib/elementary/elm_widget_photo.h index e6b5b76..bd0a967 100644 --- a/src/lib/elementary/elm_widget_photo.h +++ b/src/lib/elementary/elm_widget_photo.h @@ -55,7 +55,7 @@ struct _Elm_Photo_Data ELM_PHOTO_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -64,7 +64,7 @@ struct _Elm_Photo_Data ELM_PHOTO_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_player.h b/src/lib/elementary/elm_widget_player.h index ea54068..3bc4f20 100644 --- a/src/lib/elementary/elm_widget_player.h +++ b/src/lib/elementary/elm_widget_player.h @@ -60,7 +60,7 @@ struct _Elm_Player_Data ELM_PLAYER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -69,7 +69,7 @@ struct _Elm_Player_Data ELM_PLAYER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_plug.h b/src/lib/elementary/elm_widget_plug.h index bc5e6da..8798fee 100644 --- a/src/lib/elementary/elm_widget_plug.h +++ b/src/lib/elementary/elm_widget_plug.h @@ -31,7 +31,7 @@ ELM_PLUG_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -40,7 +40,7 @@ ELM_PLUG_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_popup.h b/src/lib/elementary/elm_widget_popup.h index 38ceafb..2857728 100644 --- a/src/lib/elementary/elm_widget_popup.h +++ b/src/lib/elementary/elm_widget_popup.h @@ -105,7 +105,7 @@ struct _Action_Area_Data ELM_POPUP_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -114,7 +114,7 @@ struct _Action_Area_Data ELM_POPUP_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_prefs.h b/src/lib/elementary/elm_widget_prefs.h index 4b5f126..439ce18 100644 --- a/src/lib/elementary/elm_widget_prefs.h +++ b/src/lib/elementary/elm_widget_prefs.h @@ -110,7 +110,7 @@ extern const Elm_Prefs_Item_Iface *elm_prefs_item_default_widget; ELM_PREFS_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -119,7 +119,7 @@ extern const Elm_Prefs_Item_Iface *elm_prefs_item_default_widget; ELM_PREFS_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_route.h b/src/lib/elementary/elm_widget_route.h index f8e099f..6c6286b 100644 --- a/src/lib/elementary/elm_widget_route.h +++ b/src/lib/elementary/elm_widget_route.h @@ -65,7 +65,7 @@ struct Segment ELM_ROUTE_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -74,7 +74,7 @@ struct Segment ELM_ROUTE_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_scroller.h b/src/lib/elementary/elm_widget_scroller.h index 29ec6bd..bd7fde2 100644 --- a/src/lib/elementary/elm_widget_scroller.h +++ b/src/lib/elementary/elm_widget_scroller.h @@ -50,7 +50,7 @@ struct _Elm_Scroller_Data ELM_SCROLLER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -59,7 +59,7 @@ struct _Elm_Scroller_Data ELM_SCROLLER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_segment_control.h b/src/lib/elementary/elm_widget_segment_control.h index 79bdf79..75ae74e 100644 --- a/src/lib/elementary/elm_widget_segment_control.h +++ b/src/lib/elementary/elm_widget_segment_control.h @@ -56,7 +56,7 @@ struct _Elm_Segment_Control_Item_Data ELM_SEGMENT_CONTROL_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -65,7 +65,7 @@ struct _Elm_Segment_Control_Item_Data ELM_SEGMENT_CONTROL_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_separator.h b/src/lib/elementary/elm_widget_separator.h index 7044b58..2c1d6b2 100644 --- a/src/lib/elementary/elm_widget_separator.h +++ b/src/lib/elementary/elm_widget_separator.h @@ -40,7 +40,7 @@ struct _Elm_Separator_Data ELM_SEPARATOR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -49,7 +49,7 @@ struct _Elm_Separator_Data ELM_SEPARATOR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_slideshow.h b/src/lib/elementary/elm_widget_slideshow.h index e1226a4..8c18138 100644 --- a/src/lib/elementary/elm_widget_slideshow.h +++ b/src/lib/elementary/elm_widget_slideshow.h @@ -71,7 +71,7 @@ struct _Elm_Slideshow_Data ELM_SLIDESHOW_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -80,7 +80,7 @@ struct _Elm_Slideshow_Data ELM_SLIDESHOW_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_spinner.h b/src/lib/elementary/elm_widget_spinner.h index 50bb88c..6d820fd 100644 --- a/src/lib/elementary/elm_widget_spinner.h +++ b/src/lib/elementary/elm_widget_spinner.h @@ -79,7 +79,7 @@ struct _Elm_Spinner_Special_Value ELM_SPINNER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -88,7 +88,7 @@ struct _Elm_Spinner_Special_Value ELM_SPINNER_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_thumb.h b/src/lib/elementary/elm_widget_thumb.h index d7aeee7..927d798 100644 --- a/src/lib/elementary/elm_widget_thumb.h +++ b/src/lib/elementary/elm_widget_thumb.h @@ -78,7 +78,7 @@ struct _Elm_Thumb_Data ELM_THUMB_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -87,7 +87,7 @@ struct _Elm_Thumb_Data ELM_THUMB_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_toolbar.h b/src/lib/elementary/elm_widget_toolbar.h index d89d139..a718902 100644 --- a/src/lib/elementary/elm_widget_toolbar.h +++ b/src/lib/elementary/elm_widget_toolbar.h @@ -104,7 +104,7 @@ struct _Elm_Toolbar_Item_Data ELM_TOOLBAR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -113,7 +113,7 @@ struct _Elm_Toolbar_Item_Data ELM_TOOLBAR_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/elementary/elm_widget_web.h b/src/lib/elementary/elm_widget_web.h index 5fc6bd8..2a32d23 100644 --- a/src/lib/elementary/elm_widget_web.h +++ b/src/lib/elementary/elm_widget_web.h @@ -45,7 +45,7 @@ typedef struct _Elm_Web_Callback_Proxy_Context Elm_Web_Callback_Proxy_Context; ELM_WEB_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -54,7 +54,7 @@ typedef struct _Elm_Web_Callback_Proxy_Context Elm_Web_Callback_Proxy_Context; ELM_WEB_DATA_GET(o, ptr); \ if (EINA_UNLIKELY(!ptr)) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c index bbe66b2..3342da3 100644 --- a/src/lib/evas/canvas/evas_object_box.c +++ b/src/lib/evas/canvas/evas_object_box.c @@ -48,7 +48,7 @@ static void _sizing_eval(Evas_Object *obj); EVAS_OBJECT_BOX_DATA_GET(o, ptr); \ if (!ptr) \ { \ - CRI("no widget data for object %p (%s)", \ + ERR("no widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ fflush(stderr); \ return; \ @@ -58,7 +58,7 @@ if (!ptr) \ EVAS_OBJECT_BOX_DATA_GET(o, ptr); \ if (!ptr) \ { \ - CRI("no widget data for object %p (%s)", \ + ERR("no widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ fflush(stderr); \ return val; \ diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c index 8aab7cf..074c12b 100644 --- a/src/lib/evas/canvas/evas_object_grid.c +++ b/src/lib/evas/canvas/evas_object_grid.c @@ -49,7 +49,7 @@ struct _Evas_Object_Grid_Accessor EVAS_OBJECT_GRID_DATA_GET(o, ptr); \ if (!ptr) \ { \ - CRI("no widget data for object %p (%s)", \ + ERR("no widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ } @@ -58,7 +58,7 @@ struct _Evas_Object_Grid_Accessor EVAS_OBJECT_GRID_DATA_GET(o, ptr); \ if (!ptr) \ { \ - CRI("No widget data for object %p (%s)", \ + ERR("No widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return val; \ } diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index a07461f..d805d96 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -105,7 +105,7 @@ struct _Evas_Object_Table_Accessor EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \ if (!ptr) \ { \ - CRI("no widget data for object %p (%s)", \ + ERR("no widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ return; \ }