Depricated functions changed

Change-Id: I126dc644b95578e70953387a930b161399775c31
Signed-off-by: Patryk Kaczmarek <patryk.k@samsung.com>

diff --git a/src/navigator.c b/src/navigator.c
index aeea9c5..ab4c8c9 100644 (file)
--- a/src/navigator.c
+++ b/src/navigator.c
@@ -274,7 +274,7 @@ _current_highlight_object_set(AtspiAccessible *obj)
     if (obj && ATSPI_IS_COMPONENT(obj))
       {
          DEBUG("OBJ WITH COMPONENT");
-         AtspiComponent *comp = atspi_accessible_get_component(obj);
+         AtspiComponent *comp = atspi_accessible_get_component_iface(obj);
          if (!comp)
            {
              GError *err = NULL;
@@ -497,7 +497,7 @@ static void _focus_widget(Gesture_Info *info)
     AtspiComponent *window_component;
     GError *err = NULL;
 
-    window_component = atspi_accessible_get_component(top_window);
+    window_component = atspi_accessible_get_component_iface(top_window);
     if(!window_component)
         return;
     if ((last_focus.x == info->x_begin) && (last_focus.y == info->y_begin))
@@ -597,7 +597,7 @@ static void _value_inc_widget(void)
     GERROR_CHECK(err)
     if(!strcmp(role, "entry"))
     {
-        text_interface = atspi_accessible_get_text(current_widget);
+        text_interface = atspi_accessible_get_text_iface(current_widget);
         if(text_interface)
         {
             current_offset = atspi_text_get_caret_offset(text_interface, &err);
@@ -619,7 +619,7 @@ static void _value_inc_widget(void)
         return;
     }
     g_free(role);
-    AtspiValue *value_interface = atspi_accessible_get_value(current_widget);
+    AtspiValue *value_interface = atspi_accessible_get_value_iface(current_widget);
     if(value_interface)
     {
         ERROR("Value interface supported!\n");
@@ -653,7 +653,7 @@ static void _value_dec_widget(void)
     GERROR_CHECK(err)
     if(!strcmp(role, "entry"))
     {
-        text_interface = atspi_accessible_get_text(current_widget);
+        text_interface = atspi_accessible_get_text_iface(current_widget);
         if(text_interface)
         {
             current_offset = atspi_text_get_caret_offset(text_interface, &err);
@@ -676,7 +676,7 @@ static void _value_dec_widget(void)
     }
     g_free(role);
 
-    AtspiValue *value_interface = atspi_accessible_get_value(current_widget);
+    AtspiValue *value_interface = atspi_accessible_get_value_iface(current_widget);
     if(value_interface)
     {
         ERROR("Value interface supported!\n");
@@ -726,12 +726,11 @@ static void _activate_widget(void)
 
     display_info_about_object(current_widget);
 
-
     edit = atspi_accessible_get_editable_text (current_widget);
     if (edit)
       {
          DEBUG("Activated object has editable Interface");
-         focus_component = atspi_accessible_get_component(current_widget);
+         focus_component = atspi_accessible_get_component_iface(current_widget);
          if (focus_component)
             {
             if (atspi_component_grab_focus(focus_component, &err) == TRUE){
@@ -744,7 +743,7 @@ static void _activate_widget(void)
       return;
     }
 
-    action = atspi_accessible_get_action(current_widget);
+    action = atspi_accessible_get_action_iface(current_widget);
     if (action) {
        number = atspi_action_get_n_actions(action, &err);
        DEBUG("Number of available action = %d\n", number);
@@ -1138,7 +1137,7 @@ void navigator_shutdown(void)
   GError *err = NULL;
    if (current_obj)
      {
-       AtspiComponent *comp = atspi_accessible_get_component(current_obj);
+       AtspiComponent *comp = atspi_accessible_get_component_iface(current_obj);
        if (comp)
          {
            atspi_component_clear_highlight(comp, &err);

diff --git a/src/object_cache.c b/src/object_cache.c
index 8eddd5b..96a3955 100644 (file)
--- a/src/object_cache.c
+++ b/src/object_cache.c
@@ -113,7 +113,7 @@ _cache_item_construct(AtspiAccessible *obj)
         return NULL;
      }
 
-   comp = atspi_accessible_get_component(obj);
+   comp = atspi_accessible_get_component_iface(obj);
    if (!comp) {
      ERROR("Cached Object do not implement Component interface");
    }

diff --git a/src/position_sort.c b/src/position_sort.c
index 5497128..181f0ac 100644 (file)
--- a/src/position_sort.c
+++ b/src/position_sort.c
@@ -60,7 +60,7 @@ _get_zones(const Eina_List *objs)
 
    EINA_LIST_FOREACH(objs, l, obj)
      {
-        if ((comp = atspi_accessible_get_component(obj)) != NULL)
+        if ((comp = atspi_accessible_get_component_iface(obj)) != NULL)
           {
              oc = object_cache_get(obj);
 

diff --git a/src/screen_reader_spi.c b/src/screen_reader_spi.c
index b62d0cb..fa7cdd9 100644 (file)
--- a/src/screen_reader_spi.c
+++ b/src/screen_reader_spi.c
@@ -146,7 +146,7 @@ static char *spi_on_caret_move_get_text(AtspiEvent *event, void *user_data)
     sd->currently_focused = event->source;
     char *return_text;
 
-    AtspiText *text_interface = atspi_accessible_get_text(sd->currently_focused);
+    AtspiText *text_interface = atspi_accessible_get_text_iface(sd->currently_focused);
     if(text_interface)
         {
           DEBUG("->->->->->-> WIDGET CARET MOVED: %s <-<-<-<-<-<-<-",
@@ -196,7 +196,7 @@ static char *spi_on_value_changed_get_text(AtspiEvent *event, void *user_data)
 
     sd->currently_focused = event->source;
 
-    AtspiValue *value_interface = atspi_accessible_get_value(sd->currently_focused);
+    AtspiValue *value_interface = atspi_accessible_get_value_iface(sd->currently_focused);
     if(value_interface)
     {
       DEBUG("->->->->->-> WIDGET VALUE CHANGED: %s <-<-<-<-<-<-<-",

diff --git a/tests/atspi/atspi.c b/tests/atspi/atspi.c
index 4b0a163..2114614 100644 (file)
--- a/tests/atspi/atspi.c
+++ b/tests/atspi/atspi.c
@@ -85,7 +85,7 @@ gchar * atspi_accessible_get_description (AtspiAccessible *obj, GError **error)
     return strdup(obj->description);
 }
 
-AtspiText * atspi_accessible_get_text (AtspiAccessible *obj)
+AtspiText * atspi_accessible_get_text_iface (AtspiAccessible *obj)
 {
     if(!obj) return NULL;
     return text;
@@ -109,7 +109,7 @@ gchar * atspi_text_get_text (AtspiText *obj, gint start_offset, gint end_offset,
     return "AtspiText text";
 }
 
-AtspiValue * atspi_accessible_get_value (AtspiAccessible *obj)
+AtspiValue * atspi_accessible_get_value_iface (AtspiAccessible *obj)
 {
     if(!obj) return NULL;
     return value;
@@ -223,7 +223,7 @@ AtspiAccessible * atspi_accessible_get_child_at_index (AtspiAccessible *obj, gin
     return g_object_ref(g_list_nth_data(obj->children, child_index));
 }
 
-AtspiComponent * atspi_accessible_get_component (AtspiAccessible *obj)
+AtspiComponent * atspi_accessible_get_component_iface (AtspiAccessible *obj)
 {
     if(!obj) return NULL;
     AtspiComponent *component = g_object_new(ATSPI_COMPONENT_OBJECT_TYPE, 0);
@@ -376,7 +376,7 @@ static void atspi_component_init(AtspiComponent* obj)
     obj->role = (AtspiRole*)malloc(sizeof(AtspiRole));
 }
 
-AtspiEditableText * atspi_accessible_get_editable_text (AtspiAccessible *obj)
+AtspiEditableText * atspi_accessible_get_editable_text_iface (AtspiAccessible *obj)
 {
     return editable_text;
 }

diff --git a/tests/atspi/atspi.h b/tests/atspi/atspi.h
index 0853084..c367a0d 100644 (file)
--- a/tests/atspi/atspi.h
+++ b/tests/atspi/atspi.h
@@ -352,11 +352,11 @@ gchar * atspi_accessible_get_name (AtspiAccessible *obj, GError **error);
 gchar * atspi_accessible_get_role_name (AtspiAccessible *obj, GError **error);
 gchar * atspi_accessible_get_toolkit_name (AtspiAccessible *obj, GError **error);
 gchar * atspi_accessible_get_description (AtspiAccessible *obj, GError **error);
-AtspiText * atspi_accessible_get_text (AtspiAccessible *obj);
+AtspiText * atspi_accessible_get_text_iface (AtspiAccessible *obj);
 gint atspi_text_get_character_count (AtspiText *obj, GError **error);
 gint atspi_text_get_caret_offset (AtspiText *obj, GError **error);
 gchar * atspi_text_get_text (AtspiText *obj, gint start_offset, gint end_offset, GError **error);
-AtspiValue * atspi_accessible_get_value (AtspiAccessible *obj);
+AtspiValue * atspi_accessible_get_value_iface (AtspiAccessible *obj);
 gdouble atspi_value_get_current_value (AtspiValue *obj, GError **error);
 gdouble atspi_value_get_maximum_value (AtspiValue *obj, GError **error);
 gdouble atspi_value_get_minimum_value (AtspiValue *obj, GError **error);
@@ -384,13 +384,13 @@ gboolean atspi_component_clear_highlight (AtspiComponent *obj, GError **error);
 AtspiRole atspi_accessible_get_role (AtspiAccessible *obj, GError **error);
 gint atspi_accessible_get_child_count (AtspiAccessible *obj, GError **error);
 AtspiAccessible * atspi_accessible_get_child_at_index (AtspiAccessible *obj, gint child_index, GError **error);
-AtspiComponent * atspi_accessible_get_component (AtspiAccessible *obj);
+AtspiComponent * atspi_accessible_get_component_iface (AtspiAccessible *obj);
 AtspiRect *atspi_component_get_extents (AtspiComponent *obj, AtspiCoordType ctype, GError **error);
 AtspiAccessible *atspi_create_accessible(void);
 void atspi_delete_accessible(AtspiAccessible *obj);
 void atspi_accessible_add_child(AtspiAccessible *obj, AtspiAccessible *child);
 void atpis_accessible_remove_children(AtspiAccessible *obj);
-AtspiEditableText * atspi_accessible_get_editable_text (AtspiAccessible *obj);
+AtspiEditableText * atspi_accessible_get_editable_text_iface (AtspiAccessible *obj);
 GArray * atspi_accessible_get_relation_set (AtspiAccessible *obj, GError **error);
 AtspiRelationType atspi_relation_get_relation_type (AtspiRelation *obj);
 gint atspi_relation_get_n_targets (AtspiRelation *obj);