Commit a17d59c7 authored by Stefan Schmidt's avatar Stefan Schmidt

Revert "access: add API to get access object of given part"

This reverts commit 57d77c90.

We are in freeze right now and this is a new feature. Considering the access
API is still in beta I might have let this slip by but its does not even build

../../../src/tests/elementary/elm_test_popup.c:27:1: error: conflicting types for ‘elm_object_part_access_object_get’
 START_TEST (elm_object_part_access_object_get)
 ^
In file included from ../../../src/lib/elementary/Elementary.h:240:0,
                 from ../../../src/tests/elementary/elm_test_popup.c:6:
../../../src/lib/elementary/elm_object.h:521:54: note: previous declaration of ‘elm_object_part_access_object_get’ was here
 EAPI Evas_Object *elm_object_part_access_object_get(const Evas_Object *obj, const char *part);
                                                      ^
../../../src/tests/elementary/elm_test_popup.c: In function ‘elm_object_part_access_object_get’:
../../../src/tests/elementary/elm_test_popup.c:39:47: warning: passing argument 1 of ‘elm_object_part_access_object_get’ makes integer from pointer without a cast [-Wint-conversion]
    access = elm_object_part_access_object_get(popup, "access.title");
                                               ^
../../../src/tests/elementary/elm_test_popup.c:27:1: note: expected ‘int’ but argument is of type ‘Evas_Object * {aka struct _Eo_Opaque *}’
 START_TEST (elm_object_part_access_object_get)
 ^
../../../src/tests/elementary/elm_test_popup.c:39:13: error: too many arguments to function ‘elm_object_part_access_object_get’
    access = elm_object_part_access_object_get(popup, "access.title");
             ^
../../../src/tests/elementary/elm_test_popup.c:27:1: note: declared here
 START_TEST (elm_object_part_access_object_get)
 ^
../../../src/tests/elementary/elm_test_popup.c:39:11: error: void value not ignored as it ought to be
    access = elm_object_part_access_object_get(popup, "access.title");
           ^
Makefile:43996: recipe for target 'tests/elementary/tests_elementary_elm_suite-elm_test_popup.o' failed
make[5]: *** [tests/elementary/tests_elementary_elm_suite-elm_test_popup.o] Error 1

If you still want this in make sure it actually can compile the tests you added.
parent 864ea76a
...@@ -240,7 +240,6 @@ Features: ...@@ -240,7 +240,6 @@ Features:
* eo base - add weak object refs as per jpeg needs * eo base - add weak object refs as per jpeg needs
* elput: Add API function to return output name associated with input device * elput: Add API function to return output name associated with input device
* Eo refcount: Split the refcount to private and public (user). * Eo refcount: Split the refcount to private and public (user).
* access: Add API to get access object of given widget's part.
Fixes: Fixes:
......
...@@ -1482,12 +1482,6 @@ _elm_popup_elm_widget_event(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Evas_Objec ...@@ -1482,12 +1482,6 @@ _elm_popup_elm_widget_event(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, Evas_Objec
return EINA_TRUE; return EINA_TRUE;
} }
EOLIAN static Evas_Object*
_elm_popup_elm_widget_part_access_object_get(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED, const char *part)
{
return _access_object_get(obj, part);
}
EOLIAN static void EOLIAN static void
_elm_popup_efl_canvas_group_group_add(Eo *obj, Elm_Popup_Data *priv) _elm_popup_efl_canvas_group_group_add(Eo *obj, Elm_Popup_Data *priv)
{ {
......
...@@ -1924,10 +1924,3 @@ elm_object_focus_region_show_mode_get(const Evas_Object *obj) ...@@ -1924,10 +1924,3 @@ elm_object_focus_region_show_mode_get(const Evas_Object *obj)
{ {
return elm_widget_focus_region_show_mode_get(obj); return elm_widget_focus_region_show_mode_get(obj);
} }
EAPI Evas_Object *
elm_object_part_access_object_get(const Evas_Object *obj, const char *part)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
return elm_widget_part_access_object_get(obj, part);
}
...@@ -508,14 +508,3 @@ EAPI void elm_object_orientation_mode_disabled_set(Evas_Object *obj, Eina ...@@ -508,14 +508,3 @@ EAPI void elm_object_orientation_mode_disabled_set(Evas_Object *obj, Eina
*/ */
EAPI Eina_Bool elm_object_orientation_mode_disabled_get(const Evas_Object *obj); EAPI Eina_Bool elm_object_orientation_mode_disabled_get(const Evas_Object *obj);
/**
* Get the access object which is registered to part
*
* @param obj The Elementary widget
* @param part The widget's part name to get access object
*
* @since 1.18
*
* @ingroup General
*/
EAPI Evas_Object *elm_object_part_access_object_get(const Evas_Object *obj, const char *part);
...@@ -180,7 +180,6 @@ class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Edje.Object) ...@@ -180,7 +180,6 @@ class Elm.Popup (Elm.Layout, Elm.Interface.Atspi_Widget_Action, Edje.Object)
Elm.Widget.translate; Elm.Widget.translate;
Elm.Widget.sub_object_del; Elm.Widget.sub_object_del;
Elm.Widget.event; Elm.Widget.event;
Elm.Widget.part_access_object_get;
Elm.Layout.text.set; Elm.Layout.text.set;
Elm.Layout.text.get; Elm.Layout.text.get;
Elm.Layout.sizing_eval; Elm.Layout.sizing_eval;
......
...@@ -3696,14 +3696,6 @@ _elm_widget_focus_reconfigure(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) ...@@ -3696,14 +3696,6 @@ _elm_widget_focus_reconfigure(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
_elm_widget_focus_move_policy_reload(obj); _elm_widget_focus_move_policy_reload(obj);
} }
EOLIAN static Evas_Object*
_elm_widget_part_access_object_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const char *part)
{
WRN("The %s widget does not implement the \"part_access_object_get\" functions.",
eo_class_name_get(eo_class_get(obj)));
return NULL;
}
EAPI void EAPI void
elm_widget_content_part_set(Evas_Object *obj, elm_widget_content_part_set(Evas_Object *obj,
const char *part, const char *part,
......
...@@ -837,15 +837,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter ...@@ -837,15 +837,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
} }
focus_reconfigure { focus_reconfigure {
} }
part_access_object_get {
[[Get the access object of given part of the widget.
@since 1.18]]
return: Efl.Canvas.Object;
params {
@in part: string; [[The object's part name to get access object]]
}
}
} }
implements { implements {
class.constructor; class.constructor;
......
...@@ -24,27 +24,7 @@ START_TEST (elm_atspi_role_get) ...@@ -24,27 +24,7 @@ START_TEST (elm_atspi_role_get)
} }
END_TEST END_TEST
START_TEST (elm_object_part_access_object_get)
{
Evas_Object *win, *popup, *access;
elm_init(1, NULL);
elm_config_access_set(EINA_TRUE);
win = elm_win_add(NULL, "popup", ELM_WIN_BASIC);
popup = elm_popup_add(win);
elm_object_part_text_set(popup, "title,text", "Title");
evas_object_show(popup);
access = elm_object_part_access_object_get(popup, "access.title");
ck_assert(access != NULL);
elm_shutdown();
}
END_TEST
void elm_test_popup(TCase *tc) void elm_test_popup(TCase *tc)
{ {
tcase_add_test(tc, elm_atspi_role_get); tcase_add_test(tc, elm_atspi_role_get);
tcase_add_test(tc, elm_object_part_access_object_get);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment