diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/legacy/elementary/src/lib/elc_ctxpopup.c index ed5c6f8bf7..f9e42c842c 100644 --- a/legacy/elementary/src/lib/elc_ctxpopup.c +++ b/legacy/elementary/src/lib/elc_ctxpopup.c @@ -15,12 +15,14 @@ EAPI Eo_Op ELM_OBJ_CTXPOPUP_BASE_ID = EO_NOOP; EAPI const char ELM_CTXPOPUP_SMART_NAME[] = "elm_ctxpopup"; -static const char SIG_DISMISSED[] = "dismissed"; -static const char SIG_LANG_CHANGED[] = "language,changed"; +#define ELM_PRIV_CTXPOPUP_SIGNALS(cmd) \ + cmd(SIG_DISMISSED, "dismissed", "") \ + cmd(SIG_LANG_CHANGED, "language,changed", "") + +ELM_PRIV_CTXPOPUP_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE); static const Evas_Smart_Cb_Description _smart_callbacks[] = { - {SIG_DISMISSED, ""}, - {SIG_LANG_CHANGED, ""}, + ELM_PRIV_CTXPOPUP_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC) {"focused", ""}, /**< handled by elm_widget */ {"unfocused", ""}, /**< handled by elm_widget */ {NULL, NULL} diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/legacy/elementary/src/lib/elc_fileselector.c index 7dca76550d..ef73b6a807 100644 --- a/legacy/elementary/src/lib/elc_fileselector.c +++ b/legacy/elementary/src/lib/elc_fileselector.c @@ -30,13 +30,15 @@ EAPI Eo_Op ELM_OBJ_FILESELECTOR_BASE_ID = EO_NOOP; static Elm_Genlist_Item_Class *list_itc[ELM_FILE_LAST]; static Elm_Gengrid_Item_Class *grid_itc[ELM_FILE_LAST]; -static const char SIG_DIRECTORY_OPEN[] = "directory,open"; -static const char SIG_DONE[] = "done"; -static const char SIG_SELECTED[] = "selected"; +#define ELM_PRIV_FILESELECTOR_SIGNALS(cmd) \ + cmd(SIG_DIRECTORY_OPEN, "directory,open", "s") \ + cmd(SIG_DONE, "done", "s") \ + cmd(SIG_SELECTED, "selected", "s") + +ELM_PRIV_FILESELECTOR_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE); + static const Evas_Smart_Cb_Description _smart_callbacks[] = { - {SIG_DIRECTORY_OPEN, "s"}, - {SIG_DONE, "s"}, - {SIG_SELECTED, "s"}, + ELM_PRIV_FILESELECTOR_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC) {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elc_fileselector_button.c b/legacy/elementary/src/lib/elc_fileselector_button.c index 60369758ef..e2182badda 100644 --- a/legacy/elementary/src/lib/elc_fileselector_button.c +++ b/legacy/elementary/src/lib/elc_fileselector_button.c @@ -14,12 +14,14 @@ EAPI Eo_Op ELM_OBJ_FILESELECTOR_BUTTON_BASE_ID = EO_NOOP; #define DEFAULT_WINDOW_TITLE "Select a file" -static const char SIG_FILE_CHOSEN[] = "file,chosen"; -static const char SIG_LANG_CHANGED[] = "language,changed"; +#define ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS(cmd) \ + cmd(SIG_FILE_CHOSEN, "file,chosen", "s") \ + cmd(SIG_LANG_CHANGED, "language,changed", "") + +ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE); static const Evas_Smart_Cb_Description _smart_callbacks[] = { - {SIG_FILE_CHOSEN, "s"}, - {SIG_LANG_CHANGED, ""}, + ELM_PRIV_FILESELECTOR_BUTTON_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC) {"focused", ""}, /**< handled by elm_widget */ {"unfocused", ""}, /**< handled by elm_widget */ {NULL, NULL} diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.c b/legacy/elementary/src/lib/elc_fileselector_entry.c index fa7dd44f58..abdf7e59d3 100644 --- a/legacy/elementary/src/lib/elc_fileselector_entry.c +++ b/legacy/elementary/src/lib/elc_fileselector_entry.c @@ -15,37 +15,27 @@ EAPI Eo_Op ELM_OBJ_FILESELECTOR_ENTRY_BASE_ID = EO_NOOP; EAPI const char ELM_FILESELECTOR_ENTRY_SMART_NAME[] = "elm_fileselector_entry"; -static const char SIG_CHANGED[] = "changed"; -static const char SIG_ACTIVATED[] = "activated"; -static const char SIG_PRESS[] = "press"; -static const char SIG_LONGPRESSED[] = "longpressed"; -static const char SIG_CLICKED[] = "clicked"; -static const char SIG_CLICKED_DOUBLE[] = "clicked,double"; -static const char SIG_FOCUSED[] = "focused"; -static const char SIG_UNFOCUSED[] = "unfocused"; -static const char SIG_SELECTION_PASTE[] = "selection,paste"; -static const char SIG_SELECTION_COPY[] = "selection,copy"; -static const char SIG_SELECTION_CUT[] = "selection,cut"; -static const char SIG_UNPRESSED[] = "unpressed"; -static const char SIG_FILE_CHOSEN[] = "file,chosen"; -static const char SIG_LANG_CHANGED[] = "language,changed"; +#define ELM_PRIV_FILESELECTOR_ENTRY_SIGNALS(cmd) \ + cmd(SIG_CHANGED, "changed", "") \ + cmd(SIG_ACTIVATED, "activated", "") \ + cmd(SIG_PRESS, "press", "") \ + cmd(SIG_LONGPRESSED, "longpressed", "") \ + cmd(SIG_CLICKED, "clicked", "") \ + cmd(SIG_CLICKED_DOUBLE, "clicked,double", "") \ + cmd(SIG_FOCUSED, "focused", "") \ + cmd(SIG_UNFOCUSED, "unfocused", "") \ + cmd(SIG_SELECTION_PASTE, "selection,paste", "") \ + cmd(SIG_SELECTION_COPY, "selection,copy", "") \ + cmd(SIG_SELECTION_CUT, "selection,cut", "") \ + cmd(SIG_UNPRESSED, "unpressed", "") \ + cmd(SIG_FILE_CHOSEN, "file,chosen", "s") \ + cmd(SIG_LANG_CHANGED, "language,changed", "") + +ELM_PRIV_FILESELECTOR_ENTRY_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE); static const Evas_Smart_Cb_Description _smart_callbacks[] = { - {SIG_CHANGED, ""}, - {SIG_ACTIVATED, ""}, - {SIG_PRESS, ""}, - {SIG_LONGPRESSED, ""}, - {SIG_CLICKED, ""}, - {SIG_CLICKED_DOUBLE, ""}, - {SIG_FOCUSED, ""}, - {SIG_UNFOCUSED, ""}, - {SIG_SELECTION_PASTE, ""}, - {SIG_SELECTION_COPY, ""}, - {SIG_SELECTION_CUT, ""}, - {SIG_UNPRESSED, ""}, - {SIG_FILE_CHOSEN, "s"}, - {SIG_LANG_CHANGED, ""}, + ELM_PRIV_FILESELECTOR_ENTRY_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC) {NULL, NULL} }; diff --git a/legacy/elementary/src/lib/elm_actionslider.c b/legacy/elementary/src/lib/elm_actionslider.c index a579fe5a9b..42c94c70e2 100644 --- a/legacy/elementary/src/lib/elm_actionslider.c +++ b/legacy/elementary/src/lib/elm_actionslider.c @@ -23,12 +23,15 @@ static const Elm_Layout_Part_Alias_Description _text_aliases[] = {NULL, NULL} }; -static const char SIG_CHANGED[] = "pos_changed"; -static const char SIG_SELECTED[] = "selected"; +#define ELM_PRIV_ACTIONSLIDER_SIGNALS(cmd) \ + cmd(SIG_CHANGED, "pos_changed", "") \ + cmd(SIG_SELECTED, "selected", "") + +ELM_PRIV_ACTIONSLIDER_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE); + static const Evas_Smart_Cb_Description _smart_callbacks[] = { - {SIG_CHANGED, ""}, - {SIG_SELECTED, ""}, + ELM_PRIV_ACTIONSLIDER_SIGNALS(ELM_PRIV_SMART_CALLBACKS_DESC) {NULL, NULL} };