elm_widget_xxx.h: Adopt EINA_UNLIKELY and fix indentation in FOO_DATA_GET macros.

diff --git a/legacy/elementary/src/lib/elm_widget_actionslider.h b/legacy/elementary/src/lib/elm_widget_actionslider.h
index 61bb2d0..f4c0a58 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_actionslider.h
+++ b/legacy/elementary/src/lib/elm_widget_actionslider.h
@@ -35,26 +35,26 @@ struct _Elm_Actionslider_Smart_Data
 #define ELM_ACTIONSLIDER_DATA_GET(o, sd) \
   Elm_Actionslider_Smart_Data * sd = eo_data_scope_get(o, ELM_OBJ_ACTIONSLIDER_CLASS)
 
-#define ELM_ACTIONSLIDER_DATA_GET_OR_RETURN(o, ptr)     \
-  ELM_ACTIONSLIDER_DATA_GET(o, ptr);                    \
-  if (!ptr)                                          \
+#define ELM_ACTIONSLIDER_DATA_GET_OR_RETURN(o, ptr)  \
+  ELM_ACTIONSLIDER_DATA_GET(o, ptr);                 \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_ACTIONSLIDER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_ACTIONSLIDER_DATA_GET(o, ptr);                         \
-  if (!ptr)                                               \
-    {                                                     \
-       CRI("No widget data for object %p (%s)",      \
-                o, evas_object_type_get(o));              \
-       return val;                                        \
+  if (EINA_UNLIKELY(!ptr))                                   \
+    {                                                        \
+       CRI("No widget data for object %p (%s)",              \
+           o, evas_object_type_get(o));                      \
+       return val;                                           \
     }
 
-#define ELM_ACTIONSLIDER_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_ACTIONSLIDER_CLASS)) \
+#define ELM_ACTIONSLIDER_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_ACTIONSLIDER_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_bg.h b/legacy/elementary/src/lib/elm_widget_bg.h
index 8174eac..dbf427b 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_bg.h
+++ b/legacy/elementary/src/lib/elm_widget_bg.h
@@ -46,24 +46,24 @@ struct _Elm_Bg_Smart_Data
 
 #define ELM_BG_DATA_GET_OR_RETURN(o, ptr)            \
   ELM_BG_DATA_GET(o, ptr);                           \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_BG_DATA_GET_OR_RETURN_VAL(o, ptr, val)   \
   ELM_BG_DATA_GET(o, ptr);                           \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return val;                                   \
     }
 
-#define ELM_BG_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_BG_CLASS)) \
+#define ELM_BG_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_BG_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_box.h b/legacy/elementary/src/lib/elm_widget_box.h
index 92f39f4..998772e 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_box.h
+++ b/legacy/elementary/src/lib/elm_widget_box.h
@@ -68,24 +68,24 @@ struct _Transition_Animation_Data
 
 #define ELM_BOX_DATA_GET_OR_RETURN(o, ptr)           \
   ELM_BOX_DATA_GET(o, ptr);                          \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_BOX_DATA_GET_OR_RETURN_VAL(o, ptr, val)  \
   ELM_BOX_DATA_GET(o, ptr);                          \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return val;                                   \
     }
 
-#define ELM_BOX_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_BOX_CLASS)) \
+#define ELM_BOX_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_BOX_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_bubble.h b/legacy/elementary/src/lib/elm_widget_bubble.h
index c78ee89..d608432 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_bubble.h
+++ b/legacy/elementary/src/lib/elm_widget_bubble.h
@@ -33,24 +33,24 @@ struct _Elm_Bubble_Smart_Data
 
 #define ELM_BUBBLE_DATA_GET_OR_RETURN(o, ptr)        \
   ELM_BUBBLE_DATA_GET(o, ptr);                       \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_BUBBLE_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_BUBBLE_DATA_GET(o, ptr);                         \
-  if (!ptr)                                            \
+  if (EINA_UNLIKELY(!ptr))                             \
     {                                                  \
-       CRI("No widget data for object %p (%s)",   \
-                o, evas_object_type_get(o));           \
+       CRI("No widget data for object %p (%s)",        \
+           o, evas_object_type_get(o));                \
        return val;                                     \
     }
 
-#define ELM_BUBBLE_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_BUBBLE_CLASS)) \
+#define ELM_BUBBLE_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_BUBBLE_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_button.h b/legacy/elementary/src/lib/elm_widget_button.h
index cedb864..0e4a1fb 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_button.h
+++ b/legacy/elementary/src/lib/elm_widget_button.h
@@ -39,24 +39,24 @@ typedef struct _Elm_Button_Smart_Data
 
 #define ELM_BUTTON_DATA_GET_OR_RETURN(o, ptr)        \
   ELM_BUTTON_DATA_GET(o, ptr);                       \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_BUTTON_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_BUTTON_DATA_GET(o, ptr);                         \
-  if (!ptr)                                            \
+  if (EINA_UNLIKELY(!ptr))                             \
     {                                                  \
-       CRI("No widget data for object %p (%s)",   \
-                o, evas_object_type_get(o));           \
+       CRI("No widget data for object %p (%s)",        \
+           o, evas_object_type_get(o));                \
        return val;                                     \
     }
 
-#define ELM_BUTTON_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_BUTTON_CLASS)) \
+#define ELM_BUTTON_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_BUTTON_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_calendar.h b/legacy/elementary/src/lib/elm_widget_calendar.h
index f98e96f..dd35039 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_calendar.h
+++ b/legacy/elementary/src/lib/elm_widget_calendar.h
@@ -69,8 +69,8 @@ struct _Elm_Calendar_Mark
 #define ELM_CALENDAR_DATA_GET(o, sd) \
   Elm_Calendar_Smart_Data * sd = eo_data_scope_get(o, ELM_OBJ_CALENDAR_CLASS)
 
-#define ELM_CALENDAR_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_CALENDAR_CLASS)) \
+#define ELM_CALENDAR_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_CALENDAR_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_check.h b/legacy/elementary/src/lib/elm_widget_check.h
index e5b05d7..7c4a6d2 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_check.h
+++ b/legacy/elementary/src/lib/elm_widget_check.h
@@ -33,24 +33,24 @@ struct _Elm_Check_Smart_Data
 
 #define ELM_CHECK_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_CHECK_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_CHECK_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_CHECK_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
 #define ELM_CHECK_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_CHECK_CLASS)) \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_CHECK_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_clock.h b/legacy/elementary/src/lib/elm_widget_clock.h
index 9a06d6d..7986d3f 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_clock.h
+++ b/legacy/elementary/src/lib/elm_widget_clock.h
@@ -56,24 +56,24 @@ struct _Elm_Clock_Smart_Data
 
 #define ELM_CLOCK_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_CLOCK_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_CLOCK_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_CLOCK_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_CLOCK_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_CLOCK_CLASS)) \
+#define ELM_CLOCK_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_CLOCK_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_colorselector.h b/legacy/elementary/src/lib/elm_widget_colorselector.h
index d610872..4dbc4ac 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_colorselector.h
+++ b/legacy/elementary/src/lib/elm_widget_colorselector.h
@@ -100,24 +100,24 @@ struct _Elm_Color_Item
 
 #define ELM_COLORSELECTOR_DATA_GET_OR_RETURN(o, ptr) \
   ELM_COLORSELECTOR_DATA_GET(o, ptr);                \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_COLORSELECTOR_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_COLORSELECTOR_DATA_GET(o, ptr);                         \
-  if (!ptr)                                                   \
+  if (EINA_UNLIKELY(!ptr))                                    \
     {                                                         \
-       CRI("No widget data for object %p (%s)",          \
-                o, evas_object_type_get(o));                  \
+       CRI("No widget data for object %p (%s)",               \
+           o, evas_object_type_get(o));                       \
        return val;                                            \
     }
 
