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: I21cee619919e071a66d15840632f972b1e89c58e

diff --git a/src/lib/elm_interface_atspi_accessible.c b/src/lib/elm_interface_atspi_accessible.c
index 7a429ab5a495090a69ef2c34cd3d62e43fff0f1b..5bd83179a3ec352562b3a0f0eb9692df090250a3 100644 (file)
--- a/src/lib/elm_interface_atspi_accessible.c
+++ b/src/lib/elm_interface_atspi_accessible.c
@@ -147,7 +147,7 @@ struct _Elm_Interface_Atspi_Accessible_Data
    Elm_Atspi_Relation_Set relations;
    Elm_Interface_Atspi_Accessible *parent;
    //TIZEN_ONLY(20160729): attributes_get, append, reading_information set APIs added/updated.
-   Elm_Accessible_Reading_Info_Type reading_info;
+   Elm_Atspi_Reading_Info_Type_Mask reading_info;
    //
    //TIZEN_ONLY(20190922): add name callback, description callback.
    Elm_Atspi_Reading_Info_Cb_Item name_cb_item;
@@ -261,7 +261,7 @@ EOLIAN static void _elm_interface_atspi_accessible_attributes_clear(Eo *obj EINA
 }
 
 EOLIAN static void
-_elm_interface_atspi_accessible_reading_info_type_set(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd, Elm_Accessible_Reading_Info_Type reading_info)
+_elm_interface_atspi_accessible_reading_info_type_set(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd, Elm_Atspi_Reading_Info_Type_Mask reading_info)
 {
    Eina_Strbuf *buf = NULL;
    pd->reading_info = reading_info;
@@ -290,7 +290,7 @@ _elm_interface_atspi_accessible_reading_info_type_set(Eo *obj, Elm_Interface_Ats
    eina_strbuf_free(buf);
 }
 
-EOLIAN Elm_Accessible_Reading_Info_Type
+EOLIAN Elm_Atspi_Reading_Info_Type_Mask
 _elm_interface_atspi_accessible_reading_info_type_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd)
 {
    return pd->reading_info;

diff --git a/src/lib/elm_interface_atspi_accessible.eo b/src/lib/elm_interface_atspi_accessible.eo
index d143e3271b80954b802a7d6df05e09396cf1dec9..a2843a2a9ceed1d011cb7769163db529dcac8052 100644 (file)
--- a/src/lib/elm_interface_atspi_accessible.eo
+++ b/src/lib/elm_interface_atspi_accessible.eo
@@ -133,7 +133,7 @@ mixin Elm_Interface_Atspi_Accessible ()
             [[Gets reading information of an accessible object.]]
          }
          values {
-            reading_info: Elm.Accessible.Reading.Info.Type; [[Access Reading information type]]
+            reading_info: Elm_Atspi_Reading_Info_Type_Mask; [[Reading information types]]
          }
       }
       //

diff --git a/src/lib/elm_interface_atspi_accessible.h b/src/lib/elm_interface_atspi_accessible.h
index adcab71a78cd2d48c2ebc4fa77b6c717cbe8c655..bc2ca4467c776ff12e61dfda449df32afb4162e8 100644 (file)
--- a/src/lib/elm_interface_atspi_accessible.h
+++ b/src/lib/elm_interface_atspi_accessible.h
@@ -13,6 +13,9 @@
  */
 typedef char *(*Elm_Atspi_Reading_Info_Cb)(void *data, Evas_Object *obj);
 //
+//TIZEN_ONLY(20170406) Add Elm_Atspi_Reading_Info_Type_Mask
+typedef unsigned int Elm_Atspi_Reading_Info_Type_Mask;
+//
 
 //TIZEN_ONLY(20170405) Add gesture method to accessible interface
 enum _Elm_Atspi_Gesture_Type