From abadefab322adc7d09b1a139ff2cc6fe8a271801 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Mon, 8 Feb 2016 18:48:45 +0000 Subject: [PATCH] Fix problems introduced by doxygen changes Change-Id: Ibf4f5cad2b4fc0abfbbcd997c5d7abe41b55f6f3 --- dali/public-api/actors/camera-actor.h | 2 +- dali/public-api/actors/custom-actor-impl.h | 4 ++-- dali/public-api/animation/animation.h | 2 +- dali/public-api/animation/constraints.h | 4 ++-- dali/public-api/animation/path.h | 2 +- dali/public-api/events/tap-gesture-detector.h | 3 ++- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dali/public-api/actors/camera-actor.h b/dali/public-api/actors/camera-actor.h index 81065f7..0c44da0 100644 --- a/dali/public-api/actors/camera-actor.h +++ b/dali/public-api/actors/camera-actor.h @@ -34,7 +34,7 @@ class CameraActor; /** * @brief Camera enumerations. - * @since_tizen 2.4 + * @SINCE_1_0.0 */ namespace Camera { diff --git a/dali/public-api/actors/custom-actor-impl.h b/dali/public-api/actors/custom-actor-impl.h index 370aaf2..975d4fe 100644 --- a/dali/public-api/actors/custom-actor-impl.h +++ b/dali/public-api/actors/custom-actor-impl.h @@ -157,7 +157,7 @@ public: * @brief Called when the owning actor's size is set e.g. using Actor::SetSize(). * * @SINCE_1_0.0 - * @param[in] targetSize The target size. Note that this target size may not match the size returned via @ref Actor::GetSize. + * @param[in] targetSize The target size. Note that this target size may not match the size returned via @ref Actor::GetTargetSize. */ virtual void OnSizeSet(const Vector3& targetSize) = 0; @@ -166,7 +166,7 @@ public: * * @SINCE_1_0.0 * @param[in] animation The object which is animating the owning actor. - * @param[in] targetSize The target size. Note that this target size may not match the size returned via @ref Actor::GetSize. + * @param[in] targetSize The target size. Note that this target size may not match the size returned via @ref Actor::GetTargetSize. */ virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize) = 0; diff --git a/dali/public-api/animation/animation.h b/dali/public-api/animation/animation.h index 1fd9ba9..894398d 100644 --- a/dali/public-api/animation/animation.h +++ b/dali/public-api/animation/animation.h @@ -442,7 +442,7 @@ public: * @brief Connect to this signal to be notified when an Animation's animations have finished. * * @SINCE_1_0.0 - * @return A signal object to @ref Signal::Connect() with. + * @return A signal object to connect with. */ AnimationSignalType& FinishedSignal(); diff --git a/dali/public-api/animation/constraints.h b/dali/public-api/animation/constraints.h index 150d8f6..13c0485 100644 --- a/dali/public-api/animation/constraints.h +++ b/dali/public-api/animation/constraints.h @@ -167,7 +167,7 @@ struct RelativeToConstraint * @brief Functor. * @SINCE_1_0.0 * @param[in,out] current The current property value (vector3 property * scale factor). - * @param[in] input Property container for current property calculation + * @param[in] inputs Property container for current property calculation */ void operator()( Vector3& current, const PropertyInputContainer& inputs ) { @@ -199,7 +199,7 @@ struct RelativeToConstraintFloat * @brief Functor. * @SINCE_1_0.0 * @param[in,out] current The current property value (float property * scale factor). - * @param[in] input Property container for current property calculation + * @param[in] inputs Property container for current property calculation */ void operator()( float& current, const PropertyInputContainer& inputs ) { diff --git a/dali/public-api/animation/path.h b/dali/public-api/animation/path.h index 7ecd505..1646acb 100644 --- a/dali/public-api/animation/path.h +++ b/dali/public-api/animation/path.h @@ -37,7 +37,7 @@ class Path; /** * @brief A 3D parametric curve * - * Paths can be used to animate position and orientation of actors using @ref Dali::Animate( Actor, Path, ... ) + * Paths can be used to animate position and orientation of actors using Dali::Animate() * * @SINCE_1_0.0 */ diff --git a/dali/public-api/events/tap-gesture-detector.h b/dali/public-api/events/tap-gesture-detector.h index 3f322d1..020558e 100644 --- a/dali/public-api/events/tap-gesture-detector.h +++ b/dali/public-api/events/tap-gesture-detector.h @@ -40,7 +40,8 @@ struct TapGesture; * @brief This class emits a signal when a tap gesture occurs that meets the requirements set by the * application. * - * See @ref TapGestureDetector::SetTapsRequired + * See @ref TapGestureDetector::SetMinimumTapsRequired + * See @ref TapGestureDetector::SetMaximumTapsRequired * * A TapGesture is a discrete gesture, which means it does not have any state information attached * to it. Please see TapGesture for more information. -- 2.7.4