Revert "[3.0] Add descriptions and example codes"

This reverts commit d24adfe7051e62ca7956ffcfa4bdbdb16d1269e5.

Change-Id: Id46e667fef06b05a3ccb745f7abdb7ffea4db53c

diff --git a/dali/public-api/actors/actor-enumerations.h b/dali/public-api/actors/actor-enumerations.h
index bed10d2..fea5c33 100644 (file)
--- a/dali/public-api/actors/actor-enumerations.h
+++ b/dali/public-api/actors/actor-enumerations.h
@@ -82,7 +82,7 @@ namespace ResizePolicy
 enum Type
 {
   FIXED,                 ///< Size is fixed as set by SetSize @SINCE_1_0.0
-  USE_NATURAL_SIZE,      ///< Size is to use the actor's natural size @SINCE_1_0.0 @see Actor::GetNaturalSize()
+  USE_NATURAL_SIZE,      ///< Size is to use the actor's natural size @SINCE_1_0.0
   FILL_TO_PARENT,        ///< Size is to fill up to the actor's parent's bounds. Aspect ratio is not maintained. @SINCE_1_0.0
   SIZE_RELATIVE_TO_PARENT,        ///< The actors size will be ( ParentSize * SizeRelativeToParentFactor ). @SINCE_1_0.0
   SIZE_FIXED_OFFSET_FROM_PARENT,  ///< The actors size will be ( ParentSize + SizeRelativeToParentFactor ). @SINCE_1_0.0

diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h
index 1040218..2008faf 100644 (file)
--- a/dali/public-api/actors/actor.h
+++ b/dali/public-api/actors/actor.h
@@ -147,7 +147,13 @@ typedef Rect<float> Padding;      ///< Padding definition @SINCE_1_0.0
  *
  *     Hit Priority of above Actor tree (all overlays): 1 - Lowest. 6 - Highest.
  *     @endcode
- *     For more information, see SetDrawMode().
+ *   - Stencil Actors can be used to influence the result of hits on renderable actors within a layer.
+ *     If a Stencil Actor exists on a layer and that Actor is marked visible then a successful
+ *     hit on a renderable actor can only take place in the area that the stencil Actor marks as visible.
+ *     The hit can be in any Stencil Actor in that layer, but must be in the region of one of them.
+ *     Stencil Actor inheritance behaves as with rendering in that any child of a Stencil Actor will
+ *     also be considered a Stencil Actor.
+ *     Non-renderable actors can be hit regardless of whether a stencil actor is hit or not.
  *
  * <i>Touch or hover Event Delivery:</i>
  *

diff --git a/dali/public-api/actors/camera-actor.h b/dali/public-api/actors/camera-actor.h
index 8cf1cd2..8e19673 100644 (file)
--- a/dali/public-api/actors/camera-actor.h
+++ b/dali/public-api/actors/camera-actor.h
@@ -61,7 +61,7 @@ enum ProjectionMode
 } // namespace Camera
 
 /**
- * @brief CameraActor controls a camera.
+ * @brief Controls a camera.
  *
  * Allows the developer to use actor semantics to control a camera.
  *

diff --git a/dali/public-api/common/view-mode.h b/dali/public-api/common/view-mode.h
index 12438ae..0bab312 100644 (file)
--- a/dali/public-api/common/view-mode.h
+++ b/dali/public-api/common/view-mode.h
@@ -28,7 +28,6 @@ namespace Dali
 /**
  * @brief Stereoscopic view modes
  * @SINCE_1_0.0
- * @remarks Viewmode is supported in mobile applications only.
  */
 enum ViewMode
 {

diff --git a/dali/public-api/events/long-press-gesture-detector.h b/dali/public-api/events/long-press-gesture-detector.h
index 8a884d5..7c3cc1f 100644 (file)
--- a/dali/public-api/events/long-press-gesture-detector.h
+++ b/dali/public-api/events/long-press-gesture-detector.h
@@ -39,6 +39,7 @@ struct LongPressGesture;
 /**
  * @brief This class emits a signals when a long press gesture occurs that meets the requirements set by the application.
  * @SINCE_1_0.0
+ * @see LongPressGestureDetector::SetTouchesRequired.
  *
  * For any valid long press, two signals will be emitted:
  * - First identifying the beginning (state = Started) i.e. when fingers held down for the required time.

diff --git a/dali/public-api/events/tap-gesture-detector.h b/dali/public-api/events/tap-gesture-detector.h
index 8d55871..537aa5e 100644 (file)
--- a/dali/public-api/events/tap-gesture-detector.h
+++ b/dali/public-api/events/tap-gesture-detector.h
@@ -54,8 +54,7 @@ struct TapGesture;
  * @endcode
  *
  * @SINCE_1_0.0
- * @note Multi-touch taps (two or more points of contact with the surface) are not currently
- * supported. However, multiple taps (double & triple tap etc.) are supported.
+ * @note Multi-touch taps are not currently supported. However, multiple taps (double & triple tap etc.) are supported.
  *
  * Signals
  * | %Signal Name | Method                |

diff --git a/dali/public-api/object/base-handle.h b/dali/public-api/object/base-handle.h
index 75a0c1b..1cafbc1 100644 (file)
--- a/dali/public-api/object/base-handle.h
+++ b/dali/public-api/object/base-handle.h
@@ -129,13 +129,6 @@ public:
   /**
    * @brief Perform action on this object with the given action name and attributes.
    *
-   * Usage example: -
-   * @code
-   * BaseHandle handle = SomeClass::New(); // Initialized with New() method
-   *
-   * Property::Map attributes; // Use empty Property::Map because "show" action doesn't need parameter
-   * handle.DoAction("show", attributes);
-   * @endcode
    * @SINCE_1_0.0
    * @param [in] actionName The command for the action.
    * @param [in] attributes The list of attributes for the action.
@@ -255,8 +248,6 @@ protected:
   /**
    * @brief Used by the safe bool idiom.
    *
-   * The safe bool idiom basically provides a Boolean test for classes. It validates objects
-   * in a boolean context without the usual harmful side effects.
    * @SINCE_1_0.0
    */
   void ThisIsSaferThanReturningVoidStar() const {}

diff --git a/doc/dali-core-doc.h b/doc/dali-core-doc.h
index 788d16f..561c847 100644 (file)
--- a/doc/dali-core-doc.h
+++ b/doc/dali-core-doc.h
@@ -40,7 +40,7 @@
  * </tr>
  * <tr>
  *    <td>@ref dali_core_animation</td>
- *    <td>Classes for animation which allows your objects to move around / change their properties for a specified duration.</td>
+ *    <td>Animation allows your objects to move around / change their properties for a specified duration.</td>
  * </tr>
  * <tr>
  *    <td>@ref dali_core_common</td>
@@ -48,7 +48,7 @@
  * </tr>
  * <tr>
  *    <td>@ref dali_core_events</td>
- *    <td>Classes for input events and gestures supported by DALi.</td>
+ *    <td>Input events and gestures supported by DALi.</td>
  * </tr>
  * <tr>
  *    <td>@ref dali_core_images</td>
@@ -56,7 +56,7 @@
  * </tr>
  * <tr>
  *    <td>@ref dali_core_math</td>
- *    <td>Classes for basic math.</td>
+ *    <td>Basic math classes.</td>
  * </tr>
  * <tr>
  *    <td>@ref dali_core_object</td>
@@ -64,7 +64,7 @@
  * </tr>
  * <tr>
  *    <td>@ref dali_core_rendering_effects</td>
- *    <td>Classes for render task and shader effect.</td>
+ *    <td>Render task and shader effect classes.</td>
  * </tr>
  * <tr>
  *    <td>@ref dali_core_signals</td>
@@ -94,25 +94,25 @@
  *   @brief Actor is the primary object for interaction in DALi applications.
 
  *   @defgroup dali_core_animation Animation
- *   @brief Classes for animation which allows your objects to move around / change their properties for a specified duration.
+ *   @brief Animation allows your objects to move around / change their properties for a specified duration.
 
  *   @defgroup dali_core_common Common
  *   @brief Common classes for using DALi.
 
  *   @defgroup dali_core_events Events
- *   @brief Classes for input events and gestures supported by DALi.
+ *   @brief Input events and gestures supported by DALi.
 
  *   @defgroup dali_core_images Images
  *   @brief Classes for handling resource images.
 
  *   @defgroup dali_core_math Math
- *   @brief Classes for basic math.
+ *   @brief Basic math classes.
 
  *   @defgroup dali_core_object Object
  *   @brief Classes for the handle/body pattern and property system.
 
  *   @defgroup dali_core_rendering_effects Rendering & Effect
- *   @brief Classes for render task and shader effect.
+ *   @brief Render task and shader effect classes.
 
  *   @defgroup dali_core_signals Signal
  *   @brief Classes for the signal and slot structure.