-#define ELM_COLORSELECTOR_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_COLORSELECTOR_CLASS)) \
+#define ELM_COLORSELECTOR_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_COLORSELECTOR_CLASS))) \
     return
 
 #define ELM_COLORSELECTOR_ITEM_CHECK(it)                    \

diff --git a/legacy/elementary/src/lib/elm_widget_conform.h b/legacy/elementary/src/lib/elm_widget_conform.h
index e1826c5..0c46264 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_conform.h
+++ b/legacy/elementary/src/lib/elm_widget_conform.h
@@ -66,24 +66,24 @@ enum _Conformant_Part_Type
 
 #define ELM_CONFORMANT_DATA_GET_OR_RETURN(o, ptr)    \
   ELM_CONFORMANT_DATA_GET(o, ptr);                   \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_CONFORMANT_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_CONFORMANT_DATA_GET(o, ptr);                         \
-  if (!ptr)                                                \
+  if (EINA_UNLIKELY(!ptr))                                 \
     {                                                      \
-       CRI("No widget data for object %p (%s)",       \
-                o, evas_object_type_get(o));               \
+       CRI("No widget data for object %p (%s)",            \
+           o, evas_object_type_get(o));                    \
        return val;                                         \
     }
 
-#define ELM_CONFORMANT_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_CONFORMANT_CLASS)) \
+#define ELM_CONFORMANT_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_CONFORMANT_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_ctxpopup.h b/legacy/elementary/src/lib/elm_widget_ctxpopup.h
index 2ab8bbc..ab68122 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_ctxpopup.h
+++ b/legacy/elementary/src/lib/elm_widget_ctxpopup.h
@@ -64,24 +64,24 @@ struct _Elm_Ctxpopup_Smart_Data
 
 #define ELM_CTXPOPUP_DATA_GET_OR_RETURN(o, ptr)      \
   ELM_CTXPOPUP_DATA_GET(o, ptr);                     \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_CTXPOPUP_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_CTXPOPUP_DATA_GET(o, ptr);                         \
-  if (!ptr)                                              \
+  if (EINA_UNLIKELY(!ptr))                               \
     {                                                    \
-       CRI("No widget data for object %p (%s)",     \
-                o, evas_object_type_get(o));             \
+       CRI("No widget data for object %p (%s)",          \
+           o, evas_object_type_get(o));                  \
        return val;                                       \
     }
 
-#define ELM_CTXPOPUP_CHECK(obj)                                          \
-  if (!eo_isa((obj), ELM_OBJ_CTXPOPUP_CLASS)) \
+#define ELM_CTXPOPUP_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_CTXPOPUP_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_datetime.h b/legacy/elementary/src/lib/elm_widget_datetime.h
index 68d6ca6..f49b790 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_datetime.h
+++ b/legacy/elementary/src/lib/elm_widget_datetime.h
@@ -83,24 +83,24 @@ struct _Format_Map
 
 #define ELM_DATETIME_DATA_GET_OR_RETURN(o, ptr)      \
   ELM_DATETIME_DATA_GET(o, ptr);                     \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_DATETIME_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_DATETIME_DATA_GET(o, ptr);                         \
-  if (!ptr)                                              \
+  if (EINA_UNLIKELY(!ptr))                               \
     {                                                    \
-       CRI("No widget data for object %p (%s)",     \
-                o, evas_object_type_get(o));             \
+       CRI("No widget data for object %p (%s)",          \
+           o, evas_object_type_get(o));                  \
        return val;                                       \
     }
 
-#define ELM_DATETIME_CHECK(obj)                                      \
-  if (!eo_isa((obj), ELM_OBJ_DATETIME_CLASS)) \
+#define ELM_DATETIME_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_DATETIME_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_dayselector.h b/legacy/elementary/src/lib/elm_widget_dayselector.h
index 9207164..c8fb5dd 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_dayselector.h
+++ b/legacy/elementary/src/lib/elm_widget_dayselector.h
@@ -44,24 +44,24 @@ struct _Elm_Dayselector_Item
 
 #define ELM_DAYSELECTOR_DATA_GET_OR_RETURN(o, ptr)   \
   ELM_DAYSELECTOR_DATA_GET(o, ptr);                  \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_DAYSELECTOR_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_DAYSELECTOR_DATA_GET(o, ptr);                         \
-  if (!ptr)                                                 \
+  if (EINA_UNLIKELY(!ptr))                                  \
     {                                                       \
-       CRI("No widget data for object %p (%s)",        \
-                o, evas_object_type_get(o));                \
+       CRI("No widget data for object %p (%s)",             \
+           o, evas_object_type_get(o));                     \
        return val;                                          \
     }
 
-#define ELM_DAYSELECTOR_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_DAYSELECTOR_CLASS)) \
+#define ELM_DAYSELECTOR_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_DAYSELECTOR_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_diskselector.h b/legacy/elementary/src/lib/elm_widget_diskselector.h
index 42813b1..4d54c0e 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_diskselector.h
+++ b/legacy/elementary/src/lib/elm_widget_diskselector.h
@@ -69,24 +69,24 @@ struct _Elm_Diskselector_Item
 
 #define ELM_DISKSELECTOR_DATA_GET_OR_RETURN(o, ptr)  \
   ELM_DISKSELECTOR_DATA_GET(o, ptr);                 \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_DISKSELECTOR_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_DISKSELECTOR_DATA_GET(o, ptr);                         \
-  if (!ptr)                                                  \
+  if (EINA_UNLIKELY(!ptr))                                   \
     {                                                        \
-       CRI("No widget data for object %p (%s)",         \
-                o, evas_object_type_get(o));                 \
+       CRI("No widget data for object %p (%s)",              \
+           o, evas_object_type_get(o));                      \
        return val;                                           \
     }
 
-#define ELM_DISKSELECTOR_CHECK(obj)                         \
-  if (!eo_isa((obj), ELM_OBJ_DISKSELECTOR_CLASS))           \
+#define ELM_DISKSELECTOR_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_DISKSELECTOR_CLASS))) \
     return
 
 #define ELM_DISKSELECTOR_ITEM_CHECK(it)                     \

diff --git a/legacy/elementary/src/lib/elm_widget_entry.h b/legacy/elementary/src/lib/elm_widget_entry.h
index dc2b96d..3e6f78e 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_entry.h
+++ b/legacy/elementary/src/lib/elm_widget_entry.h
@@ -148,24 +148,24 @@ typedef enum _Length_Unit
 
 #define ELM_ENTRY_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_ENTRY_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_ENTRY_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_ENTRY_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_ENTRY_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_ENTRY_CLASS))       \
+#define ELM_ENTRY_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_ENTRY_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_fileselector.h b/legacy/elementary/src/lib/elm_widget_fileselector.h
index 2991485..03cc407 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_fileselector.h
+++ b/legacy/elementary/src/lib/elm_widget_fileselector.h
@@ -133,24 +133,24 @@ struct _Elm_Fileselector_Filter
 
 #define ELM_FILESELECTOR_DATA_GET_OR_RETURN(o, ptr)  \
   ELM_FILESELECTOR_DATA_GET(o, ptr);                 \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_FILESELECTOR_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_FILESELECTOR_DATA_GET(o, ptr);                         \
-  if (!ptr)                                                  \
+  if (EINA_UNLIKELY(!ptr))                                   \
     {                                                        \
-       CRI("No widget data for object %p (%s)",         \
-                o, evas_object_type_get(o));                 \
+       CRI("No widget data for object %p (%s)",              \
+           o, evas_object_type_get(o));                      \
        return val;                                           \
     }
 
