Fix conflicts: Map, Hover, Hoversel, Menu, Web

[framework/uifw/elementary.git] / src / examples / map_example_03.c

diff --git a/src/examples/map_example_03.c b/src/examples/map_example_03.c
index d9e2611..c033e14 100644 (file)
--- a/src/examples/map_example_03.c
+++ b/src/examples/map_example_03.c
@@ -22,17 +22,12 @@ typedef struct _Example_Data
    Elm_Map_Route *route;
    double start_lon, start_lat, dest_lon, dest_lat;
    Elm_Map_Name *name;
-<<<<<<< HEAD
-=======
    Elm_Map_Overlay *route_ovl;
->>>>>>> remotes/origin/upstream
 } Example_Data;
 
 static Example_Data example_data;
 
 static void
-<<<<<<< HEAD
-=======
 _route_loaded(void *data, Evas_Object *obj, void *ev __UNUSED__)
 {
    Example_Data *example_data = data;
@@ -42,7 +37,6 @@ _route_loaded(void *data, Evas_Object *obj, void *ev __UNUSED__)
 }
 
 static void
->>>>>>> remotes/origin/upstream
 _name_loaded(void *data, Evas_Object *obj, void *ev __UNUSED__)
 {
    Example_Data *example_data = data;
@@ -57,13 +51,8 @@ _name_loaded(void *data, Evas_Object *obj, void *ev __UNUSED__)
    example_data->route = elm_map_route_add(map, ELM_MAP_ROUTE_TYPE_FOOT,
                      ELM_MAP_ROUTE_METHOD_SHORTEST,
                      example_data->start_lon, example_data->start_lat,
-<<<<<<< HEAD
-                     example_data->dest_lon, example_data->dest_lat);
-   elm_map_route_color_set(example_data->route, 0, 255, 0, 255);
-=======
                      example_data->dest_lon, example_data->dest_lat,
                      NULL, NULL);
->>>>>>> remotes/origin/upstream
 }
 
 static void
@@ -76,74 +65,40 @@ _bt_route(void *data, Evas_Object *obj __UNUSED__, void *ev __UNUSED__)
    map = example_data->map;
    address = (char *)elm_object_text_get(example_data->entry);
 
-<<<<<<< HEAD
-   example_data->name = elm_map_utils_convert_name_into_coord(map, address);
-
-   evas_object_smart_callback_add(map, "name,loaded", _name_loaded, data);
-=======
    example_data->name = elm_map_name_add(map, address, 0, 0, NULL, NULL);
 
    evas_object_smart_callback_add(map, "name,loaded", _name_loaded, data);
    evas_object_smart_callback_add(map, "route,loaded", _route_loaded, data);
->>>>>>> remotes/origin/upstream
 }
 
 static void
 _bt_zoom_in(void *data, Evas_Object *obj __UNUSED__, void *ev __UNUSED__)
 {
-<<<<<<< HEAD
-   Evas_Object *map = data;
-   int zoom;
-
-   elm_map_zoom_mode_set(map, ELM_MAP_ZOOM_MODE_MANUAL);
-   zoom = elm_map_zoom_get(map);
-   elm_map_zoom_set(map, zoom + 1);
-=======
    int zoom;
    elm_map_zoom_mode_set(data, ELM_MAP_ZOOM_MODE_MANUAL);
    zoom = elm_map_zoom_get(data);
    elm_map_zoom_set(data, zoom + 1);
->>>>>>> remotes/origin/upstream
 }
 
 static void
 _bt_zoom_out(void *data, Evas_Object *obj __UNUSED__, void *ev __UNUSED__)
 {
-<<<<<<< HEAD
-   Evas_Object *map = data;
-   int zoom;
-
-   elm_map_zoom_mode_set(map, ELM_MAP_ZOOM_MODE_MANUAL);
-   zoom = elm_map_zoom_get(map);
-   elm_map_zoom_set(map, zoom - 1);
-=======
    int zoom;
    elm_map_zoom_mode_set(data, ELM_MAP_ZOOM_MODE_MANUAL);
    zoom = elm_map_zoom_get(data);
    elm_map_zoom_set(data, zoom - 1);
->>>>>>> remotes/origin/upstream
 }
 
 static void
 _bt_zoom_fit(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-<<<<<<< HEAD
-   Evas_Object *map = data;
-   elm_map_zoom_mode_set(map, ELM_MAP_ZOOM_MODE_AUTO_FIT);
-=======
    elm_map_zoom_mode_set(data, ELM_MAP_ZOOM_MODE_AUTO_FIT);
->>>>>>> remotes/origin/upstream
 }
 
 static void
 _bt_zoom_fill(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-<<<<<<< HEAD
-   Evas_Object *map = data;
-   elm_map_zoom_mode_set(map, ELM_MAP_ZOOM_MODE_AUTO_FILL);
-=======
    elm_map_zoom_mode_set(data, ELM_MAP_ZOOM_MODE_AUTO_FILL);
->>>>>>> remotes/origin/upstream
 }
 
 static void
@@ -242,13 +197,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
    example_data.start_lon = -43.175;
    example_data.start_lat = -22.97;
 
-<<<<<<< HEAD
-   elm_map_geo_region_show(map, example_data.start_lon, example_data.start_lat);
-   elm_map_zoom_set(map, 12);
-=======
    elm_map_zoom_set(map, 12);
    elm_map_region_show(map, example_data.start_lon, example_data.start_lat);
->>>>>>> remotes/origin/upstream
 
    evas_object_resize(win, 512, 512);
    evas_object_show(win);