atspi: Add Elm_Atspi_Reading_Info_Type_Mask

   The elm_atspi_accessible_reading_info_type_set could get result value of bitwise
   operation. If the elm_atspi_accessible_reading_info_type_set allows only enum
   Elm_Accessible_Reading_Info_type, then g++ complains with following error:

   invalid conversion from 'int' to 'Elm_Accessible_Reading_Info_Type' [-fpermissive]

   So the elm_atspi_accessible_reading_info_type_set should change its parameter
   from Elm_Accessible_Reading_Info_Type to Elm_Atspi_Reading_Info_Type_Mask.
   The Elm_Atspi_Reading_Info_Type_Mask is unsigned int type.

Change-Id: Ibadb4effe3ac46b5aaa806bcac0002b9f68d1b76

diff --git a/src/lib/elementary/efl_access.c b/src/lib/elementary/efl_access.c
index d862162..1c4027a 100644 (file)
--- a/src/lib/elementary/efl_access.c
+++ b/src/lib/elementary/efl_access.c
@@ -162,7 +162,7 @@ struct _Efl_Access_Data
    const char    *description;
    const char    *translation_domain;
    Efl_Access_Role role;
-   Efl_Access_Reading_Info_Type reading_info;
+   Efl_Access_Reading_Info_Type_Mask reading_info;
    Efl_Access_Type type: 2;
 };
 
@@ -288,7 +288,7 @@ EOLIAN static void _efl_access_attributes_clear(Eo *obj EINA_UNUSED, Efl_Access_
 }
 
 EOLIAN static void
-_efl_access_reading_info_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Reading_Info_Type reading_info)
+_efl_access_reading_info_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Reading_Info_Type_Mask reading_info)
 {
    Eina_Strbuf *buf = NULL;
    pd->reading_info = reading_info;
@@ -317,7 +317,7 @@ _efl_access_reading_info_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Readi
    eina_strbuf_free(buf);
 }
 
-EOLIAN Efl_Access_Reading_Info_Type
+EOLIAN Efl_Access_Reading_Info_Type_Mask
 _efl_access_reading_info_type_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
 {
    return pd->reading_info;
@@ -982,13 +982,13 @@ elm_atspi_accessible_attributes_get(const Elm_Interface_Atspi_Accessible *obj)
 EAPI void
 elm_atspi_accessible_reading_info_type_set(Elm_Interface_Atspi_Accessible *obj, Elm_Atspi_Reading_Info_Type_Mask reading_info)
 {
-   efl_access_reading_info_type_set(obj, reading_info);
+   efl_access_reading_info_type_set(obj, (Efl_Access_Reading_Info_Type_Mask)reading_info);
 }
 
 EAPI Elm_Atspi_Reading_Info_Type_Mask
 elm_atspi_accessible_reading_info_type_get(const Elm_Interface_Atspi_Accessible *obj)
 {
-   return efl_access_reading_info_type_get(obj);
+   return (Elm_Atspi_Reading_Info_Type_Mask)efl_access_reading_info_type_get(obj);
 }
 
 EAPI int

diff --git a/src/lib/elementary/efl_access.eo b/src/lib/elementary/efl_access.eo
index e9c821e..f0b491c 100644 (file)
--- a/src/lib/elementary/efl_access.eo
+++ b/src/lib/elementary/efl_access.eo
@@ -2,6 +2,7 @@
 type Efl_Event_Cb: __undefined_type; [[Efl event callback type]]
 type Efl_Access_Reading_Info_Cb: __undefined_type; [[reading information callback]]
 type Efl_Access_Gesture_Cb: __undefined_type; [[gesture callback]]
+type Efl_Access_Reading_Info_Type_Mask: __undefined_type; [[Reading information types]]
 
 enum Efl.Access.Type
 {
@@ -468,7 +469,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object)
             ]]
          }
          values {
-            reading_info: Efl.Access.Reading.Info.Type; [[Reading information types]]
+            reading_info: Efl_Access_Reading_Info_Type_Mask; [[Reading information types]]
          }
       }
       @property index_in_parent @protected @beta {

diff --git a/src/lib/elementary/efl_access.h b/src/lib/elementary/efl_access.h
index 42dbe88..3d729a0 100644 (file)
--- a/src/lib/elementary/efl_access.h
+++ b/src/lib/elementary/efl_access.h
@@ -18,6 +18,10 @@ typedef struct _Efl_Access_Gesture_Info Efl_Access_Gesture_Info;
 typedef Eina_Bool (*Efl_Access_Gesture_Cb)(void *data, Efl_Access_Gesture_Info gesture_info, Evas_Object *obj);
 //
 
+//TIZEN_ONLY(20170406) Add Elm_Atspi_Reading_Info_Type_Mask
+typedef unsigned int Efl_Access_Reading_Info_Type_Mask;
+//
+
 #ifdef EFL_EO_API_SUPPORT
 #include "efl_access.eo.h"
 #endif