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

diff --git a/src/lib/elm_widget_actionslider.h b/src/lib/elm_widget_actionslider.h
index 61bb2d0fd76cd8a0a48c42f599104c5755ba0c5c..f4c0a5816b495f33cf12a2113426b7a86f80f66b 100644 (file)
--- a/src/lib/elm_widget_actionslider.h
+++ b/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/src/lib/elm_widget_bg.h b/src/lib/elm_widget_bg.h
index 8174eac1010ad3ce7fd396e12128148d88cf4ba6..dbf427bf252816ae592c0b750835be987fae867e 100644 (file)
--- a/src/lib/elm_widget_bg.h
+++ b/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/src/lib/elm_widget_box.h b/src/lib/elm_widget_box.h
index 92f39f43d4a6c8e7018fcfae5ded0c490a68fd19..998772ec7f365ea2d031473ca508f45c25f5f58b 100644 (file)
--- a/src/lib/elm_widget_box.h
+++ b/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/src/lib/elm_widget_bubble.h b/src/lib/elm_widget_bubble.h
index c78ee89d73f2e5c71d5d1fa6a23f5a3be0fbc3b2..d608432820e4cb1653ecdbf99f0392dcaa636f7a 100644 (file)
--- a/src/lib/elm_widget_bubble.h
+++ b/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/src/lib/elm_widget_button.h b/src/lib/elm_widget_button.h
index cedb86490c8633b88cac77b618b99d58bb826b0c..0e4a1fb50b456d5e27f6204dda610d176008111a 100644 (file)
--- a/src/lib/elm_widget_button.h
+++ b/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/src/lib/elm_widget_calendar.h b/src/lib/elm_widget_calendar.h
index f98e96f435043426fb80e37a1a835e5c25dde91a..dd3503976161526e4b6344f6fa43da2f560ff1ef 100644 (file)
--- a/src/lib/elm_widget_calendar.h
+++ b/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/src/lib/elm_widget_check.h b/src/lib/elm_widget_check.h
index e5b05d7b8f9c6360f8c20c927d0a968a7f8a8021..7c4a6d21ed955875c6a478ea5682b722a4c83ec1 100644 (file)
--- a/src/lib/elm_widget_check.h
+++ b/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/src/lib/elm_widget_clock.h b/src/lib/elm_widget_clock.h
index 9a06d6da481f4ffb1e0e209348727e8e0a492ba9..7986d3f6b091aab3875626185ccc2da223e654fc 100644 (file)
--- a/src/lib/elm_widget_clock.h
+++ b/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/src/lib/elm_widget_colorselector.h b/src/lib/elm_widget_colorselector.h
index d610872667fdc89a954bc1fca2307674cec1d1b6..4dbc4acf285ff49498b0125f9ae4469f7f4e9f74 100644 (file)
--- a/src/lib/elm_widget_colorselector.h
+++ b/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/src/lib/elm_widget_conform.h b/src/lib/elm_widget_conform.h
index e1826c53dc9471242117155fa60414d5e3e1a69e..0c46264e19717a390101d0fbc286ac243d845144 100644 (file)
--- a/src/lib/elm_widget_conform.h
+++ b/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/src/lib/elm_widget_ctxpopup.h b/src/lib/elm_widget_ctxpopup.h
index 2ab8bbc756e04f08b40f96025c054084d0fb799c..ab681226c57858db2f4fe6c4fa71d76e2fba12fc 100644 (file)
--- a/src/lib/elm_widget_ctxpopup.h
+++ b/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/src/lib/elm_widget_datetime.h b/src/lib/elm_widget_datetime.h
index 68d6ca6042f6e757a9e7b1cd9f3fe84960f91755..f49b790b0bb4eb850e21181bdff49d770ee68478 100644 (file)
--- a/src/lib/elm_widget_datetime.h
+++ b/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/src/lib/elm_widget_dayselector.h b/src/lib/elm_widget_dayselector.h
index 92071647ecb735020843d46e56537ac2b626de6b..c8fb5dd6f9c50511cdc8fea47598c6a2427e69d5 100644 (file)
--- a/src/lib/elm_widget_dayselector.h
+++ b/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/src/lib/elm_widget_diskselector.h b/src/lib/elm_widget_diskselector.h
index 42813b1aa8dcecb6b6fc54fe84ee1dbf030c7ca5..4d54c0e21db60721603c29cb2d2a39550df5dd86 100644 (file)
--- a/src/lib/elm_widget_diskselector.h
+++ b/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/src/lib/elm_widget_entry.h b/src/lib/elm_widget_entry.h
index dc2b96d82d90ab34ab2677bb5b4bc15a76b7e9c9..3e6f78e5d7bba18b143894bd4fee36b4d4cef3ec 100644 (file)
--- a/src/lib/elm_widget_entry.h
+++ b/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/src/lib/elm_widget_fileselector.h b/src/lib/elm_widget_fileselector.h
index 2991485539b98f808100e8eba56533ea7980386c..03cc40791fac3a11e92d45a8c7b5936d63f5ffb5 100644 (file)
--- a/src/lib/elm_widget_fileselector.h
+++ b/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/src/lib/elm_widget_fileselector_button.h b/src/lib/elm_widget_fileselector_button.h
index d47222a5eafb0cea1c923f490aebb7a37e564af3..14b3878f5864483f08fe17e4def5efc782fc93a8 100644 (file)
--- a/src/lib/elm_widget_fileselector_button.h
+++ b/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/src/lib/elm_widget_fileselector_entry.h b/src/lib/elm_widget_fileselector_entry.h
index 4cac805a848dd90120c84444d1bd6ec8539f747e..3f3ee3581f2997b21fcc4ea4cf406ebb6d543d36 100644 (file)
--- a/src/lib/elm_widget_fileselector_entry.h
+++ b/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/src/lib/elm_widget_flip.h b/src/lib/elm_widget_flip.h
index a7cd670eb264f5384f565354a72a4645ee03eb35..1ffc300fb4643d78075874d5cabfda34e55bd3a0 100644 (file)
--- a/src/lib/elm_widget_flip.h
+++ b/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/src/lib/elm_widget_flipselector.h b/src/lib/elm_widget_flipselector.h
index 0b76e3153e44664964ecb3985f4f9d2d11bf26ab..2512f596cf1b31582c0cef31fb2568145838ad2b 100644 (file)
--- a/src/lib/elm_widget_flipselector.h
+++ b/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/src/lib/elm_widget_frame.h b/src/lib/elm_widget_frame.h
index e2ee9f05799a88f46398bc69f6563c707bf2a2d9..2381ffb77ec4748de3207625be2ff2aaf1a31d41 100644 (file)
--- a/src/lib/elm_widget_frame.h
+++ b/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/src/lib/elm_widget_gengrid.h b/src/lib/elm_widget_gengrid.h
index f04e0d43153aba5ab8cff8c61bac2aced7008745..7748252bfd2933661cc07449f747db33b8f52c4b 100644 (file)
--- a/src/lib/elm_widget_gengrid.h
+++ b/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/src/lib/elm_widget_genlist.h b/src/lib/elm_widget_genlist.h
index 734f545201a8c1c00de0dffeed3b5e782c8d8b72..4ac52c2a3978182ee4e7421ed806a30b4e4d5c05 100644 (file)
--- a/src/lib/elm_widget_genlist.h
+++ b/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/src/lib/elm_widget_glview.h b/src/lib/elm_widget_glview.h
index 5f5ba5e70930041bdff3e4889aabbbd27ed24995..013f797050fe442dfc5a81a661370d1c29170143 100644 (file)
--- a/src/lib/elm_widget_glview.h
+++ b/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/src/lib/elm_widget_grid.h b/src/lib/elm_widget_grid.h
index f717d31e4bdbe9206c783e4b2067b83b603fc3fd..5a5b18a5f3bdfe53d2b943804ff4f745e37e942d 100644 (file)
--- a/src/lib/elm_widget_grid.h
+++ b/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/src/lib/elm_widget_hover.h b/src/lib/elm_widget_hover.h
index dcfd30e1e3b407d19803bbc59dae904194124423..d0c1af3580d440c8e768d1c1a9173dc5e41fab1a 100644 (file)
--- a/src/lib/elm_widget_hover.h
+++ b/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/src/lib/elm_widget_hoversel.h b/src/lib/elm_widget_hoversel.h
index 355208873b8c4f988c908649516822efde28106a..19397b0f67c6e89fd9e1522214fc9a179f719436 100644 (file)
--- a/src/lib/elm_widget_hoversel.h
+++ b/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/src/lib/elm_widget_icon.h b/src/lib/elm_widget_icon.h
index 64509a6674764f051f8010fd1196acd45f722dfc..f5cec4b80a52fd2d247830028387a9b742e07335 100644 (file)
--- a/src/lib/elm_widget_icon.h
+++ b/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/src/lib/elm_widget_image.h b/src/lib/elm_widget_image.h
index 7a2674dad61da6702a61c8d5f9381efa1094311a..fc6f8f438269ce20e474d8c97f293bcc2ce2b33d 100644 (file)
--- a/src/lib/elm_widget_image.h
+++ b/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/src/lib/elm_widget_index.h b/src/lib/elm_widget_index.h
index cf5ea72e2c622100b9bdcabcb3ef4cc2e6f92e90..5189c18fa92c574dd7175093b020b9af02c5aa7e 100644 (file)
--- a/src/lib/elm_widget_index.h
+++ b/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/src/lib/elm_widget_inwin.h b/src/lib/elm_widget_inwin.h
index 1623b47c24fa41010749dadedb9e083bd10ab4ca..1aa32613ee3ec6c484dd7a5e680238584a90cab8 100644 (file)
--- a/src/lib/elm_widget_inwin.h
+++ b/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/src/lib/elm_widget_label.h b/src/lib/elm_widget_label.h
index 3d627d01d7811b97148f5fb503175ae59f089bf7..4e2ac72549f83591595996f17f68b614a8ecbce5 100644 (file)
--- a/src/lib/elm_widget_label.h
+++ b/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/src/lib/elm_widget_layout.h b/src/lib/elm_widget_layout.h
index b9c8cf7f0d9bed2ffe5e4725f015e0eaa1e7a3de..837b04b69c7e5a5dd905b09a2506b0e95e6d2ffa 100644 (file)
--- a/src/lib/elm_widget_layout.h
+++ b/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/src/lib/elm_widget_list.h b/src/lib/elm_widget_list.h
index 2c21c961bf641db23ffb9435a141ddda695268fb..cfc9b1e2fd26dee514c7955e30c38891a1acc793 100644 (file)
--- a/src/lib/elm_widget_list.h
+++ b/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/src/lib/elm_widget_map.h b/src/lib/elm_widget_map.h
index 1d98e4f673d13dd9111c22b2578a7fab556df1e6..9d9e61b14afea61d711efe7fa997131e7b425d92 100644 (file)
--- a/src/lib/elm_widget_map.h
+++ b/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/src/lib/elm_widget_mapbuf.h b/src/lib/elm_widget_mapbuf.h
index 97435ef9cbd835ded238bfc13256ec45038d6b11..2ee9f04320702ec626afb831a85023de91b1f941 100644 (file)
--- a/src/lib/elm_widget_mapbuf.h
+++ b/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/src/lib/elm_widget_menu.h b/src/lib/elm_widget_menu.h
index 50b97e128ba1406e2269e8118ed6d6941d95994e..22cac8fc35ca05dd1ae15e82f0826f6498d4ae2d 100644 (file)
--- a/src/lib/elm_widget_menu.h
+++ b/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/src/lib/elm_widget_multibuttonentry.h b/src/lib/elm_widget_multibuttonentry.h
index 428cafbdc623fb1f50d456361963d71e77462683..984d7f4f283bbc3a1b2639aaffe077265894c172 100644 (file)
--- a/src/lib/elm_widget_multibuttonentry.h
+++ b/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/src/lib/elm_widget_naviframe.h b/src/lib/elm_widget_naviframe.h
index 115f8a976180610e17174335eb8d42dd361da206..83809f9812f1be59688d03a45abc51f89252c97d 100644 (file)
--- a/src/lib/elm_widget_naviframe.h
+++ b/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/src/lib/elm_widget_notify.h b/src/lib/elm_widget_notify.h
index 046f12984ddde930e0bcfe78cb9b5778e34cd109..38d563990074da5ca46141b2b8caf03b3c9b97af 100644 (file)
--- a/src/lib/elm_widget_notify.h
+++ b/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/src/lib/elm_widget_panel.h b/src/lib/elm_widget_panel.h
index a82f064bd770798997ddeec794b3cd4412a23111..e869f0186c241b65b65589f2b5bea0b4969d75e5 100644 (file)
--- a/src/lib/elm_widget_panel.h
+++ b/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/src/lib/elm_widget_panes.h b/src/lib/elm_widget_panes.h
index 089be61277864a64827cfc830509da9d6ef4ac99..765b4bf8c177478126ce97f689a8c691ef2b8c88 100644 (file)
--- a/src/lib/elm_widget_panes.h
+++ b/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/src/lib/elm_widget_photo.h b/src/lib/elm_widget_photo.h
index 40625ebe02b837e09f8608e4c90ab1edc992314d..ba3c015afb7112e0c06aad6b547d474f32c32cc9 100644 (file)
--- a/src/lib/elm_widget_photo.h
+++ b/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/src/lib/elm_widget_photocam.h b/src/lib/elm_widget_photocam.h
index 6b410397b5c7aadc166f3a93826de2f1ecb8f243..2636de80ce49f8469a0a4afad63d4e22330c7ed7 100644 (file)
--- a/src/lib/elm_widget_photocam.h
+++ b/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/src/lib/elm_widget_player.h b/src/lib/elm_widget_player.h
index 54a41649425da760f1f7456dfa01355b9f5b80e5..d92b9a1315893a7744097dd7f45a432e7f0aa93f 100644 (file)
--- a/src/lib/elm_widget_player.h
+++ b/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/src/lib/elm_widget_plug.h b/src/lib/elm_widget_plug.h
index 60589520cc21f6d6c09db02515194f7fc5031f14..1100d8bf4eb3887a3c389fef1c10ca6544f4faf1 100644 (file)
--- a/src/lib/elm_widget_plug.h
+++ b/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/src/lib/elm_widget_popup.h b/src/lib/elm_widget_popup.h
index 84016ebdc072de9abb2ebf4c7bc1e3e464e67da0..5510ca95bd132a617b7198e062efa08bb0df40fe 100644 (file)
--- a/src/lib/elm_widget_popup.h
+++ b/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/src/lib/elm_widget_prefs.h b/src/lib/elm_widget_prefs.h
index 126201b009a7249d1e8e25cc9205603f70afbb46..82945b5da5fc0d05666556619d4dd2e13bc355ed 100644 (file)
--- a/src/lib/elm_widget_prefs.h
+++ b/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/src/lib/elm_widget_progressbar.h b/src/lib/elm_widget_progressbar.h
index 014bb0f229498a9797d30486f3e9c839e2e2bbaa..e84c593efda2eefe6772ae2358468cdd15b5169a 100644 (file)
--- a/src/lib/elm_widget_progressbar.h
+++ b/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/src/lib/elm_widget_radio.h b/src/lib/elm_widget_radio.h
index 904c1de032bc898087168bbf8b3507532aa06ae2..1b59b536815ae338283bbf10ef3b549d7280c857 100644 (file)
--- a/src/lib/elm_widget_radio.h
+++ b/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/src/lib/elm_widget_route.h b/src/lib/elm_widget_route.h
index c7ff1a6526137064605356dbc53d5d7833fb2721..77eb32332fea8bf7da8ae3863d234a1bc6507a21 100644 (file)
--- a/src/lib/elm_widget_route.h
+++ b/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/src/lib/elm_widget_scroller.h b/src/lib/elm_widget_scroller.h
index be871f41285af2b8eb2f28e7cad24d2a2e30903b..222999bab1aafccfb97eaa0cfda5f9999771d4ef 100644 (file)
--- a/src/lib/elm_widget_scroller.h
+++ b/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/src/lib/elm_widget_segment_control.h b/src/lib/elm_widget_segment_control.h
index 1d5fab0416141f7bc29259eee575617f2c1eee58..2464c62e4a4a0df279031af63f158f63eac6cbb9 100644 (file)
--- a/src/lib/elm_widget_segment_control.h
+++ b/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/src/lib/elm_widget_separator.h b/src/lib/elm_widget_separator.h
index 132c0528292bb10c2b2a3caa433e3ec761309fed..e78145c8acb085f3c2b97a51b97e6d1c30e9cd76 100644 (file)
--- a/src/lib/elm_widget_separator.h
+++ b/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/src/lib/elm_widget_slider.h b/src/lib/elm_widget_slider.h
index 88c386bfff40e96d647a9dd834fa7cb8b20b2072..3a6304f8aad5636e212cb8e1e75645d40ecde6c1 100644 (file)
--- a/src/lib/elm_widget_slider.h
+++ b/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/src/lib/elm_widget_slideshow.h b/src/lib/elm_widget_slideshow.h
index 022b0f713ea2ce2774768bd636f2a5e9160c9517..2d0e3c85ed1e30523e024e0014de8cfbb83346c5 100644 (file)
--- a/src/lib/elm_widget_slideshow.h
+++ b/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/src/lib/elm_widget_spinner.h b/src/lib/elm_widget_spinner.h
index 5f732fb589e47429f0901e033ee83a3ead34fa14..6d13d0f0ef995f40b50398c9fd9de05de555d7c0 100644 (file)
--- a/src/lib/elm_widget_spinner.h
+++ b/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/src/lib/elm_widget_table.h b/src/lib/elm_widget_table.h
index 29b31397049fb0795c9f56fa741925829cfd9efd..b7b23176f66160c25975ae5378eb3156d1115c97 100644 (file)
--- a/src/lib/elm_widget_table.h
+++ b/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/src/lib/elm_widget_thumb.h b/src/lib/elm_widget_thumb.h
index 8ecdc79af3d46e1516c48690d2898f6343cd8cc1..3a2d2d65918e16a9abc38cac232a64293e367c63 100644 (file)
--- a/src/lib/elm_widget_thumb.h
+++ b/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/src/lib/elm_widget_toolbar.h b/src/lib/elm_widget_toolbar.h
index 66d18024c4f8606023946f3325864ea23ef8dfdc..500b53ab6dcbe1d180daca689e31edfd2132ecc9 100644 (file)
--- a/src/lib/elm_widget_toolbar.h
+++ b/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/src/lib/elm_widget_video.h b/src/lib/elm_widget_video.h
index 1907c1ce88feacbf3515c69662c8db92442f8566..c26d18fbb2cc6e8cb40cc6f3dbdc47d7a769f9a6 100644 (file)
--- a/src/lib/elm_widget_video.h
+++ b/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/src/lib/elm_widget_web.h b/src/lib/elm_widget_web.h
index 85df9a15e16d59d5368b8bcadca4876c94aa520f..05c599bd4a41b52434cccaaf4d7b4347f39a770e 100644 (file)
--- a/src/lib/elm_widget_web.h
+++ b/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