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

issue #2430: CCBValue::Type is strong enum type now.

This commit is contained in:
James Chen 2013-07-28 00:26:24 +08:00
parent b7afc9db43
commit ab84dacf8f
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
extensions/CCBReader/CCBValue.cpp
View File

@ -34,7 +34,7 @@ CCBValue* CCBValue::create(int nValue)
if (ret)
{
ret->_value.intValue = nValue;
ret->_type = TYPE_INT;
ret->_type = Type::INT;
ret->autorelease();
}
@ -47,7 +47,7 @@ CCBValue* CCBValue::create(float fValue)
if (ret)
{
ret->_value.floatValue = fValue;
ret->_type = TYPE_FLOAT;
ret->_type = Type::FLOAT;
ret->autorelease();
}
@ -60,7 +60,7 @@ CCBValue* CCBValue::create(bool vValue)
if (ret)
{
ret->_value.intValue = vValue ? 1 : 0;
ret->_type = TYPE_BOOL;
ret->_type = Type::BOOL;
ret->autorelease();
}
@ -73,7 +73,7 @@ CCBValue* CCBValue::create(unsigned char byte)
if (ret)
{
ret->_value.intValue = byte;
ret->_type = TYPE_UNSIGNED_CHAR;
ret->_type = Type::UNSIGNED_CHAR;
ret->autorelease();
}
@ -86,7 +86,7 @@ CCBValue* CCBValue::create(const char *pStringValue)
if (ret)
{
ret->_strValue = pStringValue;
ret->_type = TYPE_STRING;
ret->_type = Type::STRING;
ret->autorelease();
}
@ -100,7 +100,7 @@ CCBValue* CCBValue::create(Array *pArrValue)
if (ret)
{
ret->_arrValue = pArrValue;
ret->_type = TYPE_ARRAY;
ret->_type = Type::ARRAY;
ret->autorelease();
}
@ -110,35 +110,35 @@ CCBValue* CCBValue::create(Array *pArrValue)
int CCBValue::getIntValue()
{
CCASSERT(_type == TYPE_INT, "The type of CCBValue isn't integer.");
CCASSERT(_type == Type::INT, "The type of CCBValue isn't integer.");
return _value.intValue;
}
float CCBValue::getFloatValue()
{
CCASSERT(_type == TYPE_FLOAT, "The type of CCBValue isn't float.");
CCASSERT(_type == Type::FLOAT, "The type of CCBValue isn't float.");
return _value.floatValue;
}
bool CCBValue::getBoolValue()
{
CCASSERT(_type == TYPE_BOOL, "The type of CCBValue isn't boolean.");
CCASSERT(_type == Type::BOOL, "The type of CCBValue isn't boolean.");
return _value.intValue == 1 ? true : false;
}
unsigned char CCBValue::getByteValue()
{
CCASSERT(_type == TYPE_UNSIGNED_CHAR, "The type of CCBValue isn't unsigned char.");
CCASSERT(_type == Type::UNSIGNED_CHAR, "The type of CCBValue isn't unsigned char.");
return (unsigned char)(_value.intValue);
}
Array* CCBValue::getArrayValue()
{
CCASSERT(_type == TYPE_ARRAY, "The type of CCBValue isn't array.");
CCASSERT(_type == Type::ARRAY, "The type of CCBValue isn't array.");
return _arrValue;
}
@ -146,7 +146,7 @@ Array* CCBValue::getArrayValue()
const char* CCBValue::getStringValue()
{
CCASSERT(_type == TYPE_STRING, "The type of CCBValue isn't string.");
CCASSERT(_type == Type::STRING, "The type of CCBValue isn't string.");
return _strValue.c_str();
}

14
extensions/CCBReader/CCBValue.h
View File

@ -27,14 +27,14 @@ class CCBValue : public Object
{
public:
enum Type
enum class Type
{
TYPE_INT,
TYPE_FLOAT,
TYPE_BOOL,
TYPE_UNSIGNED_CHAR,
TYPE_STRING,
TYPE_ARRAY
INT,
FLOAT,
BOOL,
UNSIGNED_CHAR,
STRING,
ARRAY
};
static CCBValue* create(int nValue);

12
extensions/CCDeprecated-ext.h
View File

@ -185,12 +185,12 @@ CC_DEPRECATED_ATTRIBUTE typedef Control::Handler SEL_CCControlHandler;
// For CCBReader
CC_DEPRECATED_ATTRIBUTE const int kIntValue = CCBValue::TYPE_INT;
CC_DEPRECATED_ATTRIBUTE const int kFloatValue = CCBValue::TYPE_FLOAT;
CC_DEPRECATED_ATTRIBUTE const int kBoolValue = CCBValue::TYPE_BOOL;
CC_DEPRECATED_ATTRIBUTE const int kUnsignedCharValue = CCBValue::TYPE_UNSIGNED_CHAR;
CC_DEPRECATED_ATTRIBUTE const int kStringValue = CCBValue::TYPE_STRING;
CC_DEPRECATED_ATTRIBUTE const int kArrayValue = CCBValue::TYPE_ARRAY;
CC_DEPRECATED_ATTRIBUTE const CCBValue::Type kIntValue = CCBValue::Type::INT;
CC_DEPRECATED_ATTRIBUTE const CCBValue::Type kFloatValue = CCBValue::Type::FLOAT;
CC_DEPRECATED_ATTRIBUTE const CCBValue::Type kBoolValue = CCBValue::Type::BOOL;
CC_DEPRECATED_ATTRIBUTE const CCBValue::Type kUnsignedCharValue = CCBValue::Type::UNSIGNED_CHAR;
CC_DEPRECATED_ATTRIBUTE const CCBValue::Type kStringValue = CCBValue::Type::STRING;
CC_DEPRECATED_ATTRIBUTE const CCBValue::Type kArrayValue = CCBValue::Type::ARRAY;
CC_DEPRECATED_ATTRIBUTE const CCBReader::PropertyType kCCBPropTypePosition = CCBReader::PropertyType::POSITION;