-#define ELM_FILESELECTOR_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_FILESELECTOR_CLASS)) \
+#define ELM_FILESELECTOR_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_FILESELECTOR_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_fileselector_button.h b/legacy/elementary/src/lib/elm_widget_fileselector_button.h
index d47222a..14b3878 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_fileselector_button.h
+++ b/legacy/elementary/src/lib/elm_widget_fileselector_button.h
@@ -49,24 +49,24 @@ struct _Elm_Fileselector_Button_Smart_Data
 
 #define ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN(o, ptr) \
   ELM_FILESELECTOR_BUTTON_DATA_GET(o, ptr);                \
-  if (!ptr)                                                \
+  if (EINA_UNLIKELY(!ptr))                                 \
     {                                                      \
-       CRI("No widget data for object %p (%s)",       \
-                o, evas_object_type_get(o));               \
+       CRI("No widget data for object %p (%s)",            \
+           o, evas_object_type_get(o));                    \
        return;                                             \
     }
 
 #define ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_FILESELECTOR_BUTTON_DATA_GET(o, ptr);                         \
-  if (!ptr)                                                         \
+  if (EINA_UNLIKELY(!ptr))                                          \
     {                                                               \
-       CRI("No widget data for object %p (%s)",                \
-                o, evas_object_type_get(o));                        \
+       CRI("No widget data for object %p (%s)",                     \
+           o, evas_object_type_get(o));                             \
        return val;                                                  \
     }
 
-#define ELM_FILESELECTOR_BUTTON_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_FILESELECTOR_BUTTON_CLASS)) \
+#define ELM_FILESELECTOR_BUTTON_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_FILESELECTOR_BUTTON_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_fileselector_entry.h b/legacy/elementary/src/lib/elm_widget_fileselector_entry.h
index 4cac805..3f3ee35 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_fileselector_entry.h
+++ b/legacy/elementary/src/lib/elm_widget_fileselector_entry.h
@@ -39,24 +39,24 @@ struct _Elm_Fileselector_Entry_Smart_Data
 
 #define ELM_FILESELECTOR_ENTRY_DATA_GET_OR_RETURN(o, ptr) \
   ELM_FILESELECTOR_ENTRY_DATA_GET(o, ptr);                \
-  if (!ptr)                                               \
+  if (EINA_UNLIKELY(!ptr))                                \
     {                                                     \
-       CRI("No widget data for object %p (%s)",      \
-                o, evas_object_type_get(o));              \
+       CRI("No widget data for object %p (%s)",           \
+           o, evas_object_type_get(o));                   \
        return;                                            \
     }
 
 #define ELM_FILESELECTOR_ENTRY_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_FILESELECTOR_ENTRY_DATA_GET(o, ptr);                         \
-  if (!ptr)                                                        \
+  if (EINA_UNLIKELY(!ptr))                                         \
     {                                                              \
-       CRI("No widget data for object %p (%s)",               \
-                o, evas_object_type_get(o));                       \
+       CRI("No widget data for object %p (%s)",                    \
+           o, evas_object_type_get(o));                            \
        return val;                                                 \
     }
 
-#define ELM_FILESELECTOR_ENTRY_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_FILESELECTOR_ENTRY_CLASS)) \
+#define ELM_FILESELECTOR_ENTRY_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_FILESELECTOR_ENTRY_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_flip.h b/legacy/elementary/src/lib/elm_widget_flip.h
index a7cd670..1ffc300 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_flip.h
+++ b/legacy/elementary/src/lib/elm_widget_flip.h
@@ -80,24 +80,24 @@ struct _Vertex3
 
 #define ELM_FLIP_DATA_GET_OR_RETURN(o, ptr)          \
   ELM_FLIP_DATA_GET(o, ptr);                         \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_FLIP_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_FLIP_DATA_GET(o, ptr);                         \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return val;                                   \
     }
 
-#define ELM_FLIP_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_FLIP_CLASS)) \
+#define ELM_FLIP_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_FLIP_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_flipselector.h b/legacy/elementary/src/lib/elm_widget_flipselector.h
index 0b76e31..2512f59 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_flipselector.h
+++ b/legacy/elementary/src/lib/elm_widget_flipselector.h
@@ -51,24 +51,24 @@ struct _Elm_Flipselector_Item
 
 #define ELM_FLIPSELECTOR_DATA_GET_OR_RETURN(o, ptr)  \
   ELM_FLIPSELECTOR_DATA_GET(o, ptr);                 \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_FLIPSELECTOR_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_FLIPSELECTOR_DATA_GET(o, ptr);                         \
-  if (!ptr)                                                  \
+  if (EINA_UNLIKELY(!ptr))                                   \
     {                                                        \
-       CRI("No widget data for object %p (%s)",         \
-                o, evas_object_type_get(o));                 \
+       CRI("No widget data for object %p (%s)",              \
+           o, evas_object_type_get(o));                      \
        return val;                                           \
     }
 
-#define ELM_FLIPSELECTOR_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_FLIPSELECTOR_CLASS)) \
+#define ELM_FLIPSELECTOR_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_FLIPSELECTOR_CLASS))) \
     return
 
 #define ELM_FLIPSELECTOR_ITEM_CHECK(it)                     \

diff --git a/legacy/elementary/src/lib/elm_widget_frame.h b/legacy/elementary/src/lib/elm_widget_frame.h
index e2ee9f0..2381ffb 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_frame.h
+++ b/legacy/elementary/src/lib/elm_widget_frame.h
@@ -34,24 +34,24 @@ struct _Elm_Frame_Smart_Data
 
 #define ELM_FRAME_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_FRAME_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_FRAME_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_FRAME_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_FRAME_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_FRAME_CLASS)) \
+#define ELM_FRAME_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_FRAME_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_gengrid.h b/legacy/elementary/src/lib/elm_widget_gengrid.h
index f04e0d4..7748252 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_gengrid.h
+++ b/legacy/elementary/src/lib/elm_widget_gengrid.h
@@ -143,24 +143,24 @@ struct _Elm_Gengrid_Pan_Smart_Data
 
 #define ELM_GENGRID_DATA_GET_OR_RETURN(o, ptr)       \
   ELM_GENGRID_DATA_GET(o, ptr);                      \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_GENGRID_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_GENGRID_DATA_GET(o, ptr);                         \
-  if (!ptr)                                             \
+  if (EINA_UNLIKELY(!ptr))                              \
     {                                                   \
-       CRI("No widget data for object %p (%s)",    \
-                o, evas_object_type_get(o));            \
+       CRI("No widget data for object %p (%s)",         \
+           o, evas_object_type_get(o));                 \
        return val;                                      \
     }
 
-#define ELM_GENGRID_CHECK(obj)               \
-  if (!eo_isa((obj), ELM_OBJ_GENGRID_CLASS)) \
+#define ELM_GENGRID_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_GENGRID_CLASS))) \
     return
 
 #define ELM_GENGRID_ITEM_CHECK(it)                          \

diff --git a/legacy/elementary/src/lib/elm_widget_genlist.h b/legacy/elementary/src/lib/elm_widget_genlist.h
index 734f545..4ac52c2 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_genlist.h
+++ b/legacy/elementary/src/lib/elm_widget_genlist.h
@@ -294,24 +294,24 @@ struct _Elm_Genlist_Pan_Smart_Data
 
 #define ELM_GENLIST_DATA_GET_OR_RETURN(o, ptr)       \
   ELM_GENLIST_DATA_GET(o, ptr);                      \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_GENLIST_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_GENLIST_DATA_GET(o, ptr);                         \
-  if (!ptr)                                             \
+  if (EINA_UNLIKELY(!ptr))                              \
     {                                                   \
-       CRI("No widget data for object %p (%s)",    \
-                o, evas_object_type_get(o));            \
+       CRI("No widget data for object %p (%s)",         \
+           o, evas_object_type_get(o));                 \
        return val;                                      \
     }
 
