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

issue #2790: const char* —> const std::string& for CCNS.h/.cpp.

This commit is contained in:
James Chen 2013-12-03 16:21:16 +08:00
parent 9881ab2178
commit 3fc5fffd26
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cocos/base/CCNS.cpp
View File

@ -53,16 +53,16 @@ static inline void split(std::string src, const char* token, strArray& vect)
// if the form is right,the string will be split into the parameter strs;
// or the parameter strs will be empty.
// if the form is right return true,else return false.
static bool splitWithForm(const char* pStr, strArray& strs)
static bool splitWithForm(const std::string& str, strArray& strs)
{
bool bRet = false;
do
{
CC_BREAK_IF(!pStr);
CC_BREAK_IF(str.empty());
// string is empty
std::string content = pStr;
std::string content = str;
CC_BREAK_IF(content.length() == 0);
int nPosLeft = content.find('{');
@ -97,14 +97,14 @@ static bool splitWithForm(const char* pStr, strArray& strs)
// implement the functions
Rect RectFromString(const char* pszContent)
Rect RectFromString(const std::string& str)
{
Rect result = Rect::ZERO;
do
{
CC_BREAK_IF(!pszContent);
std::string content = pszContent;
CC_BREAK_IF(str.empty());
std::string content = str;
// find the first '{' and the third '}'
int nPosLeft = content.find('{');
@ -146,14 +146,14 @@ Rect RectFromString(const char* pszContent)
return result;
}
Point PointFromString(const char* pszContent)
Point PointFromString(const std::string& str)
{
Point ret = Point::ZERO;
do
{
strArray strs;
CC_BREAK_IF(!splitWithForm(pszContent, strs));
CC_BREAK_IF(!splitWithForm(str, strs));
float x = (float) atof(strs[0].c_str());
float y = (float) atof(strs[1].c_str());
@ -164,7 +164,7 @@ Point PointFromString(const char* pszContent)
return ret;
}
Size SizeFromString(const char* pszContent)
Size SizeFromString(const std::string& pszContent)
{
Size ret = Size::ZERO;

6
cocos/base/CCNS.h
View File

@ -44,7 +44,7 @@ NS_CC_BEGIN
@return A Core Graphics structure that represents a rectangle.
If the string is not well-formed, the function returns Rect::ZERO.
*/
Rect CC_DLL RectFromString(const char* pszContent);
Rect CC_DLL RectFromString(const std::string& str);
/**
@brief Returns a Core Graphics point structure corresponding to the data in a given string.
@ -56,7 +56,7 @@ Rect CC_DLL RectFromString(const char* pszContent);
@return A Core Graphics structure that represents a point.
If the string is not well-formed, the function returns Point::ZERO.
*/
Point CC_DLL PointFromString(const char* pszContent);
Point CC_DLL PointFromString(const std::string& str);
/**
@brief Returns a Core Graphics size structure corresponding to the data in a given string.
@ -68,7 +68,7 @@ Point CC_DLL PointFromString(const char* pszContent);
@return A Core Graphics structure that represents a size.
If the string is not well-formed, the function returns Size::ZERO.
*/
Size CC_DLL SizeFromString(const char* pszContent);
Size CC_DLL SizeFromString(const std::string& str);
// end of data_structure group
/// @}