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

Merge pull request #7515 from Dhilan007/v3-320final 

fixed warn and replace 'printf' with 'log';
This commit is contained in:
minggo 2014-07-18 13:56:54 +08:00
parent 9409a73a06 c10e49201d
commit 21647839b6
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
View File

@ -369,12 +369,12 @@ void HttpClientTest::onHttpRequestCompleted(HttpClient *sender, HttpResponse *re
// dump data
std::vector<char> *buffer = response->getResponseData();
printf("Http Test, dump data: ");
log("Http Test, dump data: ");
for (unsigned int i = 0; i < buffer->size(); i++)
{
printf("%c", (*buffer)[i]);
log("%c", (*buffer)[i]);
}
printf("\n");
log("\n");
if (response->getHttpRequest()->getReferenceCount() != 2)
{
log("request ref count not 2, is %d", response->getHttpRequest()->getReferenceCount());

10
tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp
View File

@ -230,7 +230,7 @@ void NodeCreateTest::initWithQuantityOfNodes(unsigned int nNodes)
{
PerformceAllocScene::initWithQuantityOfNodes(nNodes);
printf("Size of Node: %lu\n", sizeof(Node));
log("Size of Node: %u\n", sizeof(Node));
scheduleUpdate();
}
@ -278,7 +278,7 @@ void NodeDeallocTest::initWithQuantityOfNodes(unsigned int nNodes)
{
PerformceAllocScene::initWithQuantityOfNodes(nNodes);
printf("Size of Node: %lu\n", sizeof(Node));
log("Size of Node: %u\n", sizeof(Node));
scheduleUpdate();
}
@ -331,7 +331,7 @@ void SpriteCreateEmptyTest::initWithQuantityOfNodes(unsigned int nNodes)
{
PerformceAllocScene::initWithQuantityOfNodes(nNodes);
printf("Size of Sprite: %lu\n", sizeof(Sprite));
log("Size of Sprite: %u\n", sizeof(Sprite));
scheduleUpdate();
}
@ -381,7 +381,7 @@ void SpriteCreateTest::initWithQuantityOfNodes(unsigned int nNodes)
{
PerformceAllocScene::initWithQuantityOfNodes(nNodes);
printf("Size of Sprite: %lu\n", sizeof(Sprite));
log("Size of Sprite: %u\n", sizeof(Sprite));
scheduleUpdate();
}
@ -431,7 +431,7 @@ void SpriteDeallocTest::initWithQuantityOfNodes(unsigned int nNodes)
{
PerformceAllocScene::initWithQuantityOfNodes(nNodes);
printf("Size of sprite: %lu\n", sizeof(Sprite));
log("Size of sprite: %u\n", sizeof(Sprite));
scheduleUpdate();
}

2
tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp
View File

@ -156,7 +156,7 @@ void PerformanceContainerScene::initWithQuantityOfNodes(unsigned int nNodes)
addChild(menuLayer);
menuLayer->release();
printf("Size of Node: %lu\n", sizeof(Node));
log("Size of Node: %u\n", sizeof(Node));
int oldFontSize = MenuItemFont::getFontSize();
MenuItemFont::setFontSize(24);

2
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest.cpp
View File

@ -130,7 +130,7 @@ void CocostudioParserTestScene::onEnter()
//#endif
MenuItemLabel* pMenuItem = MenuItemLabel::create(label, CC_CALLBACK_1(CocostudioParserTestScene::BackCallback, this));
Menu* pMenu = Menu::create(pMenuItem, NULL);
Menu* pMenu = Menu::create(pMenuItem, nullptr);
pMenu->setPosition( Vec2::ZERO );
pMenuItem->setPosition( Vec2( VisibleRect::right().x - 50, VisibleRect::bottom().y + 25) );

2
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp
View File

@ -76,7 +76,7 @@ void CocostudioParserJsonScene::onEnter()
//#endif
MenuItemLabel* pMenuItem = MenuItemLabel::create(label, CC_CALLBACK_1(CocostudioParserJsonScene::BackCallback, this));
Menu* pMenu = Menu::create(pMenuItem, NULL);
Menu* pMenu = Menu::create(pMenuItem, nullptr);
pMenu->setPosition( Vec2::ZERO );
pMenuItem->setPosition( Vec2( VisibleRect::right().x - 50, VisibleRect::bottom().y + 25) );