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

Merge pull request #4343 from ricardoquesada/virtual_destructors 

Adds virtual destructors on Interfaces and enables 'warn on missing virtual destructors' for xcode.
This commit is contained in:
James Chen 2013-11-19 17:55:16 -08:00
parent 340544c42d 0d750cdbaf
commit f4a5dc33d0
8 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
1dbcea49018d245ac72bf4138633f3905ef4dc7f
0d9ce76f7e63d75718c38b1137b2580e19d0db76

48
cocos/2d/CCLabelTextFormatProtocol.h
View File

@ -42,36 +42,38 @@ struct LetterInfo
class CC_DLL LabelTextFormatProtocol
{
public:
virtual bool recordLetterInfo(const cocos2d::Point& point,unsigned short int theChar, int spriteIndex) = 0;
virtual bool recordPlaceholderInfo(int spriteIndex) = 0;
virtual std::vector<LetterInfo> *getLettersInfo() = 0;
virtual float getLetterPosXLeft(int index) const = 0;
virtual float getLetterPosXRight(int index) const = 0;
virtual ~LabelTextFormatProtocol() {}
virtual bool recordLetterInfo(const cocos2d::Point& point,unsigned short int theChar, int spriteIndex) = 0;
virtual bool recordPlaceholderInfo(int spriteIndex) = 0;
virtual std::vector<LetterInfo> *getLettersInfo() = 0;
virtual float getLetterPosXLeft(int index) const = 0;
virtual float getLetterPosXRight(int index) const = 0;
// sprite related stuff
virtual cocos2d::Sprite *getLetter(int ID) = 0;
virtual cocos2d::Sprite *getLetter(int ID) = 0;
// font related stuff
virtual int getCommonLineHeight() const = 0;
virtual int getKerningForCharsPair(unsigned short first, unsigned short second) const = 0;
virtual int getXOffsetForChar(unsigned short c) const = 0;
virtual int getYOffsetForChar(unsigned short c) const = 0;
virtual int getAdvanceForChar(unsigned short c, int hintPositionInString) const = 0;
virtual cocos2d::Rect getRectForChar(unsigned short c) const = 0;
virtual int getCommonLineHeight() const = 0;
virtual int getKerningForCharsPair(unsigned short first, unsigned short second) const = 0;
virtual int getXOffsetForChar(unsigned short c) const = 0;
virtual int getYOffsetForChar(unsigned short c) const = 0;
virtual int getAdvanceForChar(unsigned short c, int hintPositionInString) const = 0;
virtual cocos2d::Rect getRectForChar(unsigned short c) const = 0;
// string related stuff
virtual int getStringNumLines() const = 0;
virtual int getStringLenght() const = 0;
virtual unsigned short getCharAtStringPosition(int position) const = 0;
virtual unsigned short * getUTF8String() const = 0;
virtual void assignNewUTF8String(unsigned short *newString) = 0;
virtual TextHAlignment getTextAlignment() const = 0;
virtual int getStringNumLines() const = 0;
virtual int getStringLenght() const = 0;
virtual unsigned short getCharAtStringPosition(int position) const = 0;
virtual unsigned short * getUTF8String() const = 0;
virtual void assignNewUTF8String(unsigned short *newString) = 0;
virtual TextHAlignment getTextAlignment() const = 0;
// label related stuff
virtual float getMaxLineWidth() const = 0;
virtual bool breakLineWithoutSpace() const = 0;
virtual cocos2d::Size getLabelContentSize() const = 0;
virtual void setLabelContentSize(const Size &newSize) = 0;
virtual float getMaxLineWidth() const = 0;
virtual bool breakLineWithoutSpace() const = 0;
virtual cocos2d::Size getLabelContentSize() const = 0;
virtual void setLabelContentSize(const Size &newSize) = 0;
};
NS_CC_END

9
cocos/2d/CCProtocols.h
View File

@ -38,6 +38,8 @@ NS_CC_BEGIN
class CC_DLL RGBAProtocol
{
public:
virtual ~RGBAProtocol() {}
/**
* Changes the color with R,G,B bytes
*
@ -165,6 +167,8 @@ public:
class CC_DLL BlendProtocol
{
public:
virtual ~BlendProtocol() {}
/**
* Sets the source blending function.
*
@ -197,6 +201,7 @@ public:
class CC_DLL TextureProtocol : public BlendProtocol
{
public:
virtual ~TextureProtocol() {}
/**
* Returns the currently used texture
*
@ -222,6 +227,8 @@ public:
class CC_DLL LabelProtocol
{
public:
virtual ~LabelProtocol() {}
/**
* Sets a new label using a string
*
@ -247,6 +254,8 @@ public:
class CC_DLL DirectorDelegate
{
public:
virtual ~DirectorDelegate() {}
/**
* Will be called by Director when the projection is updated, and "custom" projection is used
* @js NA

2
cocos/2d/CCTextFieldTTF.h
View File

@ -40,6 +40,8 @@ class TextFieldTTF;
class CC_DLL TextFieldDelegate
{
public:
virtual ~TextFieldDelegate() {}
/**
@brief If the sender doesn't want to attach to the IME, return true;
*/

2
cocos/2d/CCTransition.h
View File

@ -50,6 +50,8 @@ class Node;
class CC_DLL TransitionEaseScene// : public Object
{
public:
virtual ~TransitionEaseScene() {}
/** returns the Ease action that will be performed on a linear action.
@since v0.8.2
*/

2
cocos/2d/platform/CCSAXParser.h
View File

@ -39,6 +39,8 @@ typedef unsigned char CC_XML_CHAR;
class CC_DLL SAXDelegator
{
public:
virtual ~SAXDelegator() {}
/**
* @js NA
* @lua NA

1
cocos/editor-support/cocosbuilder/CCBAnimationManager.h
View File

@ -13,6 +13,7 @@ namespace cocosbuilder {
class CCBAnimationManagerDelegate
{
public:
virtual ~CCBAnimationManagerDelegate() {}
virtual void completedAnimationSequenceNamed(const char *name) = 0;
};

3
cocos/gui/UIScrollInterface.h
View File

@ -31,6 +31,9 @@ namespace gui {
class UIScrollInterface
{
public:
virtual ~UIScrollInterface() {}
protected:
virtual void handlePressLogic(const cocos2d::Point &touchPoint) = 0;
virtual void handleMoveLogic(const cocos2d::Point &touchPoint) = 0;