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

Merge pull request #4600 from dumganhar/remove-unneeded-bindings-codes 

closed #3480: Removes unneeded codes of override function.
This commit is contained in:
James Chen 2013-12-23 03:43:27 -08:00
parent 0c19081a0b ed93f90ccc
commit eb9cb237d5
11 changed files with 10 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cocos/2d/CCParticleBatchNode.cpp
View File

@ -143,16 +143,6 @@ void ParticleBatchNode::visit()
}
// override addChild:
void ParticleBatchNode::addChild(Node * child)
{
Node::addChild(child);
}
void ParticleBatchNode::addChild(Node * child, int zOrder)
{
Node::addChild(child, zOrder);
}
void ParticleBatchNode::addChild(Node * aChild, int zOrder, int tag)
{
CCASSERT( aChild != nullptr, "Argument must be non-nullptr");

4
cocos/2d/CCParticleBatchNode.h
View File

@ -105,8 +105,8 @@ public:
// Overrides
void visit();
virtual void addChild(Node * child) override;
virtual void addChild(Node * child, int zOrder) override;
using Node::addChild;
virtual void addChild(Node * child, int zOrder, int tag) override;
virtual void removeChild(Node* child, bool cleanup) override;
virtual void reorderChild(Node * child, int zOrder) override;

10
cocos/2d/CCScene.cpp
View File

@ -121,16 +121,6 @@ bool Scene::initWithPhysics()
return ret;
}
void Scene::addChild(Node* child)
{
Node::addChild(child);
}
void Scene::addChild(Node* child, int zOrder)
{
Node::addChild(child, zOrder);
}
void Scene::addChild(Node* child, int zOrder, int tag)
{
Node::addChild(child, zOrder, tag);

3
cocos/2d/CCScene.h
View File

@ -64,8 +64,7 @@ public:
inline PhysicsWorld* getPhysicsWorld() { return _physicsWorld; }
virtual void addChild(Node* child) override;
virtual void addChild(Node* child, int zOrder) override;
using Node::addChild;
virtual void addChild(Node* child, int zOrder, int tag) override;
virtual void update(float delta) override;
virtual std::string getDescription() const override;

10
cocos/2d/CCSprite.cpp
View File

@ -749,16 +749,6 @@ void Sprite::updateQuadVertices()
// Node overrides
void Sprite::addChild(Node *child)
{
Node::addChild(child);
}
void Sprite::addChild(Node *child, int zOrder)
{
Node::addChild(child, zOrder);
}
void Sprite::addChild(Node *child, int zOrder, int tag)
{
CCASSERT(child != nullptr, "Argument must be non-nullptr");

5
cocos/2d/CCSprite.h
View File

@ -413,10 +413,7 @@ public:
virtual void removeChild(Node* child, bool cleanup) override;
virtual void removeAllChildrenWithCleanup(bool cleanup) override;
virtual void reorderChild(Node *child, int zOrder) override;
// Should also override addChild(Node*) and addChild(Node*, int), or binding generator will only
// bind addChild(Node*, int, int);
virtual void addChild(Node* child) override;
virtual void addChild(Node* child, int zOrder) override;
using Node::addChild;
virtual void addChild(Node *child, int zOrder, int tag) override;
virtual void sortAllChildren() override;
virtual void setScale(float scale) override;

4
cocos/2d/CCSpriteBatchNode.h
View File

@ -154,8 +154,8 @@ public:
virtual const BlendFunc& getBlendFunc() const override;
virtual void visit() override;
virtual void addChild(Node* child) override{ Node::addChild(child);}
virtual void addChild(Node * child, int zOrder) override { Node::addChild(child, zOrder);}
using Node::addChild;
virtual void addChild(Node * child, int zOrder, int tag) override;
virtual void reorderChild(Node *child, int zOrder) override;

2
cocos/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
View File

@ -1 +1 @@
4f58619fbbaa2bb184766db408386d247df236ce
80b25c13bca3a2d8adfc68a899c732103f68e0f5

10
extensions/GUI/CCScrollView/CCScrollView.cpp
View File

@ -485,16 +485,6 @@ void ScrollView::addChild(Node * child, int zOrder, int tag)
}
}
void ScrollView::addChild(Node * child, int zOrder)
{
this->addChild(child, zOrder, child->getTag());
}
void ScrollView::addChild(Node * child)
{
this->addChild(child, child->getZOrder(), child->getTag());
}
/**
* clip this view so that outside of the visible bounds can be hidden.
*/

4
extensions/GUI/CCScrollView/CCScrollView.h
View File

@ -224,9 +224,9 @@ public:
* @lua NA
*/
virtual void visit() override;
using Node::addChild;
virtual void addChild(Node * child, int zOrder, int tag) override;
virtual void addChild(Node * child, int zOrder) override;
virtual void addChild(Node * child) override;
protected:
/**

2
tools/bindings-generator

@ -1 +1 @@
Subproject commit ad532012457e2eaff15d73d9ba28a638fa748d2d
Subproject commit 5f412d0b3a4eadba3d2abd750de87d1b0e219e0a