-#define ELM_GENLIST_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_GENLIST_CLASS)) \
+#define ELM_GENLIST_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_GENLIST_CLASS))) \
     return
 
 #define ELM_GENLIST_ITEM_CHECK(it)                          \

diff --git a/legacy/elementary/src/lib/elm_widget_glview.h b/legacy/elementary/src/lib/elm_widget_glview.h
index 5f5ba5e..013f797 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_glview.h
+++ b/legacy/elementary/src/lib/elm_widget_glview.h
@@ -49,26 +49,26 @@ struct _Elm_Glview_Smart_Data
 #define ELM_GLVIEW_DATA_GET(o, sd) \
   Elm_Glview_Smart_Data * sd = eo_data_scope_get(o, ELM_OBJ_GLVIEW_CLASS)
 
-#define ELM_GLVIEW_DATA_GET_OR_RETURN(o, ptr)           \
-  ELM_GLVIEW_DATA_GET(o, ptr);                          \
-  if (!ptr)                                          \
-    {                                                \
+#define ELM_GLVIEW_DATA_GET_OR_RETURN(o, ptr)   \
+  ELM_GLVIEW_DATA_GET(o, ptr);                  \
+  if (EINA_UNLIKELY(!ptr))                      \
+    {                                           \
        CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
-       return;                                       \
+           o, evas_object_type_get(o));         \
+       return;                                  \
     }
 
-#define ELM_GLVIEW_DATA_GET_OR_RETURN_VAL(o, ptr, val)  \
-  ELM_GLVIEW_DATA_GET(o, ptr);                          \
-  if (!ptr)                                          \
-    {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
-       return val;                                   \
+#define ELM_GLVIEW_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
+  ELM_GLVIEW_DATA_GET(o, ptr);                         \
+  if (EINA_UNLIKELY(!ptr))                             \
+    {                                                  \
+       CRI("No widget data for object %p (%s)",        \
+           o, evas_object_type_get(o));                \
+       return val;                                     \
     }
 
-#define ELM_GLVIEW_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_GLVIEW_CLASS)) \
+#define ELM_GLVIEW_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_GLVIEW_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_grid.h b/legacy/elementary/src/lib/elm_widget_grid.h
index f717d31..5a5b18a 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_grid.h
+++ b/legacy/elementary/src/lib/elm_widget_grid.h
@@ -18,7 +18,8 @@
  * @}
  */
 
-#define ELM_GRID_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_GRID_CLASS)) \
+#define ELM_GRID_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_GRID_CLASS))) \
     return
+
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_hover.h b/legacy/elementary/src/lib/elm_widget_hover.h
index dcfd30e..d0c1af3 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_hover.h
+++ b/legacy/elementary/src/lib/elm_widget_hover.h
@@ -51,24 +51,24 @@ struct _Elm_Hover_Smart_Data
 
 #define ELM_HOVER_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_HOVER_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_HOVER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_HOVER_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_HOVER_CHECK(obj)                       \
-  if (!eo_isa((obj), ELM_OBJ_HOVER_CLASS)) \
+#define ELM_HOVER_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_HOVER_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_hoversel.h b/legacy/elementary/src/lib/elm_widget_hoversel.h
index 3552088..19397b0 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_hoversel.h
+++ b/legacy/elementary/src/lib/elm_widget_hoversel.h
@@ -54,24 +54,24 @@ struct _Elm_Hoversel_Item
 
 #define ELM_HOVERSEL_DATA_GET_OR_RETURN(o, ptr)      \
   ELM_HOVERSEL_DATA_GET(o, ptr);                     \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_HOVERSEL_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_HOVERSEL_DATA_GET(o, ptr);                         \
-  if (!ptr)                                              \
+  if (EINA_UNLIKELY(!ptr))                               \
     {                                                    \
-       CRI("No widget data for object %p (%s)",     \
-                o, evas_object_type_get(o));             \
+       CRI("No widget data for object %p (%s)",          \
+           o, evas_object_type_get(o));                  \
        return val;                                       \
     }
 
-#define ELM_HOVERSEL_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_HOVERSEL_CLASS)) \
+#define ELM_HOVERSEL_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_HOVERSEL_CLASS))) \
     return
 
 #define ELM_HOVERSEL_ITEM_CHECK(it)                         \

diff --git a/legacy/elementary/src/lib/elm_widget_icon.h b/legacy/elementary/src/lib/elm_widget_icon.h
index 64509a6..f5cec4b 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_icon.h
+++ b/legacy/elementary/src/lib/elm_widget_icon.h
@@ -60,24 +60,24 @@ struct _Elm_Icon_Smart_Data
 
 #define ELM_ICON_DATA_GET_OR_RETURN(o, ptr)          \
   ELM_ICON_DATA_GET(o, ptr);                         \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_ICON_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_ICON_DATA_GET(o, ptr);                         \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return val;                                   \
     }
 
-#define ELM_ICON_CHECK(obj)                                                 \
-  if (!eo_isa((obj), ELM_OBJ_ICON_CLASS)) \
+#define ELM_ICON_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_ICON_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_image.h b/legacy/elementary/src/lib/elm_widget_image.h
index 7a2674d..fc6f8f4 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_image.h
+++ b/legacy/elementary/src/lib/elm_widget_image.h
@@ -71,24 +71,24 @@ struct _Elm_Image_Smart_Data
 
 #define ELM_IMAGE_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_IMAGE_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_IMAGE_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_IMAGE_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_IMAGE_CHECK(obj)                                                 \
-  if (!eo_isa((obj), ELM_OBJ_IMAGE_CLASS)) \
+#define ELM_IMAGE_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_IMAGE_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_index.h b/legacy/elementary/src/lib/elm_widget_index.h
index cf5ea72..5189c18 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_index.h
+++ b/legacy/elementary/src/lib/elm_widget_index.h
@@ -72,24 +72,24 @@ struct _Elm_Index_Omit
 
 #define ELM_INDEX_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_INDEX_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_INDEX_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_INDEX_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_INDEX_CHECK(obj)                                                 \
-  if (!eo_isa((obj), ELM_OBJ_INDEX_CLASS)) \
+#define ELM_INDEX_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_INDEX_CLASS))) \
     return
 
 #define ELM_INDEX_ITEM_CHECK(it)                            \

diff --git a/legacy/elementary/src/lib/elm_widget_inwin.h b/legacy/elementary/src/lib/elm_widget_inwin.h
index 1623b47..1aa3261 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_inwin.h
+++ b/legacy/elementary/src/lib/elm_widget_inwin.h
@@ -31,24 +31,24 @@ struct _Elm_Inwin_Smart_Data
 
 #define ELM_INWIN_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_INWIN_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_INWIN_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_INWIN_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_INWIN_CHECK(obj)                           \
-  if (!eo_isa((obj), ELM_OBJ_WIN_INWIN_CLASS)) \
+#define ELM_INWIN_CHECK(obj)                                  \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_WIN_INWIN_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_label.h b/legacy/elementary/src/lib/elm_widget_label.h
index 3d627d0..4e2ac72 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_label.h
+++ b/legacy/elementary/src/lib/elm_widget_label.h
@@ -27,24 +27,24 @@ struct _Elm_Label_Smart_Data
 
 #define ELM_LABEL_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_LABEL_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_LABEL_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_LABEL_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_LABEL_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_LABEL_CLASS)) \
+#define ELM_LABEL_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_LABEL_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_layout.h b/legacy/elementary/src/lib/elm_widget_layout.h
index b9c8cf7..837b04b 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_layout.h
+++ b/legacy/elementary/src/lib/elm_widget_layout.h
@@ -96,8 +96,8 @@ typedef struct _Elm_Layout_Smart_Data
 #define ELM_LAYOUT_DATA_GET(o, sd) \
   Elm_Layout_Smart_Data * sd = eo_data_scope_get(o, ELM_OBJ_LAYOUT_CLASS)
 
