summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/examples/evas/evas-3d-parallax-occlusion.c2
-rw-r--r--src/examples/evas/shooter/evas-3d-shooter.c26
-rw-r--r--src/lib/ecore_con/ecore_con.c15
-rw-r--r--src/lib/ecore_con/ecore_con_eet.c2
-rw-r--r--src/lib/edje/edje_smart.c2
-rw-r--r--src/lib/emotion/emotion_smart.c10
-rw-r--r--src/lib/eo/eo_base_class.c1
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_node.c7
-rw-r--r--src/lib/evas/canvas/evas_canvas3d_scene.c5
-rw-r--r--src/lib/evas/canvas/evas_layer.c2
-rw-r--r--src/lib/evas/canvas/evas_object_image.c5
-rw-r--r--src/lib/evas/canvas/evas_object_main.c2
-rw-r--r--src/lib/evas/canvas/evas_object_text.c1
-rw-r--r--src/lib/evas/canvas/evas_stack.c4
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_radial.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c14
-rw-r--r--src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c1
-rw-r--r--src/modules/evas/engines/software_generic/evas_ector_software_buffer.c1
-rw-r--r--src/tests/edje/edje_test_edje.c3
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c1
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c1
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c4
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.h4
-rw-r--r--src/tests/eo/signals/signals_simple.c4
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c2
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.h2
-rw-r--r--src/tests/eo/suite/eo_test_general.c3
29 files changed, 33 insertions, 97 deletions
diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c
index ff20dfe20e..67be66536d 100644
--- a/src/examples/evas/evas-3d-parallax-occlusion.c
+++ b/src/examples/evas/evas-3d-parallax-occlusion.c
@@ -246,7 +246,7 @@ main(void)
246 image = evas_object_image_filled_add(evas); 246 image = evas_object_image_filled_add(evas);
247 efl_gfx_size_set(image, WIDTH, HEIGHT); 247 efl_gfx_size_set(image, WIDTH, HEIGHT);
248 efl_gfx_visible_set(image, EINA_TRUE); 248 efl_gfx_visible_set(image, EINA_TRUE);
249 evas_object_focus_set(image, image, EINA_TRUE); 249 evas_object_focus_set(image, EINA_TRUE);
250 250
251 /* Set the image object as render target for 3D scene. */ 251 /* Set the image object as render target for 3D scene. */
252 evas_obj_image_scene_set(image, data.scene); 252 evas_obj_image_scene_set(image, data.scene);
diff --git a/src/examples/evas/shooter/evas-3d-shooter.c b/src/examples/evas/shooter/evas-3d-shooter.c
index 9ea9ceb1a4..2e83fd8e6d 100644
--- a/src/examples/evas/shooter/evas-3d-shooter.c
+++ b/src/examples/evas/shooter/evas-3d-shooter.c
@@ -250,13 +250,19 @@ _key_down(void *data,
250 } 250 }
251 } 251 }
252 else if (!strcmp(ev->key, "F1")) 252 else if (!strcmp(ev->key, "F1"))
253 evas_canvas3d_node_position_set(scene->camera_node, 0.0, 80.0, 30.0); 253 {
254 evas_canvas3d_node_look_at_set(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 254 evas_canvas3d_node_position_set(scene->camera_node, 0.0, 80.0, 30.0);
255 evas_canvas3d_node_look_at_set(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
256 }
255 else if (!strcmp(ev->key, "F2")) 257 else if (!strcmp(ev->key, "F2"))
256 evas_canvas3d_node_position_set(scene->camera_node, -2.0, 0.0, 4.0); 258 {
259 evas_canvas3d_node_position_set(scene->camera_node, -2.0, 0.0, 4.0);
257 evas_canvas3d_node_look_at_set(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, -100.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0); 260 evas_canvas3d_node_look_at_set(scene->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, -100.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
261 }
258 else if (!strcmp(ev->key, "A")) 262 else if (!strcmp(ev->key, "A"))
259 aabb_index++; 263 {
264 aabb_index++;
265 }
260} 266}
261 267
262static void 268static void
@@ -831,8 +837,10 @@ _mesh_setup_wall(Scene_Data *data, int index)
831 837
832 /* placing of wall carpet on the floor grid */ 838 /* placing of wall carpet on the floor grid */
833 if (index == 0) 839 if (index == 0)
834 evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 6.7 * 19.5, 20.0, 2.0); 840 {
835 evas_canvas3d_node_position_set(data->mesh_node_wall[index], -39.7 + 18.6 * 3, 0.0, -60.3); 841 evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 6.7 * 19.5, 20.0, 2.0);
842 evas_canvas3d_node_position_set(data->mesh_node_wall[index], -39.7 + 18.6 * 3, 0.0, -60.3);
843 }
836 else if (index == 1) 844 else if (index == 1)
837 { 845 {
838 evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 5 * 19.5, 20.0, 2.0); 846 evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 5 * 19.5, 20.0, 2.0);
@@ -840,8 +848,10 @@ _mesh_setup_wall(Scene_Data *data, int index)
840 evas_canvas3d_node_orientation_angle_axis_set(data->mesh_node_wall[index], 90, 0, 1.0, 0.0); 848 evas_canvas3d_node_orientation_angle_axis_set(data->mesh_node_wall[index], 90, 0, 1.0, 0.0);
841 } 849 }
842 else if (index == 2) 850 else if (index == 2)
843 evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 6.7 * 19.5, 20.0, 2.0); 851 {
844 evas_canvas3d_node_position_set(data->mesh_node_wall[index], -39.7 + 18.6*3, 0.0, 35.3); 852 evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 6.7 * 19.5, 20.0, 2.0);
853 evas_canvas3d_node_position_set(data->mesh_node_wall[index], -39.7 + 18.6*3, 0.0, 35.3);
854 }
845 else if (index == 3) 855 else if (index == 3)
846 { 856 {
847 evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 5* 19.5, 20.0, 2.0); 857 evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 5* 19.5, 20.0, 2.0);
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 8dd9d822cc..ba1a575fad 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -108,7 +108,6 @@ static void _ecore_con_lookup_done(void *data,
108static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr); 108static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr);
109 109
110#define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \ 110#define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
111 Eina_Bool finalized; \
112 if (eo_finalized_get(obj)) \ 111 if (eo_finalized_get(obj)) \
113 { \ 112 { \
114 ERR("This function is only allowed during construction."); \ 113 ERR("This function is only allowed during construction."); \
@@ -556,7 +555,6 @@ _efl_network_server_efl_network_base_timeout_set(Eo *obj, Efl_Network_Server_Dat
556EAPI double 555EAPI double
557ecore_con_server_timeout_get(const Ecore_Con *obj) 556ecore_con_server_timeout_get(const Ecore_Con *obj)
558{ 557{
559 double ret;
560 return efl_network_base_timeout_get((Ecore_Con *)obj); 558 return efl_network_base_timeout_get((Ecore_Con *)obj);
561} 559}
562 560
@@ -610,7 +608,6 @@ ecore_con_server_data_set(Ecore_Con_Server *obj,
610EAPI Eina_Bool 608EAPI Eina_Bool
611ecore_con_server_connected_get(const Ecore_Con *obj) 609ecore_con_server_connected_get(const Ecore_Con *obj)
612{ 610{
613 Eina_Bool ret;
614 return efl_network_base_connected_get((Ecore_Con *)obj); 611 return efl_network_base_connected_get((Ecore_Con *)obj);
615} 612}
616 613
@@ -660,7 +657,6 @@ _efl_network_server_name_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Data *svr)
660EAPI int 657EAPI int
661ecore_con_server_port_get(const Ecore_Con *obj) 658ecore_con_server_port_get(const Ecore_Con *obj)
662{ 659{
663 int ret;
664 return efl_network_base_port_get((Ecore_Con *)obj); 660 return efl_network_base_port_get((Ecore_Con *)obj);
665} 661}
666 662
@@ -681,7 +677,6 @@ _efl_network_server_efl_network_base_port_get(Eo *obj EINA_UNUSED, Efl_Network_S
681EAPI int 677EAPI int
682ecore_con_server_send(Ecore_Con *obj, const void *data, int size) 678ecore_con_server_send(Ecore_Con *obj, const void *data, int size)
683{ 679{
684 int ret;
685 return efl_network_base_send((Ecore_Con *)obj, data, size); 680 return efl_network_base_send((Ecore_Con *)obj, data, size);
686} 681}
687 682
@@ -738,7 +733,6 @@ _efl_network_server_client_limit_get(Eo *obj EINA_UNUSED, Efl_Network_Server_Dat
738EAPI const char * 733EAPI const char *
739ecore_con_server_ip_get(const Ecore_Con *obj) 734ecore_con_server_ip_get(const Ecore_Con *obj)
740{ 735{
741 const char *ret;
742 return efl_network_base_ip_get(obj); 736 return efl_network_base_ip_get(obj);
743} 737}
744 738
@@ -751,7 +745,6 @@ _efl_network_server_efl_network_base_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Ser
751EAPI double 745EAPI double
752ecore_con_server_uptime_get(const Ecore_Con *obj) 746ecore_con_server_uptime_get(const Ecore_Con *obj)
753{ 747{
754 double ret;
755 return efl_network_base_uptime_get(obj); 748 return efl_network_base_uptime_get(obj);
756} 749}
757 750
@@ -793,7 +786,6 @@ _efl_network_server_efl_network_base_flush(Eo *obj, Efl_Network_Server_Data *svr
793EAPI int 786EAPI int
794ecore_con_client_send(Ecore_Con *obj, const void *data, int size) 787ecore_con_client_send(Ecore_Con *obj, const void *data, int size)
795{ 788{
796 int ret;
797 return efl_network_base_send((Ecore_Con *)obj, data, size); 789 return efl_network_base_send((Ecore_Con *)obj, data, size);
798} 790}
799 791
@@ -861,7 +853,6 @@ _efl_network_client_efl_network_base_connected_get(Eo *obj EINA_UNUSED, Efl_Netw
861EAPI Eina_Bool 853EAPI Eina_Bool
862ecore_con_client_connected_get(const Ecore_Con *obj) 854ecore_con_client_connected_get(const Ecore_Con *obj)
863{ 855{
864 Eina_Bool ret;
865 return efl_network_base_connected_get((Ecore_Con *)obj); 856 return efl_network_base_connected_get((Ecore_Con *)obj);
866} 857}
867 858
@@ -888,7 +879,6 @@ _efl_network_client_efl_network_base_timeout_get(Eo *obj EINA_UNUSED, Efl_Networ
888EAPI double 879EAPI double
889ecore_con_client_timeout_get(const Ecore_Con *obj) 880ecore_con_client_timeout_get(const Ecore_Con *obj)
890{ 881{
891 double ret;
892 return efl_network_base_timeout_get((Ecore_Con *)obj); 882 return efl_network_base_timeout_get((Ecore_Con *)obj);
893} 883}
894 884
@@ -940,7 +930,6 @@ _efl_network_client_efl_network_base_ip_get(Eo *obj EINA_UNUSED, Efl_Network_Cli
940EAPI const char * 930EAPI const char *
941ecore_con_client_ip_get(const Ecore_Con *obj) 931ecore_con_client_ip_get(const Ecore_Con *obj)
942{ 932{
943 const char *ret;
944 return efl_network_base_ip_get(obj); 933 return efl_network_base_ip_get(obj);
945} 934}
946 935
@@ -968,7 +957,6 @@ _efl_network_client_efl_network_base_port_get(Eo *obj EINA_UNUSED, Efl_Network_C
968EAPI int 957EAPI int
969ecore_con_client_port_get(const Ecore_Con *obj) 958ecore_con_client_port_get(const Ecore_Con *obj)
970{ 959{
971 int ret;
972 return efl_network_base_port_get((Ecore_Con *)obj); 960 return efl_network_base_port_get((Ecore_Con *)obj);
973} 961}
974 962
@@ -981,7 +969,6 @@ _efl_network_client_efl_network_base_uptime_get(Eo *obj EINA_UNUSED, Efl_Network
981EAPI double 969EAPI double
982ecore_con_client_uptime_get(const Ecore_Con *obj) 970ecore_con_client_uptime_get(const Ecore_Con *obj)
983{ 971{
984 double ret;
985 return efl_network_base_uptime_get(obj); 972 return efl_network_base_uptime_get(obj);
986} 973}
987 974
@@ -1000,7 +987,6 @@ ecore_con_client_flush(Ecore_Con *obj)
1000EAPI int 987EAPI int
1001ecore_con_server_fd_get(const Ecore_Con *obj) 988ecore_con_server_fd_get(const Ecore_Con *obj)
1002{ 989{
1003 int ret;
1004 return efl_network_base_fd_get((Ecore_Con *)obj); 990 return efl_network_base_fd_get((Ecore_Con *)obj);
1005} 991}
1006 992
@@ -1021,7 +1007,6 @@ _efl_network_client_efl_network_base_fd_get(Eo *obj EINA_UNUSED, Efl_Network_Cli
1021EAPI int 1007EAPI int
1022ecore_con_client_fd_get(const Ecore_Con *obj) 1008ecore_con_client_fd_get(const Ecore_Con *obj)
1023{ 1009{
1024 int ret;
1025 return efl_network_base_fd_get((Ecore_Con *)obj); 1010 return efl_network_base_fd_get((Ecore_Con *)obj);
1026} 1011}
1027 1012
diff --git a/src/lib/ecore_con/ecore_con_eet.c b/src/lib/ecore_con/ecore_con_eet.c
index 800770c636..59a5b211c4 100644
--- a/src/lib/ecore_con/ecore_con_eet.c
+++ b/src/lib/ecore_con/ecore_con_eet.c
@@ -924,8 +924,6 @@ ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data)
924EAPI const void * 924EAPI const void *
925ecore_con_eet_data_get(Ecore_Con_Eet *ece) 925ecore_con_eet_data_get(Ecore_Con_Eet *ece)
926{ 926{
927 const void *temp;
928
929 return eo_key_data_get(ece, ECORE_CON_EET_DATA_KEY); 927 return eo_key_data_get(ece, ECORE_CON_EET_DATA_KEY);
930} 928}
931 929
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index e571ecf48a..ab42445257 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -401,8 +401,6 @@ _edje_object_efl_file_mmap_get(Eo *obj EINA_UNUSED, Edje *pd,
401EAPI Eina_Bool 401EAPI Eina_Bool
402edje_object_mmap_set(Edje_Object *obj, const Eina_File *file, const char *group) 402edje_object_mmap_set(Edje_Object *obj, const Eina_File *file, const char *group)
403{ 403{
404 Eina_Bool ret;
405
406 return efl_file_mmap_set(obj, file, group); 404 return efl_file_mmap_set(obj, file, group);
407} 405}
408 406
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 231a81efac..d0b0f327f8 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -349,7 +349,6 @@ _emotion_object_engine_set(Eo *obj, Emotion_Object_Data *pd, const char *engine)
349EAPI Eina_Bool 349EAPI Eina_Bool
350emotion_object_file_set(Evas_Object *obj, const char *file) 350emotion_object_file_set(Evas_Object *obj, const char *file)
351{ 351{
352 Eina_Bool ret;
353 return efl_file_set(obj, file, NULL); 352 return efl_file_set(obj, file, NULL);
354} 353}
355 354
@@ -648,7 +647,6 @@ _emotion_object_efl_player_play_set(Eo *obj, Emotion_Object_Data *sd, Eina_Bool
648EAPI Eina_Bool 647EAPI Eina_Bool
649emotion_object_play_get(const Evas_Object *obj) 648emotion_object_play_get(const Evas_Object *obj)
650{ 649{
651 Eina_Bool ret;
652 return efl_player_play_get(obj); 650 return efl_player_play_get(obj);
653} 651}
654 652
@@ -687,7 +685,6 @@ _emotion_object_efl_player_position_set(Eo *obj, Emotion_Object_Data *sd, double
687EAPI double 685EAPI double
688emotion_object_position_get(const Evas_Object *obj) 686emotion_object_position_get(const Evas_Object *obj)
689{ 687{
690 double ret;
691 return efl_player_position_get(obj); 688 return efl_player_position_get(obj);
692} 689}
693 690
@@ -712,7 +709,6 @@ emotion_object_buffer_size_get(const Evas_Object *obj)
712EAPI Eina_Bool 709EAPI Eina_Bool
713emotion_object_seekable_get(const Evas_Object *obj) 710emotion_object_seekable_get(const Evas_Object *obj)
714{ 711{
715 Eina_Bool ret;
716 return efl_player_seekable_get(obj); 712 return efl_player_seekable_get(obj);
717} 713}
718 714
@@ -739,7 +735,6 @@ emotion_object_audio_handled_get(const Evas_Object *obj)
739EAPI double 735EAPI double
740emotion_object_play_length_get(const Evas_Object *obj) 736emotion_object_play_length_get(const Evas_Object *obj)
741{ 737{
742 double ret;
743 return efl_player_length_get(obj); 738 return efl_player_length_get(obj);
744} 739}
745 740
@@ -774,7 +769,6 @@ _emotion_object_efl_image_smooth_scale_set(Eo *obj EINA_UNUSED, Emotion_Object_D
774EAPI Eina_Bool 769EAPI Eina_Bool
775emotion_object_smooth_scale_get(const Evas_Object *obj) 770emotion_object_smooth_scale_get(const Evas_Object *obj)
776{ 771{
777 Eina_Bool ret;
778 return efl_image_smooth_scale_get(obj); 772 return efl_image_smooth_scale_get(obj);
779} 773}
780 774
@@ -787,7 +781,6 @@ _emotion_object_efl_image_smooth_scale_get(Eo *obj EINA_UNUSED, Emotion_Object_D
787EAPI double 781EAPI double
788emotion_object_ratio_get(const Evas_Object *obj) 782emotion_object_ratio_get(const Evas_Object *obj)
789{ 783{
790 double ret;
791 return efl_image_ratio_get(obj); 784 return efl_image_ratio_get(obj);
792} 785}
793 786
@@ -828,7 +821,6 @@ _emotion_object_efl_player_audio_volume_set(Eo *obj EINA_UNUSED, Emotion_Object_
828EAPI double 821EAPI double
829emotion_object_audio_volume_get(const Evas_Object *obj) 822emotion_object_audio_volume_get(const Evas_Object *obj)
830{ 823{
831 double ret;
832 return efl_player_audio_volume_get(obj); 824 return efl_player_audio_volume_get(obj);
833} 825}
834 826
@@ -856,7 +848,6 @@ _emotion_object_efl_player_audio_mute_set(Eo *obj EINA_UNUSED, Emotion_Object_Da
856EAPI Eina_Bool 848EAPI Eina_Bool
857emotion_object_audio_mute_get(const Evas_Object *obj) 849emotion_object_audio_mute_get(const Evas_Object *obj)
858{ 850{
859 Eina_Bool ret;
860 return efl_player_audio_mute_get(obj); 851 return efl_player_audio_mute_get(obj);
861} 852}
862 853
@@ -1147,7 +1138,6 @@ emotion_object_progress_info_get(const Evas_Object *obj)
1147EAPI double 1138EAPI double
1148emotion_object_progress_status_get(const Evas_Object *obj) 1139emotion_object_progress_status_get(const Evas_Object *obj)
1149{ 1140{
1150 double ret;
1151 return efl_player_progress_get(obj); 1141 return efl_player_progress_get(obj);
1152} 1142}
1153 1143
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 5af26b38b3..065c77eae8 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -99,7 +99,6 @@ _eo_base_key_data_get(Eo *obj EINA_UNUSED, Eo_Base_Data *pd, const char *key)
99EOLIAN static void 99EOLIAN static void
100_eo_base_parent_set(Eo *obj, Eo_Base_Data *pd, Eo *parent_id) 100_eo_base_parent_set(Eo *obj, Eo_Base_Data *pd, Eo *parent_id)
101{ 101{
102 Eina_Bool tmp;
103 if (pd->parent == parent_id) 102 if (pd->parent == parent_id)
104 return; 103 return;
105 104
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c
index 010d161201..5e0944d929 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.c
+++ b/src/lib/evas/canvas/evas_canvas3d_node.c
@@ -969,7 +969,6 @@ evas_canvas3d_node_color_node_mesh_collect(Evas_Canvas3D_Node *node, void *data)
969 list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(node); 969 list_meshes = (Eina_List *)evas_canvas3d_node_mesh_list_get(node);
970 EINA_LIST_FOREACH(list_meshes, l, mesh) 970 EINA_LIST_FOREACH(list_meshes, l, mesh)
971 { 971 {
972 Eina_Bool tmp;
973 if (evas_canvas3d_mesh_color_pick_enable_get(mesh)) 972 if (evas_canvas3d_mesh_color_pick_enable_get(mesh))
974 { 973 {
975 color = calloc(1, sizeof(Evas_Color)); 974 color = calloc(1, sizeof(Evas_Color));
@@ -1207,7 +1206,7 @@ _evas_canvas3d_node_position_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, Eva
1207 } 1206 }
1208 else if (space == EVAS_CANVAS3D_SPACE_WORLD) 1207 else if (space == EVAS_CANVAS3D_SPACE_WORLD)
1209 { 1208 {
1210 evas_canvas3d_object_update(obj); 1209 evas_canvas3d_object_update((Eo *) obj);
1211 1210
1212 if (x) *x = pd->position_world.x; 1211 if (x) *x = pd->position_world.x;
1213 if (y) *y = pd->position_world.y; 1212 if (y) *y = pd->position_world.y;
@@ -1235,7 +1234,7 @@ _evas_canvas3d_node_orientation_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd,
1235 } 1234 }
1236 else if (space == EVAS_CANVAS3D_SPACE_WORLD) 1235 else if (space == EVAS_CANVAS3D_SPACE_WORLD)
1237 { 1236 {
1238 evas_canvas3d_object_update(obj); 1237 evas_canvas3d_object_update((Eo *) obj);
1239 1238
1240 if (x) *x = pd->orientation_world.x; 1239 if (x) *x = pd->orientation_world.x;
1241 if (y) *y = pd->orientation_world.y; 1240 if (y) *y = pd->orientation_world.y;
@@ -1263,7 +1262,7 @@ _evas_canvas3d_node_scale_get(const Eo *obj, Evas_Canvas3D_Node_Data *pd, Evas_C
1263 } 1262 }
1264 else if (space == EVAS_CANVAS3D_SPACE_WORLD) 1263 else if (space == EVAS_CANVAS3D_SPACE_WORLD)
1265 { 1264 {
1266 evas_canvas3d_object_update(obj); 1265 evas_canvas3d_object_update((Eo *) obj);
1267 1266
1268 if (x) *x = pd->scale_world.x; 1267 if (x) *x = pd->scale_world.x;
1269 if (y) *y = pd->scale_world.y; 1268 if (y) *y = pd->scale_world.y;
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.c b/src/lib/evas/canvas/evas_canvas3d_scene.c
index c7b229e8ac..1b9ea30b00 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.c
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.c
@@ -691,7 +691,7 @@ _evas_canvas3d_scene_pick(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Real
691 return EINA_FALSE; 691 return EINA_FALSE;
692 } 692 }
693 /* Update the scene graph. */ 693 /* Update the scene graph. */
694 evas_canvas3d_object_update(obj); 694 evas_canvas3d_object_update((Eo *) obj);
695 pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS); 695 pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
696 pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS); 696 pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
697 eina_matrix4_multiply(&data.matrix_vp, 697 eina_matrix4_multiply(&data.matrix_vp,
@@ -737,7 +737,7 @@ _evas_canvas3d_scene_exist(const Eo *obj, Evas_Canvas3D_Scene_Data *pd, Evas_Rea
737 data.t = 0.0; 737 data.t = 0.0;
738 738
739 /* Update the scene graph. */ 739 /* Update the scene graph. */
740 evas_canvas3d_object_update(obj); 740 evas_canvas3d_object_update((Eo *) obj);
741 pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS); 741 pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_CANVAS3D_NODE_CLASS);
742 pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS); 742 pd_camera = eo_data_scope_get(pd_camera_node->data.camera.camera, EVAS_CANVAS3D_CAMERA_CLASS);
743 eina_matrix4_multiply(&data.matrix_vp, 743 eina_matrix4_multiply(&data.matrix_vp,
@@ -773,7 +773,6 @@ _evas_canvas3d_scene_pick_member_list_get(const Eo *obj, Evas_Canvas3D_Scene_Dat
773 773
774 EINA_LIST_FOREACH(list, l, node) 774 EINA_LIST_FOREACH(list, l, node)
775 { 775 {
776 Evas_Canvas3D_Node *exists;
777 if (evas_canvas3d_scene_exist(obj, x, y, node)) 776 if (evas_canvas3d_scene_exist(obj, x, y, node))
778 picked_nodes = eina_list_append(picked_nodes, l); 777 picked_nodes = eina_list_append(picked_nodes, l);
779 } 778 }
diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c
index 8412bcc93a..7d6ff67cbf 100644
--- a/src/lib/evas/canvas/evas_layer.c
+++ b/src/lib/evas/canvas/evas_layer.c
@@ -247,8 +247,6 @@ _evas_object_efl_gfx_stack_layer_set(Eo *eo_obj,
247EAPI short 247EAPI short
248evas_object_layer_get(const Evas_Object *obj) 248evas_object_layer_get(const Evas_Object *obj)
249{ 249{
250 short ret;
251
252 return efl_gfx_stack_layer_get((Evas_Object *)obj); 250 return efl_gfx_stack_layer_get((Evas_Object *)obj);
253} 251}
254 252
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index fc4a68010c..f3b1d7797a 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -1064,8 +1064,6 @@ _evas_image_efl_gfx_fill_fill_spread_set(Eo *eo_obj, Evas_Image_Data *o,
1064EAPI Evas_Fill_Spread 1064EAPI Evas_Fill_Spread
1065evas_object_image_fill_spread_get(const Evas_Image *obj) 1065evas_object_image_fill_spread_get(const Evas_Image *obj)
1066{ 1066{
1067 Evas_Fill_Spread ret;
1068
1069 return efl_gfx_fill_spread_get((Evas_Image *)obj); 1067 return efl_gfx_fill_spread_get((Evas_Image *)obj);
1070} 1068}
1071 1069
@@ -4937,14 +4935,12 @@ evas_object_image_mmap_get(const Evas_Image *obj, const Eina_File **f, const cha
4937EAPI Eina_Bool 4935EAPI Eina_Bool
4938evas_object_image_save(const Eo *obj, const char *file, const char *key, const char *flags) 4936evas_object_image_save(const Eo *obj, const char *file, const char *key, const char *flags)
4939{ 4937{
4940 Eina_Bool ret;
4941 return efl_file_save((Eo *) obj, file, key, flags); 4938 return efl_file_save((Eo *) obj, file, key, flags);
4942} 4939}
4943 4940
4944EAPI Eina_Bool 4941EAPI Eina_Bool
4945evas_object_image_animated_get(const Eo *obj) 4942evas_object_image_animated_get(const Eo *obj)
4946{ 4943{
4947 Eina_Bool ret;
4948 return efl_image_animated_get((Eo *) obj); 4944 return efl_image_animated_get((Eo *) obj);
4949} 4945}
4950 4946
@@ -4969,7 +4965,6 @@ evas_object_image_smooth_scale_set(Eo *obj, Eina_Bool smooth_scale)
4969EAPI Eina_Bool 4965EAPI Eina_Bool
4970evas_object_image_smooth_scale_get(const Eo *obj) 4966evas_object_image_smooth_scale_get(const Eo *obj)
4971{ 4967{
4972 Eina_Bool ret;
4973 return efl_image_smooth_scale_get((Eo *) obj); 4968 return efl_image_smooth_scale_get((Eo *) obj);
4974} 4969}
4975 4970
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 2536973828..b72d5fd060 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1301,8 +1301,6 @@ evas_object_hide(Evas_Object *eo_obj)
1301EAPI Eina_Bool 1301EAPI Eina_Bool
1302evas_object_visible_get(const Evas_Object *obj) 1302evas_object_visible_get(const Evas_Object *obj)
1303{ 1303{
1304 Eina_Bool ret;
1305
1306 return efl_gfx_visible_get((Evas_Object *)obj); 1304 return efl_gfx_visible_get((Evas_Object *)obj);
1307} 1305}
1308 1306
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 419dd491f9..7efb37f01b 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -2327,7 +2327,6 @@ evas_object_text_text_set(Eo *obj, const char *text)
2327EAPI const char * 2327EAPI const char *
2328evas_object_text_text_get(const Eo *obj) 2328evas_object_text_text_get(const Eo *obj)
2329{ 2329{
2330 const char *ret;
2331 return efl_text_get((Eo *) obj); 2330 return efl_text_get((Eo *) obj);
2332} 2331}
2333 2332
diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c
index b5de2463d5..b9d7b3965f 100644
--- a/src/lib/evas/canvas/evas_stack.c
+++ b/src/lib/evas/canvas/evas_stack.c
@@ -311,8 +311,6 @@ _evas_object_efl_gfx_stack_stack_below(Eo *eo_obj, Evas_Object_Protected_Data *o
311EAPI Evas_Object * 311EAPI Evas_Object *
312evas_object_above_get(const Evas_Object *obj) 312evas_object_above_get(const Evas_Object *obj)
313{ 313{
314 Evas_Object *ret;
315
316 return efl_gfx_stack_above_get((Evas_Object *)obj); 314 return efl_gfx_stack_above_get((Evas_Object *)obj);
317} 315}
318 316
@@ -342,8 +340,6 @@ _evas_object_efl_gfx_stack_above_get(Eo *eo_obj EINA_UNUSED,
342EAPI Evas_Object * 340EAPI Evas_Object *
343evas_object_below_get(const Evas_Object *obj) 341evas_object_below_get(const Evas_Object *obj)
344{ 342{
345 Evas_Object *ret;
346
347 return efl_gfx_stack_below_get((Evas_Object *)obj); 343 return efl_gfx_stack_below_get((Evas_Object *)obj);
348} 344}
349 345
diff --git a/src/lib/evas/canvas/evas_vg_gradient.c b/src/lib/evas/canvas/evas_vg_gradient.c
index 047ba72e7e..d4a64b7235 100644
--- a/src/lib/evas/canvas/evas_vg_gradient.c
+++ b/src/lib/evas/canvas/evas_vg_gradient.c
@@ -130,8 +130,6 @@ evas_vg_gradient_spread_set(Eo *obj, Efl_Gfx_Gradient_Spread s)
130EAPI Efl_Gfx_Gradient_Spread 130EAPI Efl_Gfx_Gradient_Spread
131evas_vg_gradient_spread_get(Eo *obj) 131evas_vg_gradient_spread_get(Eo *obj)
132{ 132{
133 Efl_Gfx_Gradient_Spread ret;
134
135 return efl_gfx_gradient_spread_get(obj); 133 return efl_gfx_gradient_spread_get(obj);
136} 134}
137 135
diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c
index 84d00bf7bb..91e5c6509d 100644
--- a/src/lib/evas/canvas/evas_vg_gradient_radial.c
+++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c
@@ -206,8 +206,6 @@ evas_vg_gradient_radial_radius_set(Eo *obj, double r)
206EAPI double 206EAPI double
207evas_vg_gradient_radial_radius_get(Eo *obj) 207evas_vg_gradient_radial_radius_get(Eo *obj)
208{ 208{
209 double ret;
210
211 return efl_gfx_gradient_radial_radius_get(obj); 209 return efl_gfx_gradient_radial_radius_get(obj);
212} 210}
213 211
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index d9c561ba6c..3a80b63594 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -795,8 +795,6 @@ _efl_vg_base_dup(Eo *obj, Efl_VG_Base_Data *pd, const Efl_VG_Base *from)
795EAPI Eina_Bool 795EAPI Eina_Bool
796evas_vg_node_visible_get(Eo *obj) 796evas_vg_node_visible_get(Eo *obj)
797{ 797{
798 Eina_Bool ret;
799
800 return efl_gfx_visible_get(obj); 798 return efl_gfx_visible_get(obj);
801} 799}
802 800
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index 906f2420db..312953a46f 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -254,8 +254,6 @@ _efl_vg_shape_efl_vg_base_dup(Eo *obj, Efl_VG_Shape_Data *pd EINA_UNUSED, const
254EAPI double 254EAPI double
255evas_vg_shape_stroke_scale_get(Eo *obj) 255evas_vg_shape_stroke_scale_get(Eo *obj)
256{ 256{
257 double ret;
258
259 return efl_gfx_shape_stroke_scale_get(obj); 257 return efl_gfx_shape_stroke_scale_get(obj);
260} 258}
261 259
@@ -280,8 +278,6 @@ evas_vg_shape_stroke_color_set(Eo *obj, int r, int g, int b, int a)
280EAPI double 278EAPI double
281evas_vg_shape_stroke_width_get(Eo *obj) 279evas_vg_shape_stroke_width_get(Eo *obj)
282{ 280{
283 double ret;
284
285 return efl_gfx_shape_stroke_width_get(obj); 281 return efl_gfx_shape_stroke_width_get(obj);
286} 282}
287 283
@@ -294,8 +290,6 @@ evas_vg_shape_stroke_width_set(Eo *obj, double w)
294EAPI double 290EAPI double
295evas_vg_shape_stroke_location_get(Eo *obj) 291evas_vg_shape_stroke_location_get(Eo *obj)
296{ 292{
297 double ret;
298
299 return efl_gfx_shape_stroke_location_get(obj); 293 return efl_gfx_shape_stroke_location_get(obj);
300} 294}
301 295
@@ -320,8 +314,6 @@ evas_vg_shape_stroke_dash_set(Eo *obj, const Efl_Gfx_Dash *dash, unsigned int le
320EAPI Efl_Gfx_Cap 314EAPI Efl_Gfx_Cap
321evas_vg_shape_stroke_cap_get(Eo *obj) 315evas_vg_shape_stroke_cap_get(Eo *obj)
322{ 316{
323 Efl_Gfx_Cap ret;
324
325 return efl_gfx_shape_stroke_cap_get(obj); 317 return efl_gfx_shape_stroke_cap_get(obj);
326} 318}
327 319
@@ -334,8 +326,6 @@ evas_vg_shape_stroke_cap_set(Eo *obj, Efl_Gfx_Cap c)
334EAPI Efl_Gfx_Join 326EAPI Efl_Gfx_Join
335evas_vg_shape_stroke_join_get(Eo *obj) 327evas_vg_shape_stroke_join_get(Eo *obj)
336{ 328{
337 Efl_Gfx_Join ret;
338
339 return efl_gfx_shape_stroke_join_get(obj); 329 return efl_gfx_shape_stroke_join_get(obj);
340} 330}
341 331
@@ -456,16 +446,12 @@ evas_vg_shape_shape_append_svg_path(Eo *obj, const char *svg_path_data)
456EAPI Eina_Bool 446EAPI Eina_Bool
457evas_vg_shape_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map) 447evas_vg_shape_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map)
458{ 448{
459 Eina_Bool ret;
460
461 return efl_gfx_shape_interpolate(obj, from, to, pos_map); 449 return efl_gfx_shape_interpolate(obj, from, to, pos_map);
462} 450}
463 451
464EAPI Eina_Bool 452EAPI Eina_Bool
465evas_vg_shape_shape_equal_commands(Eo *obj, const Eo *with) 453evas_vg_shape_shape_equal_commands(Eo *obj, const Eo *with)
466{ 454{
467 Eina_Bool ret;
468
469 return efl_gfx_shape_equal_commands(obj, with); 455 return efl_gfx_shape_equal_commands(obj, with);
470} 456}
471 457
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
index 73c66a3d53..2e34d4edf6 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_rgbaimage_buffer.c
@@ -31,7 +31,6 @@ _evas_ector_gl_rgbaimage_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas
31 Evas *evas, void *image) 31 Evas *evas, void *image)
32{ 32{
33 RGBA_Image *im = image; 33 RGBA_Image *im = image;
34 Eina_Bool b;
35 34
36 EINA_SAFETY_ON_NULL_RETURN(image); 35 EINA_SAFETY_ON_NULL_RETURN(image);
37 if (eo_finalized_get(obj)) 36 if (eo_finalized_get(obj))
diff --git a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
index bf00a1b2b3..2a9f17d502 100644
--- a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
+++ b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.c
@@ -25,7 +25,6 @@ _evas_ector_software_buffer_evas_ector_buffer_engine_image_set(Eo *obj, Evas_Ect
25 Evas *evas, void *image) 25 Evas *evas, void *image)
26{ 26{
27 RGBA_Image *im = image; 27 RGBA_Image *im = image;
28 Eina_Bool b;
29 28
30 EINA_SAFETY_ON_NULL_RETURN(image); 29 EINA_SAFETY_ON_NULL_RETURN(image);
31 if (eo_finalized_get(obj)) 30 if (eo_finalized_get(obj))
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index e28329f1dd..f8aea4a7b9 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -178,7 +178,6 @@ START_TEST(edje_test_masking)
178 Evas *evas = EDJE_TEST_INIT_EVAS(); 178 Evas *evas = EDJE_TEST_INIT_EVAS();
179 const Evas_Object *sub, *clip2, *clip; 179 const Evas_Object *sub, *clip2, *clip;
180 Evas_Object *obj; 180 Evas_Object *obj;
181 Eina_Bool b;
182 181
183 obj = edje_object_add(evas); 182 obj = edje_object_add(evas);
184 fail_unless(edje_object_file_set(obj, test_layout_get("test_masking.edj"), "test_group")); 183 fail_unless(edje_object_file_set(obj, test_layout_get("test_masking.edj"), "test_group"));
@@ -213,7 +212,6 @@ START_TEST(edje_test_filters)
213 const Evas_Object *text, *sub; 212 const Evas_Object *text, *sub;
214 Evas_Object *obj, *src = NULL; 213 Evas_Object *obj, *src = NULL;
215 const char *prg, *name; 214 const char *prg, *name;
216 Eina_Bool b;
217 215
218 setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1); 216 setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1);
219 217
@@ -254,7 +252,6 @@ START_TEST(edje_test_snapshot)
254 Evas *evas = EDJE_TEST_INIT_EVAS(); 252 Evas *evas = EDJE_TEST_INIT_EVAS();
255 const Evas_Object *sub; 253 const Evas_Object *sub;
256 Evas_Object *obj; 254 Evas_Object *obj;
257 Eina_Bool b;
258 255
259 setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1); 256 setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1);
260 257
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index 59ab9560dc..51824a9a98 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -24,7 +24,6 @@ _a_get(Eo *obj, void *class_data EINA_UNUSED)
24static Eo * 24static Eo *
25_constructor(Eo *obj, void *class_data EINA_UNUSED) 25_constructor(Eo *obj, void *class_data EINA_UNUSED)
26{ 26{
27 Eina_Bool tmp;
28 obj = eo_constructor(eo_super(obj, MY_CLASS)); 27 obj = eo_constructor(eo_super(obj, MY_CLASS));
29 28
30 Eo *simple = eo_add(SIMPLE_CLASS, obj); 29 Eo *simple = eo_add(SIMPLE_CLASS, obj);
diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c
index 9e90eb412a..6f9e914415 100644
--- a/src/tests/eo/composite_objects/composite_objects_main.c
+++ b/src/tests/eo/composite_objects/composite_objects_main.c
@@ -26,7 +26,6 @@ _a_changed_cb(void *data, const Eo_Event *event)
26int 26int
27main(int argc, char *argv[]) 27main(int argc, char *argv[])
28{ 28{
29 Eina_Bool tmp;
30 (void) argc; 29 (void) argc;
31 (void) argv; 30 (void) argv;
32 eo_init(); 31 eo_init();
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index 57942f7efe..1e0a6a27f1 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -53,8 +53,8 @@ _class_print2(Eo_Class *klass, void *class_data EINA_UNUSED)
53 53
54EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a); 54EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
55EAPI EO_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE); 55EAPI EO_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
56EAPI EO_FUNC_BODY(simple_class_print, Eina_Bool, EINA_FALSE); 56EAPI EO_FUNC_BODY_CONST(simple_class_print, Eina_Bool, EINA_FALSE);
57EAPI EO_FUNC_BODY(simple_class_print2, Eina_Bool, EINA_FALSE); 57EAPI EO_FUNC_BODY_CONST(simple_class_print2, Eina_Bool, EINA_FALSE);
58 58
59static Eo_Op_Description op_descs[] = { 59static Eo_Op_Description op_descs[] = {
60 EO_OP_FUNC(simple_a_set, _a_set), 60 EO_OP_FUNC(simple_a_set, _a_set),
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.h b/src/tests/eo/function_overrides/function_overrides_simple.h
index 3c54d74dd4..9128c90d34 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.h
+++ b/src/tests/eo/function_overrides/function_overrides_simple.h
@@ -8,8 +8,8 @@ typedef struct
8 8
9EAPI void simple_a_set(Eo *obj, int a); 9EAPI void simple_a_set(Eo *obj, int a);
10EAPI Eina_Bool simple_a_print(Eo *obj); 10EAPI Eina_Bool simple_a_print(Eo *obj);
11EAPI Eina_Bool simple_class_print(Eo *obj); 11EAPI Eina_Bool simple_class_print(const Eo *obj);
12EAPI Eina_Bool simple_class_print2(Eo *obj); 12EAPI Eina_Bool simple_class_print2(const Eo *obj);
13 13
14extern const Eo_Event_Description _SIG_A_CHANGED; 14extern const Eo_Event_Description _SIG_A_CHANGED;
15#define SIG_A_CHANGED (&(_SIG_A_CHANGED)) 15#define SIG_A_CHANGED (&(_SIG_A_CHANGED))
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index 8a70f5fca2..458b95c008 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -27,7 +27,7 @@ _a_set(Eo *obj, void *class_data, int a)
27} 27}
28 28
29Eina_Bool 29Eina_Bool
30_cb_added(void *data, const Eo_Event *event) 30_cb_added(void *data EINA_UNUSED, const Eo_Event *event)
31{ 31{
32 Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS); 32 Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS);
33 const Eo_Callback_Array_Item *callback_array = event->event_info; 33 const Eo_Callback_Array_Item *callback_array = event->event_info;
@@ -42,7 +42,7 @@ _cb_added(void *data, const Eo_Event *event)
42} 42}
43 43
44Eina_Bool 44Eina_Bool
45_cb_deled(void *data, const Eo_Event *event) 45_cb_deled(void *data EINA_UNUSED, const Eo_Event *event)
46{ 46{
47 Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS); 47 Simple_Public_Data *pd = eo_data_scope_get(event->obj, MY_CLASS);
48 const Eo_Callback_Array_Item *callback_array = event->event_info; 48 const Eo_Callback_Array_Item *callback_array = event->event_info;
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index 1fe449a002..224e80a290 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -84,7 +84,7 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, Eo_Dbg_Info *root)
84EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a); 84EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
85EO_FUNC_BODY(simple_a_get, int, 0); 85EO_FUNC_BODY(simple_a_get, int, 0);
86EO_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE); 86EO_FUNC_BODY(simple_a_print, Eina_Bool, EINA_FALSE);
87EO_FUNC_BODY(simple_class_hi_print, Eina_Bool, EINA_FALSE); 87EO_FUNC_BODY_CONST(simple_class_hi_print, Eina_Bool, EINA_FALSE);
88EO_VOID_FUNC_BODY(simple_pure_virtual); 88EO_VOID_FUNC_BODY(simple_pure_virtual);
89EO_VOID_FUNC_BODY(simple_no_implementation); 89EO_VOID_FUNC_BODY(simple_no_implementation);
90 90
diff --git a/src/tests/eo/suite/eo_test_class_simple.h b/src/tests/eo/suite/eo_test_class_simple.h
index 43cdd28bf6..3360ea887b 100644
--- a/src/tests/eo/suite/eo_test_class_simple.h
+++ b/src/tests/eo/suite/eo_test_class_simple.h
@@ -9,7 +9,7 @@ typedef struct
9EAPI void simple_a_set(Eo *obj, int a); 9EAPI void simple_a_set(Eo *obj, int a);
10EAPI int simple_a_get(Eo *obj); 10EAPI int simple_a_get(Eo *obj);
11EAPI Eina_Bool simple_a_print(Eo *obj); 11EAPI Eina_Bool simple_a_print(Eo *obj);
12EAPI Eina_Bool simple_class_hi_print(Eo *obj); 12EAPI Eina_Bool simple_class_hi_print(const Eo *obj);
13EAPI void simple_recursive(Eo *obj, int n); 13EAPI void simple_recursive(Eo *obj, int n);
14EAPI void simple_pure_virtual(Eo *obj); 14EAPI void simple_pure_virtual(Eo *obj);
15EAPI void simple_no_implementation(Eo *obj); 15EAPI void simple_no_implementation(Eo *obj);
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 4800872ef3..b87f37a01c 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -284,7 +284,6 @@ END_TEST
284 284
285START_TEST(eo_composite_tests) 285START_TEST(eo_composite_tests)
286{ 286{
287 Eina_Bool tmp;
288 eo_init(); 287 eo_init();
289 288
290 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 289 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
@@ -735,7 +734,7 @@ _class_hi_print(Eo_Class *klass EINA_UNUSED, void *class_data EINA_UNUSED)
735} 734}
736 735
737EO_FUNC_BODY(multi_a_print, Eina_Bool, EINA_FALSE); 736EO_FUNC_BODY(multi_a_print, Eina_Bool, EINA_FALSE);
738EO_FUNC_BODY(multi_class_hi_print, Eina_Bool, EINA_FALSE); 737EO_FUNC_BODY_CONST(multi_class_hi_print, Eina_Bool, EINA_FALSE);
739 738
740static Eo_Op_Description _multi_do_op_descs[] = { 739static Eo_Op_Description _multi_do_op_descs[] = {
741 EO_OP_FUNC(multi_a_print, _a_print), 740 EO_OP_FUNC(multi_a_print, _a_print),