From e468cb16c482945e9d0fb87d4586e4d4495e938a Mon Sep 17 00:00:00 2001 From: jypark Date: Fri, 16 Mar 2012 08:02:33 +0000 Subject: [PATCH] remove elm_map_marker_XXX git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@69451 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_map.c | 186 ------------------------------------------------------ 1 file changed, 186 deletions(-) diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c index 8726bdb..afb5cde 100644 --- a/src/lib/elm_map.c +++ b/src/lib/elm_map.c @@ -5692,189 +5692,3 @@ elm_map_track_remove(Evas_Object *obj __UNUSED__, Evas_Object *route __UNUSED__) { } #endif - -/************************* Belows are deprecated APIs *************************/ -EAPI Elm_Map_Marker * -elm_map_marker_add(Evas_Object *obj, double lon, double lat, Elm_Map_Marker_Class *clas, Elm_Map_Group_Class *group_clas, void *data) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - - EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(clas, NULL); - - Elm_Map_Marker *marker = ELM_NEW(Elm_Map_Marker); - marker->wd = wd; - marker->clas = clas; - marker->group_clas = group_clas; - marker->longitude = lon; - marker->latitude = lat; - marker->data = data; - marker->x = 0; - marker->y = 0; - _edj_marker_size_get(wd, &marker->w, &marker->h); - - marker->obj = elm_layout_add(wd->obj); - evas_object_smart_member_add(marker->obj, wd->pan_smart); - evas_object_stack_above(marker->obj, wd->sep_maps_markers); - - edje_object_signal_callback_add(elm_layout_edje_get(marker->obj), - "open", "elm", _marker_bubble_open_cb, - marker); - edje_object_signal_callback_add(elm_layout_edje_get(marker->obj), - "bringin", "elm", _marker_bringin_cb, - marker); - - wd->markers = eina_list_append(wd->markers, marker); - if (marker->group_clas) group_clas->markers = eina_list_append(group_clas->markers, - marker); - evas_object_smart_changed(wd->pan_smart); - return marker; -#else - (void) obj; - (void) lon; - (void) lat; - (void) clas; - (void) group_clas; - (void) data; - return NULL; -#endif -} - -EAPI void -elm_map_marker_remove(Elm_Map_Marker *marker) -{ - _elm_map_marker_remove(marker); -} - -EAPI void -elm_map_marker_region_get(const Elm_Map_Marker *marker, double *lon, double *lat) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - EINA_SAFETY_ON_NULL_RETURN(marker); - if (lon) *lon = marker->longitude; - if (lat) *lat = marker->latitude; -#else - (void) marker; - (void) lon; - (void) lat; -#endif -} - -EAPI void -elm_map_marker_bring_in(Elm_Map_Marker *marker) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - EINA_SAFETY_ON_NULL_RETURN(marker); - elm_map_region_bring_in(marker->wd->obj, marker->longitude, marker->latitude); -#else - (void) marker; -#endif -} - -EAPI void -elm_map_marker_show(Elm_Map_Marker *marker) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - EINA_SAFETY_ON_NULL_RETURN(marker); - elm_map_region_show(marker->wd->obj, marker->longitude, marker->latitude); -#else - (void) marker; -#endif -} - -EAPI void -elm_map_markers_list_show(Eina_List *markers) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - EINA_SAFETY_ON_NULL_RETURN(markers); - EINA_SAFETY_ON_FALSE_RETURN(eina_list_count(markers)); - - Elm_Map_Marker *marker; - marker = eina_list_data_get(markers); - - Delayed_Data *data = ELM_NEW(Delayed_Data); - data->func = _marker_list_show; - data->wd = marker->wd; - data->markers = eina_list_clone(markers); - data->wd->delayed_jobs = eina_list_append(data->wd->delayed_jobs, data); - evas_object_smart_changed(data->wd->pan_smart); -#else - (void) markers; -#endif -} - -EAPI Evas_Object * -elm_map_marker_object_get(const Elm_Map_Marker *marker) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - EINA_SAFETY_ON_NULL_RETURN_VAL(marker, NULL); - return marker->content; -#else - (void) marker; - return NULL; -#endif -} - -EAPI void -elm_map_marker_update(Elm_Map_Marker *marker) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - EINA_SAFETY_ON_NULL_RETURN(marker); - Widget_Data *wd = marker->wd; - EINA_SAFETY_ON_NULL_RETURN(wd); - - _marker_update(marker); -#else - (void) marker; -#endif -} - -EAPI Elm_Map_Group_Class * -elm_map_group_class_new(Evas_Object *obj) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL); - - Elm_Map_Group_Class *clas = ELM_NEW(Elm_Map_Group_Class); - clas->wd = wd; - clas->zoom_displayed = 0; - clas->zoom_grouped = 255; - eina_stringshare_replace(&clas->style, "radio"); - - wd->group_classes = eina_list_append(wd->group_classes, clas); - - return clas; -#else - (void) obj; - return NULL; -#endif -} - -EAPI Elm_Map_Marker_Class * -elm_map_marker_class_new(Evas_Object *obj) -{ -#ifdef HAVE_ELEMENTARY_ECORE_CON - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - EINA_SAFETY_ON_NULL_RETURN_VAL(wd, NULL); - - Elm_Map_Marker_Class *clas = ELM_NEW(Elm_Map_Marker_Class); - eina_stringshare_replace(&clas->style, "radio"); - - wd->marker_classes = eina_list_append(wd->marker_classes, clas); - return clas; -#else - (void) obj; - return NULL; -#endif -} - -EAPI void -elm_map_route_remove(Elm_Map_Route *route) -{ - elm_map_route_del(route); -} -- 2.7.4