-#define ELM_LAYOUT_CHECK(obj)                                                 \
-  if (!eo_isa(obj, ELM_OBJ_LAYOUT_CLASS)) \
+#define ELM_LAYOUT_CHECK(obj)                            \
+  if (EINA_UNLIKELY(!eo_isa(obj, ELM_OBJ_LAYOUT_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_list.h b/legacy/elementary/src/lib/elm_widget_list.h
index 2c21c96..cfc9b1e 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_list.h
+++ b/legacy/elementary/src/lib/elm_widget_list.h
@@ -87,24 +87,24 @@ struct _Elm_List_Item
 
 #define ELM_LIST_DATA_GET_OR_RETURN(o, ptr)          \
   ELM_LIST_DATA_GET(o, ptr);                         \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_LIST_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_LIST_DATA_GET(o, ptr);                         \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return val;                                   \
     }
 
-#define ELM_LIST_CHECK(obj)               \
-  if (!eo_isa((obj), ELM_OBJ_LIST_CLASS)) \
+#define ELM_LIST_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_LIST_CLASS))) \
     return
 
 #define ELM_LIST_ITEM_CHECK(it)                             \

diff --git a/legacy/elementary/src/lib/elm_widget_map.h b/legacy/elementary/src/lib/elm_widget_map.h
index 1d98e4f..9d9e61b 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_map.h
+++ b/legacy/elementary/src/lib/elm_widget_map.h
@@ -496,24 +496,24 @@ struct _Elm_Map_Pan_Smart_Data
 
 #define ELM_MAP_DATA_GET_OR_RETURN(o, ptr)      \
   ELM_MAP_DATA_GET(o, ptr);                     \
-  if (!ptr)                                          \
-    {                                                \
+  if (EINA_UNLIKELY(!ptr))                      \
+    {                                           \
        CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
-       return;                                       \
+           o, evas_object_type_get(o));         \
+       return;                                  \
     }
 
 #define ELM_MAP_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_MAP_DATA_GET(o, ptr);                         \
-  if (!ptr)                                              \
-    {                                                    \
+  if (EINA_UNLIKELY(!ptr))                          \
+    {                                               \
        CRI("No widget data for object %p (%s)",     \
-                o, evas_object_type_get(o));             \
-       return val;                                       \
+           o, evas_object_type_get(o));             \
+       return val;                                  \
     }
 
-#define ELM_MAP_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_MAP_CLASS))       \
+#define ELM_MAP_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_MAP_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_mapbuf.h b/legacy/elementary/src/lib/elm_widget_mapbuf.h
index 97435ef..2ee9f04 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_mapbuf.h
+++ b/legacy/elementary/src/lib/elm_widget_mapbuf.h
@@ -44,24 +44,24 @@ struct _Elm_Mapbuf_Smart_Data
 
 #define ELM_MAPBUF_DATA_GET_OR_RETURN(o, ptr)        \
   ELM_MAPBUF_DATA_GET(o, ptr);                       \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_MAPBUF_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_MAPBUF_DATA_GET(o, ptr);                         \
-  if (!ptr)                                            \
+  if (EINA_UNLIKELY(!ptr))                             \
     {                                                  \
-       CRI("No widget data for object %p (%s)",   \
-                o, evas_object_type_get(o));           \
+       CRI("No widget data for object %p (%s)",        \
+           o, evas_object_type_get(o));                \
        return val;                                     \
     }
 
-#define ELM_MAPBUF_CHECK(obj)                                                 \
-  if (!eo_isa((obj), ELM_OBJ_MAPBUF_CLASS)) \
+#define ELM_MAPBUF_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_MAPBUF_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_menu.h b/legacy/elementary/src/lib/elm_widget_menu.h
index 50b97e1..22cac8f 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_menu.h
+++ b/legacy/elementary/src/lib/elm_widget_menu.h
@@ -64,24 +64,24 @@ struct _Elm_Menu_Item
 
 #define ELM_MENU_DATA_GET_OR_RETURN(o, ptr)          \
   ELM_MENU_DATA_GET(o, ptr);                         \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_MENU_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_MENU_DATA_GET(o, ptr);                         \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return val;                                   \
     }
 
-#define ELM_MENU_CHECK(obj)                                                 \
-  if (!eo_isa((obj), ELM_OBJ_MENU_CLASS)) \
+#define ELM_MENU_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_MENU_CLASS))) \
     return
 
 #define ELM_MENU_ITEM_CHECK(it)                             \

diff --git a/legacy/elementary/src/lib/elm_widget_multibuttonentry.h b/legacy/elementary/src/lib/elm_widget_multibuttonentry.h
index 428cafb..984d7f4 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_multibuttonentry.h
+++ b/legacy/elementary/src/lib/elm_widget_multibuttonentry.h
@@ -107,24 +107,24 @@ struct _Elm_Multibuttonentry_Smart_Data
 
 #define ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(o, ptr) \
   Elm_Multibuttonentry_Smart_Data *ptr = eo_data_scope_get(o, ELM_OBJ_MULTIBUTTONENTRY_CLASS); \
-  if (!ptr)                                             \
+  if (EINA_UNLIKELY(!ptr))                              \
     {                                                   \
-       CRI("No widget data for object %p (%s)",    \
-                o, evas_object_type_get(o));            \
+       CRI("No widget data for object %p (%s)",         \
+           o, evas_object_type_get(o));                 \
        return;                                          \
     }
 
 #define ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   Elm_Multibuttonentry_Smart_Data * ptr = eo_data_scope_get(o, ELM_OBJ_MULTIBUTTONENTRY_CLASS); \
-  if (!ptr)                                                      \
+  if (EINA_UNLIKELY(!ptr))                                       \
     {                                                            \
-       CRI("No widget data for object %p (%s)",             \
-                o, evas_object_type_get(o));                     \
+       CRI("No widget data for object %p (%s)",                  \
+           o, evas_object_type_get(o));                          \
        return val;                                               \
     }
 
-#define ELM_MULTIBUTTONENTRY_CHECK(obj)             \
-  if (!eo_isa((obj), ELM_OBJ_MULTIBUTTONENTRY_CLASS)) \
+#define ELM_MULTIBUTTONENTRY_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_MULTIBUTTONENTRY_CLASS))) \
     return
 
 #define ELM_MULTIBUTTONENTRY_ITEM_CHECK(it)                 \

diff --git a/legacy/elementary/src/lib/elm_widget_naviframe.h b/legacy/elementary/src/lib/elm_widget_naviframe.h
index 115f8a9..83809f9 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_naviframe.h
+++ b/legacy/elementary/src/lib/elm_widget_naviframe.h
@@ -84,24 +84,24 @@ struct _Elm_Naviframe_Text_Item_Pair
 
 #define ELM_NAVIFRAME_DATA_GET_OR_RETURN(o, ptr)     \
   ELM_NAVIFRAME_DATA_GET(o, ptr);                    \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_NAVIFRAME_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_NAVIFRAME_DATA_GET(o, ptr);                         \
-  if (!ptr)                                               \
+  if (EINA_UNLIKELY(!ptr))                                \
     {                                                     \
-       CRI("No widget data for object %p (%s)",      \
-                o, evas_object_type_get(o));              \
+       CRI("No widget data for object %p (%s)",           \
+           o, evas_object_type_get(o));                   \
        return val;                                        \
     }
 
-#define ELM_NAVIFRAME_CHECK(obj)                                      \
-  if (!eo_isa((obj), ELM_OBJ_NAVIFRAME_CLASS))    \
+#define ELM_NAVIFRAME_CHECK(obj)                                 \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_NAVIFRAME_CLASS)))    \
     return
 
 #define ELM_NAVIFRAME_ITEM_CHECK(it)                        \

diff --git a/legacy/elementary/src/lib/elm_widget_notify.h b/legacy/elementary/src/lib/elm_widget_notify.h
index 046f129..38d5639 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_notify.h
+++ b/legacy/elementary/src/lib/elm_widget_notify.h
@@ -41,24 +41,24 @@ struct _Elm_Notify_Smart_Data
 
 #define ELM_NOTIFY_DATA_GET_OR_RETURN(o, ptr)        \
   ELM_NOTIFY_DATA_GET(o, ptr);                       \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_NOTIFY_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_NOTIFY_DATA_GET(o, ptr);                         \
-  if (!ptr)                                            \
+  if (EINA_UNLIKELY(!ptr))                             \
     {                                                  \
-       CRI("No widget data for object %p (%s)",   \
-                o, evas_object_type_get(o));           \
+       CRI("No widget data for object %p (%s)",        \
+           o, evas_object_type_get(o));                \
        return val;                                     \
     }
 
-#define ELM_NOTIFY_CHECK(obj)                                                 \
-  if (!eo_isa((obj), ELM_OBJ_NOTIFY_CLASS)) \
+#define ELM_NOTIFY_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_NOTIFY_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_panel.h b/legacy/elementary/src/lib/elm_widget_panel.h
index a82f064..e869f01 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_panel.h
+++ b/legacy/elementary/src/lib/elm_widget_panel.h
@@ -39,24 +39,24 @@ struct _Elm_Panel_Smart_Data
 
 #define ELM_PANEL_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_PANEL_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_PANEL_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_PANEL_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_PANEL_CHECK(obj)                                      \
-  if (!eo_isa((obj), ELM_OBJ_PANEL_CLASS)) \
+#define ELM_PANEL_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PANEL_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_panes.h b/legacy/elementary/src/lib/elm_widget_panes.h
index 089be61..765b4bf 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_panes.h
+++ b/legacy/elementary/src/lib/elm_widget_panes.h
@@ -42,24 +42,24 @@ struct _Elm_Panes_Smart_Data
 
 #define ELM_PANES_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_PANES_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_PANES_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_PANES_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_PANES_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_PANES_CLASS)) \
+#define ELM_PANES_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PANES_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_photo.h b/legacy/elementary/src/lib/elm_widget_photo.h
index 40625eb..ba3c015 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_photo.h
+++ b/legacy/elementary/src/lib/elm_widget_photo.h
@@ -47,24 +47,24 @@ struct _Elm_Photo_Smart_Data
 
 #define ELM_PHOTO_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_PHOTO_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_PHOTO_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_PHOTO_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_PHOTO_CHECK(obj)                                                 \
-  if (!eo_isa((obj), ELM_OBJ_PHOTO_CLASS)) \
+#define ELM_PHOTO_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PHOTO_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_photocam.h b/legacy/elementary/src/lib/elm_widget_photocam.h
index 6b41039..2636de8 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_photocam.h
+++ b/legacy/elementary/src/lib/elm_widget_photocam.h
@@ -143,24 +143,24 @@ struct _Elm_Photocam_Pan_Smart_Data
 
 #define ELM_PHOTOCAM_DATA_GET_OR_RETURN(o, ptr)      \
   ELM_PHOTOCAM_DATA_GET(o, ptr);                     \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_PHOTOCAM_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_PHOTOCAM_DATA_GET(o, ptr);                         \
-  if (!ptr)                                              \
+  if (EINA_UNLIKELY(!ptr))                               \
     {                                                    \
-       CRI("No widget data for object %p (%s)",     \
-                o, evas_object_type_get(o));             \
+       CRI("No widget data for object %p (%s)",          \
+           o, evas_object_type_get(o));                  \
        return val;                                       \
     }
 
-#define ELM_PHOTOCAM_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_PHOTOCAM_CLASS)) \
+#define ELM_PHOTOCAM_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PHOTOCAM_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_player.h b/legacy/elementary/src/lib/elm_widget_player.h
index 54a4164..d92b9a1 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_player.h
+++ b/legacy/elementary/src/lib/elm_widget_player.h
@@ -50,24 +50,24 @@ struct _Elm_Player_Smart_Data
 
 #define ELM_PLAYER_DATA_GET_OR_RETURN(o, ptr)        \
   ELM_PLAYER_DATA_GET(o, ptr);                       \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_PLAYER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_PLAYER_DATA_GET(o, ptr);                         \
-  if (!ptr)                                            \
+  if (EINA_UNLIKELY(!ptr))                             \
     {                                                  \
-       CRI("No widget data for object %p (%s)",   \
-                o, evas_object_type_get(o));           \
+       CRI("No widget data for object %p (%s)",        \
+           o, evas_object_type_get(o));                \
        return val;                                     \
     }
 
-#define ELM_PLAYER_CHECK(obj)                                      \
-  if (!eo_isa((obj), ELM_OBJ_PLAYER_CLASS)) \
+#define ELM_PLAYER_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PLAYER_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_plug.h b/legacy/elementary/src/lib/elm_widget_plug.h
index 6058952..1100d8b 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_plug.h
+++ b/legacy/elementary/src/lib/elm_widget_plug.h
@@ -22,24 +22,24 @@
 
 #define ELM_PLUG_DATA_GET_OR_RETURN(o, ptr)          \
   ELM_PLUG_DATA_GET(o, ptr);                         \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_PLUG_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_PLUG_DATA_GET(o, ptr);                         \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return val;                                   \
     }
 
