migration merge<Jiyoun Park>

[framework/uifw/elementary.git] / src / lib / elm_icon.h

diff --git a/src/lib/elm_icon.h b/src/lib/elm_icon.h
index c4f698d..3f4b078 100644 (file)
--- a/src/lib/elm_icon.h
+++ b/src/lib/elm_icon.h
@@ -271,17 +271,10 @@ EAPI Eina_Bool             elm_icon_smooth_get(const Evas_Object *obj);
  * This function disables scaling of the icon object through the function
  * elm_object_scale_set(). However, this does not affect the object
  * size/resize in any way. For that effect, take a look at
-<<<<<<< HEAD
- * elm_icon_scale_set().
- *
- * @see elm_icon_no_scale_get()
- * @see elm_icon_scale_set()
-=======
  * elm_icon_resizable_set().
  *
  * @see elm_icon_no_scale_get()
  * @see elm_icon_resizable_set()
->>>>>>> remotes/origin/upstream
  * @see elm_object_scale_set()
  *
  * @ingroup Icon
@@ -304,22 +297,6 @@ EAPI Eina_Bool             elm_icon_no_scale_get(const Evas_Object *obj);
  * Set if the object is (up/down) resizable.
  *
  * @param obj The icon object
-<<<<<<< HEAD
- * @param scale_up A bool to set if the object is resizable up. Default is
- * @c EINA_TRUE.
- * @param scale_down A bool to set if the object is resizable down. Default
- * is @c EINA_TRUE.
- *
- * This function limits the icon object resize ability. If @p scale_up is set to
- * @c EINA_FALSE, the object can't have its height or width resized to a value
- * higher than the original icon size. Same is valid for @p scale_down.
- *
- * @see elm_icon_scale_get()
- *
- * @ingroup Icon
- */
-EAPI void                  elm_icon_scale_set(Evas_Object *obj, Eina_Bool scale_up, Eina_Bool scale_down);
-=======
  * @param size_up A bool to set if the object is resizable up. Default is
  * @c EINA_TRUE.
  * @param size_down A bool to set if the object is resizable down. Default
@@ -334,22 +311,11 @@ EAPI void                  elm_icon_scale_set(Evas_Object *obj, Eina_Bool scale_
  * @ingroup Icon
  */
 EAPI void                  elm_icon_resizable_set(Evas_Object *obj, Eina_Bool size_up, Eina_Bool size_down);
->>>>>>> remotes/origin/upstream
 
 /**
  * Get if the object is (up/down) resizable.
  *
  * @param obj The icon object
-<<<<<<< HEAD
- * @param scale_up A bool to set if the object is resizable up
- * @param scale_down A bool to set if the object is resizable down
- *
- * @see elm_icon_scale_set()
- *
- * @ingroup Icon
- */
-EAPI void                  elm_icon_scale_get(const Evas_Object *obj, Eina_Bool *scale_up, Eina_Bool *scale_down);
-=======
  * @param size_up A bool to set if the object is resizable up
  * @param size_down A bool to set if the object is resizable down
  *
@@ -358,7 +324,6 @@ EAPI void                  elm_icon_scale_get(const Evas_Object *obj, Eina_Bool
  * @ingroup Icon
  */
 EAPI void                  elm_icon_resizable_get(const Evas_Object *obj, Eina_Bool *size_up, Eina_Bool *size_down);
->>>>>>> remotes/origin/upstream
 
 /**
  * Get the object's image size
@@ -487,17 +452,10 @@ EAPI Elm_Icon_Lookup_Order elm_icon_order_lookup_get(const Evas_Object *obj);
  * Enable or disable preloading of the icon
  *
  * @param obj The icon object
-<<<<<<< HEAD
- * @param disable If EINA_TRUE, preloading will be disabled
- * @ingroup Icon
- */
-EAPI void                  elm_icon_preload_set(Evas_Object *obj, Eina_Bool disable);
-=======
  * @param disabled If EINA_TRUE, preloading will be disabled
  * @ingroup Icon
  */
 EAPI void                  elm_icon_preload_disabled_set(Evas_Object *obj, Eina_Bool disabled);
->>>>>>> remotes/origin/upstream
 
 /**
  * Get if the icon supports animation or not.
@@ -508,11 +466,7 @@ EAPI void                  elm_icon_preload_disabled_set(Evas_Object *obj, Eina_
  *
  * Return if this elm icon's image can be animated. Currently Evas only
  * supports gif animation. If the return value is EINA_FALSE, other
-<<<<<<< HEAD
- * elm_icon_animated_XXX APIs won't work.
-=======
  * elm_icon_animated_xxx APIs won't work.
->>>>>>> remotes/origin/upstream
  * @ingroup Icon
  */
 EAPI Eina_Bool             elm_icon_animated_available_get(const Evas_Object *obj);
@@ -521,11 +475,7 @@ EAPI Eina_Bool             elm_icon_animated_available_get(const Evas_Object *ob
  * Set animation mode of the icon.
  *
  * @param obj The icon object
-<<<<<<< HEAD
- * @param anim @c EINA_TRUE if the object do animation job,
-=======
  * @param animated @c EINA_TRUE if the object do animation job,
->>>>>>> remotes/origin/upstream
  * @c EINA_FALSE otherwise. Default is @c EINA_FALSE.
  *
  * Since the default animation mode is set to EINA_FALSE,
@@ -554,11 +504,7 @@ EAPI Eina_Bool             elm_icon_animated_get(const Evas_Object *obj);
  * @param play @c EINA_TRUE the object play animation images,
  * @c EINA_FALSE otherwise. Default is @c EINA_FALSE.
  *
-<<<<<<< HEAD
- * To play elm icon's animation, set play to EINA_TURE.
-=======
  * To play elm icon's animation, set play to EINA_TRUE.
->>>>>>> remotes/origin/upstream
  * For example, you make gif player using this set/get API and click event.
  * This literally lets you control current play or paused state. To have
  * this work with animated GIF files for example, you first, before
@@ -566,11 +512,7 @@ EAPI Eina_Bool             elm_icon_animated_get(const Evas_Object *obj);
  * at all on the icon.
  *
  * 1. Click event occurs
-<<<<<<< HEAD
- * 2. Check play flag using elm_icon_animaged_play_get
-=======
  * 2. Check play flag using elm_icon_animated_play_get
->>>>>>> remotes/origin/upstream
  * 3. If elm icon was playing, set play to EINA_FALSE.
  *    Then animation will be stopped and vice versa
  * @ingroup Icon
@@ -589,8 +531,6 @@ EAPI void                  elm_icon_animated_play_set(Evas_Object *obj, Eina_Boo
 EAPI Eina_Bool             elm_icon_animated_play_get(const Evas_Object *obj);
 
 /**
-<<<<<<< HEAD
-=======
  * Set whether the original aspect ratio of the icon should be kept on resize.
  *
  * @param obj The icon object.
@@ -621,6 +561,5 @@ EAPI void             elm_icon_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixe
 EAPI Eina_Bool        elm_icon_aspect_fixed_get(const Evas_Object *obj);
 
 /**
->>>>>>> remotes/origin/upstream
  * @}
  */