Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removes "calling explicit constructor"

This commit is contained in:
Ricardo Quesada 2013-06-13 20:08:56 -07:00
parent 98190a21c0
commit e2e68aa36d
3 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cocos2dx/actions/CCAction.cpp
View File

@ -37,23 +37,12 @@ NS_CC_BEGIN
//
CCAction::CCAction()
:CCObject()
,m_pOriginalTarget(NULL)
:m_pOriginalTarget(NULL)
,m_pTarget(NULL)
,m_nTag(kCCActionTagInvalid)
{
}
// XXX: Can it use the implicitic copy constructor ?
// XXX: here target and original target are being resetted to NULL.
CCAction::CCAction(const CCAction& other )
:CCObject()
,m_pOriginalTarget(NULL)
,m_pTarget(NULL)
,m_nTag(other.m_nTag)
{
}
CCAction::~CCAction()
{
CCLOGINFO("cocos2d: deallocing");
@ -75,6 +64,8 @@ CCAction* CCAction::clone() const
{
// XXX shall not happen
auto a = new CCAction(*this);
a->m_nTag = m_nTag;
a->m_pTarget = a->m_pOriginalTarget = NULL;
a->autorelease();
return a;
}
@ -151,13 +142,6 @@ CCSpeed::CCSpeed()
{
}
CCSpeed::CCSpeed(const CCSpeed &other)
: m_fSpeed(0.0)
, CCAction()
//, m_pInnerAction(other.m_pInnerAction->clone())
{
}
CCSpeed::~CCSpeed()
{
CC_SAFE_RELEASE(m_pInnerAction);

8
cocos2dx/actions/CCAction.h
View File

@ -50,7 +50,6 @@ class CC_DLL CCAction : public CCObject
{
public:
CCAction(void);
CCAction(const CCAction& other );
virtual ~CCAction(void);
@ -128,8 +127,7 @@ class CC_DLL CCFiniteTimeAction : public CCAction
{
public:
CCFiniteTimeAction()
: CCAction()
, m_fDuration(0)
: m_fDuration(0)
{}
virtual ~CCFiniteTimeAction(){}
//! get duration in seconds of the action
@ -161,7 +159,6 @@ class CC_DLL CCSpeed : public CCAction
{
public:
CCSpeed();
CCSpeed(const CCSpeed &other);
virtual ~CCSpeed(void);
inline float getSpeed(void) { return m_fSpeed; }
@ -209,8 +206,7 @@ class CC_DLL CCFollow : public CCAction
{
public:
CCFollow()
: CCAction()
, m_pobFollowedNode(NULL)
: m_pobFollowedNode(NULL)
, m_bBoundarySet(false)
, m_bBoundaryFullyCovered(false)
, m_fLeftBoundary(0.0)

6
cocos2dx/actions/CCActionCamera.h
View File

@ -45,8 +45,7 @@ class CC_DLL CCActionCamera : public CCActionInterval //<NSCopying>
{
public:
CCActionCamera()
:CCActionInterval()
,m_fCenterXOrig(0)
:m_fCenterXOrig(0)
,m_fCenterYOrig(0)
,m_fCenterZOrig(0)
,m_fEyeXOrig(0)
@ -85,8 +84,7 @@ class CC_DLL CCOrbitCamera : public CCActionCamera //<NSCopying>
{
public:
CCOrbitCamera()
: CCActionCamera()
, m_fRadius(0.0)
: m_fRadius(0.0)
, m_fDeltaRadius(0.0)
, m_fAngleZ(0.0)
, m_fDeltaAngleZ(0.0)