-#define ELM_PLUG_CHECK(obj)                                                 \
-  if (!eo_isa((obj), ELM_OBJ_PLUG_CLASS)) \
+#define ELM_PLUG_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PLUG_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_popup.h b/legacy/elementary/src/lib/elm_widget_popup.h
index 84016eb..5510ca9 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_popup.h
+++ b/legacy/elementary/src/lib/elm_widget_popup.h
@@ -74,24 +74,24 @@ struct _Action_Area_Data
 
 #define ELM_POPUP_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_POPUP_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_POPUP_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_POPUP_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_POPUP_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_POPUP_CLASS)) \
+#define ELM_POPUP_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_POPUP_CLASS))) \
     return
 
 #define ELM_POPUP_ITEM_CHECK(it)                            \

diff --git a/legacy/elementary/src/lib/elm_widget_prefs.h b/legacy/elementary/src/lib/elm_widget_prefs.h
index 126201b..82945b5 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_prefs.h
+++ b/legacy/elementary/src/lib/elm_widget_prefs.h
@@ -94,33 +94,33 @@ extern const Elm_Prefs_Item_Iface *elm_prefs_item_default_widget;
   Elm_Prefs_Smart_Data * sd = eo_data_scope_get(o, ELM_OBJ_PREFS_CLASS)
 
 #define ELM_PREFS_ENTRY(o, sd)                                              \
-  if (!sd->data_file || !sd->page)                                          \
+  if (EINA_UNLIKELY(!sd->data_file || !sd->page))                           \
     {                                                                       \
-       CRI("You must issue elm_prefs_file_set() on this widget before" \
-                " you make this call");                                     \
+       CRI("You must issue elm_prefs_file_set() on this widget before"      \
+           " you make this call");                                          \
     }                                                                       \
   return
 
 #define ELM_PREFS_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_PREFS_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_PREFS_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_PREFS_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_PREFS_CHECK(obj)               \
-  if (!eo_isa((obj), ELM_OBJ_PREFS_CLASS)) \
+#define ELM_PREFS_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PREFS_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_progressbar.h b/legacy/elementary/src/lib/elm_widget_progressbar.h
index 014bb0f..e84c593 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_progressbar.h
+++ b/legacy/elementary/src/lib/elm_widget_progressbar.h
@@ -51,26 +51,26 @@ struct _Elm_Progress_Status
 #define ELM_PROGRESSBAR_DATA_GET(o, sd) \
   Elm_Progressbar_Smart_Data * sd = eo_data_scope_get(o, ELM_OBJ_PROGRESSBAR_CLASS)
 
