Merge pull request #11179 from WenhaiLin/v3-doxygen

[ci skip]Fixed warnings when generating docs by doxygen.
This commit is contained in:
minggo 2015-03-27 11:10:43 +08:00
commit 8b4f662ac0
3 changed files with 7 additions and 6 deletions

View File

@ -739,9 +739,9 @@ public:
*
* If the child is added to a 'running' node, then 'onEnter' and 'onEnterTransitionDidFinish' will be called immediately.
*
* @param child A child node.
* @param zOrder Z order for drawing priority. Please refer to `setLocalZOrder(int)`.
* @param tag An integer to identify the node easily. Please refer to `setTag(int)`.
* @param child A child node.
* @param localZOrder Z order for drawing priority. Please refer to `setLocalZOrder(int)`.
* @param tag An integer to identify the node easily. Please refer to `setTag(int)`.
*
* Please use `addChild(Node* child, int localZOrder, const std::string &name)` instead.
*/

View File

@ -194,10 +194,11 @@ public:
/**
* Sets the current playback position of an audio instance.
*
* @param audioID An audioID returned by the play2d function.
* @param audioID An audioID returned by the play2d function.
* @param sec The offset in seconds from the start to seek to.
* @return
*/
static bool setCurrentTime(int audioID, float time);
static bool setCurrentTime(int audioID, float sec);
/**
* Gets the current playback position of an audio instance.

View File

@ -47,7 +47,7 @@ NS_CC_BEGIN
/**
* Similar to std::unordered_map, but it will manage reference count automatically internally.
* Which means it will invoke Ref::retain() when adding an element, and invoke Ref::release() when removing an element.
* @warn The element should be `Ref` or its sub-class.
* @warning The element should be `Ref` or its sub-class.
* @lua NA
*/
template <class K, class V>