summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Stanislawski <l.stanislaws@samsung.com>2017-10-24 12:01:50 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-10-24 12:01:50 +0900
commitbcb24a40dc2f3e5ad018ca9b8f91770cb44617ff (patch)
tree22cfaeaf90773aef7cff549f71309dec2fe01f22
parent1e83dd84c6d41dbb977eb6820f5ba26dc8b11e07 (diff)
elm: add prefixes to Efl.Access.Action to avoid clashes
Summary: Prefix methods/properties of Efl.Access.Action mixin to avoid potential clashes in genrated bindings. This is first of series of patches removing potential name clashes in accessibility interfaces. Reviewers: jpeg Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D5213
-rw-r--r--src/lib/elementary/efl_access_action.c3
-rw-r--r--src/lib/elementary/efl_access_action.eo12
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c2
-rw-r--r--src/lib/elementary/elm_interface_atspi_widget_action.c9
-rw-r--r--src/lib/elementary/elm_interface_atspi_widget_action.eo6
5 files changed, 18 insertions, 14 deletions
diff --git a/src/lib/elementary/efl_access_action.c b/src/lib/elementary/efl_access_action.c
index 92b62f8b9f..a6aba74f33 100644
--- a/src/lib/elementary/efl_access_action.c
+++ b/src/lib/elementary/efl_access_action.c
@@ -3,13 +3,14 @@
3#endif 3#endif
4 4
5#define EFL_ACCESS_ACTION_PROTECTED 5#define EFL_ACCESS_ACTION_PROTECTED
6#define EFL_ACCESS_ACTION_BETA
6 7
7#include <Elementary.h> 8#include <Elementary.h>
8#include "elm_widget.h" 9#include "elm_widget.h"
9#include "elm_priv.h" 10#include "elm_priv.h"
10 11
11EOLIAN const char * 12EOLIAN const char *
12_efl_access_action_localized_name_get(Eo *obj, void *pd EINA_UNUSED, int id) 13_efl_access_action_action_localized_name_get(Eo *obj, void *pd EINA_UNUSED, int id)
13{ 14{
14 const char *ret = NULL; 15 const char *ret = NULL;
15 16
diff --git a/src/lib/elementary/efl_access_action.eo b/src/lib/elementary/efl_access_action.eo
index d31fb61f0c..ca5d3457d8 100644
--- a/src/lib/elementary/efl_access_action.eo
+++ b/src/lib/elementary/efl_access_action.eo
@@ -6,7 +6,7 @@ mixin Efl.Access.Action ()
6 [[Accessible action mixin]] 6 [[Accessible action mixin]]
7 data: null; 7 data: null;
8 methods { 8 methods {
9 @property name @protected @pure_virtual { 9 @property action_name @protected @pure_virtual @beta {
10 [[Gets action name for given id]] 10 [[Gets action name for given id]]
11 get { 11 get {
12 } 12 }
@@ -17,7 +17,7 @@ mixin Efl.Access.Action ()
17 id: int; [[ID to get action name for]] 17 id: int; [[ID to get action name for]]
18 } 18 }
19 } 19 }
20 @property localized_name @protected { 20 @property action_localized_name @protected @beta {
21 [[Gets localized action name for given id]] 21 [[Gets localized action name for given id]]
22 get { 22 get {
23 } 23 }
@@ -28,7 +28,7 @@ mixin Efl.Access.Action ()
28 id: int; [[ID to get localized name for]] 28 id: int; [[ID to get localized name for]]
29 } 29 }
30 } 30 }
31 @property description @protected @pure_virtual { 31 @property action_description @protected @pure_virtual @beta {
32 [[Action description for given id]] 32 [[Action description for given id]]
33 get { 33 get {
34 } 34 }
@@ -42,7 +42,7 @@ mixin Efl.Access.Action ()
42 id: int; [[ID to set or get description for]] 42 id: int; [[ID to set or get description for]]
43 } 43 }
44 } 44 }
45 @property actions @protected { 45 @property actions @protected @beta {
46 [[Get list of available widget actions]] 46 [[Get list of available widget actions]]
47 get @pure_virtual { 47 get @pure_virtual {
48 } 48 }
@@ -50,14 +50,14 @@ mixin Efl.Access.Action ()
50 actions: list<Elm_Atspi_Action>; [[Contains statically allocated strings]] 50 actions: list<Elm_Atspi_Action>; [[Contains statically allocated strings]]
51 } 51 }
52 } 52 }
53 action_do @protected @pure_virtual { 53 action_do @protected @pure_virtual @beta {
54 [[Performs action on given widget.]] 54 [[Performs action on given widget.]]
55 params { 55 params {
56 @in id: int; [[ID for widget]] 56 @in id: int; [[ID for widget]]
57 } 57 }
58 return: bool; [[$true if action was performed, $false otherwise]] 58 return: bool; [[$true if action was performed, $false otherwise]]
59 } 59 }
60 keybinding_get @protected @pure_virtual { 60 action_keybinding_get @protected @pure_virtual @beta {
61 [[Gets configured keybinding for specific action and widget.]] 61 [[Gets configured keybinding for specific action and widget.]]
62 params { 62 params {
63 @in id: int; [[ID for widget]] 63 @in id: int; [[ID for widget]]
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 3d3b3ff521..c8681932e5 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -11,6 +11,8 @@
11#define EFL_ACCESS_TEXT_PROTECTED 11#define EFL_ACCESS_TEXT_PROTECTED
12#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED 12#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
13 13
14#define EFL_ACCESS_ACTION_BETA
15
14#include "atspi/atspi-constants.h" 16#include "atspi/atspi-constants.h"
15 17
16#include <stdint.h> 18#include <stdint.h>
diff --git a/src/lib/elementary/elm_interface_atspi_widget_action.c b/src/lib/elementary/elm_interface_atspi_widget_action.c
index 66f3891a13..aee335b16f 100644
--- a/src/lib/elementary/elm_interface_atspi_widget_action.c
+++ b/src/lib/elementary/elm_interface_atspi_widget_action.c
@@ -4,6 +4,7 @@
4 4
5#define EFL_ACCESS_ACTION_PROTECTED 5#define EFL_ACCESS_ACTION_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7#define EFL_ACCESS_ACTION_BETA
7 8
8#include <Elementary.h> 9#include <Elementary.h>
9#include "elm_widget.h" 10#include "elm_widget.h"
@@ -40,7 +41,7 @@ _elm_interface_atspi_widget_action_efl_access_action_action_do(Eo *obj, void *pd
40} 41}
41 42
42EOLIAN static char* 43EOLIAN static char*
43_elm_interface_atspi_widget_action_efl_access_action_keybinding_get(Eo *obj, void *pd EINA_UNUSED, int id) 44_elm_interface_atspi_widget_action_efl_access_action_action_keybinding_get(Eo *obj, void *pd EINA_UNUSED, int id)
44{ 45{
45 const Elm_Atspi_Action *actions = NULL; 46 const Elm_Atspi_Action *actions = NULL;
46 Eina_List *l1, *binding_list; 47 Eina_List *l1, *binding_list;
@@ -93,7 +94,7 @@ _elm_interface_atspi_widget_action_efl_access_action_keybinding_get(Eo *obj, voi
93} 94}
94 95
95EOLIAN static const char * 96EOLIAN static const char *
96_elm_interface_atspi_widget_action_efl_access_action_name_get(Eo *obj, void *pd EINA_UNUSED, int id) 97_elm_interface_atspi_widget_action_efl_access_action_action_name_get(Eo *obj, void *pd EINA_UNUSED, int id)
97{ 98{
98 const Elm_Atspi_Action *actions = NULL; 99 const Elm_Atspi_Action *actions = NULL;
99 int tmp = 0; 100 int tmp = 0;
@@ -110,13 +111,13 @@ _elm_interface_atspi_widget_action_efl_access_action_name_get(Eo *obj, void *pd
110} 111}
111 112
112EOLIAN static Eina_Bool 113EOLIAN static Eina_Bool
113_elm_interface_atspi_widget_action_efl_access_action_description_set(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED, const char *description EINA_UNUSED) 114_elm_interface_atspi_widget_action_efl_access_action_action_description_set(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED, const char *description EINA_UNUSED)
114{ 115{
115 return EINA_FALSE; 116 return EINA_FALSE;
116} 117}
117 118
118EOLIAN static const char * 119EOLIAN static const char *
119_elm_interface_atspi_widget_action_efl_access_action_description_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED) 120_elm_interface_atspi_widget_action_efl_access_action_action_description_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, int id EINA_UNUSED)
120{ 121{
121 return NULL; 122 return NULL;
122} 123}
diff --git a/src/lib/elementary/elm_interface_atspi_widget_action.eo b/src/lib/elementary/elm_interface_atspi_widget_action.eo
index 869ccc547d..9d0ce3458b 100644
--- a/src/lib/elementary/elm_interface_atspi_widget_action.eo
+++ b/src/lib/elementary/elm_interface_atspi_widget_action.eo
@@ -17,9 +17,9 @@ mixin Elm.Interface.Atspi_Widget_Action (Efl.Access.Action)
17 } 17 }
18 implements { 18 implements {
19 Efl.Access.Action.action_do; 19 Efl.Access.Action.action_do;
20 Efl.Access.Action.keybinding_get; 20 Efl.Access.Action.action_keybinding_get;
21 Efl.Access.Action.name { get; } 21 Efl.Access.Action.action_name { get; }
22 Efl.Access.Action.description { get; set; } 22 Efl.Access.Action.action_description { get; set; }
23 Efl.Access.Action.actions { get; } 23 Efl.Access.Action.actions { get; }
24 } 24 }
25} 25}