-#define ELM_PROGRESSBAR_DATA_GET_OR_RETURN(o, ptr)        \
-  ELM_PROGRESSBAR_DATA_GET(o, ptr);                       \
-  if (!ptr)                                          \
+#define ELM_PROGRESSBAR_DATA_GET_OR_RETURN(o, ptr)   \
+  ELM_PROGRESSBAR_DATA_GET(o, ptr);                  \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_PROGRESSBAR_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_PROGRESSBAR_DATA_GET(o, ptr);                         \
-  if (!ptr)                                            \
-    {                                                  \
-       CRI("No widget data for object %p (%s)",   \
-                o, evas_object_type_get(o));           \
-       return val;                                     \
+  if (EINA_UNLIKELY(!ptr))                                  \
+    {                                                       \
+       CRI("No widget data for object %p (%s)",             \
+           o, evas_object_type_get(o));                     \
+       return val;                                          \
     }
 
-#define ELM_PROGRESSBAR_CHECK(obj)                                      \
-  if (!eo_isa((obj), ELM_OBJ_PROGRESSBAR_CLASS)) \
+#define ELM_PROGRESSBAR_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_PROGRESSBAR_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_radio.h b/legacy/elementary/src/lib/elm_widget_radio.h
index 904c1de..1b59b53 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_radio.h
+++ b/legacy/elementary/src/lib/elm_widget_radio.h
@@ -44,24 +44,24 @@ struct _Elm_Radio_Smart_Data
 
 #define ELM_RADIO_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_RADIO_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_RADIO_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_RADIO_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_RADIO_CHECK(obj)                                      \
-  if (!eo_isa((obj), ELM_OBJ_RADIO_CLASS)) \
+#define ELM_RADIO_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_RADIO_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_route.h b/legacy/elementary/src/lib/elm_widget_route.h
index c7ff1a6..77eb323 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_route.h
+++ b/legacy/elementary/src/lib/elm_widget_route.h
@@ -53,26 +53,26 @@ struct Segment
 #define ELM_ROUTE_DATA_GET(o, sd) \
   Elm_Route_Smart_Data * sd = eo_data_scope_get(o, ELM_OBJ_ROUTE_CLASS)
 
-#define ELM_ROUTE_DATA_GET_OR_RETURN(o, ptr)          \
-  ELM_ROUTE_DATA_GET(o, ptr);                         \
-  if (!ptr)                                          \
+#define ELM_ROUTE_DATA_GET_OR_RETURN(o, ptr)         \
+  ELM_ROUTE_DATA_GET(o, ptr);                        \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_ROUTE_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_ROUTE_DATA_GET(o, ptr);                         \
-  if (!ptr)                                          \
-    {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
-       return val;                                   \
+  if (EINA_UNLIKELY(!ptr))                            \
+    {                                                 \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
+       return val;                                    \
     }
 
-#define ELM_ROUTE_CHECK(obj)                         \
-  if (!eo_isa((obj), ELM_OBJ_ROUTE_CLASS)) \
+#define ELM_ROUTE_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_ROUTE_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_scroller.h b/legacy/elementary/src/lib/elm_widget_scroller.h
index be871f4..222999b 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_scroller.h
+++ b/legacy/elementary/src/lib/elm_widget_scroller.h
@@ -38,24 +38,24 @@ struct _Elm_Scroller_Smart_Data
 
 #define ELM_SCROLLER_DATA_GET_OR_RETURN(o, ptr)      \
   ELM_SCROLLER_DATA_GET(o, ptr);                     \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_SCROLLER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_SCROLLER_DATA_GET(o, ptr);                         \
-  if (!ptr)                                              \
+  if (EINA_UNLIKELY(!ptr))                               \
     {                                                    \
-       CRI("No widget data for object %p (%s)",     \
-                o, evas_object_type_get(o));             \
+       CRI("No widget data for object %p (%s)",          \
+           o, evas_object_type_get(o));                  \
        return val;                                       \
     }
 
-#define ELM_SCROLLER_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_SCROLLER_CLASS)) \
+#define ELM_SCROLLER_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_SCROLLER_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_segment_control.h b/legacy/elementary/src/lib/elm_widget_segment_control.h
index 1d5fab0..2464c62 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_segment_control.h
+++ b/legacy/elementary/src/lib/elm_widget_segment_control.h
@@ -47,24 +47,24 @@ struct _Elm_Segment_Item
 
 #define ELM_SEGMENT_CONTROL_DATA_GET_OR_RETURN(o, ptr) \
   ELM_SEGMENT_CONTROL_DATA_GET(o, ptr);                \
-  if (!ptr)                                            \
+  if (EINA_UNLIKELY(!ptr))                             \
     {                                                  \
-       CRI("No widget data for object %p (%s)",   \
-                o, evas_object_type_get(o));           \
+       CRI("No widget data for object %p (%s)",        \
+           o, evas_object_type_get(o));                \
        return;                                         \
     }
 
 #define ELM_SEGMENT_CONTROL_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_SEGMENT_CONTROL_DATA_GET(o, ptr);                         \
-  if (!ptr)                                                     \
+  if (EINA_UNLIKELY(!ptr))                                      \
     {                                                           \
-       CRI("No widget data for object %p (%s)",            \
-                o, evas_object_type_get(o));                    \
+       CRI("No widget data for object %p (%s)",                 \
+           o, evas_object_type_get(o));                         \
        return val;                                              \
     }
 
-#define ELM_SEGMENT_CONTROL_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_SEGMENT_CONTROL_CLASS)) \
+#define ELM_SEGMENT_CONTROL_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_SEGMENT_CONTROL_CLASS))) \
     return
 
 #define ELM_SEGMENT_CONTROL_ITEM_CHECK(it)                  \

diff --git a/legacy/elementary/src/lib/elm_widget_separator.h b/legacy/elementary/src/lib/elm_widget_separator.h
index 132c052..e78145c 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_separator.h
+++ b/legacy/elementary/src/lib/elm_widget_separator.h
@@ -32,24 +32,24 @@ struct _Elm_Separator_Smart_Data
 
 #define ELM_SEPARATOR_DATA_GET_OR_RETURN(o, ptr)     \
   ELM_SEPARATOR_DATA_GET(o, ptr);                    \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_SEPARATOR_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_SEPARATOR_DATA_GET(o, ptr);                         \
-  if (!ptr)                                               \
+  if (EINA_UNLIKELY(!ptr))                                \
     {                                                     \
-       CRI("No widget data for object %p (%s)",      \
-                o, evas_object_type_get(o));              \
+       CRI("No widget data for object %p (%s)",           \
+           o, evas_object_type_get(o));                   \
        return val;                                        \
     }
 
-#define ELM_SEPARATOR_CHECK(obj)                                      \
-  if (!eo_isa((obj), ELM_OBJ_SEPARATOR_CLASS)) \
+#define ELM_SEPARATOR_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_SEPARATOR_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_slider.h b/legacy/elementary/src/lib/elm_widget_slider.h
index 88c386b..3a6304f 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_slider.h
+++ b/legacy/elementary/src/lib/elm_widget_slider.h
@@ -57,24 +57,24 @@ struct _Elm_Slider_Smart_Data
 
 #define ELM_SLIDER_DATA_GET_OR_RETURN(o, ptr)        \
   ELM_SLIDER_DATA_GET(o, ptr);                       \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_SLIDER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_SLIDER_DATA_GET(o, ptr);                         \
-  if (!ptr)                                            \
+  if (EINA_UNLIKELY(!ptr))                             \
     {                                                  \
-       CRI("No widget data for object %p (%s)",   \
-                o, evas_object_type_get(o));           \
+       CRI("No widget data for object %p (%s)",        \
+           o, evas_object_type_get(o));                \
        return val;                                     \
     }
 
-#define ELM_SLIDER_CHECK(obj)                                      \
-  if (!eo_isa((obj), ELM_OBJ_SLIDER_CLASS))    \
+#define ELM_SLIDER_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_SLIDER_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_slideshow.h b/legacy/elementary/src/lib/elm_widget_slideshow.h
index 022b0f7..2d0e3c8 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_slideshow.h
+++ b/legacy/elementary/src/lib/elm_widget_slideshow.h
@@ -63,24 +63,24 @@ struct _Elm_Slideshow_Smart_Data
 
 #define ELM_SLIDESHOW_DATA_GET_OR_RETURN(o, ptr)     \
   ELM_SLIDESHOW_DATA_GET(o, ptr);                    \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_SLIDESHOW_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_SLIDESHOW_DATA_GET(o, ptr);                         \
-  if (!ptr)                                               \
+  if (EINA_UNLIKELY(!ptr))                                \
     {                                                     \
-       CRI("No widget data for object %p (%s)",      \
-                o, evas_object_type_get(o));              \
+       CRI("No widget data for object %p (%s)",           \
+           o, evas_object_type_get(o));                   \
        return val;                                        \
     }
 
-#define ELM_SLIDESHOW_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_SLIDESHOW_CLASS)) \
+#define ELM_SLIDESHOW_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_SLIDESHOW_CLASS))) \
     return
 
 #define ELM_SLIDESHOW_ITEM_CHECK(it)                        \

diff --git a/legacy/elementary/src/lib/elm_widget_spinner.h b/legacy/elementary/src/lib/elm_widget_spinner.h
index 5f732fb..6d13d0f 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_spinner.h
+++ b/legacy/elementary/src/lib/elm_widget_spinner.h
@@ -56,24 +56,24 @@ struct _Elm_Spinner_Special_Value
 
 #define ELM_SPINNER_DATA_GET_OR_RETURN(o, ptr)       \
   ELM_SPINNER_DATA_GET(o, ptr);                      \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_SPINNER_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_SPINNER_DATA_GET(o, ptr);                         \
-  if (!ptr)                                             \
+  if (EINA_UNLIKELY(!ptr))                              \
     {                                                   \
-       CRI("No widget data for object %p (%s)",    \
-                o, evas_object_type_get(o));            \
+       CRI("No widget data for object %p (%s)",         \
+           o, evas_object_type_get(o));                 \
        return val;                                      \
     }
 
-#define ELM_SPINNER_CHECK(obj)                     \
-  if (!eo_isa((obj), ELM_OBJ_SPINNER_CLASS)) \
+#define ELM_SPINNER_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_SPINNER_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_table.h b/legacy/elementary/src/lib/elm_widget_table.h
index 29b3139..b7b2317 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_table.h
+++ b/legacy/elementary/src/lib/elm_widget_table.h
@@ -18,8 +18,8 @@
  * @}
  */
 
-#define ELM_TABLE_CHECK(obj)               \
-  if (!eo_isa((obj), ELM_OBJ_TABLE_CLASS)) \
+#define ELM_TABLE_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_TABLE_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_thumb.h b/legacy/elementary/src/lib/elm_widget_thumb.h
index 8ecdc79..3a2d2d6 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_thumb.h
+++ b/legacy/elementary/src/lib/elm_widget_thumb.h
@@ -70,24 +70,24 @@ struct _Elm_Thumb_Smart_Data
 
 #define ELM_THUMB_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_THUMB_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_THUMB_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_THUMB_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_THUMB_CHECK(obj)                                                 \
-  if (!eo_isa((obj), ELM_OBJ_THUMB_CLASS))      \
+#define ELM_THUMB_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_THUMB_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_toolbar.h b/legacy/elementary/src/lib/elm_widget_toolbar.h
index 66d1802..500b53a 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_toolbar.h
+++ b/legacy/elementary/src/lib/elm_widget_toolbar.h
@@ -100,24 +100,24 @@ struct _Elm_Toolbar_Item_State
 
 #define ELM_TOOLBAR_DATA_GET_OR_RETURN(o, ptr)       \
   ELM_TOOLBAR_DATA_GET(o, ptr);                      \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_TOOLBAR_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_TOOLBAR_DATA_GET(o, ptr);                         \
-  if (!ptr)                                             \
+  if (EINA_UNLIKELY(!ptr))                              \
     {                                                   \
-       CRI("No widget data for object %p (%s)",    \
-                o, evas_object_type_get(o));            \
+       CRI("No widget data for object %p (%s)",         \
+           o, evas_object_type_get(o));                 \
        return val;                                      \
     }
 
-#define ELM_TOOLBAR_CHECK(obj)                                          \
-  if (!eo_isa((obj), ELM_OBJ_TOOLBAR_CLASS)) \
+#define ELM_TOOLBAR_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_TOOLBAR_CLASS))) \
     return
 
 #define ELM_TOOLBAR_ITEM_CHECK(it)                          \

diff --git a/legacy/elementary/src/lib/elm_widget_video.h b/legacy/elementary/src/lib/elm_widget_video.h
index 1907c1c..c26d18f 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_video.h
+++ b/legacy/elementary/src/lib/elm_widget_video.h
@@ -36,24 +36,24 @@ struct _Elm_Video_Smart_Data
 
 #define ELM_VIDEO_DATA_GET_OR_RETURN(o, ptr)         \
   ELM_VIDEO_DATA_GET(o, ptr);                        \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_VIDEO_DATA_GET_OR_RETURN_VAL(o, ptr, val) \
   ELM_VIDEO_DATA_GET(o, ptr);                         \
-  if (!ptr)                                           \
+  if (EINA_UNLIKELY(!ptr))                            \
     {                                                 \
-       CRI("No widget data for object %p (%s)",  \
-                o, evas_object_type_get(o));          \
+       CRI("No widget data for object %p (%s)",       \
+           o, evas_object_type_get(o));               \
        return val;                                    \
     }
 
-#define ELM_VIDEO_CHECK(obj)                                      \
-  if (!eo_isa((obj), ELM_OBJ_VIDEO_CLASS)) \
+#define ELM_VIDEO_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_VIDEO_CLASS))) \
     return
 
 #endif

diff --git a/legacy/elementary/src/lib/elm_widget_web.h b/legacy/elementary/src/lib/elm_widget_web.h
index 85df9a1..05c599b 100644 (file)
--- a/legacy/elementary/src/lib/elm_widget_web.h
+++ b/legacy/elementary/src/lib/elm_widget_web.h
@@ -127,24 +127,24 @@ struct _View_Smart_Data
 
 #define ELM_WEB_DATA_GET_OR_RETURN(o, ptr)           \
   ELM_WEB_DATA_GET(o, ptr);                          \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return;                                       \
     }
 
 #define ELM_WEB_DATA_GET_OR_RETURN_VAL(o, ptr, val)  \
   ELM_WEB_DATA_GET(o, ptr);                          \
-  if (!ptr)                                          \
+  if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)", \
-                o, evas_object_type_get(o));         \
+       CRI("No widget data for object %p (%s)",      \
+           o, evas_object_type_get(o));              \
        return val;                                   \
     }
 
-#define ELM_WEB_CHECK(obj)                                                 \
-  if (!eo_isa((obj), ELM_OBJ_WEB_CLASS)) \
+#define ELM_WEB_CHECK(obj)                              \
+  if (EINA_UNLIKELY(!eo_isa((obj), ELM_OBJ_WEB_CLASS))) \
     return
 
 #endif