summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/benchmarks/eina/Ecore_Data.h6
-rw-r--r--src/bin/elementary/test_dnd.c6
-rw-r--r--src/bindings/cxx/eina_cxx/eina_log.hh2
-rw-r--r--src/examples/eina/eina_log_03.c2
-rw-r--r--src/examples/eio/efl_io_manager_ls.c4
-rw-r--r--src/examples/eio/efl_io_manager_open.c4
-rw-r--r--src/examples/eio/efl_io_manager_open_multi.c2
-rw-r--r--src/lib/ecore/ecore_private.h4
-rw-r--r--src/lib/ecore_con/ecore_con_legacy.c4
-rw-r--r--src/lib/ecore_con/ecore_con_url.c2
-rw-r--r--src/lib/ecore_con/efl_net_ssl_conn-openssl.c4
-rw-r--r--src/lib/ecore_con/efl_net_ssl_ctx-openssl.c2
-rw-r--r--src/lib/ecore_evas/ecore_evas.c8
-rw-r--r--src/lib/ecore_evas/ecore_evas_util.c14
-rw-r--r--src/lib/ecore_file/ecore_file_download.c2
-rw-r--r--src/lib/edje/edje_private.h4
-rw-r--r--src/lib/efreet/efreet_menu.c4
-rw-r--r--src/lib/eina/eina_debug_private.h4
-rw-r--r--src/lib/eina/eina_lock.h4
-rw-r--r--src/lib/eina/eina_log.h6
-rw-r--r--src/lib/eina/eina_magic.h4
-rw-r--r--src/lib/eina/eina_promise.c2
-rw-r--r--src/lib/eina/eina_promise.h22
-rw-r--r--src/lib/eina/eina_safety_checks.h2
-rw-r--r--src/lib/elementary/efl_ui_win.c18
-rw-r--r--src/lib/elementary/elm_gesture_layer_extra_gestures.c16
-rw-r--r--src/lib/embryo/embryo_main.c2
-rw-r--r--src/lib/eo/eo.c10
-rw-r--r--src/lib/eo/eo_private.h10
-rw-r--r--src/lib/eo/eo_ptr_indirection.h10
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c2
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c4
-rw-r--r--src/lib/evas/canvas/evas_object_main.c2
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c2
-rw-r--r--src/lib/evas/filters/evas_filter_parser.c4
-rw-r--r--src/lib/evil/evil_util.c16
-rw-r--r--src/modules/ecore_imf/ibus/ibus_imcontext.c14
-rw-r--r--src/modules/ecore_imf/scim/scim_imcontext.cpp158
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api.c4
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api_ext.c2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api_gles1.c4
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_common.h2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_texture.c2
-rw-r--r--src/modules/evas/image_loaders/dds/evas_image_load_dds.c2
-rw-r--r--src/static_libs/rg_etc/etc2_encoder.c2
-rw-r--r--src/static_libs/rg_etc/rg_etc1.c4
-rw-r--r--src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c10
-rw-r--r--src/tests/ecore/efl_app_test_promise.c10
-rw-r--r--src/tests/efl_mono/libefl_mono_native_test.h4
-rw-r--r--src/tests/eina/eina_test_log.c6
-rw-r--r--src/tests/eina/eina_test_magic.c6
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc2
-rw-r--r--src/tests/eolian_cxx/simple.c4
53 files changed, 225 insertions, 225 deletions
diff --git a/src/benchmarks/eina/Ecore_Data.h b/src/benchmarks/eina/Ecore_Data.h
index 6641eff267..a085401242 100644
--- a/src/benchmarks/eina/Ecore_Data.h
+++ b/src/benchmarks/eina/Ecore_Data.h
@@ -69,7 +69,7 @@ extern "C" {
69 "\t%s();\n\n" \ 69 "\t%s();\n\n" \
70 "\tWith the parameter:\n\n" \ 70 "\tWith the parameter:\n\n" \
71 "\t%s\n\n" \ 71 "\t%s\n\n" \
72 "\tbeing NULL. Please fix your program.", __FUNCTION__, sparam); \ 72 "\tbeing NULL. Please fix your program.", __func__, sparam); \
73 if (getenv("ECORE_ERROR_ABORT")) { abort(); } \ 73 if (getenv("ECORE_ERROR_ABORT")) { abort(); } \
74 return ret; \ 74 return ret; \
75 } 75 }
@@ -83,14 +83,14 @@ extern "C" {
83 "\t%s();\n\n" \ 83 "\t%s();\n\n" \
84 "\tWith the parameter:\n\n" \ 84 "\tWith the parameter:\n\n" \
85 "\t%s\n\n" \ 85 "\t%s\n\n" \
86 "\tbeing NULL. Please fix your program.", __FUNCTION__, sparam); \ 86 "\tbeing NULL. Please fix your program.", __func__, sparam); \
87 if (getenv("ECORE_ERROR_ABORT")) { abort(); } \ 87 if (getenv("ECORE_ERROR_ABORT")) { abort(); } \
88 return; \ 88 return; \
89 } 89 }
90 90
91 91
92# ifdef __sgi 92# ifdef __sgi
93# define __FUNCTION__ "unknown" 93# define __func__ "unknown"
94# ifndef __cplusplus 94# ifndef __cplusplus
95# define inline 95# define inline
96# endif 96# endif
diff --git a/src/bin/elementary/test_dnd.c b/src/bin/elementary/test_dnd.c
index be0738e122..604f73f33f 100644
--- a/src/bin/elementary/test_dnd.c
+++ b/src/bin/elementary/test_dnd.c
@@ -635,7 +635,7 @@ _gl_dnd_default_anim_data_getcb(Evas_Object *obj, /* The genlist object */
635 /* Now, collect data to send for drop from ALL selected items */ 635 /* Now, collect data to send for drop from ALL selected items */
636 /* Save list pointer to remove items after drop and free list on done */ 636 /* Save list pointer to remove items after drop and free list on done */
637 info->data = _gl_get_drag_data(obj, it, (Eina_List **) &info->donecbdata); 637 info->data = _gl_get_drag_data(obj, it, (Eina_List **) &info->donecbdata);
638 printf("%s - data = %s\n", __FUNCTION__, info->data); 638 printf("%s - data = %s\n", __func__, info->data);
639 info->acceptdata = info->donecbdata; 639 info->acceptdata = info->donecbdata;
640 640
641 if (info->data) 641 if (info->data)
@@ -740,7 +740,7 @@ _grid_data_getcb(Evas_Object *obj, /* The genlist object */
740 /* Now, collect data to send for drop from ALL selected items */ 740 /* Now, collect data to send for drop from ALL selected items */
741 /* Save list pointer to remove items after drop and free list on done */ 741 /* Save list pointer to remove items after drop and free list on done */
742 info->data = _grid_get_drag_data(obj, it, (Eina_List **) &info->donecbdata); 742 info->data = _grid_get_drag_data(obj, it, (Eina_List **) &info->donecbdata);
743 printf("%s %d- data = %s\n", __FUNCTION__, __LINE__, info->data); 743 printf("%s %d- data = %s\n", __func__, __LINE__, info->data);
744 info->acceptdata = info->donecbdata; 744 info->acceptdata = info->donecbdata;
745 745
746 if (info->data) 746 if (info->data)
@@ -1005,7 +1005,7 @@ static Eina_Bool _drop_box_button_new_cb(void *data, Evas_Object *obj, Elm_Selec
1005 1005
1006void _enter_but_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED) 1006void _enter_but_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED)
1007{ 1007{
1008 printf("Entered %s - drop it here and I will never print this line anymore.\n", __FUNCTION__); 1008 printf("Entered %s - drop it here and I will never print this line anymore.\n", __func__);
1009} 1009}
1010 1010
1011static Eina_Bool _drop_but_icon_change_cb(void *data, Evas_Object *obj, Elm_Selection_Data *ev) 1011static Eina_Bool _drop_but_icon_change_cb(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
diff --git a/src/bindings/cxx/eina_cxx/eina_log.hh b/src/bindings/cxx/eina_cxx/eina_log.hh
index c287b7bd2d..d59af25e59 100644
--- a/src/bindings/cxx/eina_cxx/eina_log.hh
+++ b/src/bindings/cxx/eina_cxx/eina_log.hh
@@ -210,7 +210,7 @@ inline void _log(std::stringstream const& stream, int domain, ::Eina_Log_Level l
210 for( bool run = ::eina_log_domain_level_check((DOMAIN), LEVEL); run;) \ 210 for( bool run = ::eina_log_domain_level_check((DOMAIN), LEVEL); run;) \
211 for(std::stringstream stream; run ; \ 211 for(std::stringstream stream; run ; \
212 ::efl::eina::_log(std::move(stream), (DOMAIN), LEVEL \ 212 ::efl::eina::_log(std::move(stream), (DOMAIN), LEVEL \
213 , __FILE__, __FUNCTION__, __LINE__), run = false) \ 213 , __FILE__, __func__, __LINE__), run = false) \
214 stream 214 stream
215 215
216/** 216/**
diff --git a/src/examples/eina/eina_log_03.c b/src/examples/eina/eina_log_03.c
index 4918872e44..02fe04c322 100644
--- a/src/examples/eina/eina_log_03.c
+++ b/src/examples/eina/eina_log_03.c
@@ -7,7 +7,7 @@
7#include <Eina.h> 7#include <Eina.h>
8 8
9#define log(fmt, ...) \ 9#define log(fmt, ...) \
10 eina_log_print(EINA_LOG_LEVEL_ERR, __FILE__, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__) 10 eina_log_print(EINA_LOG_LEVEL_ERR, __FILE__, __func__, __LINE__, fmt, ##__VA_ARGS__)
11 11
12typedef struct _Data Data; 12typedef struct _Data Data;
13 13
diff --git a/src/examples/eio/efl_io_manager_ls.c b/src/examples/eio/efl_io_manager_ls.c
index 636883d91c..e77877b0b1 100644
--- a/src/examples/eio/efl_io_manager_ls.c
+++ b/src/examples/eio/efl_io_manager_ls.c
@@ -29,7 +29,7 @@ done_cb(void *data EINA_UNUSED,
29 29
30 eina_value_get(&file, &value); 30 eina_value_get(&file, &value);
31 31
32 printf("%s done listing files %"PRIu64".\n", __FUNCTION__, value); 32 printf("%s done listing files %"PRIu64".\n", __func__, value);
33 } 33 }
34 34
35 ecore_main_loop_quit(); 35 ecore_main_loop_quit();
@@ -46,7 +46,7 @@ progress_cb(void *data EINA_UNUSED, Eina_Array *array)
46 unsigned int count; 46 unsigned int count;
47 47
48 EINA_ARRAY_ITER_NEXT(array, count, filename, it) 48 EINA_ARRAY_ITER_NEXT(array, count, filename, it)
49 printf("%s listing filename: %s\n", __FUNCTION__, filename); 49 printf("%s listing filename: %s\n", __func__, filename);
50} 50}
51 51
52void list_files(void *data) 52void list_files(void *data)
diff --git a/src/examples/eio/efl_io_manager_open.c b/src/examples/eio/efl_io_manager_open.c
index 5c731c1186..f03f454847 100644
--- a/src/examples/eio/efl_io_manager_open.c
+++ b/src/examples/eio/efl_io_manager_open.c
@@ -23,7 +23,7 @@ _closing_cb(void* data EINA_UNUSED,
23 } 23 }
24 else 24 else
25 { 25 {
26 printf("%s closed file.\n", __FUNCTION__); 26 printf("%s closed file.\n", __func__);
27 } 27 }
28 28
29 ecore_main_loop_quit(); 29 ecore_main_loop_quit();
@@ -54,7 +54,7 @@ _open_cb(void *data,
54 54
55 eina_value_get(&file, &f); 55 eina_value_get(&file, &f);
56 56
57 printf("%s opened file %s\n", __FUNCTION__, eina_file_filename_get(f)); 57 printf("%s opened file %s\n", __func__, eina_file_filename_get(f));
58 58
59 return eina_future_as_value(efl_io_manager_close(job, f)); 59 return eina_future_as_value(efl_io_manager_close(job, f));
60 } 60 }
diff --git a/src/examples/eio/efl_io_manager_open_multi.c b/src/examples/eio/efl_io_manager_open_multi.c
index bcee8ca125..8256f659eb 100644
--- a/src/examples/eio/efl_io_manager_open_multi.c
+++ b/src/examples/eio/efl_io_manager_open_multi.c
@@ -12,7 +12,7 @@
12Eina_Value 12Eina_Value
13_close_cb(void *data EINA_UNUSED, const Eina_Value array, const Eina_Future *dead EINA_UNUSED) 13_close_cb(void *data EINA_UNUSED, const Eina_Value array, const Eina_Future *dead EINA_UNUSED)
14{ 14{
15 printf("%s closed all files.\n", __FUNCTION__); 15 printf("%s closed all files.\n", __func__);
16 16
17 ecore_main_loop_quit(); 17 ecore_main_loop_quit();
18 18
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index e60c191a21..8e9b796c2c 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -270,7 +270,7 @@ ecore_print_warning(const char *function,
270#define CHECK_PARAM_POINTER_RETURN(sparam, param, ret) \ 270#define CHECK_PARAM_POINTER_RETURN(sparam, param, ret) \
271 if (!(param)) \ 271 if (!(param)) \
272 { \ 272 { \
273 ecore_print_warning(__FUNCTION__, sparam); \ 273 ecore_print_warning(__func__, sparam); \
274 return ret; \ 274 return ret; \
275 } 275 }
276 276
@@ -278,7 +278,7 @@ ecore_print_warning(const char *function,
278#define CHECK_PARAM_POINTER(sparam, param) \ 278#define CHECK_PARAM_POINTER(sparam, param) \
279 if (!(param)) \ 279 if (!(param)) \
280 { \ 280 { \
281 ecore_print_warning(__FUNCTION__, sparam); \ 281 ecore_print_warning(__func__, sparam); \
282 return; \ 282 return; \
283 } 283 }
284 284
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index 050a30f1f2..e171d79078 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -95,7 +95,7 @@ typedef struct _Ecore_Con_Lookup_Ctx {
95 if (!svr) return __VA_ARGS__; \ 95 if (!svr) return __VA_ARGS__; \
96 if (!EINA_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) \ 96 if (!EINA_MAGIC_CHECK(svr, ECORE_MAGIC_CON_SERVER)) \
97 { \ 97 { \
98 ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_CON_SERVER, __FUNCTION__); \ 98 ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_CON_SERVER, __func__); \
99 return __VA_ARGS__; \ 99 return __VA_ARGS__; \
100 } \ 100 } \
101 } \ 101 } \
@@ -115,7 +115,7 @@ typedef struct _Ecore_Con_Lookup_Ctx {
115 if (!cl) return __VA_ARGS__; \ 115 if (!cl) return __VA_ARGS__; \
116 if (!EINA_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) \ 116 if (!EINA_MAGIC_CHECK(cl, ECORE_MAGIC_CON_CLIENT)) \
117 { \ 117 { \
118 ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_CON_CLIENT, __FUNCTION__); \ 118 ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_CON_CLIENT, __func__); \
119 return __VA_ARGS__; \ 119 return __VA_ARGS__; \
120 } \ 120 } \
121 } \ 121 } \
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index ec1e5b1a0c..b1d95f14f6 100644
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -161,7 +161,7 @@ struct _Ecore_Con_Url
161 { \ 161 { \
162 if (!EINA_MAGIC_CHECK(u, ECORE_MAGIC_CON_URL)) \ 162 if (!EINA_MAGIC_CHECK(u, ECORE_MAGIC_CON_URL)) \
163 { \ 163 { \
164 ECORE_MAGIC_FAIL(u, ECORE_MAGIC_CON_URL, __FUNCTION__); \ 164 ECORE_MAGIC_FAIL(u, ECORE_MAGIC_CON_URL, __func__); \
165 return __VA_ARGS__; \ 165 return __VA_ARGS__; \
166 } \ 166 } \
167 EINA_SAFETY_ON_TRUE_RETURN_VAL(u->delete_me, __VA_ARGS__); \ 167 EINA_SAFETY_ON_TRUE_RETURN_VAL(u->delete_me, __VA_ARGS__); \
diff --git a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
index 8e7339c2ea..e59c6811c9 100644
--- a/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
+++ b/src/lib/ecore_con/efl_net_ssl_conn-openssl.c
@@ -195,7 +195,7 @@ struct _Efl_Net_Ssl_Conn
195#define EFL_NET_SOCKET_SSL_CIPHERS "aRSA+HIGH:+kEDH:+kRSA:!kSRP:!kPSK:+3DES:!MD5" 195#define EFL_NET_SOCKET_SSL_CIPHERS "aRSA+HIGH:+kEDH:+kRSA:!kSRP:!kPSK:+3DES:!MD5"
196 196
197#define _efl_net_ssl_conn_session_debug(conn) \ 197#define _efl_net_ssl_conn_session_debug(conn) \
198 __efl_net_ssl_conn_session_debug(__FILE__, __LINE__, __FUNCTION__, conn) 198 __efl_net_ssl_conn_session_debug(__FILE__, __LINE__, __func__, conn)
199static void 199static void
200__efl_net_ssl_conn_session_debug(const char *file, int line, const char *fname, Efl_Net_Ssl_Conn *conn) 200__efl_net_ssl_conn_session_debug(const char *file, int line, const char *fname, Efl_Net_Ssl_Conn *conn)
201{ 201{
@@ -294,7 +294,7 @@ __efl_net_ssl_conn_session_debug(const char *file, int line, const char *fname,
294} 294}
295 295
296#define _efl_net_ssl_conn_check_errors() \ 296#define _efl_net_ssl_conn_check_errors() \
297 __efl_net_ssl_conn_check_errors(__FILE__, __LINE__, __FUNCTION__) 297 __efl_net_ssl_conn_check_errors(__FILE__, __LINE__, __func__)
298static unsigned long 298static unsigned long
299__efl_net_ssl_conn_check_errors(const char *file, int line, const char *fname) 299__efl_net_ssl_conn_check_errors(const char *file, int line, const char *fname)
300{ 300{
diff --git a/src/lib/ecore_con/efl_net_ssl_ctx-openssl.c b/src/lib/ecore_con/efl_net_ssl_ctx-openssl.c
index d8e4b6e220..3cf2d2f90b 100644
--- a/src/lib/ecore_con/efl_net_ssl_ctx-openssl.c
+++ b/src/lib/ecore_con/efl_net_ssl_ctx-openssl.c
@@ -17,7 +17,7 @@ struct _Efl_Net_Ssl_Ctx
17#define EFL_NET_SSL_CONTEXT_CIPHERS "aRSA+HIGH:+kEDH:+kRSA:!kSRP:!kPSK:+3DES:!MD5" 17#define EFL_NET_SSL_CONTEXT_CIPHERS "aRSA+HIGH:+kEDH:+kRSA:!kSRP:!kPSK:+3DES:!MD5"
18 18
19#define _efl_net_ssl_ctx_check_errors() \ 19#define _efl_net_ssl_ctx_check_errors() \
20 __efl_net_ssl_ctx_check_errors(__FILE__, __LINE__, __FUNCTION__) 20 __efl_net_ssl_ctx_check_errors(__FILE__, __LINE__, __func__)
21static unsigned long 21static unsigned long
22__efl_net_ssl_ctx_check_errors(const char *file, int line, const char *fname) 22__efl_net_ssl_ctx_check_errors(const char *file, int line, const char *fname)
23{ 23{
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 87331f03e8..46112d9537 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -44,14 +44,14 @@
44#define ECORE_EVAS_CHECK(ee, ...) \ 44#define ECORE_EVAS_CHECK(ee, ...) \
45 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) \ 45 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) \
46 { \ 46 { \
47 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__); \ 47 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__); \
48 return __VA_ARGS__; \ 48 return __VA_ARGS__; \
49 } 49 }
50 50
51#define ECORE_EVAS_CHECK_GOTO(_ee, _label) \ 51#define ECORE_EVAS_CHECK_GOTO(_ee, _label) \
52 if (!ECORE_MAGIC_CHECK(_ee, ECORE_MAGIC_EVAS)) \ 52 if (!ECORE_MAGIC_CHECK(_ee, ECORE_MAGIC_EVAS)) \
53 { \ 53 { \
54 ECORE_MAGIC_FAIL(_ee, ECORE_MAGIC_EVAS, __FUNCTION__); \ 54 ECORE_MAGIC_FAIL(_ee, ECORE_MAGIC_EVAS, __func__); \
55 goto _label; \ 55 goto _label; \
56 } 56 }
57 57
@@ -2785,13 +2785,13 @@ ecore_evas_screen_dpi_get(const Ecore_Evas *ee, int *xdpi, int *ydpi)
2785EAPI void 2785EAPI void
2786ecore_evas_draw_frame_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool draw_frame EINA_UNUSED) 2786ecore_evas_draw_frame_set(Ecore_Evas *ee EINA_UNUSED, Eina_Bool draw_frame EINA_UNUSED)
2787{ 2787{
2788 WRN("Calling deprecated function %s (not implemented)", __FUNCTION__); 2788 WRN("Calling deprecated function %s (not implemented)", __func__);
2789} 2789}
2790 2790
2791EAPI Eina_Bool 2791EAPI Eina_Bool
2792ecore_evas_draw_frame_get(const Ecore_Evas *ee EINA_UNUSED) 2792ecore_evas_draw_frame_get(const Ecore_Evas *ee EINA_UNUSED)
2793{ 2793{
2794 WRN("Calling deprecated function %s (not implemented)", __FUNCTION__); 2794 WRN("Calling deprecated function %s (not implemented)", __func__);
2795 return EINA_FALSE; 2795 return EINA_FALSE;
2796} 2796}
2797 2797
diff --git a/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c
index 7b07fdc699..43558ec767 100644
--- a/src/lib/ecore_evas/ecore_evas_util.c
+++ b/src/lib/ecore_evas/ecore_evas_util.c
@@ -86,13 +86,13 @@ _ecore_evas_object_intercept_lower(void *data, Evas_Object *obj EINA_UNUSED)
86static void 86static void
87_ecore_evas_object_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED) 87_ecore_evas_object_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED)
88{ 88{
89 INF("TODO: %s", __FUNCTION__); 89 INF("TODO: %s", __func__);
90} 90}
91 91
92static void 92static void
93_ecore_evas_object_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED) 93_ecore_evas_object_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED)
94{ 94{
95 INF("TODO: %s", __FUNCTION__); 95 INF("TODO: %s", __func__);
96} 96}
97 97
98static void 98static void
@@ -227,12 +227,12 @@ ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_
227 227
228 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) 228 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
229 { 229 {
230 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__); 230 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__);
231 return EINA_FALSE; 231 return EINA_FALSE;
232 } 232 }
233 233
234 CHECK_PARAM_POINTER_RETURN("obj", obj, EINA_FALSE); 234 CHECK_PARAM_POINTER_RETURN("obj", obj, EINA_FALSE);
235 if (!_ecore_evas_object_evas_check(__FUNCTION__, ee, obj)) 235 if (!_ecore_evas_object_evas_check(__func__, ee, obj))
236 return EINA_FALSE; 236 return EINA_FALSE;
237 237
238 old_ee = _evas_object_associate_get(obj); 238 old_ee = _evas_object_associate_get(obj);
@@ -255,7 +255,7 @@ ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj)
255 255
256 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) 256 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
257 { 257 {
258 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__); 258 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__);
259 return EINA_FALSE; 259 return EINA_FALSE;
260 } 260 }
261 261
@@ -284,7 +284,7 @@ ecore_evas_object_associate_get(const Ecore_Evas *ee)
284{ 284{
285 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) 285 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
286 { 286 {
287 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__); 287 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__);
288 return NULL; 288 return NULL;
289 } 289 }
290 return _ecore_evas_associate_get(ee); 290 return _ecore_evas_associate_get(ee);
@@ -380,7 +380,7 @@ _ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj)
380 380
381 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) 381 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
382 { 382 {
383 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__); 383 ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __func__);
384 } 384 }
385 else 385 else
386 { 386 {
diff --git a/src/lib/ecore_file/ecore_file_download.c b/src/lib/ecore_file/ecore_file_download.c
index 4b65c51ee6..e212ea0fbf 100644
--- a/src/lib/ecore_file/ecore_file_download.c
+++ b/src/lib/ecore_file/ecore_file_download.c
@@ -305,7 +305,7 @@ ecore_file_download_abort(Ecore_File_Download_Job *job)
305 return; 305 return;
306 if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB)) 306 if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB))
307 { 307 {
308 ECORE_MAGIC_FAIL(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB, __FUNCTION__); 308 ECORE_MAGIC_FAIL(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB, __func__);
309 return; 309 return;
310 } 310 }
311 311
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 03e288c567..818a62195f 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -2757,7 +2757,7 @@ void _edje_lua_shutdown(void);
2757 2757
2758void __edje_lua_error(const char *file, const char *fnc, int line, lua_State *L, int err_code); 2758void __edje_lua_error(const char *file, const char *fnc, int line, lua_State *L, int err_code);
2759#define _edje_lua_error(L, err_code) \ 2759#define _edje_lua_error(L, err_code) \
2760 __edje_lua_error(__FILE__, __FUNCTION__, __LINE__, L, err_code) 2760 __edje_lua_error(__FILE__, __func__, __LINE__, L, err_code)
2761 2761
2762Eina_Bool _edje_lua_script_only(Edje *ed); 2762Eina_Bool _edje_lua_script_only(Edje *ed);
2763void _edje_lua_script_only_init(Edje *ed); 2763void _edje_lua_script_only_init(Edje *ed);
@@ -2892,7 +2892,7 @@ EAPI void _edje_program_insert(Edje_Part_Collection *ed, Edje_Program *p);
2892EAPI void _edje_program_remove(Edje_Part_Collection *ed, Edje_Program *p); 2892EAPI void _edje_program_remove(Edje_Part_Collection *ed, Edje_Program *p);
2893 2893
2894void _edje_lua2_error_full(const char *file, const char *fnc, int line, lua_State *L, int err_code); 2894void _edje_lua2_error_full(const char *file, const char *fnc, int line, lua_State *L, int err_code);
2895#define _edje_lua2_error(L, err_code) _edje_lua2_error_full(__FILE__, __FUNCTION__, __LINE__, L, err_code) 2895#define _edje_lua2_error(L, err_code) _edje_lua2_error_full(__FILE__, __func__, __LINE__, L, err_code)
2896void _edje_lua2_script_init(Edje *ed); 2896void _edje_lua2_script_init(Edje *ed);
2897void _edje_lua2_script_shutdown(Edje *ed); 2897void _edje_lua2_script_shutdown(Edje *ed);
2898void _edje_lua2_script_load(Edje_Part_Collection *edc, void *data, int size); 2898void _edje_lua2_script_load(Edje_Part_Collection *edc, void *data, int size);
diff --git a/src/lib/efreet/efreet_menu.c b/src/lib/efreet/efreet_menu.c
index 06c2c418fb..e45cb678b4 100644
--- a/src/lib/efreet/efreet_menu.c
+++ b/src/lib/efreet/efreet_menu.c
@@ -531,7 +531,7 @@ efreet_menu_file_set(const char *file)
531EFREET_DEPRECATED_API EAPI void 531EFREET_DEPRECATED_API EAPI void
532efreet_menu_async_get(Efreet_Menu_Cb func EINA_UNUSED, const void *data EINA_UNUSED) 532efreet_menu_async_get(Efreet_Menu_Cb func EINA_UNUSED, const void *data EINA_UNUSED)
533{ 533{
534 ERR("%s is deprecated and shouldn't be called", __FUNCTION__); 534 ERR("%s is deprecated and shouldn't be called", __func__);
535 535
536 return; 536 return;
537} 537}
@@ -575,7 +575,7 @@ efreet_menu_get(void)
575EFREET_DEPRECATED_API EAPI void 575EFREET_DEPRECATED_API EAPI void
576efreet_menu_async_parse(const char *path EINA_UNUSED, Efreet_Menu_Cb func EINA_UNUSED, const void *data EINA_UNUSED) 576efreet_menu_async_parse(const char *path EINA_UNUSED, Efreet_Menu_Cb func EINA_UNUSED, const void *data EINA_UNUSED)
577{ 577{
578 ERR("%s is deprecated and shouldn't be called", __FUNCTION__); 578 ERR("%s is deprecated and shouldn't be called", __func__);
579 579
580 return; 580 return;
581} 581}
diff --git a/src/lib/eina/eina_debug_private.h b/src/lib/eina/eina_debug_private.h
index a635c2072d..dbe4df771a 100644
--- a/src/lib/eina/eina_debug_private.h
+++ b/src/lib/eina/eina_debug_private.h
@@ -12,8 +12,8 @@
12#define REMOTE_SERVER_PORT 6666 12#define REMOTE_SERVER_PORT 6666
13 13
14#ifdef DEBUGON 14#ifdef DEBUGON
15# define e_debug(fmt, args...) fprintf(stderr, "%d:"__FILE__":%s/%d : " fmt "\n", getpid(), __FUNCTION__, __LINE__, ##args) 15# define e_debug(fmt, args...) fprintf(stderr, "%d:"__FILE__":%s/%d : " fmt "\n", getpid(), __func__, __LINE__, ##args)
16# define e_debug_begin(fmt, args...) fprintf(stderr, "%d:"__FILE__":%s/%d : " fmt "", getpid(), __FUNCTION__, __LINE__, ##args) 16# define e_debug_begin(fmt, args...) fprintf(stderr, "%d:"__FILE__":%s/%d : " fmt "", getpid(), __func__, __LINE__, ##args)
17# define e_debug_continue(fmt, args...) fprintf(stderr, fmt, ##args) 17# define e_debug_continue(fmt, args...) fprintf(stderr, fmt, ##args)
18# define e_debug_end() fprintf(stderr, "\n") 18# define e_debug_end() fprintf(stderr, "\n")
19#else 19#else
diff --git a/src/lib/eina/eina_lock.h b/src/lib/eina/eina_lock.h
index d173f6be34..14c6ff270f 100644
--- a/src/lib/eina/eina_lock.h
+++ b/src/lib/eina/eina_lock.h
@@ -618,7 +618,7 @@ static inline void eina_spinlock_free(Eina_Spinlock *spinlock);
618 { \ 618 { \
619 EINA_LOG_ERR("You are calling %s from outside" \ 619 EINA_LOG_ERR("You are calling %s from outside" \
620 "of the main loop threads in %s at line %i", \ 620 "of the main loop threads in %s at line %i", \
621 __FUNCTION__, \ 621 __func__, \
622 __FILE__, \ 622 __FILE__, \
623 __LINE__); \ 623 __LINE__); \
624 return val; \ 624 return val; \
@@ -630,7 +630,7 @@ static inline void eina_spinlock_free(Eina_Spinlock *spinlock);
630 { \ 630 { \
631 EINA_LOG_ERR("You are calling %s from outside" \ 631 EINA_LOG_ERR("You are calling %s from outside" \
632 "of the main loop threads in %s at line %i", \ 632 "of the main loop threads in %s at line %i", \
633 __FUNCTION__, \ 633 __func__, \
634 __FILE__, \ 634 __FILE__, \
635 __LINE__); \ 635 __LINE__); \
636 return ; \ 636 return ; \
diff --git a/src/lib/eina/eina_log.h b/src/lib/eina/eina_log.h
index b4254fed4f..7b4e17e9a9 100644
--- a/src/lib/eina/eina_log.h
+++ b/src/lib/eina/eina_log.h
@@ -142,7 +142,7 @@
142 * custom data can be passed to that callback, powerful display 142 * custom data can be passed to that callback, powerful display
143 * messages can be displayed. 143 * messages can be displayed.
144 * 144 *
145 * It is suggested to not use __FILE__, __FUNCTION__ or __LINE__ when 145 * It is suggested to not use __FILE__, __func__ or __LINE__ when
146 * writing that callback, but when defining macros (like 146 * writing that callback, but when defining macros (like
147 * EINA_LOG_ERR() and other macros). 147 * EINA_LOG_ERR() and other macros).
148 * 148 *
@@ -304,7 +304,7 @@ EAPI extern int EINA_LOG_DOMAIN_GLOBAL;
304# define EINA_LOG(DOM, LEVEL, fmt, ...) \ 304# define EINA_LOG(DOM, LEVEL, fmt, ...) \
305 do { \ 305 do { \
306 if (LEVEL <= EINA_LOG_LEVEL_MAXIMUM) { \ 306 if (LEVEL <= EINA_LOG_LEVEL_MAXIMUM) { \
307 eina_log_print(DOM, LEVEL, __FILE__, __FUNCTION__, __LINE__, \ 307 eina_log_print(DOM, LEVEL, __FILE__, __func__, __LINE__, \
308 fmt, ## __VA_ARGS__); } \ 308 fmt, ## __VA_ARGS__); } \
309 } while (0) 309 } while (0)
310# else 310# else
@@ -312,7 +312,7 @@ EAPI extern int EINA_LOG_DOMAIN_GLOBAL;
312 eina_log_print(DOM, \ 312 eina_log_print(DOM, \
313 LEVEL, \ 313 LEVEL, \
314 __FILE__, \ 314 __FILE__, \
315 __FUNCTION__, \ 315 __func__, \
316 __LINE__, \ 316 __LINE__, \
317 fmt, \ 317 fmt, \
318 ## __VA_ARGS__) 318 ## __VA_ARGS__)
diff --git a/src/lib/eina/eina_magic.h b/src/lib/eina/eina_magic.h
index 7222f045f2..a2a7cba350 100644
--- a/src/lib/eina/eina_magic.h
+++ b/src/lib/eina/eina_magic.h
@@ -249,7 +249,7 @@ EAPI extern Eina_Error EINA_ERROR_MAGIC_FAILED;
249/** 249/**
250 * @def EINA_MAGIC_FAIL(d, m) 250 * @def EINA_MAGIC_FAIL(d, m)
251 * @brief Definition to call eina_magic_fail() with the parameters @p d, @p d->__magic, 251 * @brief Definition to call eina_magic_fail() with the parameters @p d, @p d->__magic,
252 * @p m, __FILE__, __FUNCTION__, and __LINE__. @p d must be a structure that 252 * @p m, __FILE__, __func__, and __LINE__. @p d must be a structure that
253 * holds an Eina magic number declaration. Use #EINA_MAGIC to add such a 253 * holds an Eina magic number declaration. Use #EINA_MAGIC to add such a
254 * declaration. 254 * declaration.
255 * 255 *
@@ -261,7 +261,7 @@ EAPI extern Eina_Error EINA_ERROR_MAGIC_FAILED;
261 (d) ? (d)->__magic : 0, \ 261 (d) ? (d)->__magic : 0, \
262 (m), \ 262 (m), \
263 __FILE__, \ 263 __FILE__, \
264 __FUNCTION__, \ 264 __func__, \
265 __LINE__); 265 __LINE__);
266 266
267/** 267/**
diff --git a/src/lib/eina/eina_promise.c b/src/lib/eina/eina_promise.c
index 4255f7b41c..ee7fc93249 100644
--- a/src/lib/eina/eina_promise.c
+++ b/src/lib/eina/eina_promise.c
@@ -98,7 +98,7 @@
98#undef CRI 98#undef CRI
99#define CRI(...) EINA_LOG_DOM_CRIT(_promise_log_dom, __VA_ARGS__) 99#define CRI(...) EINA_LOG_DOM_CRIT(_promise_log_dom, __VA_ARGS__)
100 100
101#define _eina_promise_value_dbg(_msg, _p, _v) __eina_promise_value_dbg(_msg, _p, _v, __LINE__, __FUNCTION__) 101#define _eina_promise_value_dbg(_msg, _p, _v) __eina_promise_value_dbg(_msg, _p, _v, __LINE__, __func__)
102 102
103struct _Eina_Promise { 103struct _Eina_Promise {
104 Eina_Future *future; 104 Eina_Future *future;
diff --git a/src/lib/eina/eina_promise.h b/src/lib/eina/eina_promise.h
index 7bd120ec0f..cad96b4049 100644
--- a/src/lib/eina/eina_promise.h
+++ b/src/lib/eina/eina_promise.h
@@ -1091,7 +1091,7 @@ EAPI Eina_Future *eina_future_then_from_desc(Eina_Future *prev, const Eina_Futur
1091 * fill the following fields: 1091 * fill the following fields:
1092 * 1092 *
1093 * @li Eina_Future_Cb_Log_Desc::file: The `__FILE__` function will be used. 1093 * @li Eina_Future_Cb_Log_Desc::file: The `__FILE__` function will be used.
1094 * @li Eina_Future_Cb_Log_Desc::func: The `__FUNCTION__` macro will be used. 1094 * @li Eina_Future_Cb_Log_Desc::func: The `__func__` macro will be used.
1095 * @li Eina_Future_Cb_Log_Desc::level: `EINA_LOG_LEVEL_DBG` will be used. 1095 * @li Eina_Future_Cb_Log_Desc::level: `EINA_LOG_LEVEL_DBG` will be used.
1096 * @li Eina_Future_Cb_Log_Desc::domain: `EINA_LOG_DOMAIN_DEFAULT` will be used. 1096 * @li Eina_Future_Cb_Log_Desc::domain: `EINA_LOG_DOMAIN_DEFAULT` will be used.
1097 * @li Eina_Future_Cb_Log_Desc::line: The `__LINE__` macro will be used. 1097 * @li Eina_Future_Cb_Log_Desc::line: The `__LINE__` macro will be used.
@@ -1752,7 +1752,7 @@ eina_future_race_array(Eina_Future *array[])
1752 * This macro will set the following fields of the #Eina_Future_Cb_Log_Desc: 1752 * This macro will set the following fields of the #Eina_Future_Cb_Log_Desc:
1753 * 1753 *
1754 * @li Eina_Future_Cb_Log_Desc::file: The `__FILE__` function will be used. 1754 * @li Eina_Future_Cb_Log_Desc::file: The `__FILE__` function will be used.
1755 * @li Eina_Future_Cb_Log_Desc::func: The `__FUNCTION__` macro will be used. 1755 * @li Eina_Future_Cb_Log_Desc::func: The `__func__` macro will be used.
1756 * @li Eina_Future_Cb_Log_Desc::level: `EINA_LOG_LEVEL_DBG` will be used. 1756 * @li Eina_Future_Cb_Log_Desc::level: `EINA_LOG_LEVEL_DBG` will be used.
1757 * @li Eina_Future_Cb_Log_Desc::domain: `EINA_LOG_DOMAIN_DEFAULT` will be used. 1757 * @li Eina_Future_Cb_Log_Desc::domain: `EINA_LOG_DOMAIN_DEFAULT` will be used.
1758 * @li Eina_Future_Cb_Log_Desc::line: The `__LINE__` macro will be used. 1758 * @li Eina_Future_Cb_Log_Desc::line: The `__LINE__` macro will be used.
@@ -1765,7 +1765,7 @@ eina_future_race_array(Eina_Future *array[])
1765 */ 1765 */
1766#define eina_future_cb_log_dbg(_prefix, _suffix) \ 1766#define eina_future_cb_log_dbg(_prefix, _suffix) \
1767 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \ 1767 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
1768 __FUNCTION__, EINA_LOG_LEVEL_DBG, EINA_LOG_DOMAIN_DEFAULT, __LINE__}) 1768 __func__, EINA_LOG_LEVEL_DBG, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
1769 1769
1770/** 1770/**
1771 * A syntactic sugar over eina_future_cb_log_from_desc(). 1771 * A syntactic sugar over eina_future_cb_log_from_desc().
@@ -1773,7 +1773,7 @@ eina_future_race_array(Eina_Future *array[])
1773 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc: 1773 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc:
1774 * 1774 *
1775 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used. 1775 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used.
1776 * @li Eina_Future_Cb_Log_Desc::func: The __FUNCTION__ macro will be used. 1776 * @li Eina_Future_Cb_Log_Desc::func: The __func__ macro will be used.
1777 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_CRITICAL will be used. 1777 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_CRITICAL will be used.
1778 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used. 1778 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used.
1779 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used. 1779 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used.
@@ -1786,7 +1786,7 @@ eina_future_race_array(Eina_Future *array[])
1786 */ 1786 */
1787#define eina_future_cb_log_crit(_prefix, _suffix) \ 1787#define eina_future_cb_log_crit(_prefix, _suffix) \
1788 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \ 1788 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
1789 __FUNCTION__, EINA_LOG_LEVEL_CRITICAL, EINA_LOG_DOMAIN_DEFAULT, __LINE__}) 1789 __func__, EINA_LOG_LEVEL_CRITICAL, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
1790 1790
1791/** 1791/**
1792 * A syntactic sugar over eina_future_cb_log_from_desc(). 1792 * A syntactic sugar over eina_future_cb_log_from_desc().
@@ -1794,7 +1794,7 @@ eina_future_race_array(Eina_Future *array[])
1794 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc: 1794 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc:
1795 * 1795 *
1796 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used. 1796 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used.
1797 * @li Eina_Future_Cb_Log_Desc::func: The __FUNCTION__ macro will be used. 1797 * @li Eina_Future_Cb_Log_Desc::func: The __func__ macro will be used.
1798 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_ERR will be used. 1798 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_ERR will be used.
1799 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used. 1799 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used.
1800 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used. 1800 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used.
@@ -1807,7 +1807,7 @@ eina_future_race_array(Eina_Future *array[])
1807 */ 1807 */
1808#define eina_future_cb_log_err(_prefix, _suffix) \ 1808#define eina_future_cb_log_err(_prefix, _suffix) \
1809 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \ 1809 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
1810 __FUNCTION__, EINA_LOG_LEVEL_ERR, EINA_LOG_DOMAIN_DEFAULT, __LINE__}) 1810 __func__, EINA_LOG_LEVEL_ERR, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
1811 1811
1812/** 1812/**
1813 * A syntactic sugar over eina_future_cb_log_from_desc(). 1813 * A syntactic sugar over eina_future_cb_log_from_desc().
@@ -1815,7 +1815,7 @@ eina_future_race_array(Eina_Future *array[])
1815 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc: 1815 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc:
1816 * 1816 *
1817 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used. 1817 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used.
1818 * @li Eina_Future_Cb_Log_Desc::func: The __FUNCTION__ macro will be used. 1818 * @li Eina_Future_Cb_Log_Desc::func: The __func__ macro will be used.
1819 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_INFO will be used. 1819 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_INFO will be used.
1820 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used. 1820 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used.
1821 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used. 1821 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used.
@@ -1828,7 +1828,7 @@ eina_future_race_array(Eina_Future *array[])
1828 */ 1828 */
1829#define eina_future_cb_log_info(_prefix, _suffix) \ 1829#define eina_future_cb_log_info(_prefix, _suffix) \
1830 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \ 1830 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
1831 __FUNCTION__, EINA_LOG_LEVEL_INFO, EINA_LOG_DOMAIN_DEFAULT, __LINE__}) 1831 __func__, EINA_LOG_LEVEL_INFO, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
1832 1832
1833/** 1833/**
1834 * A syntactic sugar over eina_future_cb_log_from_desc(). 1834 * A syntactic sugar over eina_future_cb_log_from_desc().
@@ -1836,7 +1836,7 @@ eina_future_race_array(Eina_Future *array[])
1836 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc: 1836 * This macro will set the following fields of the Eina_Future_Cb_Log_Desc:
1837 * 1837 *
1838 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used. 1838 * @li Eina_Future_Cb_Log_Desc::file: The __FILE__ function will be used.
1839 * @li Eina_Future_Cb_Log_Desc::func: The __FUNCTION__ macro will be used. 1839 * @li Eina_Future_Cb_Log_Desc::func: The __func__ macro will be used.
1840 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_WARN will be used. 1840 * @li Eina_Future_Cb_Log_Desc::level: EINA_LOG_LEVEL_WARN will be used.
1841 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used. 1841 * @li Eina_Future_Cb_Log_Desc::domain: EINA_LOG_DOMAIN_DEFAULT will be used.
1842 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used. 1842 * @li Eina_Future_Cb_Log_Desc::line: The __LINE__ macro will be used.
@@ -1852,7 +1852,7 @@ eina_future_race_array(Eina_Future *array[])
1852 */ 1852 */
1853#define eina_future_cb_log_warn(_prefix, _suffix) \ 1853#define eina_future_cb_log_warn(_prefix, _suffix) \
1854 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \ 1854 eina_future_cb_log_from_desc((Eina_Future_Cb_Log_Desc){_prefix, _suffix, __FILE__, \
1855 __FUNCTION__, EINA_LOG_LEVEL_WARN, EINA_LOG_DOMAIN_DEFAULT, __LINE__}) 1855 __func__, EINA_LOG_LEVEL_WARN, EINA_LOG_DOMAIN_DEFAULT, __LINE__})
1856 1856
1857/** 1857/**
1858 * A syntactic sugar over eina_future_then() and eina_future_cb_easy(). 1858 * A syntactic sugar over eina_future_then() and eina_future_cb_easy().
diff --git a/src/lib/eina/eina_safety_checks.h b/src/lib/eina/eina_safety_checks.h
index 27551290d6..0819a1079f 100644
--- a/src/lib/eina/eina_safety_checks.h
+++ b/src/lib/eina/eina_safety_checks.h
@@ -105,7 +105,7 @@ EAPI extern Eina_Error EINA_ERROR_SAFETY_FAILED;
105 * @internal 105 * @internal
106 */ 106 */
107EAPI void _eina_safety_error(const char *file, const char *func, int line, const char *str); 107EAPI void _eina_safety_error(const char *file, const char *func, int line, const char *str);
108# define EINA_SAFETY_ERROR(msg) _eina_safety_error(__FILE__, __FUNCTION__, __LINE__, msg) 108# define EINA_SAFETY_ERROR(msg) _eina_safety_error(__FILE__, __func__, __LINE__, msg)
109# else 109# else
110# define EINA_SAFETY_ERROR(msg) EINA_LOG_ERR("%s", msg) 110# define EINA_SAFETY_ERROR(msg) EINA_LOG_ERR("%s", msg)
111# endif 111# endif
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 1ceda1513b..816c7e20fd 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1010,13 +1010,13 @@ _elm_win_obj_intercept_lower(void *data, Evas_Object *obj EINA_UNUSED)
1010static void 1010static void
1011_elm_win_obj_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED) 1011_elm_win_obj_intercept_stack_above(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *above EINA_UNUSED)
1012{ 1012{
1013 INF("TODO: %s", __FUNCTION__); 1013 INF("TODO: %s", __func__);
1014} 1014}
1015 1015
1016static void 1016static void
1017_elm_win_obj_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED) 1017_elm_win_obj_intercept_stack_below(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, Evas_Object *below EINA_UNUSED)
1018{ 1018{
1019 INF("TODO: %s", __FUNCTION__); 1019 INF("TODO: %s", __func__);
1020} 1020}
1021 1021
1022static void 1022static void
@@ -9160,45 +9160,45 @@ elm_win_available_profiles_set(Elm_Win *obj, const char **profiles, unsigned int
9160EAPI void 9160EAPI void
9161elm_win_fake_canvas_set(Evas_Object *obj EINA_UNUSED, Ecore_Evas *oee EINA_UNUSED) 9161elm_win_fake_canvas_set(Evas_Object *obj EINA_UNUSED, Ecore_Evas *oee EINA_UNUSED)
9162{ 9162{
9163 ERR("Calling deprecrated function '%s'", __FUNCTION__); 9163 ERR("Calling deprecrated function '%s'", __func__);
9164} 9164}
9165 9165
9166EAPI void 9166EAPI void
9167elm_win_name_set(Evas_Object *obj, const char *name) 9167elm_win_name_set(Evas_Object *obj, const char *name)
9168{ 9168{
9169 ERR("Calling deprecrated function '%s'", __FUNCTION__); 9169 ERR("Calling deprecrated function '%s'", __func__);
9170 efl_ui_win_name_set(obj, name); 9170 efl_ui_win_name_set(obj, name);
9171} 9171}
9172 9172
9173EAPI void 9173EAPI void
9174elm_win_type_set(Evas_Object *obj, Elm_Win_Type type) 9174elm_win_type_set(Evas_Object *obj, Elm_Win_Type type)
9175{ 9175{
9176 ERR("Calling deprecrated function '%s'", __FUNCTION__); 9176 ERR("Calling deprecrated function '%s'", __func__);
9177 efl_ui_win_type_set(obj, _elm_win_type_to_efl_ui_win_type(type)); 9177 efl_ui_win_type_set(obj, _elm_win_type_to_efl_ui_win_type(type));
9178} 9178}
9179 9179
9180EAPI void 9180EAPI void
9181elm_win_teamwork_uri_preload(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED) 9181elm_win_teamwork_uri_preload(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED)
9182{ 9182{
9183 ERR("Calling deprecrated function '%s'", __FUNCTION__); 9183 ERR("Calling deprecrated function '%s'", __func__);
9184} 9184}
9185 9185
9186EAPI void 9186EAPI void
9187elm_win_teamwork_uri_show(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED) 9187elm_win_teamwork_uri_show(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED)
9188{ 9188{
9189 ERR("Calling deprecrated function '%s'", __FUNCTION__); 9189 ERR("Calling deprecrated function '%s'", __func__);
9190} 9190}
9191 9191
9192EAPI void 9192EAPI void
9193elm_win_teamwork_uri_hide(Efl_Ui_Win *obj EINA_UNUSED) 9193elm_win_teamwork_uri_hide(Efl_Ui_Win *obj EINA_UNUSED)
9194{ 9194{
9195 ERR("Calling deprecrated function '%s'", __FUNCTION__); 9195 ERR("Calling deprecrated function '%s'", __func__);
9196} 9196}
9197 9197
9198EAPI void 9198EAPI void
9199elm_win_teamwork_uri_open(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED) 9199elm_win_teamwork_uri_open(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUSED)
9200{ 9200{
9201 ERR("Calling deprecrated function '%s'", __FUNCTION__); 9201 ERR("Calling deprecrated function '%s'", __func__);
9202} 9202}
9203 9203
9204/* What here follows is code that implements the glue between ecore evas and efl_ui* side */ 9204/* What here follows is code that implements the glue between ecore evas and efl_ui* side */
diff --git a/src/lib/elementary/elm_gesture_layer_extra_gestures.c b/src/lib/elementary/elm_gesture_layer_extra_gestures.c
index b7bce1926c..dd663a8e79 100644
--- a/src/lib/elementary/elm_gesture_layer_extra_gestures.c
+++ b/src/lib/elementary/elm_gesture_layer_extra_gestures.c
@@ -50,7 +50,7 @@ _tap_long_single_tap_start_cb(void *data, void *event_info)
50 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE; 50 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
51 if (!info->nb_taps_on_single) 51 if (!info->nb_taps_on_single)
52 { 52 {
53 gl_debug("\n%s\n", __FUNCTION__); 53 gl_debug("\n%s\n", __func__);
54 _cb_call(info, ELM_GESTURE_STATE_START, event_info); 54 _cb_call(info, ELM_GESTURE_STATE_START, event_info);
55 } 55 }
56 return flags; 56 return flags;
@@ -63,7 +63,7 @@ _tap_long_single_tap_abort_cb(void *data, void *event_info EINA_UNUSED)
63 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE; 63 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
64 if (!info->long_tap_started) 64 if (!info->long_tap_started)
65 { 65 {
66 gl_debug("%s\n", __FUNCTION__); 66 gl_debug("%s\n", __func__);
67 _cb_call(info, ELM_GESTURE_STATE_ABORT, NULL); 67 _cb_call(info, ELM_GESTURE_STATE_ABORT, NULL);
68 info->nb_taps_on_single = 0; 68 info->nb_taps_on_single = 0;
69 } 69 }
@@ -73,7 +73,7 @@ _tap_long_single_tap_abort_cb(void *data, void *event_info EINA_UNUSED)
73static Eina_Bool 73static Eina_Bool
74_tap_long_timeout(void *data) 74_tap_long_timeout(void *data)
75{ 75{
76 gl_debug("%s\n", __FUNCTION__); 76 gl_debug("%s\n", __func__);
77 Tap_Longpress_Info *info = data; 77 Tap_Longpress_Info *info = data;
78 _tap_long_single_tap_abort_cb(info, NULL); 78 _tap_long_single_tap_abort_cb(info, NULL);
79 info->timer_between_taps = NULL; 79 info->timer_between_taps = NULL;
@@ -83,7 +83,7 @@ _tap_long_timeout(void *data)
83static Evas_Event_Flags 83static Evas_Event_Flags
84_tap_long_single_tap_end_cb(void *data, void *event_info) 84_tap_long_single_tap_end_cb(void *data, void *event_info)
85{ 85{
86 gl_debug("%s\n", __FUNCTION__); 86 gl_debug("%s\n", __func__);
87 Tap_Longpress_Info *info = data; 87 Tap_Longpress_Info *info = data;
88 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE; 88 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
89 double timeout_between_taps = elm_gesture_layer_double_tap_timeout_get(info->obj); 89 double timeout_between_taps = elm_gesture_layer_double_tap_timeout_get(info->obj);
@@ -100,7 +100,7 @@ _tap_long_long_tap_start_cb(void *data, void *event_info EINA_UNUSED)
100 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE; 100 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
101 if (info->nb_taps_on_single && info->timer_between_taps) 101 if (info->nb_taps_on_single && info->timer_between_taps)
102 { 102 {
103 gl_debug("%s\n", __FUNCTION__); 103 gl_debug("%s\n", __func__);
104 info->long_tap_started = EINA_TRUE; 104 info->long_tap_started = EINA_TRUE;
105 ecore_timer_del(info->timer_between_taps); 105 ecore_timer_del(info->timer_between_taps);
106 info->timer_between_taps = NULL; 106 info->timer_between_taps = NULL;
@@ -115,7 +115,7 @@ _tap_long_long_tap_abort_cb(void *data, void *event_info EINA_UNUSED)
115 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE; 115 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
116 if (info->long_tap_started) 116 if (info->long_tap_started)
117 { 117 {
118 gl_debug("%s\n", __FUNCTION__); 118 gl_debug("%s\n", __func__);
119 _cb_call(info, ELM_GESTURE_STATE_ABORT, NULL); 119 _cb_call(info, ELM_GESTURE_STATE_ABORT, NULL);
120 info->nb_taps_on_single = 0; 120 info->nb_taps_on_single = 0;
121 info->long_tap_started = EINA_FALSE; 121 info->long_tap_started = EINA_FALSE;
@@ -136,7 +136,7 @@ _tap_long_long_tap_move_cb(void *data, void *event_info)
136 } 136 }
137 else 137 else
138 { 138 {
139 gl_debug("%s\n", __FUNCTION__); 139 gl_debug("%s\n", __func__);
140 _cb_call(info, ELM_GESTURE_STATE_MOVE, event_info); 140 _cb_call(info, ELM_GESTURE_STATE_MOVE, event_info);
141 } 141 }
142 } 142 }
@@ -150,7 +150,7 @@ _tap_long_long_tap_end_cb(void *data, void *event_info)
150 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE; 150 Evas_Event_Flags flags = EVAS_EVENT_FLAG_NONE;
151 if (info->long_tap_started) 151 if (info->long_tap_started)
152 { 152 {
153 gl_debug("%s\n", __FUNCTION__); 153 gl_debug("%s\n", __func__);
154 _cb_call(info, ELM_GESTURE_STATE_END, event_info); 154 _cb_call(info, ELM_GESTURE_STATE_END, event_info);
155 info->long_tap_started = EINA_FALSE; 155 info->long_tap_started = EINA_FALSE;
156 info->nb_taps_on_single = 0; 156 info->nb_taps_on_single = 0;
diff --git a/src/lib/embryo/embryo_main.c b/src/lib/embryo/embryo_main.c
index 4b2af3c5e5..852b1903f2 100644
--- a/src/lib/embryo/embryo_main.c
+++ b/src/lib/embryo/embryo_main.c
@@ -52,7 +52,7 @@ embryo_shutdown(void)
52{ 52{
53 if (_embryo_init_count <= 0) 53 if (_embryo_init_count <= 0)
54 { 54 {
55 printf("%s:%i Init count not greater than 0 in shutdown.", __FUNCTION__, __LINE__); 55 printf("%s:%i Init count not greater than 0 in shutdown.", __func__, __LINE__);
56 return 0; 56 return 0;
57 } 57 }
58 if (--_embryo_init_count != 0) 58 if (--_embryo_init_count != 0)
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index b93497372c..f5d880918f 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -989,7 +989,7 @@ err_vtable:
989static Eo * 989static Eo *
990_efl_add_internal_start_do(const char *file, int line, const Efl_Class *klass_id, Eo *parent_id, Eina_Bool ref, Eina_Bool is_fallback, Efl_Substitute_Ctor_Cb substitute_ctor, void *sub_ctor_data) 990_efl_add_internal_start_do(const char *file, int line, const Efl_Class *klass_id, Eo *parent_id, Eina_Bool ref, Eina_Bool is_fallback, Efl_Substitute_Ctor_Cb substitute_ctor, void *sub_ctor_data)
991{ 991{
992 const char *func_name = __FUNCTION__; 992 const char *func_name = __func__;
993 _Eo_Object *obj; 993 _Eo_Object *obj;
994 Eo_Stack_Frame *fptr = NULL; 994 Eo_Stack_Frame *fptr = NULL;
995 995
@@ -1981,7 +1981,7 @@ efl_xref_internal(const char *file, int line, Eo *obj_id, const Eo *ref_obj_id)
1981 efl_ref(obj_id); 1981 efl_ref(obj_id);
1982 1982
1983#ifdef EO_DEBUG 1983#ifdef EO_DEBUG
1984 const char *func_name = __FUNCTION__; 1984 const char *func_name = __func__;
1985 EO_OBJ_POINTER_RETURN_VAL_PROXY(obj_id, obj, obj_id); 1985 EO_OBJ_POINTER_RETURN_VAL_PROXY(obj_id, obj, obj_id);
1986 1986
1987 Eo_Xref_Node *xref = calloc(1, sizeof(*xref)); 1987 Eo_Xref_Node *xref = calloc(1, sizeof(*xref));
@@ -2092,7 +2092,7 @@ efl_unref(const Eo *obj_id)
2092 { 2092 {
2093 ERR("Obj:%s@%p. User refcount (%d) < 0. Too many unrefs.", 2093 ERR("Obj:%s@%p. User refcount (%d) < 0. Too many unrefs.",
2094 obj->klass->desc->name, obj_id, obj->user_refcount); 2094 obj->klass->desc->name, obj_id, obj->user_refcount);
2095 _eo_log_obj_report((Eo_Id)obj_id, EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__); 2095 _eo_log_obj_report((Eo_Id)obj_id, EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
2096 EO_OBJ_DONE(obj_id); 2096 EO_OBJ_DONE(obj_id);
2097 _efl_unref(obj); 2097 _efl_unref(obj);
2098 return; 2098 return;
@@ -2336,7 +2336,7 @@ efl_data_xref_internal(const char *file, int line, const Eo *obj_id, const Efl_C
2336{ 2336{
2337 void *ret = NULL; 2337 void *ret = NULL;
2338 _Efl_Class *klass = NULL; 2338 _Efl_Class *klass = NULL;
2339 const char *func_name = __FUNCTION__; 2339 const char *func_name = __func__;
2340 EO_OBJ_POINTER_RETURN_VAL_PROXY(obj_id, obj, NULL); 2340 EO_OBJ_POINTER_RETURN_VAL_PROXY(obj_id, obj, NULL);
2341 EO_OBJ_POINTER_PROXY(ref_obj_id, ref_obj); 2341 EO_OBJ_POINTER_PROXY(ref_obj_id, ref_obj);
2342 if (ref_obj) 2342 if (ref_obj)
@@ -3476,7 +3476,7 @@ _eo_log_obj_shutdown(void)
3476 entry->klass, 3476 entry->klass,
3477 entry->klass->desc->name, 3477 entry->klass->desc->name,
3478 entry->timestamp - _eo_log_time_start, now - entry->timestamp); 3478 entry->timestamp - _eo_log_time_start, now - entry->timestamp);
3479 _eo_log_obj_entry_show(entry, EINA_LOG_LEVEL_DBG, __FUNCTION__, __FILE__, __LINE__, now); 3479 _eo_log_obj_entry_show(entry, EINA_LOG_LEVEL_DBG, __func__, __FILE__, __LINE__, now);
3480 leaks++; 3480 leaks++;
3481 } 3481 }
3482 } 3482 }
diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h
index 2c902d8456..c719cb4c54 100644
--- a/src/lib/eo/eo_private.h
+++ b/src/lib/eo/eo_private.h
@@ -323,7 +323,7 @@ _efl_ref(_Eo_Object *obj)
323 return obj; 323 return obj;
324} 324}
325 325
326#define _efl_unref(obj) _efl_unref_internal(obj, __FUNCTION__, __FILE__, __LINE__) 326#define _efl_unref(obj) _efl_unref_internal(obj, __func__, __FILE__, __LINE__)
327static inline void 327static inline void
328_efl_unref_internal(_Eo_Object *obj, const char *func_name, const char *file, int line) 328_efl_unref_internal(_Eo_Object *obj, const char *func_name, const char *file, int line)
329{ 329{
@@ -333,27 +333,27 @@ _efl_unref_internal(_Eo_Object *obj, const char *func_name, const char *file, in
333 if (obj->user_refcount > 0) 333 if (obj->user_refcount > 0)
334 { 334 {
335 ERR("Object %p is still refcounted %i by users, but internal refcount reached 0. This should never happen. Please report a bug and send a backtrace to EFL developer.", (Eo*) obj->header.id, obj->user_refcount); 335 ERR("Object %p is still refcounted %i by users, but internal refcount reached 0. This should never happen. Please report a bug and send a backtrace to EFL developer.", (Eo*) obj->header.id, obj->user_refcount);
336 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__); 336 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
337 return; 337 return;
338 } 338 }
339 if (obj->refcount < 0) 339 if (obj->refcount < 0)
340 { 340 {
341 ERR("in %s:%d: func '%s' Obj:%p. Refcount (%d) < 0. Too many unrefs.", file, line, func_name, obj, obj->refcount); 341 ERR("in %s:%d: func '%s' Obj:%p. Refcount (%d) < 0. Too many unrefs.", file, line, func_name, obj, obj->refcount);
342 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__); 342 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
343 return; 343 return;
344 } 344 }
345 345
346 if (obj->destructed) 346 if (obj->destructed)
347 { 347 {
348 ERR("in %s:%d: func '%s' Object %p already destructed.", file, line, func_name, _eo_obj_id_get(obj)); 348 ERR("in %s:%d: func '%s' Object %p already destructed.", file, line, func_name, _eo_obj_id_get(obj));
349 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__); 349 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
350 return; 350 return;
351 } 351 }
352 352
353 if (obj->del_triggered) 353 if (obj->del_triggered)
354 { 354 {
355 ERR("in %s:%d: func '%s' Object %p deletion already triggered. You wrongly call efl_unref() within a destructor.", file, line, func_name, _eo_obj_id_get(obj)); 355 ERR("in %s:%d: func '%s' Object %p deletion already triggered. You wrongly call efl_unref() within a destructor.", file, line, func_name, _eo_obj_id_get(obj));
356 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __FUNCTION__, __FILE__, __LINE__); 356 _eo_log_obj_report((Eo_Id)_eo_obj_id_get(obj), EINA_LOG_LEVEL_ERR, __func__, __FILE__, __LINE__);
357 return; 357 return;
358 } 358 }
359 359
diff --git a/src/lib/eo/eo_ptr_indirection.h b/src/lib/eo/eo_ptr_indirection.h
index 33dc709d42..cb811404bc 100644
--- a/src/lib/eo/eo_ptr_indirection.h
+++ b/src/lib/eo/eo_ptr_indirection.h
@@ -9,12 +9,12 @@
9void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file, int line, const char *fmt, ...); 9void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file, int line, const char *fmt, ...);
10 10
11#define _EO_POINTER_ERR(obj_id, fmt, ...) \ 11#define _EO_POINTER_ERR(obj_id, fmt, ...) \
12 _eo_pointer_error(obj_id, __FUNCTION__, __FILE__, __LINE__, fmt, __VA_ARGS__) 12 _eo_pointer_error(obj_id, __func__, __FILE__, __LINE__, fmt, __VA_ARGS__)
13 13
14#define EO_OBJ_POINTER(obj_id, obj) \ 14#define EO_OBJ_POINTER(obj_id, obj) \
15 _Eo_Object *obj; \ 15 _Eo_Object *obj; \
16 do { \ 16 do { \
17 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __FUNCTION__, __FILE__, __LINE__); \ 17 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __func__, __FILE__, __LINE__); \
18 } while (0) 18 } while (0)
19 19
20#define EO_OBJ_POINTER_PROXY(obj_id, obj) \ 20#define EO_OBJ_POINTER_PROXY(obj_id, obj) \
@@ -26,7 +26,7 @@ void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file
26#define EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, ret) \ 26#define EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, ret) \
27 _Eo_Object *obj; \ 27 _Eo_Object *obj; \
28 do { \ 28 do { \
29 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __FUNCTION__, __FILE__, __LINE__); \ 29 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __func__, __FILE__, __LINE__); \
30 if (!obj) return (ret); \ 30 if (!obj) return (ret); \
31 } while (0) 31 } while (0)
32 32
@@ -41,7 +41,7 @@ void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file
41#define EO_OBJ_POINTER_RETURN(obj_id, obj) \ 41#define EO_OBJ_POINTER_RETURN(obj_id, obj) \
42 _Eo_Object *obj; \ 42 _Eo_Object *obj; \
43 do { \ 43 do { \
44 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __FUNCTION__, __FILE__, __LINE__); \ 44 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __func__, __FILE__, __LINE__); \
45 if (!obj) return; \ 45 if (!obj) return; \
46 } while (0) 46 } while (0)
47 47
@@ -55,7 +55,7 @@ void _eo_pointer_error(const Eo *obj_id, const char *func_name, const char *file
55#define EO_OBJ_POINTER_GOTO(obj_id, obj, label) \ 55#define EO_OBJ_POINTER_GOTO(obj_id, obj, label) \
56 _Eo_Object *obj; \ 56 _Eo_Object *obj; \
57 do { \ 57 do { \
58 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __FUNCTION__, __FILE__, __LINE__); \ 58 obj = _eo_obj_pointer_get((Eo_Id)obj_id, __func__, __FILE__, __LINE__); \
59 if (!obj) goto label; \ 59 if (!obj) goto label; \
60 } while (0) 60 } while (0)
61 61
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 14ab286acd..aca5d31181 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -731,7 +731,7 @@ evas_post_event_callback_push(Evas *eo_e, Evas_Object_Event_Post_Cb func, const
731 if (e->delete_me) return; 731 if (e->delete_me) return;
732 if (e->current_event == EVAS_CALLBACK_LAST) 732 if (e->current_event == EVAS_CALLBACK_LAST)
733 { 733 {
734 ERR("%s() can only be called from an input event callback!", __FUNCTION__); 734 ERR("%s() can only be called from an input event callback!", __func__);
735 return; 735 return;
736 } 736 }
737 EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, ); 737 EVAS_MEMPOOL_INIT(_mp_pc, "evas_post_callback", Evas_Post_Callback, 64, );
diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c
index f58dd3870c..d1dcf933ee 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -1122,7 +1122,7 @@ evas_object_image_data_convert(Evas_Object *eo_obj, Evas_Colorspace to_cspace)
1122 static int warned = 0; 1122 static int warned = 0;
1123 if (!warned) 1123 if (!warned)
1124 { 1124 {
1125 ERR("%s is deprecated and shouldn't be called", __FUNCTION__); 1125 ERR("%s is deprecated and shouldn't be called", __func__);
1126 warned = 1; 1126 warned = 1;
1127 } 1127 }
1128 1128
@@ -1198,7 +1198,7 @@ evas_object_image_pixels_import(Evas_Object *eo_obj, Evas_Pixel_Import_Source *p
1198 static int warned = 0; 1198 static int warned = 0;
1199 if (!warned) 1199 if (!warned)
1200 { 1200 {
1201 ERR("%s is deprecated and shouldn't be called", __FUNCTION__); 1201 ERR("%s is deprecated and shouldn't be called", __func__);
1202 warned = 1; 1202 warned = 1;
1203 } 1203 }
1204 1204
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index eb4b9952ab..0992a39424 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -933,7 +933,7 @@ evas_object_del(Evas_Object *obj)
933 if (!efl_isa(obj, MY_CLASS)) 933 if (!efl_isa(obj, MY_CLASS))
934 { 934 {
935 ERR("Called %s on a non-evas object: %s@%p", 935 ERR("Called %s on a non-evas object: %s@%p",
936 __FUNCTION__, efl_class_name_get(obj), obj); 936 __func__, efl_class_name_get(obj), obj);
937 return; 937 return;
938 } 938 }
939 pd = efl_data_scope_get(obj, MY_CLASS); 939 pd = efl_data_scope_get(obj, MY_CLASS);
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
index 2a86d271cb..78f58b5315 100644
--- a/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
@@ -9,7 +9,7 @@
9 do { \ 9 do { \
10 static int _foo = 0; \ 10 static int _foo = 0; \
11 if (_foo++%10000 ==0) \ 11 if (_foo++%10000 ==0) \
12 printf("%s %+d %s: %d (%s)\n",__FILE__,__LINE__,__FUNCTION__,\ 12 printf("%s %+d %s: %d (%s)\n",__FILE__,__LINE__,__func__,\
13 _foo, x " optimised");\ 13 _foo, x " optimised");\
14 } while (0) 14 } while (0)
15#else 15#else
diff --git a/src/lib/evas/filters/evas_filter_parser.c b/src/lib/evas/filters/evas_filter_parser.c
index eaf39119a8..7249e01cec 100644
--- a/src/lib/evas/filters/evas_filter_parser.c
+++ b/src/lib/evas/filters/evas_filter_parser.c
@@ -594,7 +594,7 @@ _bool_parse(const char *str, Eina_Bool *b)
594#define PARSE_ABORT() do {} while (0) 594#define PARSE_ABORT() do {} while (0)
595//#define PARSE_ABORT() abort() 595//#define PARSE_ABORT() abort()
596 596
597#define PARSE_CHECK(a) do { if (!(a)) { ERR("Parsing failed because '%s' is false at %s:%d", #a, __FUNCTION__, __LINE__); PARSE_ABORT(); goto end; } } while (0) 597#define PARSE_CHECK(a) do { if (!(a)) { ERR("Parsing failed because '%s' is false at %s:%d", #a, __func__, __LINE__); PARSE_ABORT(); goto end; } } while (0)
598 598
599/* Buffers */ 599/* Buffers */
600static Buffer * 600static Buffer *
@@ -1924,7 +1924,7 @@ _padding_set_instruction_prepare(Evas_Filter_Program *pgm EINA_UNUSED,
1924/* Evas_Filter_Parser entry points */ 1924/* Evas_Filter_Parser entry points */
1925 1925
1926#undef PARSE_CHECK 1926#undef PARSE_CHECK
1927#define PARSE_CHECK(a) do { if (!(a)) { ERR("Parsing failed because '%s' is false at %s:%d", #a, __FUNCTION__, __LINE__); PARSE_ABORT(); goto end; } } while (0) 1927#define PARSE_CHECK(a) do { if (!(a)) { ERR("Parsing failed because '%s' is false at %s:%d", #a, __func__, __LINE__); PARSE_ABORT(); goto end; } } while (0)
1928 1928
1929EAPI void 1929EAPI void
1930evas_filter_program_del(Evas_Filter_Program *pgm) 1930evas_filter_program_del(Evas_Filter_Program *pgm)
diff --git a/src/lib/evil/evil_util.c b/src/lib/evil/evil_util.c
index fc3c0607b2..f7c82c4f10 100644
--- a/src/lib/evil/evil_util.c
+++ b/src/lib/evil/evil_util.c
@@ -29,7 +29,7 @@ evil_char_to_wchar(const char *text)
29 (wsize > (int)(ULONG_MAX / sizeof(wchar_t)))) 29 (wsize > (int)(ULONG_MAX / sizeof(wchar_t))))
30 { 30 {
31 if (wsize == 0) 31 if (wsize == 0)
32 _evil_last_error_display(__FUNCTION__); 32 _evil_last_error_display(__func__);
33 return NULL; 33 return NULL;
34 } 34 }
35 35
@@ -37,7 +37,7 @@ evil_char_to_wchar(const char *text)
37 if (wtext) 37 if (wtext)
38 if (!MultiByteToWideChar(CP_ACP, 0, text, (int)strlen(text) + 1, wtext, wsize)) 38 if (!MultiByteToWideChar(CP_ACP, 0, text, (int)strlen(text) + 1, wtext, wsize))
39 { 39 {
40 _evil_last_error_display(__FUNCTION__); 40 _evil_last_error_display(__func__);
41 return NULL; 41 return NULL;
42 } 42 }
43 43
@@ -56,7 +56,7 @@ evil_wchar_to_char(const wchar_t *text)
56 asize = WideCharToMultiByte(CP_ACP, 0, text, -1, NULL, 0, NULL, NULL); 56 asize = WideCharToMultiByte(CP_ACP, 0, text, -1, NULL, 0, NULL, NULL);
57 if (asize == 0) 57 if (asize == 0)
58 { 58 {
59 _evil_last_error_display(__FUNCTION__); 59 _evil_last_error_display(__func__);
60 return NULL; 60 return NULL;
61 } 61 }
62 62
@@ -67,7 +67,7 @@ evil_wchar_to_char(const wchar_t *text)
67 asize = WideCharToMultiByte(CP_ACP, 0, text, -1, atext, asize, NULL, NULL); 67 asize = WideCharToMultiByte(CP_ACP, 0, text, -1, atext, asize, NULL, NULL);
68 if (asize == 0) 68 if (asize == 0)
69 { 69 {
70 _evil_last_error_display(__FUNCTION__); 70 _evil_last_error_display(__func__);
71 return NULL; 71 return NULL;
72 } 72 }
73 73
@@ -89,7 +89,7 @@ evil_utf16_to_utf8(const wchar_t *text16)
89 size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, NULL, 0, NULL, NULL); 89 size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, NULL, 0, NULL, NULL);
90 if (size8 == 0) 90 if (size8 == 0)
91 { 91 {
92 _evil_last_error_display(__FUNCTION__); 92 _evil_last_error_display(__func__);
93 return NULL; 93 return NULL;
94 } 94 }
95 95
@@ -100,7 +100,7 @@ evil_utf16_to_utf8(const wchar_t *text16)
100 size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, text8, size8, NULL, NULL); 100 size8 = WideCharToMultiByte(CP_UTF8, flag, text16, -1, text8, size8, NULL, NULL);
101 if (size8 == 0) 101 if (size8 == 0)
102 { 102 {
103 _evil_last_error_display(__FUNCTION__); 103 _evil_last_error_display(__func__);
104 return NULL; 104 return NULL;
105 } 105 }
106 106
@@ -120,7 +120,7 @@ evil_utf8_to_utf16(const char *text)
120 size16 = MultiByteToWideChar(CP_UTF8, flag, text, -1, NULL, 0); 120 size16 = MultiByteToWideChar(CP_UTF8, flag, text, -1, NULL, 0);
121 if (size16 == 0) 121 if (size16 == 0)
122 { 122 {
123 _evil_last_error_display(__FUNCTION__); 123 _evil_last_error_display(__func__);
124 return NULL; 124 return NULL;
125 } 125 }
126 126
@@ -128,7 +128,7 @@ evil_utf8_to_utf16(const char *text)
128 if (text16) 128 if (text16)
129 if (!MultiByteToWideChar(CP_UTF8, flag, text, -1, text16, size16)) 129 if (!MultiByteToWideChar(CP_UTF8, flag, text, -1, text16, size16))
130 { 130 {
131 _evil_last_error_display(__FUNCTION__); 131 _evil_last_error_display(__func__);
132 return NULL; 132 return NULL;
133 } 133 }
134 134
diff --git a/src/modules/ecore_imf/ibus/ibus_imcontext.c b/src/modules/ecore_imf/ibus/ibus_imcontext.c
index 56815a86c4..a859f9ee36 100644
--- a/src/modules/ecore_imf/ibus/ibus_imcontext.c
+++ b/src/modules/ecore_imf/ibus/ibus_imcontext.c
@@ -287,7 +287,7 @@ _request_surrounding_text(IBusIMContext *ibusimcontext)
287IBusIMContext * 287IBusIMContext *
288ecore_imf_context_ibus_new(void) 288ecore_imf_context_ibus_new(void)
289{ 289{
290 EINA_LOG_DBG("%s", __FUNCTION__); 290 EINA_LOG_DBG("%s", __func__);
291 291
292 IBusIMContext *context = calloc(1, sizeof(IBusIMContext)); 292 IBusIMContext *context = calloc(1, sizeof(IBusIMContext));
293 293
@@ -320,7 +320,7 @@ ecore_imf_context_ibus_shutdown(void)
320void 320void
321ecore_imf_context_ibus_add(Ecore_IMF_Context *ctx) 321ecore_imf_context_ibus_add(Ecore_IMF_Context *ctx)
322{ 322{
323 EINA_LOG_DBG("%s", __FUNCTION__); 323 EINA_LOG_DBG("%s", __func__);
324 324
325 char *s = NULL; 325 char *s = NULL;
326 IBusIMContext *ibusimcontext = (IBusIMContext *)ecore_imf_context_data_get(ctx); 326 IBusIMContext *ibusimcontext = (IBusIMContext *)ecore_imf_context_data_get(ctx);
@@ -358,7 +358,7 @@ ecore_imf_context_ibus_add(Ecore_IMF_Context *ctx)
358void 358void
359ecore_imf_context_ibus_del(Ecore_IMF_Context *ctx) 359ecore_imf_context_ibus_del(Ecore_IMF_Context *ctx)
360{ 360{
361 EINA_LOG_DBG("%s", __FUNCTION__); 361 EINA_LOG_DBG("%s", __func__);
362 362
363 IBusIMContext *ibusimcontext = (IBusIMContext*)ecore_imf_context_data_get(ctx); 363 IBusIMContext *ibusimcontext = (IBusIMContext*)ecore_imf_context_data_get(ctx);
364 Ecore_IMF_Preedit_Attr *attr = NULL; 364 Ecore_IMF_Preedit_Attr *attr = NULL;
@@ -401,7 +401,7 @@ ecore_imf_context_ibus_filter_event(Ecore_IMF_Context *ctx,
401 if (type != ECORE_IMF_EVENT_KEY_UP && type != ECORE_IMF_EVENT_KEY_DOWN) 401 if (type != ECORE_IMF_EVENT_KEY_UP && type != ECORE_IMF_EVENT_KEY_DOWN)
402 return EINA_FALSE; 402 return EINA_FALSE;
403 403
404 EINA_LOG_DBG("%s", __FUNCTION__); 404 EINA_LOG_DBG("%s", __func__);
405 405
406 if (G_LIKELY(ibusimcontext->ibuscontext && ibusimcontext->has_focus)) 406 if (G_LIKELY(ibusimcontext->ibuscontext && ibusimcontext->has_focus))
407 { 407 {
@@ -979,7 +979,7 @@ static void
979_ecore_imf_context_ibus_hide_preedit_text_cb(IBusInputContext *ibuscontext EINA_UNUSED, 979_ecore_imf_context_ibus_hide_preedit_text_cb(IBusInputContext *ibuscontext EINA_UNUSED,
980 IBusIMContext *ibusimcontext) 980 IBusIMContext *ibusimcontext)
981{ 981{
982 EINA_LOG_DBG("%s", __FUNCTION__); 982 EINA_LOG_DBG("%s", __func__);
983 EINA_SAFETY_ON_NULL_RETURN(ibusimcontext); 983 EINA_SAFETY_ON_NULL_RETURN(ibusimcontext);
984 984
985 if (ibusimcontext->preedit_visible == EINA_FALSE) 985 if (ibusimcontext->preedit_visible == EINA_FALSE)
@@ -1002,7 +1002,7 @@ static void
1002_ecore_imf_context_ibus_destroy_cb(IBusInputContext *ibuscontext EINA_UNUSED, 1002_ecore_imf_context_ibus_destroy_cb(IBusInputContext *ibuscontext EINA_UNUSED,
1003 IBusIMContext *ibusimcontext) 1003 IBusIMContext *ibusimcontext)
1004{ 1004{
1005 EINA_LOG_DBG("%s", __FUNCTION__); 1005 EINA_LOG_DBG("%s", __func__);
1006 EINA_SAFETY_ON_NULL_RETURN(ibusimcontext); 1006 EINA_SAFETY_ON_NULL_RETURN(ibusimcontext);
1007 1007
1008 g_object_unref(ibusimcontext->ibuscontext); 1008 g_object_unref(ibusimcontext->ibuscontext);
@@ -1028,7 +1028,7 @@ _ecore_imf_context_ibus_destroy_cb(IBusInputContext *ibuscontext EINA_UNUSED,
1028static void 1028static void
1029_ecore_imf_context_ibus_create(IBusIMContext *ibusimcontext) 1029_ecore_imf_context_ibus_create(IBusIMContext *ibusimcontext)
1030{ 1030{
1031 EINA_LOG_DBG("%s", __FUNCTION__); 1031 EINA_LOG_DBG("%s", __func__);
1032 EINA_SAFETY_ON_NULL_RETURN(ibusimcontext); 1032 EINA_SAFETY_ON_NULL_RETURN(ibusimcontext);
1033 1033
1034 ibusimcontext->ibuscontext = ibus_bus_create_input_context(_bus, "ecore"); 1034 ibusimcontext->ibuscontext = ibus_bus_create_input_context(_bus, "ecore");
diff --git a/src/modules/ecore_imf/scim/scim_imcontext.cpp b/src/modules/ecore_imf/scim/scim_imcontext.cpp
index 54249dc260..b07c4f0c72 100644
--- a/src/modules/ecore_imf/scim/scim_imcontext.cpp
+++ b/src/modules/ecore_imf/scim/scim_imcontext.cpp
@@ -471,12 +471,12 @@ _ecore_imf_lock_to_scim_mask(unsigned int locks)
471EcoreIMFContextISF * 471EcoreIMFContextISF *
472isf_imf_context_new(void) 472isf_imf_context_new(void)
473{ 473{
474 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 474 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
475 475
476 EcoreIMFContextISF *context_scim = new EcoreIMFContextISF; 476 EcoreIMFContextISF *context_scim = new EcoreIMFContextISF;
477 if (context_scim == NULL) 477 if (context_scim == NULL)
478 { 478 {
479 std::cerr << "memory allocation failed in " << __FUNCTION__ << "\n"; 479 std::cerr << "memory allocation failed in " << __func__ << "\n";
480 return NULL; 480 return NULL;
481 } 481 }
482 482
@@ -500,7 +500,7 @@ isf_imf_context_new(void)
500void 500void
501isf_imf_context_shutdown(void) 501isf_imf_context_shutdown(void)
502{ 502{
503 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 503 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
504 504
505 if (_scim_initialized) 505 if (_scim_initialized)
506 { 506 {
@@ -512,7 +512,7 @@ isf_imf_context_shutdown(void)
512void 512void
513isf_imf_context_add(Ecore_IMF_Context *ctx) 513isf_imf_context_add(Ecore_IMF_Context *ctx)
514{ 514{
515 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 515 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
516 516
517 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx); 517 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
518 EINA_SAFETY_ON_NULL_RETURN(context_scim); 518 EINA_SAFETY_ON_NULL_RETURN(context_scim);
@@ -554,7 +554,7 @@ isf_imf_context_add(Ecore_IMF_Context *ctx)
554 context_scim->impl = new_ic_impl(context_scim); 554 context_scim->impl = new_ic_impl(context_scim);
555 if (context_scim->impl == NULL) 555 if (context_scim->impl == NULL)
556 { 556 {
557 std::cerr << "memory allocation failed in " << __FUNCTION__ << "\n"; 557 std::cerr << "memory allocation failed in " << __func__ << "\n";
558 return; 558 return;
559 } 559 }
560 560
@@ -592,7 +592,7 @@ isf_imf_context_add(Ecore_IMF_Context *ctx)
592void 592void
593isf_imf_context_del(Ecore_IMF_Context *ctx) 593isf_imf_context_del(Ecore_IMF_Context *ctx)
594{ 594{
595 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 595 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
596 596
597 if (!_ic_list) return; 597 if (!_ic_list) return;
598 598
@@ -669,7 +669,7 @@ isf_imf_context_del(Ecore_IMF_Context *ctx)
669void 669void
670isf_imf_context_client_canvas_set(Ecore_IMF_Context *ctx, void *canvas) 670isf_imf_context_client_canvas_set(Ecore_IMF_Context *ctx, void *canvas)
671{ 671{
672 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 672 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
673 673
674 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx); 674 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx);
675 EINA_SAFETY_ON_NULL_RETURN(context_scim); 675 EINA_SAFETY_ON_NULL_RETURN(context_scim);
@@ -695,7 +695,7 @@ isf_imf_context_client_canvas_set(Ecore_IMF_Context *ctx, void *canvas)
695void 695void
696isf_imf_context_client_window_set(Ecore_IMF_Context *ctx, void *window) 696isf_imf_context_client_window_set(Ecore_IMF_Context *ctx, void *window)
697{ 697{
698 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 698 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
699 699
700 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx); 700 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx);
701 EINA_SAFETY_ON_NULL_RETURN(context_scim); 701 EINA_SAFETY_ON_NULL_RETURN(context_scim);
@@ -724,7 +724,7 @@ isf_imf_context_client_window_set(Ecore_IMF_Context *ctx, void *window)
724void 724void
725isf_imf_context_reset(Ecore_IMF_Context *ctx) 725isf_imf_context_reset(Ecore_IMF_Context *ctx)
726{ 726{
727 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 727 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
728 728
729 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx); 729 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx);
730 EINA_SAFETY_ON_NULL_RETURN(context_scim); 730 EINA_SAFETY_ON_NULL_RETURN(context_scim);
@@ -755,7 +755,7 @@ isf_imf_context_focus_in(Ecore_IMF_Context *ctx)
755 EINA_SAFETY_ON_NULL_RETURN(context_scim); 755 EINA_SAFETY_ON_NULL_RETURN(context_scim);
756 EINA_SAFETY_ON_NULL_RETURN(context_scim->impl); 756 EINA_SAFETY_ON_NULL_RETURN(context_scim->impl);
757 757
758 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__<< "(" << context_scim->id << ")...\n"; 758 SCIM_DEBUG_FRONTEND(1) << __func__<< "(" << context_scim->id << ")...\n";
759 759
760 if (_focused_ic) 760 if (_focused_ic)
761 { 761 {
@@ -866,7 +866,7 @@ isf_imf_context_focus_out(Ecore_IMF_Context *ctx)
866 EINA_SAFETY_ON_NULL_RETURN(context_scim); 866 EINA_SAFETY_ON_NULL_RETURN(context_scim);
867 EINA_SAFETY_ON_NULL_RETURN(context_scim->impl); 867 EINA_SAFETY_ON_NULL_RETURN(context_scim->impl);
868 868
869 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "(" << context_scim->id << ")...\n"; 869 SCIM_DEBUG_FRONTEND(1) << __func__ << "(" << context_scim->id << ")...\n";
870 870
871 if (context_scim == _focused_ic) 871 if (context_scim == _focused_ic)
872 { 872 {
@@ -900,7 +900,7 @@ isf_imf_context_focus_out(Ecore_IMF_Context *ctx)
900void 900void
901isf_imf_context_cursor_location_set(Ecore_IMF_Context *ctx, int cx, int cy, int cw, int ch) 901isf_imf_context_cursor_location_set(Ecore_IMF_Context *ctx, int cx, int cy, int cw, int ch)
902{ 902{
903 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 903 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
904 904
905 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx); 905 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx);
906 EINA_SAFETY_ON_NULL_RETURN(context_scim); 906 EINA_SAFETY_ON_NULL_RETURN(context_scim);
@@ -964,7 +964,7 @@ isf_imf_context_cursor_location_set(Ecore_IMF_Context *ctx, int cx, int cy, int
964void 964void
965isf_imf_context_use_preedit_set(Ecore_IMF_Context* ctx, Eina_Bool use_preedit) 965isf_imf_context_use_preedit_set(Ecore_IMF_Context* ctx, Eina_Bool use_preedit)
966{ 966{
967 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " = " << (use_preedit ? "true" : "false") << "...\n"; 967 SCIM_DEBUG_FRONTEND(1) << __func__ << " = " << (use_preedit ? "true" : "false") << "...\n";
968 968
969 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx); 969 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
970 EINA_SAFETY_ON_NULL_RETURN(context_scim); 970 EINA_SAFETY_ON_NULL_RETURN(context_scim);
@@ -991,7 +991,7 @@ isf_imf_context_use_preedit_set(Ecore_IMF_Context* ctx, Eina_Bool use_preedit)
991void 991void
992isf_imf_context_preedit_string_with_attributes_get(Ecore_IMF_Context *ctx, char** str, Eina_List **attrs, int *cursor_pos) 992isf_imf_context_preedit_string_with_attributes_get(Ecore_IMF_Context *ctx, char** str, Eina_List **attrs, int *cursor_pos)
993{ 993{
994 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 994 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
995 995
996 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx); 996 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
997 EINA_SAFETY_ON_NULL_RETURN(context_scim); 997 EINA_SAFETY_ON_NULL_RETURN(context_scim);
@@ -1140,7 +1140,7 @@ isf_imf_context_preedit_string_with_attributes_get(Ecore_IMF_Context *ctx, char*
1140void 1140void
1141isf_imf_context_preedit_string_get(Ecore_IMF_Context *ctx, char** str, int *cursor_pos) 1141isf_imf_context_preedit_string_get(Ecore_IMF_Context *ctx, char** str, int *cursor_pos)
1142{ 1142{
1143 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1143 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1144 1144
1145 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx); 1145 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
1146 EINA_SAFETY_ON_NULL_RETURN(context_scim); 1146 EINA_SAFETY_ON_NULL_RETURN(context_scim);
@@ -1183,7 +1183,7 @@ isf_imf_context_preedit_string_get(Ecore_IMF_Context *ctx, char** str, int *curs
1183void 1183void
1184isf_imf_context_cursor_position_set(Ecore_IMF_Context *ctx, int cursor_pos) 1184isf_imf_context_cursor_position_set(Ecore_IMF_Context *ctx, int cursor_pos)
1185{ 1185{
1186 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1186 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1187 1187
1188 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx); 1188 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx);
1189 EINA_SAFETY_ON_NULL_RETURN(context_scim); 1189 EINA_SAFETY_ON_NULL_RETURN(context_scim);
@@ -1213,7 +1213,7 @@ isf_imf_context_cursor_position_set(Ecore_IMF_Context *ctx, int cursor_pos)
1213void 1213void
1214isf_imf_context_input_mode_set(Ecore_IMF_Context *ctx, Ecore_IMF_Input_Mode input_mode) 1214isf_imf_context_input_mode_set(Ecore_IMF_Context *ctx, Ecore_IMF_Input_Mode input_mode)
1215{ 1215{
1216 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1216 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1217 1217
1218 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx); 1218 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
1219 EINA_SAFETY_ON_NULL_RETURN(context_scim); 1219 EINA_SAFETY_ON_NULL_RETURN(context_scim);
@@ -1234,7 +1234,7 @@ isf_imf_context_input_mode_set(Ecore_IMF_Context *ctx, Ecore_IMF_Input_Mode inpu
1234void 1234void
1235isf_imf_context_prediction_allow_set(Ecore_IMF_Context* ctx, Eina_Bool prediction) 1235isf_imf_context_prediction_allow_set(Ecore_IMF_Context* ctx, Eina_Bool prediction)
1236{ 1236{
1237 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " = " << (prediction ? "true" : "false") << "...\n"; 1237 SCIM_DEBUG_FRONTEND(1) << __func__ << " = " << (prediction ? "true" : "false") << "...\n";
1238 1238
1239 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx); 1239 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx);
1240 EINA_SAFETY_ON_NULL_RETURN(context_scim); 1240 EINA_SAFETY_ON_NULL_RETURN(context_scim);
@@ -1247,7 +1247,7 @@ isf_imf_context_prediction_allow_set(Ecore_IMF_Context* ctx, Eina_Bool predictio
1247void 1247void
1248isf_imf_context_autocapital_type_set(Ecore_IMF_Context* ctx, Ecore_IMF_Autocapital_Type autocapital_type) 1248isf_imf_context_autocapital_type_set(Ecore_IMF_Context* ctx, Ecore_IMF_Autocapital_Type autocapital_type)
1249{ 1249{
1250 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " = " << autocapital_type << "...\n"; 1250 SCIM_DEBUG_FRONTEND(1) << __func__ << " = " << autocapital_type << "...\n";
1251 1251
1252 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx); 1252 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get(ctx);
1253 EINA_SAFETY_ON_NULL_RETURN(context_scim); 1253 EINA_SAFETY_ON_NULL_RETURN(context_scim);
@@ -1275,7 +1275,7 @@ isf_imf_context_autocapital_type_set(Ecore_IMF_Context* ctx, Ecore_IMF_Autocapit
1275Eina_Bool 1275Eina_Bool
1276isf_imf_context_filter_event(Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type, Ecore_IMF_Event *event) 1276isf_imf_context_filter_event(Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type, Ecore_IMF_Event *event)
1277{ 1277{
1278 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1278 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1279 1279
1280 EcoreIMFContextISF *ic = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx); 1280 EcoreIMFContextISF *ic = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
1281 EINA_SAFETY_ON_NULL_RETURN_VAL(ic, EINA_FALSE); 1281 EINA_SAFETY_ON_NULL_RETURN_VAL(ic, EINA_FALSE);
@@ -1324,7 +1324,7 @@ isf_imf_context_filter_event(Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type,
1324void 1324void
1325isf_imf_context_input_panel_show(Ecore_IMF_Context *ctx) 1325isf_imf_context_input_panel_show(Ecore_IMF_Context *ctx)
1326{ 1326{
1327 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1327 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1328 1328
1329 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx); 1329 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
1330 EINA_SAFETY_ON_NULL_RETURN(context_scim); 1330 EINA_SAFETY_ON_NULL_RETURN(context_scim);
@@ -1338,7 +1338,7 @@ isf_imf_context_input_panel_show(Ecore_IMF_Context *ctx)
1338void 1338void
1339isf_imf_context_input_panel_hide(Ecore_IMF_Context *ctx) 1339isf_imf_context_input_panel_hide(Ecore_IMF_Context *ctx)
1340{ 1340{
1341 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1341 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1342 1342
1343 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx); 1343 EcoreIMFContextISF *context_scim = (EcoreIMFContextISF*)ecore_imf_context_data_get(ctx);
1344 EINA_SAFETY_ON_NULL_RETURN(context_scim); 1344 EINA_SAFETY_ON_NULL_RETURN(context_scim);
@@ -1353,14 +1353,14 @@ isf_imf_context_input_panel_hide(Ecore_IMF_Context *ctx)
1353static void 1353static void
1354panel_slot_reload_config(int context EINA_UNUSED) 1354panel_slot_reload_config(int context EINA_UNUSED)
1355{ 1355{
1356 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1356 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1357 _config->reload(); 1357 _config->reload();
1358} 1358}
1359 1359
1360static void 1360static void
1361panel_slot_exit(int /* context */) 1361panel_slot_exit(int /* context */)
1362{ 1362{
1363 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1363 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1364 1364
1365 finalize(); 1365 finalize();
1366} 1366}
@@ -1372,7 +1372,7 @@ panel_slot_update_lookup_table_page_size(int context, int page_size)
1372 EINA_SAFETY_ON_NULL_RETURN(ic); 1372 EINA_SAFETY_ON_NULL_RETURN(ic);
1373 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 1373 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
1374 1374
1375 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " page_size=" << page_size << " ic=" << ic << "\n"; 1375 SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " page_size=" << page_size << " ic=" << ic << "\n";
1376 1376
1377 _panel_client.prepare(ic->id); 1377 _panel_client.prepare(ic->id);
1378 ic->impl->si->update_lookup_table_page_size(page_size); 1378 ic->impl->si->update_lookup_table_page_size(page_size);
@@ -1386,7 +1386,7 @@ panel_slot_lookup_table_page_up(int context)
1386 EINA_SAFETY_ON_NULL_RETURN(ic); 1386 EINA_SAFETY_ON_NULL_RETURN(ic);
1387 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 1387 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
1388 1388
1389 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " ic=" << ic << "\n"; 1389 SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " ic=" << ic << "\n";
1390 1390
1391 _panel_client.prepare(ic->id); 1391 _panel_client.prepare(ic->id);
1392 ic->impl->si->lookup_table_page_up(); 1392 ic->impl->si->lookup_table_page_up();
@@ -1400,7 +1400,7 @@ panel_slot_lookup_table_page_down(int context)
1400 EINA_SAFETY_ON_NULL_RETURN(ic); 1400 EINA_SAFETY_ON_NULL_RETURN(ic);
1401 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 1401 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
1402 1402
1403 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " ic=" << ic << "\n"; 1403 SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " ic=" << ic << "\n";
1404 1404
1405 _panel_client.prepare(ic->id); 1405 _panel_client.prepare(ic->id);
1406 ic->impl->si->lookup_table_page_down(); 1406 ic->impl->si->lookup_table_page_down();
@@ -1414,7 +1414,7 @@ panel_slot_trigger_property(int context, const String &property)
1414 EINA_SAFETY_ON_NULL_RETURN(ic); 1414 EINA_SAFETY_ON_NULL_RETURN(ic);
1415 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 1415 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
1416 1416
1417 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " property=" << property << " ic=" << ic << "\n"; 1417 SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " property=" << property << " ic=" << ic << "\n";
1418 1418
1419 _panel_client.prepare(ic->id); 1419 _panel_client.prepare(ic->id);
1420 ic->impl->si->trigger_property(property); 1420 ic->impl->si->trigger_property(property);
@@ -1428,7 +1428,7 @@ panel_slot_process_helper_event(int context, const String &target_uuid, const St
1428 EINA_SAFETY_ON_NULL_RETURN(ic); 1428 EINA_SAFETY_ON_NULL_RETURN(ic);
1429 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 1429 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
1430 1430
1431 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " target=" << target_uuid 1431 SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " target=" << target_uuid
1432 << " helper=" << helper_uuid << " ic=" << ic << " ic->impl=" << ic->impl << " ic-uuid=" 1432 << " helper=" << helper_uuid << " ic=" << ic << " ic->impl=" << ic->impl << " ic-uuid="
1433 << (ic->impl ? ic->impl->si->get_factory_uuid() : "" ) << "\n"; 1433 << (ic->impl ? ic->impl->si->get_factory_uuid() : "" ) << "\n";
1434 1434
@@ -1448,7 +1448,7 @@ panel_slot_move_preedit_caret(int context, int caret_pos)
1448 EINA_SAFETY_ON_NULL_RETURN(ic); 1448 EINA_SAFETY_ON_NULL_RETURN(ic);
1449 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 1449 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
1450 1450
1451 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " caret=" << caret_pos << " ic=" << ic << "\n"; 1451 SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " caret=" << caret_pos << " ic=" << ic << "\n";
1452 1452
1453 _panel_client.prepare(ic->id); 1453 _panel_client.prepare(ic->id);
1454 ic->impl->si->move_preedit_caret(caret_pos); 1454 ic->impl->si->move_preedit_caret(caret_pos);
@@ -1462,7 +1462,7 @@ panel_slot_select_candidate(int context, int cand_index)
1462 EINA_SAFETY_ON_NULL_RETURN(ic); 1462 EINA_SAFETY_ON_NULL_RETURN(ic);
1463 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 1463 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
1464 1464
1465 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " candidate=" << cand_index << " ic=" << ic << "\n"; 1465 SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " candidate=" << cand_index << " ic=" << ic << "\n";
1466 1466
1467 _panel_client.prepare(ic->id); 1467 _panel_client.prepare(ic->id);
1468 ic->impl->si->select_candidate(cand_index); 1468 ic->impl->si->select_candidate(cand_index);
@@ -1473,7 +1473,7 @@ static void
1473panel_slot_process_key_event(int context, const KeyEvent &key) 1473panel_slot_process_key_event(int context, const KeyEvent &key)
1474{ 1474{
1475 EcoreIMFContextISF *ic = find_ic(context); 1475 EcoreIMFContextISF *ic = find_ic(context);
1476 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " key=" << key.get_key_string() << " ic=" << ic << "\n"; 1476 SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " key=" << key.get_key_string() << " ic=" << ic << "\n";
1477 1477
1478 if (!ecore_x_display_get()) return; 1478 if (!ecore_x_display_get()) return;
1479 if (key.is_key_press()) 1479 if (key.is_key_press())
@@ -1486,7 +1486,7 @@ panel_slot_commit_string(int context, const WideString &wstr)
1486 EcoreIMFContextISF *ic = find_ic(context); 1486 EcoreIMFContextISF *ic = find_ic(context);
1487 EINA_SAFETY_ON_NULL_RETURN(ic); 1487 EINA_SAFETY_ON_NULL_RETURN(ic);
1488 1488
1489 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " str=" << utf8_wcstombs(wstr) << " ic=" << ic << "\n"; 1489 SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " str=" << utf8_wcstombs(wstr) << " ic=" << ic << "\n";
1490 1490
1491 if (_focused_ic != ic) 1491 if (_focused_ic != ic)
1492 return; 1492 return;
@@ -1501,7 +1501,7 @@ panel_slot_forward_key_event(int context, const KeyEvent &key)
1501 EINA_SAFETY_ON_NULL_RETURN(ic); 1501 EINA_SAFETY_ON_NULL_RETURN(ic);
1502 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 1502 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
1503 1503
1504 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " key=" << key.get_key_string() << " ic=" << ic << "\n"; 1504 SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " key=" << key.get_key_string() << " ic=" << ic << "\n";
1505 1505
1506 if (ic->impl->client_canvas) 1506 if (ic->impl->client_canvas)
1507 feed_key_event(ic->impl->client_canvas, key.get_key_string().c_str(), EINA_TRUE); 1507 feed_key_event(ic->impl->client_canvas, key.get_key_string().c_str(), EINA_TRUE);
@@ -1513,7 +1513,7 @@ panel_slot_request_help(int context)
1513 EcoreIMFContextISF *ic = find_ic(context); 1513 EcoreIMFContextISF *ic = find_ic(context);
1514 EINA_SAFETY_ON_NULL_RETURN(ic); 1514 EINA_SAFETY_ON_NULL_RETURN(ic);
1515 1515
1516 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " ic=" << ic << "\n"; 1516 SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " ic=" << ic << "\n";
1517 1517
1518 _panel_client.prepare(ic->id); 1518 _panel_client.prepare(ic->id);
1519 panel_req_show_help(ic); 1519 panel_req_show_help(ic);
@@ -1526,7 +1526,7 @@ panel_slot_request_factory_menu(int context)
1526 EcoreIMFContextISF *ic = find_ic(context); 1526 EcoreIMFContextISF *ic = find_ic(context);
1527 EINA_SAFETY_ON_NULL_RETURN(ic); 1527 EINA_SAFETY_ON_NULL_RETURN(ic);
1528 1528
1529 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " ic=" << ic << "\n"; 1529 SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " ic=" << ic << "\n";
1530 1530
1531 _panel_client.prepare(ic->id); 1531 _panel_client.prepare(ic->id);
1532 panel_req_show_factory_menu(ic); 1532 panel_req_show_factory_menu(ic);
@@ -1540,7 +1540,7 @@ panel_slot_change_factory(int context, const String &uuid)
1540 EINA_SAFETY_ON_NULL_RETURN(ic); 1540 EINA_SAFETY_ON_NULL_RETURN(ic);
1541 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 1541 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
1542 1542
1543 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " factory=" << uuid << " ic=" << ic << "\n"; 1543 SCIM_DEBUG_FRONTEND(1) << __func__ << " context=" << context << " factory=" << uuid << " ic=" << ic << "\n";
1544 1544
1545 ic->impl->si->reset(); 1545 ic->impl->si->reset();
1546 _panel_client.prepare(ic->id); 1546 _panel_client.prepare(ic->id);
@@ -1552,7 +1552,7 @@ panel_slot_change_factory(int context, const String &uuid)
1552static void 1552static void
1553panel_req_show_help(EcoreIMFContextISF *ic) 1553panel_req_show_help(EcoreIMFContextISF *ic)
1554{ 1554{
1555 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1555 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1556 1556
1557 EINA_SAFETY_ON_NULL_RETURN(ic); 1557 EINA_SAFETY_ON_NULL_RETURN(ic);
1558 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 1558 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
@@ -1580,7 +1580,7 @@ panel_req_show_help(EcoreIMFContextISF *ic)
1580static void 1580static void
1581panel_req_show_factory_menu(EcoreIMFContextISF *ic) 1581panel_req_show_factory_menu(EcoreIMFContextISF *ic)
1582{ 1582{
1583 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1583 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1584 1584
1585 std::vector<IMEngineFactoryPointer> factories; 1585 std::vector<IMEngineFactoryPointer> factories;
1586 std::vector <PanelFactoryInfo> menu; 1586 std::vector <PanelFactoryInfo> menu;
@@ -1603,7 +1603,7 @@ panel_req_show_factory_menu(EcoreIMFContextISF *ic)
1603static void 1603static void
1604panel_req_update_factory_info(EcoreIMFContextISF *ic) 1604panel_req_update_factory_info(EcoreIMFContextISF *ic)
1605{ 1605{
1606 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1606 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1607 1607
1608 EINA_SAFETY_ON_NULL_RETURN(ic); 1608 EINA_SAFETY_ON_NULL_RETURN(ic);
1609 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 1609 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
@@ -1628,7 +1628,7 @@ panel_req_update_factory_info(EcoreIMFContextISF *ic)
1628static void 1628static void
1629panel_req_focus_in(EcoreIMFContextISF *ic) 1629panel_req_focus_in(EcoreIMFContextISF *ic)
1630{ 1630{
1631 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1631 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1632 1632
1633 _panel_client.focus_in(ic->id, ic->impl->si->get_factory_uuid()); 1633 _panel_client.focus_in(ic->id, ic->impl->si->get_factory_uuid());
1634} 1634}
@@ -1636,7 +1636,7 @@ panel_req_focus_in(EcoreIMFContextISF *ic)
1636static void 1636static void
1637panel_req_update_spot_location(EcoreIMFContextISF *ic) 1637panel_req_update_spot_location(EcoreIMFContextISF *ic)
1638{ 1638{
1639 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1639 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1640 1640
1641 _panel_client.update_spot_location(ic->id, ic->impl->cursor_x, ic->impl->cursor_y); 1641 _panel_client.update_spot_location(ic->id, ic->impl->cursor_x, ic->impl->cursor_y);
1642} 1642}
@@ -1644,7 +1644,7 @@ panel_req_update_spot_location(EcoreIMFContextISF *ic)
1644static bool 1644static bool
1645filter_hotkeys(EcoreIMFContextISF *ic, const KeyEvent &key) 1645filter_hotkeys(EcoreIMFContextISF *ic, const KeyEvent &key)
1646{ 1646{
1647 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1647 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1648 1648
1649 bool ret = false; 1649 bool ret = false;
1650 1650
@@ -1700,7 +1700,7 @@ filter_hotkeys(EcoreIMFContextISF *ic, const KeyEvent &key)
1700static bool 1700static bool
1701panel_initialize(void) 1701panel_initialize(void)
1702{ 1702{
1703 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1703 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1704 1704
1705 String display_name; 1705 String display_name;
1706 { 1706 {
@@ -1725,7 +1725,7 @@ panel_initialize(void)
1725static void 1725static void
1726panel_finalize(void) 1726panel_finalize(void)
1727{ 1727{
1728 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1728 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1729 1729
1730 _panel_client.close_connection(); 1730 _panel_client.close_connection();
1731 1731
@@ -1745,7 +1745,7 @@ panel_finalize(void)
1745static Eina_Bool 1745static Eina_Bool
1746panel_iochannel_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fd_handler) 1746panel_iochannel_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fd_handler)
1747{ 1747{
1748 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1748 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1749 1749
1750 if (fd_handler == _panel_iochannel_read_handler) 1750 if (fd_handler == _panel_iochannel_read_handler)
1751 { 1751 {
@@ -1768,7 +1768,7 @@ panel_iochannel_handler(void *data EINA_UNUSED, Ecore_Fd_Handler *fd_handler)
1768static void 1768static void
1769turn_on_ic(EcoreIMFContextISF *ic) 1769turn_on_ic(EcoreIMFContextISF *ic)
1770{ 1770{
1771 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1771 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1772 1772
1773 EINA_SAFETY_ON_NULL_RETURN(ic); 1773 EINA_SAFETY_ON_NULL_RETURN(ic);
1774 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 1774 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
@@ -1805,7 +1805,7 @@ turn_on_ic(EcoreIMFContextISF *ic)
1805static void 1805static void
1806turn_off_ic(EcoreIMFContextISF *ic) 1806turn_off_ic(EcoreIMFContextISF *ic)
1807{ 1807{
1808 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1808 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1809 1809
1810 EINA_SAFETY_ON_NULL_RETURN(ic); 1810 EINA_SAFETY_ON_NULL_RETURN(ic);
1811 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 1811 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
@@ -1838,7 +1838,7 @@ turn_off_ic(EcoreIMFContextISF *ic)
1838static void 1838static void
1839set_ic_capabilities(EcoreIMFContextISF *ic) 1839set_ic_capabilities(EcoreIMFContextISF *ic)
1840{ 1840{
1841 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1841 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1842 1842
1843 EINA_SAFETY_ON_NULL_RETURN(ic); 1843 EINA_SAFETY_ON_NULL_RETURN(ic);
1844 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 1844 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
@@ -1854,7 +1854,7 @@ set_ic_capabilities(EcoreIMFContextISF *ic)
1854static bool 1854static bool
1855check_socket_frontend(void) 1855check_socket_frontend(void)
1856{ 1856{
1857 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 1857 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
1858 1858
1859 SocketAddress address; 1859 SocketAddress address;
1860 SocketClient client; 1860 SocketClient client;
@@ -2048,7 +2048,7 @@ finalize(void)
2048static void 2048static void
2049open_next_factory(EcoreIMFContextISF *ic) 2049open_next_factory(EcoreIMFContextISF *ic)
2050{ 2050{
2051 SCIM_DEBUG_FRONTEND(2) << __FUNCTION__ << " context=" << ic->id << "\n"; 2051 SCIM_DEBUG_FRONTEND(2) << __func__ << " context=" << ic->id << "\n";
2052 IMEngineFactoryPointer sf = _backend->get_next_factory("", "UTF-8", ic->impl->si->get_factory_uuid()); 2052 IMEngineFactoryPointer sf = _backend->get_next_factory("", "UTF-8", ic->impl->si->get_factory_uuid());
2053 2053
2054 if (!sf.null()) 2054 if (!sf.null())
@@ -2078,7 +2078,7 @@ open_previous_factory(EcoreIMFContextISF *ic)
2078 EINA_SAFETY_ON_NULL_RETURN(ic); 2078 EINA_SAFETY_ON_NULL_RETURN(ic);
2079 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 2079 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
2080 2080
2081 SCIM_DEBUG_FRONTEND(2) << __FUNCTION__ << " context=" << ic->id << "\n"; 2081 SCIM_DEBUG_FRONTEND(2) << __func__ << " context=" << ic->id << "\n";
2082 IMEngineFactoryPointer sf = _backend->get_previous_factory("", "UTF-8", ic->impl->si->get_factory_uuid()); 2082 IMEngineFactoryPointer sf = _backend->get_previous_factory("", "UTF-8", ic->impl->si->get_factory_uuid());
2083 2083
2084 if (!sf.null()) 2084 if (!sf.null())
@@ -2109,7 +2109,7 @@ open_specific_factory(EcoreIMFContextISF *ic,
2109 EINA_SAFETY_ON_NULL_RETURN(ic); 2109 EINA_SAFETY_ON_NULL_RETURN(ic);
2110 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 2110 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
2111 2111
2112 SCIM_DEBUG_FRONTEND(2) << __FUNCTION__ << " context=" << ic->id << "\n"; 2112 SCIM_DEBUG_FRONTEND(2) << __func__ << " context=" << ic->id << "\n";
2113 2113
2114 // The same input method is selected, just turn on the IC. 2114 // The same input method is selected, just turn on the IC.
2115 if (ic->impl->si->get_factory_uuid() == uuid) 2115 if (ic->impl->si->get_factory_uuid() == uuid)
@@ -2171,7 +2171,7 @@ open_specific_factory(EcoreIMFContextISF *ic,
2171 2171
2172static void initialize_modifier_bits(Display *display) 2172static void initialize_modifier_bits(Display *display)
2173{ 2173{
2174 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2174 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2175 2175
2176 if (__current_display == display) 2176 if (__current_display == display)
2177 return; 2177 return;
@@ -2270,7 +2270,7 @@ static void initialize_modifier_bits(Display *display)
2270 2270
2271static unsigned int scim_x11_keymask_scim_to_x11(Display *display, uint16 scimkeymask) 2271static unsigned int scim_x11_keymask_scim_to_x11(Display *display, uint16 scimkeymask)
2272{ 2272{
2273 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2273 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2274 2274
2275 unsigned int state = 0; 2275 unsigned int state = 0;
2276 2276
@@ -2292,7 +2292,7 @@ static XKeyEvent createKeyEvent(Display *display, Window &win,
2292 Window &winRoot, bool press, 2292 Window &winRoot, bool press,
2293 int keysym, int modifiers) 2293 int keysym, int modifiers)
2294{ 2294{
2295 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2295 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2296 2296
2297 XKeyEvent event; 2297 XKeyEvent event;
2298 2298
@@ -2320,7 +2320,7 @@ static XKeyEvent createKeyEvent(Display *display, Window &win,
2320 2320
2321static void _x_send_key_event(const KeyEvent &key) 2321static void _x_send_key_event(const KeyEvent &key)
2322{ 2322{
2323 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2323 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2324 2324
2325 // Obtain the X11 display. 2325 // Obtain the X11 display.
2326 Display *display = (Display *)ecore_x_display_get(); 2326 Display *display = (Display *)ecore_x_display_get();
@@ -2410,7 +2410,7 @@ attach_instance(const IMEngineInstancePointer &si)
2410static void 2410static void
2411slot_show_preedit_string(IMEngineInstanceBase *si) 2411slot_show_preedit_string(IMEngineInstanceBase *si)
2412{ 2412{
2413 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2413 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2414 2414
2415 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2415 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2416 EINA_SAFETY_ON_NULL_RETURN(ic); 2416 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2434,7 +2434,7 @@ slot_show_preedit_string(IMEngineInstanceBase *si)
2434static void 2434static void
2435slot_show_aux_string(IMEngineInstanceBase *si) 2435slot_show_aux_string(IMEngineInstanceBase *si)
2436{ 2436{
2437 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2437 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2438 2438
2439 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2439 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2440 EINA_SAFETY_ON_NULL_RETURN(ic); 2440 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2446,7 +2446,7 @@ slot_show_aux_string(IMEngineInstanceBase *si)
2446static void 2446static void
2447slot_show_lookup_table(IMEngineInstanceBase *si) 2447slot_show_lookup_table(IMEngineInstanceBase *si)
2448{ 2448{
2449 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2449 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2450 2450
2451 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2451 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2452 EINA_SAFETY_ON_NULL_RETURN(ic); 2452 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2458,7 +2458,7 @@ slot_show_lookup_table(IMEngineInstanceBase *si)
2458static void 2458static void
2459slot_hide_preedit_string(IMEngineInstanceBase *si) 2459slot_hide_preedit_string(IMEngineInstanceBase *si)
2460{ 2460{
2461 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2461 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2462 2462
2463 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2463 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2464 EINA_SAFETY_ON_NULL_RETURN(ic); 2464 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2494,7 +2494,7 @@ slot_hide_preedit_string(IMEngineInstanceBase *si)
2494static void 2494static void
2495slot_hide_aux_string(IMEngineInstanceBase *si) 2495slot_hide_aux_string(IMEngineInstanceBase *si)
2496{ 2496{
2497 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2497 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2498 2498
2499 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2499 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2500 EINA_SAFETY_ON_NULL_RETURN(ic); 2500 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2506,7 +2506,7 @@ slot_hide_aux_string(IMEngineInstanceBase *si)
2506static void 2506static void
2507slot_hide_lookup_table(IMEngineInstanceBase *si) 2507slot_hide_lookup_table(IMEngineInstanceBase *si)
2508{ 2508{
2509 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2509 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2510 2510
2511 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2511 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2512 EINA_SAFETY_ON_NULL_RETURN(ic); 2512 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2518,7 +2518,7 @@ slot_hide_lookup_table(IMEngineInstanceBase *si)
2518static void 2518static void
2519slot_update_preedit_caret(IMEngineInstanceBase *si, int caret) 2519slot_update_preedit_caret(IMEngineInstanceBase *si, int caret)
2520{ 2520{
2521 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2521 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2522 2522
2523 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2523 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2524 EINA_SAFETY_ON_NULL_RETURN(ic); 2524 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2546,7 +2546,7 @@ slot_update_preedit_string(IMEngineInstanceBase *si,
2546 const WideString & str, 2546 const WideString & str,
2547 const AttributeList & attrs) 2547 const AttributeList & attrs)
2548{ 2548{
2549 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2549 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2550 2550
2551 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2551 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2552 EINA_SAFETY_ON_NULL_RETURN(ic); 2552 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2580,7 +2580,7 @@ slot_update_aux_string(IMEngineInstanceBase *si,
2580 const WideString & str, 2580 const WideString & str,
2581 const AttributeList & attrs) 2581 const AttributeList & attrs)
2582{ 2582{
2583 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2583 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2584 2584
2585 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2585 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2586 EINA_SAFETY_ON_NULL_RETURN(ic); 2586 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2593,7 +2593,7 @@ static void
2593slot_commit_string(IMEngineInstanceBase *si, 2593slot_commit_string(IMEngineInstanceBase *si,
2594 const WideString & str) 2594 const WideString & str)
2595{ 2595{
2596 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2596 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2597 2597
2598 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2598 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2599 EINA_SAFETY_ON_NULL_RETURN(ic); 2599 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2606,7 +2606,7 @@ static void
2606slot_forward_key_event(IMEngineInstanceBase *si, 2606slot_forward_key_event(IMEngineInstanceBase *si,
2607 const KeyEvent & key) 2607 const KeyEvent & key)
2608{ 2608{
2609 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2609 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2610 2610
2611 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2611 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2612 EINA_SAFETY_ON_NULL_RETURN(ic); 2612 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2622,7 +2622,7 @@ static void
2622slot_update_lookup_table(IMEngineInstanceBase *si, 2622slot_update_lookup_table(IMEngineInstanceBase *si,
2623 const LookupTable & table) 2623 const LookupTable & table)
2624{ 2624{
2625 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2625 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2626 2626
2627 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2627 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2628 EINA_SAFETY_ON_NULL_RETURN(ic); 2628 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2635,7 +2635,7 @@ static void
2635slot_register_properties(IMEngineInstanceBase *si, 2635slot_register_properties(IMEngineInstanceBase *si,
2636 const PropertyList & properties) 2636 const PropertyList & properties)
2637{ 2637{
2638 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2638 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2639 2639
2640 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2640 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2641 EINA_SAFETY_ON_NULL_RETURN(ic); 2641 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2648,7 +2648,7 @@ static void
2648slot_update_property(IMEngineInstanceBase *si, 2648slot_update_property(IMEngineInstanceBase *si,
2649 const Property & property) 2649 const Property & property)
2650{ 2650{
2651 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2651 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2652 2652
2653 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2653 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2654 EINA_SAFETY_ON_NULL_RETURN(ic); 2654 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2660,7 +2660,7 @@ slot_update_property(IMEngineInstanceBase *si,
2660static void 2660static void
2661slot_beep(IMEngineInstanceBase *si) 2661slot_beep(IMEngineInstanceBase *si)
2662{ 2662{
2663 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2663 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2664 2664
2665 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2665 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2666 EINA_SAFETY_ON_NULL_RETURN(ic); 2666 EINA_SAFETY_ON_NULL_RETURN(ic);
@@ -2678,7 +2678,7 @@ slot_start_helper(IMEngineInstanceBase *si,
2678 EINA_SAFETY_ON_NULL_RETURN(ic); 2678 EINA_SAFETY_ON_NULL_RETURN(ic);
2679 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 2679 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
2680 2680
2681 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " helper= " << helper_uuid << " context=" 2681 SCIM_DEBUG_FRONTEND(1) << __func__ << " helper= " << helper_uuid << " context="
2682 << ic->id << " ic=" << ic 2682 << ic->id << " ic=" << ic
2683 << " ic-uuid=" << ic->impl->si->get_factory_uuid() << "...\n"; 2683 << " ic-uuid=" << ic->impl->si->get_factory_uuid() << "...\n";
2684 2684
@@ -2692,7 +2692,7 @@ slot_stop_helper(IMEngineInstanceBase *si,
2692 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2692 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2693 EINA_SAFETY_ON_NULL_RETURN(ic); 2693 EINA_SAFETY_ON_NULL_RETURN(ic);
2694 2694
2695 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " helper= " << helper_uuid << " context=" << ic->id << " ic=" << ic << "...\n"; 2695 SCIM_DEBUG_FRONTEND(1) << __func__ << " helper= " << helper_uuid << " context=" << ic->id << " ic=" << ic << "...\n";
2696 2696
2697 _panel_client.stop_helper(ic->id, helper_uuid); 2697 _panel_client.stop_helper(ic->id, helper_uuid);
2698} 2698}
@@ -2706,7 +2706,7 @@ slot_send_helper_event(IMEngineInstanceBase *si,
2706 EINA_SAFETY_ON_NULL_RETURN(ic); 2706 EINA_SAFETY_ON_NULL_RETURN(ic);
2707 EINA_SAFETY_ON_NULL_RETURN(ic->impl); 2707 EINA_SAFETY_ON_NULL_RETURN(ic->impl);
2708 2708
2709 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " helper= " << helper_uuid << " context=" 2709 SCIM_DEBUG_FRONTEND(1) << __func__ << " helper= " << helper_uuid << " context="
2710 << ic->id << " ic=" << ic 2710 << ic->id << " ic=" << ic
2711 << " ic-uuid=" << ic->impl->si->get_factory_uuid() << "...\n"; 2711 << " ic-uuid=" << ic->impl->si->get_factory_uuid() << "...\n";
2712 2712
@@ -2720,7 +2720,7 @@ slot_get_surrounding_text(IMEngineInstanceBase *si,
2720 int maxlen_before, 2720 int maxlen_before,
2721 int maxlen_after) 2721 int maxlen_after)
2722{ 2722{
2723 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2723 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2724 2724
2725 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2725 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2726 EINA_SAFETY_ON_NULL_RETURN_VAL(ic, false); 2726 EINA_SAFETY_ON_NULL_RETURN_VAL(ic, false);
@@ -2770,7 +2770,7 @@ slot_delete_surrounding_text(IMEngineInstanceBase *si,
2770 int offset, 2770 int offset,
2771 int len) 2771 int len)
2772{ 2772{
2773 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2773 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2774 2774
2775 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data()); 2775 EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *>(si->get_frontend_data());
2776 EINA_SAFETY_ON_NULL_RETURN_VAL(ic, false); 2776 EINA_SAFETY_ON_NULL_RETURN_VAL(ic, false);
@@ -2790,7 +2790,7 @@ slot_delete_surrounding_text(IMEngineInstanceBase *si,
2790static void 2790static void
2791reload_config_callback(const ConfigPointer &config) 2791reload_config_callback(const ConfigPointer &config)
2792{ 2792{
2793 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2793 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2794 2794
2795 _frontend_hotkey_matcher.load_hotkeys(config); 2795 _frontend_hotkey_matcher.load_hotkeys(config);
2796 _imengine_hotkey_matcher.load_hotkeys(config); 2796 _imengine_hotkey_matcher.load_hotkeys(config);
@@ -2820,7 +2820,7 @@ static void
2820fallback_commit_string_cb(IMEngineInstanceBase *si EINA_UNUSED, 2820fallback_commit_string_cb(IMEngineInstanceBase *si EINA_UNUSED,
2821 const WideString &str) 2821 const WideString &str)
2822{ 2822{
2823 SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n"; 2823 SCIM_DEBUG_FRONTEND(1) << __func__ << "...\n";
2824 2824
2825 if (_focused_ic) 2825 if (_focused_ic)
2826 { 2826 {
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api.c b/src/modules/evas/engines/gl_common/evas_gl_api.c
index 30a95eee5d..d66393b1e8 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
@@ -11,10 +11,10 @@
11#define EVGLD_FUNC_BEGIN() \ 11#define EVGLD_FUNC_BEGIN() \
12{ \ 12{ \
13 EVGL_FUNC_BEGIN(); \ 13 EVGL_FUNC_BEGIN(); \
14 _func_begin_debug(__FUNCTION__); \ 14 _func_begin_debug(__func__); \
15} 15}
16 16
17#define EVGLD_FUNC_END() GLERRV(__FUNCTION__) 17#define EVGLD_FUNC_END() GLERRV(__func__)
18#define _EVGL_INT_INIT_VALUE -3 18#define _EVGL_INT_INIT_VALUE -3
19 19
20#define SET_GL_ERROR(gl_error_type) \ 20#define SET_GL_ERROR(gl_error_type) \
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_ext.c b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c
index 91e46338e9..11e76eed8b 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api_ext.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c
@@ -122,7 +122,7 @@ struct wl_resource;
122 122
123// Evas extensions from EGL extensions 123// Evas extensions from EGL extensions
124#ifdef GL_GLES 124#ifdef GL_GLES
125#define EGLDISPLAY_GET(a) _evgl_egl_display_get(__FUNCTION__, a) 125#define EGLDISPLAY_GET(a) _evgl_egl_display_get(__func__, a)
126 126
127// this struct defines an EvasGLImage when using EGL 127// this struct defines an EvasGLImage when using EGL
128typedef struct _EvasGLImage { 128typedef struct _EvasGLImage {
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c b/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
index 2c5e0adf70..3e2188dfbe 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
@@ -9,10 +9,10 @@
9 9
10#define EVGLD_FUNC_BEGIN() \ 10#define EVGLD_FUNC_BEGIN() \
11{ \ 11{ \
12 _func_begin_debug(__FUNCTION__); \ 12 _func_begin_debug(__func__); \
13} 13}
14 14
15#define EVGLD_FUNC_END() GLERRV(__FUNCTION__) 15#define EVGLD_FUNC_END() GLERRV(__func__)
16 16
17static void *_gles1_handle = NULL; 17static void *_gles1_handle = NULL;
18static Evas_GL_API _gles1_api; 18static Evas_GL_API _gles1_api;
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h
index bcd131a146..44772620d0 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -872,7 +872,7 @@ __evas_gl_errdyn(int err, const char *file, const char *func, int line, const ch
872# define GLERRV(op) do { \ 872# define GLERRV(op) do { \
873 int __gl_err = glGetError(); \ 873 int __gl_err = glGetError(); \
874 if (__gl_err != GL_NO_ERROR) \ 874 if (__gl_err != GL_NO_ERROR) \
875 __evas_gl_errdyn(__gl_err, __FILE__, __FUNCTION__, __LINE__, op); \ 875 __evas_gl_errdyn(__gl_err, __FILE__, __func__, __LINE__, op); \
876 } while (0) 876 } while (0)
877/* Redefine common gl funcs */ 877/* Redefine common gl funcs */
878# ifndef GL_ERRORS_NODEF 878# ifndef GL_ERRORS_NODEF
diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index ef99962261..2c1d1e28cf 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -1378,7 +1378,7 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im)
1378 err = glGetError(); 1378 err = glGetError();
1379 if (err != GL_NO_ERROR) 1379 if (err != GL_NO_ERROR)
1380 { 1380 {
1381 __evas_gl_err(err, __FILE__, __FUNCTION__, __LINE__, 1381 __evas_gl_err(err, __FILE__, __func__, __LINE__,
1382 "glCompressedTexSubImage2D"); 1382 "glCompressedTexSubImage2D");
1383 1383
1384 // FIXME: Changing settings on the fly. 1384 // FIXME: Changing settings on the fly.
diff --git a/src/modules/evas/image_loaders/dds/evas_image_load_dds.c b/src/modules/evas/image_loaders/dds/evas_image_load_dds.c
index d24707c9ae..aae960c25e 100644
--- a/src/modules/evas/image_loaders/dds/evas_image_load_dds.c
+++ b/src/modules/evas/image_loaders/dds/evas_image_load_dds.c
@@ -157,7 +157,7 @@ _dword_read(const char **m)
157 return val; 157 return val;
158} 158}
159 159
160#define FAIL() do { /*fprintf(stderr, "DDS: ERROR at %s:%d\n", __FUNCTION__, __LINE__);*/ goto on_error; } while (0) 160#define FAIL() do { /*fprintf(stderr, "DDS: ERROR at %s:%d\n", __func__, __LINE__);*/ goto on_error; } while (0)
161 161
162static Eina_Bool 162static Eina_Bool
163evas_image_load_file_head_dds(void *loader_data, 163evas_image_load_file_head_dds(void *loader_data,
diff --git a/src/static_libs/rg_etc/etc2_encoder.c b/src/static_libs/rg_etc/etc2_encoder.c
index 6f439078ca..e37819a780 100644
--- a/src/static_libs/rg_etc/etc2_encoder.c
+++ b/src/static_libs/rg_etc/etc2_encoder.c
@@ -146,7 +146,7 @@ absi(int a)
146 146
147#ifndef DBG 147#ifndef DBG
148# ifdef DEBUG 148# ifdef DEBUG
149# define DBG(fmt, ...) fprintf(stderr, "%s:%d: " fmt "\n", __FUNCTION__, __LINE__, ## __VA_ARGS__) 149# define DBG(fmt, ...) fprintf(stderr, "%s:%d: " fmt "\n", __func__, __LINE__, ## __VA_ARGS__)
150# else 150# else
151# define DBG(...) 151# define DBG(...)
152# endif 152# endif
diff --git a/src/static_libs/rg_etc/rg_etc1.c b/src/static_libs/rg_etc/rg_etc1.c
index e17eb887cd..9b889a3995 100644
--- a/src/static_libs/rg_etc/rg_etc1.c
+++ b/src/static_libs/rg_etc/rg_etc1.c
@@ -2278,7 +2278,7 @@ rg_etc1_pack_block_solid_color(unsigned char *block, const color_quad_u8 *color,
2278 2278
2279 if (!rg_etc1_inverse_lookup[0][255]) 2279 if (!rg_etc1_inverse_lookup[0][255])
2280 { 2280 {
2281 fprintf(stderr, "ETC1: Inverse lookup table not set (in %s)!\n", __FUNCTION__); 2281 fprintf(stderr, "ETC1: Inverse lookup table not set (in %s)!\n", __func__);
2282 return 0; 2282 return 0;
2283 } 2283 }
2284 2284
@@ -2392,7 +2392,7 @@ rg_etc1_pack_block_solid_color_constrained(rg_etc1_optimizer_results *results,ui
2392 2392
2393 if (!rg_etc1_inverse_lookup[0][255]) 2393 if (!rg_etc1_inverse_lookup[0][255])
2394 { 2394 {
2395 fprintf(stderr, "ETC1: Inverse lookup table not set (in %s)!\n", __FUNCTION__); 2395 fprintf(stderr, "ETC1: Inverse lookup table not set (in %s)!\n", __func__);
2396 return 0; 2396 return 0;
2397 } 2397 }
2398 2398
diff --git a/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c b/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
index be5c3cdd1e..a2dfe55993 100644
--- a/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
+++ b/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
@@ -499,7 +499,7 @@ th61_do(void *data EINA_UNUSED, Ecore_Thread *th)
499 } 499 }
500 500
501 eina_semaphore_release(&th6_sem, 1); 501 eina_semaphore_release(&th6_sem, 1);
502 if (DEBUG) printf("%s: message sending done!\n", __FUNCTION__); 502 if (DEBUG) printf("%s: message sending done!\n", __func__);
503} 503}
504 504
505static void 505static void
@@ -515,7 +515,7 @@ th62_do(void *data EINA_UNUSED, Ecore_Thread *th)
515 515
516 msg = eina_thread_queue_wait(thq1, &ref); 516 msg = eina_thread_queue_wait(thq1, &ref);
517 fail_if(!msg); 517 fail_if(!msg);
518 if (DEBUG) printf("%s: v %08i: %i [%i]\n", __FUNCTION__, cnt, msg->value, eina_thread_queue_pending_get(thq1)); 518 if (DEBUG) printf("%s: v %08i: %i [%i]\n", __func__, cnt, msg->value, eina_thread_queue_pending_get(thq1));
519 val = msg->value; 519 val = msg->value;
520 eina_thread_queue_wait_done(thq1, ref); 520 eina_thread_queue_wait_done(thq1, ref);
521 if (val == EXIT_MESSAGE || (ecore_thread_check(th))) break; 521 if (val == EXIT_MESSAGE || (ecore_thread_check(th))) break;
@@ -529,7 +529,7 @@ th62_do(void *data EINA_UNUSED, Ecore_Thread *th)
529 ck_assert_int_eq(msgnum, 100); 529 ck_assert_int_eq(msgnum, 100);
530 eina_spinlock_release(&msgnum_lock); 530 eina_spinlock_release(&msgnum_lock);
531 eina_semaphore_release(&th6_sem, 1); 531 eina_semaphore_release(&th6_sem, 1);
532 if (DEBUG) printf("%s: message reading done!\n", __FUNCTION__); 532 if (DEBUG) printf("%s: message reading done!\n", __func__);
533} 533}
534 534
535static void 535static void
@@ -545,7 +545,7 @@ th63_do(void *data EINA_UNUSED, Ecore_Thread *th)
545 545
546 msg = eina_thread_queue_wait(thq1, &ref); 546 msg = eina_thread_queue_wait(thq1, &ref);
547 fail_if(!msg); 547 fail_if(!msg);
548 if (DEBUG) printf("%s: v %08i: %i [%i]\n", __FUNCTION__, cnt, msg->value, eina_thread_queue_pending_get(thq1)); 548 if (DEBUG) printf("%s: v %08i: %i [%i]\n", __func__, cnt, msg->value, eina_thread_queue_pending_get(thq1));
549 val = msg->value; 549 val = msg->value;
550 eina_thread_queue_wait_done(thq1, ref); 550 eina_thread_queue_wait_done(thq1, ref);
551 if (val == EXIT_MESSAGE || (ecore_thread_check(th))) break; 551 if (val == EXIT_MESSAGE || (ecore_thread_check(th))) break;
@@ -559,7 +559,7 @@ th63_do(void *data EINA_UNUSED, Ecore_Thread *th)
559 ck_assert_int_eq(msgnum, 100); 559 ck_assert_int_eq(msgnum, 100);
560 eina_spinlock_release(&msgnum_lock); 560 eina_spinlock_release(&msgnum_lock);
561 eina_semaphore_release(&th6_sem, 1); 561 eina_semaphore_release(&th6_sem, 1);
562 if (DEBUG) printf("%s: message reading done!\n", __FUNCTION__); 562 if (DEBUG) printf("%s: message reading done!\n", __func__);
563} 563}
564 564
565EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t6) 565EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t6)
diff --git a/src/tests/ecore/efl_app_test_promise.c b/src/tests/ecore/efl_app_test_promise.c
index 424c278704..d1ec7b7097 100644
--- a/src/tests/ecore/efl_app_test_promise.c
+++ b/src/tests/ecore/efl_app_test_promise.c
@@ -1103,19 +1103,19 @@ EFL_START_TEST(efl_test_promise_log)
1103 fail_if(domain < 0); 1103 fail_if(domain < 0);
1104 eina_log_domain_level_set(PROMISE_LOG_DOMAIN_STR, EINA_LOG_LEVEL_DBG); 1104 eina_log_domain_level_set(PROMISE_LOG_DOMAIN_STR, EINA_LOG_LEVEL_DBG);
1105 ctx.dbg = (Eina_Future_Cb_Log_Desc){"dbg prefix:", " dbg suffix", __FILE__, 1105 ctx.dbg = (Eina_Future_Cb_Log_Desc){"dbg prefix:", " dbg suffix", __FILE__,
1106 __FUNCTION__, EINA_LOG_LEVEL_DBG, 1106 __func__, EINA_LOG_LEVEL_DBG,
1107 domain, __LINE__}; 1107 domain, __LINE__};
1108 ctx.crit = (Eina_Future_Cb_Log_Desc){NULL, NULL, __FILE__, 1108 ctx.crit = (Eina_Future_Cb_Log_Desc){NULL, NULL, __FILE__,
1109 __FUNCTION__, EINA_LOG_LEVEL_CRITICAL, 1109 __func__, EINA_LOG_LEVEL_CRITICAL,
1110 domain, __LINE__}; 1110 domain, __LINE__};
1111 ctx.warn = (Eina_Future_Cb_Log_Desc){"warn prefix:", NULL, __FILE__, 1111 ctx.warn = (Eina_Future_Cb_Log_Desc){"warn prefix:", NULL, __FILE__,
1112 __FUNCTION__, EINA_LOG_LEVEL_WARN, 1112 __func__, EINA_LOG_LEVEL_WARN,
1113 domain, __LINE__}; 1113 domain, __LINE__};
1114 ctx.err = (Eina_Future_Cb_Log_Desc){NULL, " err suffix", __FILE__, 1114 ctx.err = (Eina_Future_Cb_Log_Desc){NULL, " err suffix", __FILE__,
1115 __FUNCTION__, EINA_LOG_LEVEL_ERR, 1115 __func__, EINA_LOG_LEVEL_ERR,
1116 domain, __LINE__}; 1116 domain, __LINE__};
1117 ctx.info = (Eina_Future_Cb_Log_Desc){"info prefix:", " info suffix", 1117 ctx.info = (Eina_Future_Cb_Log_Desc){"info prefix:", " info suffix",
1118 __FILE__, __FUNCTION__, EINA_LOG_LEVEL_INFO, 1118 __FILE__, __func__, EINA_LOG_LEVEL_INFO,
1119 domain, __LINE__}; 1119 domain, __LINE__};
1120 eina_log_print_cb_set(_log_test, &ctx); 1120 eina_log_print_cb_set(_log_test, &ctx);
1121 f = eina_future_chain(_int_future_get(), 1121 f = eina_future_chain(_int_future_get(),
diff --git a/src/tests/efl_mono/libefl_mono_native_test.h b/src/tests/efl_mono/libefl_mono_native_test.h
index 4fe9d4c2b0..7491598324 100644
--- a/src/tests/efl_mono/libefl_mono_native_test.h
+++ b/src/tests/efl_mono/libefl_mono_native_test.h
@@ -75,7 +75,7 @@
75 75
76#include <interfaces/efl_part.eo.h> 76#include <interfaces/efl_part.eo.h>
77 77
78#define EQUAL(a, b) ((a) == (b) ? 1 : (fprintf(stderr, "NOT EQUAL! %s:%i (%s)", __FILE__, __LINE__, __FUNCTION__), fflush(stderr), 0)) 78#define EQUAL(a, b) ((a) == (b) ? 1 : (fprintf(stderr, "NOT EQUAL! %s:%i (%s)", __FILE__, __LINE__, __func__), fflush(stderr), 0))
79#define STR_EQUAL(a, b) (strcmp((a), (b)) == 0 ? 1 : (fprintf(stderr, "NOT EQUAL! %s:%i (%s) '%s' != '%s'", __FILE__, __LINE__, __FUNCTION__, (a), (b)), fflush(stderr), 0)) 79#define STR_EQUAL(a, b) (strcmp((a), (b)) == 0 ? 1 : (fprintf(stderr, "NOT EQUAL! %s:%i (%s) '%s' != '%s'", __FILE__, __LINE__, __func__, (a), (b)), fflush(stderr), 0))
80 80
81#endif 81#endif
diff --git a/src/tests/eina/eina_test_log.c b/src/tests/eina/eina_test_log.c
index 2deefd2f3d..624bbbe75d 100644
--- a/src/tests/eina/eina_test_log.c
+++ b/src/tests/eina/eina_test_log.c
@@ -114,7 +114,7 @@ EFL_START_TEST(eina_log_macro)
114 ctx.level = lvl; \ 114 ctx.level = lvl; \
115 ctx.line = __LINE__ + 1; \ 115 ctx.line = __LINE__ + 1; \
116 ctx.msg = _msg; \ 116 ctx.msg = _msg; \
117 ctx.fnc = __FUNCTION__; \ 117 ctx.fnc = __func__; \
118 ctx.did = EINA_FALSE 118 ctx.did = EINA_FALSE
119 119
120#ifdef EINA_LOG_LEVEL_MAXIMUM 120#ifdef EINA_LOG_LEVEL_MAXIMUM
@@ -188,7 +188,7 @@ EFL_START_TEST(eina_log_domains_macros)
188 ctx.level = lvl; \ 188 ctx.level = lvl; \
189 ctx.line = __LINE__ + 1; \ 189 ctx.line = __LINE__ + 1; \
190 ctx.msg = _msg; \ 190 ctx.msg = _msg; \
191 ctx.fnc = __FUNCTION__; \ 191 ctx.fnc = __func__; \
192 ctx.dom = "MyDomain"; \ 192 ctx.dom = "MyDomain"; \
193 ctx.did = EINA_FALSE 193 ctx.did = EINA_FALSE
194 194
@@ -310,7 +310,7 @@ EFL_START_TEST(eina_log_level_indexes)
310 ctx.level = lvl; \ 310 ctx.level = lvl; \
311 ctx.line = __LINE__ + 1; \ 311 ctx.line = __LINE__ + 1; \
312 ctx.msg = _msg; \ 312 ctx.msg = _msg; \
313 ctx.fnc = __FUNCTION__; \ 313 ctx.fnc = __func__; \
314 ctx.dom = "Levels"; \ 314 ctx.dom = "Levels"; \
315 ctx.did = EINA_FALSE; 315 ctx.did = EINA_FALSE;
316 316
diff --git a/src/tests/eina/eina_test_magic.c b/src/tests/eina/eina_test_magic.c
index d2254a2ba9..e4f9005b03 100644
--- a/src/tests/eina/eina_test_magic.c
+++ b/src/tests/eina/eina_test_magic.c
@@ -146,7 +146,7 @@ EFL_START_TEST(eina_magic_simple)
146#ifdef SHOW_LOG 146#ifdef SHOW_LOG
147 fprintf(stderr, "you should see 'Input handle pointer is NULL' below\n"); 147 fprintf(stderr, "you should see 'Input handle pointer is NULL' below\n");
148#endif 148#endif
149 TEST_MAGIC_SAFETY(__FUNCTION__, 149 TEST_MAGIC_SAFETY(__func__,
150 "*** Eina Magic Check Failed !!!\n" 150 "*** Eina Magic Check Failed !!!\n"
151 " Input handle pointer is NULL.\n" 151 " Input handle pointer is NULL.\n"
152 "\n"); 152 "\n");
@@ -164,7 +164,7 @@ EFL_START_TEST(eina_magic_simple)
164 fprintf(stderr, 164 fprintf(stderr,
165 "you should see 'Input handle has already been freed' below\n"); 165 "you should see 'Input handle has already been freed' below\n");
166#endif 166#endif
167 TEST_MAGIC_SAFETY(__FUNCTION__, 167 TEST_MAGIC_SAFETY(__func__,
168 "*** Eina Magic Check Failed at %p !!!\n" 168 "*** Eina Magic Check Failed at %p !!!\n"
169 " Input handle has already been freed.\n" 169 " Input handle has already been freed.\n"
170 "\n"); 170 "\n");
@@ -176,7 +176,7 @@ EFL_START_TEST(eina_magic_simple)
176#ifdef SHOW_LOG 176#ifdef SHOW_LOG
177 fprintf(stderr, "you should see 'Input handle is wrong type' below\n"); 177 fprintf(stderr, "you should see 'Input handle is wrong type' below\n");
178#endif 178#endif
179 TEST_MAGIC_SAFETY(__FUNCTION__, 179 TEST_MAGIC_SAFETY(__func__,
180 "*** Eina Magic Check Failed at %p !!!\n" 180 "*** Eina Magic Check Failed at %p !!!\n"
181 " Input handle is wrong type.\n" 181 " Input handle is wrong type.\n"
182 " Expected: %08x - %s\n" 182 " Expected: %08x - %s\n"
diff --git a/src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc b/src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc
index 2a7fb04733..a39d597659 100644
--- a/src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc
+++ b/src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc
@@ -33,7 +33,7 @@
33 33
34// bool simple_get() 34// bool simple_get()
35// { 35// {
36// printf("calling bar::%s\n", __FUNCTION__); 36// printf("calling bar::%s\n", __func__);
37// return false; 37// return false;
38// } 38// }
39// }; 39// };
diff --git a/src/tests/eolian_cxx/simple.c b/src/tests/eolian_cxx/simple.c
index 718e5c3549..7ab18dcb55 100644
--- a/src/tests/eolian_cxx/simple.c
+++ b/src/tests/eolian_cxx/simple.c
@@ -18,7 +18,7 @@ static Eo *_simple_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
18 18
19static Eina_Bool _simple_simple_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) 19static Eina_Bool _simple_simple_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
20{ 20{
21 printf("calling %s\n", __FUNCTION__); 21 printf("calling %s\n", __func__);
22 22
23 return EINA_TRUE; 23 return EINA_TRUE;
24} 24}
@@ -27,7 +27,7 @@ static Eina_Bool _simple_name_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, con
27{ 27{
28 static const char* _name= "simple_class"; 28 static const char* _name= "simple_class";
29 29
30 printf("calling %s= simples class\n", __FUNCTION__); 30 printf("calling %s= simples class\n", __func__);
31 *name = _name; 31 *name = _name;
32 32
33 return EINA_TRUE; 33 return EINA_TRUE;