diff --git a/cocos2dx/platform/emscripten/CCCommon.cpp b/cocos2dx/platform/emscripten/CCCommon.cpp index daca5f79f2..31976935e5 100644 --- a/cocos2dx/platform/emscripten/CCCommon.cpp +++ b/cocos2dx/platform/emscripten/CCCommon.cpp @@ -56,7 +56,7 @@ void log(const char * pszFormat, ...) void MessageBox(const char * pszMsg, const char * pszTitle) { // MessageBoxA(NULL, pszMsg, pszTitle, MB_OK); - CCLog(pszMsg); + log(pszMsg); } void LuaLog(const char * pszFormat) diff --git a/cocos2dx/platform/ios/CCCommon.mm b/cocos2dx/platform/ios/CCCommon.mm index c0e6ac3863..dcf3a66a33 100644 --- a/cocos2dx/platform/ios/CCCommon.mm +++ b/cocos2dx/platform/ios/CCCommon.mm @@ -56,7 +56,7 @@ void log(const char * pszFormat, ...) printf("\n"); } -// ios no MessageBox, use CCLog instead +// ios no MessageBox, use log instead void MessageBox(const char * pszMsg, const char * pszTitle) { NSString * title = (pszTitle) ? [NSString stringWithUTF8String : pszTitle] : nil; diff --git a/cocos2dx/platform/linux/CCCommon.cpp b/cocos2dx/platform/linux/CCCommon.cpp index 19f672591c..880d626540 100644 --- a/cocos2dx/platform/linux/CCCommon.cpp +++ b/cocos2dx/platform/linux/CCCommon.cpp @@ -71,7 +71,7 @@ void log(const char * pszFormat, ...) void MessageBox(const char * pszMsg, const char * pszTitle) { - CCLog("%s: %s", pszTitle, pszMsg); + log("%s: %s", pszTitle, pszMsg); } void LuaLog(const char * pszFormat) diff --git a/cocos2dx/platform/linux/CCEGLView.cpp b/cocos2dx/platform/linux/CCEGLView.cpp index d36c0e95fc..247af6e62c 100644 --- a/cocos2dx/platform/linux/CCEGLView.cpp +++ b/cocos2dx/platform/linux/CCEGLView.cpp @@ -325,20 +325,20 @@ bool EGLView::initGL() if (GLEW_ARB_vertex_shader && GLEW_ARB_fragment_shader) { - CCLog("Ready for GLSL"); + log("Ready for GLSL"); } else { - CCLog("Not totally ready :("); + log("Not totally ready :("); } if (glewIsSupported("GL_VERSION_2_0")) { - CCLog("Ready for OpenGL 2.0"); + log("Ready for OpenGL 2.0"); } else { - CCLog("OpenGL 2.0 not supported"); + log("OpenGL 2.0 not supported"); } // Enable point size by default on linux. diff --git a/cocos2dx/platform/mac/CCCommon.mm b/cocos2dx/platform/mac/CCCommon.mm index fcfc3a87f3..b2b4781460 100644 --- a/cocos2dx/platform/mac/CCCommon.mm +++ b/cocos2dx/platform/mac/CCCommon.mm @@ -67,7 +67,7 @@ void LuaLog(const char * pszFormat) puts(pszFormat); } -// ios no MessageBox, use CCLog instead +// ios no MessageBox, use log instead void MessageBox(const char * pszMsg, const char * pszTitle) { NSString * title = (pszTitle) ? [NSString stringWithUTF8String : pszTitle] : nil; diff --git a/cocos2dx/platform/nacl/CCCommon.cpp b/cocos2dx/platform/nacl/CCCommon.cpp index a21d302b56..898ea70d70 100644 --- a/cocos2dx/platform/nacl/CCCommon.cpp +++ b/cocos2dx/platform/nacl/CCCommon.cpp @@ -72,12 +72,12 @@ void log(const char * pszFormat, ...) void MessageBox(const char * pszMsg, const char * pszTitle) { - CCLog("%s: %s", pszTitle, pszMsg); + log("%s: %s", pszTitle, pszMsg); } void LuaLog(const char * pszFormat) { - CCLog("%s", pszFormat); + log("%s", pszFormat); } NS_CC_END diff --git a/cocos2dx/platform/nacl/CCInstance.cpp b/cocos2dx/platform/nacl/CCInstance.cpp index 0a71c85d44..ea23189d5f 100644 --- a/cocos2dx/platform/nacl/CCInstance.cpp +++ b/cocos2dx/platform/nacl/CCInstance.cpp @@ -74,7 +74,7 @@ void CocosPepperInstance::DidChangeView(const pp::View& view) bool CocosPepperInstance::Init(uint32_t argc, const char* argn[], const char* argv[]) { - CCLog("CocosPepperInstance::Init: %x %p", pp_instance(), + log("CocosPepperInstance::Init: %x %p", pp_instance(), pp::Module::Get()->get_browser_interface()); nacl_io_init_ppapi(pp_instance(), pp::Module::Get()->get_browser_interface()); diff --git a/cocos2dx/platform/tizen/CCCommon.cpp b/cocos2dx/platform/tizen/CCCommon.cpp index fc182d9123..26f764de6e 100644 --- a/cocos2dx/platform/tizen/CCCommon.cpp +++ b/cocos2dx/platform/tizen/CCCommon.cpp @@ -74,7 +74,7 @@ void log(const char * pszFormat, ...) void MessageBox(const char * pszMsg, const char * pszTitle) { - CCLog("%s: %s", pszTitle, pszMsg); + log("%s: %s", pszTitle, pszMsg); } void LuaLog(const char * pszFormat) diff --git a/cocos2dx/platform/win32/CCEGLView.cpp b/cocos2dx/platform/win32/CCEGLView.cpp index fc669dd284..21cca48145 100644 --- a/cocos2dx/platform/win32/CCEGLView.cpp +++ b/cocos2dx/platform/win32/CCEGLView.cpp @@ -105,10 +105,10 @@ static bool glew_dynamic_binding() // If the current opengl driver doesn't have framebuffers methods, check if an extension exists if (glGenFramebuffers == NULL) { - CCLog("OpenGL: glGenFramebuffers is NULL, try to detect an extension"); + log("OpenGL: glGenFramebuffers is NULL, try to detect an extension"); if (strstr(gl_extensions, "ARB_framebuffer_object")) { - CCLog("OpenGL: ARB_framebuffer_object is supported"); + log("OpenGL: ARB_framebuffer_object is supported"); glIsRenderbuffer = (PFNGLISRENDERBUFFERPROC) wglGetProcAddress("glIsRenderbuffer"); glBindRenderbuffer = (PFNGLBINDRENDERBUFFERPROC) wglGetProcAddress("glBindRenderbuffer"); @@ -131,7 +131,7 @@ static bool glew_dynamic_binding() else if (strstr(gl_extensions, "EXT_framebuffer_object")) { - CCLog("OpenGL: EXT_framebuffer_object is supported"); + log("OpenGL: EXT_framebuffer_object is supported"); glIsRenderbuffer = (PFNGLISRENDERBUFFERPROC) wglGetProcAddress("glIsRenderbufferEXT"); glBindRenderbuffer = (PFNGLBINDRENDERBUFFERPROC) wglGetProcAddress("glBindRenderbufferEXT"); glDeleteRenderbuffers = (PFNGLDELETERENDERBUFFERSPROC) wglGetProcAddress("glDeleteRenderbuffersEXT"); @@ -152,8 +152,8 @@ static bool glew_dynamic_binding() } else { - CCLog("OpenGL: No framebuffers extension is supported"); - CCLog("OpenGL: Any call to Fbo will crash!"); + log("OpenGL: No framebuffers extension is supported"); + log("OpenGL: Any call to Fbo will crash!"); return false; } } @@ -228,20 +228,20 @@ bool EGLView::initGL() if (GLEW_ARB_vertex_shader && GLEW_ARB_fragment_shader) { - CCLog("Ready for GLSL"); + log("Ready for GLSL"); } else { - CCLog("Not totally ready :("); + log("Not totally ready :("); } if (glewIsSupported("GL_VERSION_2_0")) { - CCLog("Ready for OpenGL 2.0"); + log("Ready for OpenGL 2.0"); } else { - CCLog("OpenGL 2.0 not supported"); + log("OpenGL 2.0 not supported"); } if(glew_dynamic_binding() == false) diff --git a/cocos2dx/platform/win32/CCImage.cpp b/cocos2dx/platform/win32/CCImage.cpp index 6543df7045..f53f375c0d 100644 --- a/cocos2dx/platform/win32/CCImage.cpp +++ b/cocos2dx/platform/win32/CCImage.cpp @@ -383,7 +383,7 @@ bool Image::initWithString( if (! dc.setFont(pFontName, nSize)) { - CCLog("Can't found font(%s), use system default", pFontName); + log("Can't found font(%s), use system default", pFontName); } // draw text diff --git a/plugin/samples/HelloPlugins/Classes/TestAds/TestAdsScene.cpp b/plugin/samples/HelloPlugins/Classes/TestAds/TestAdsScene.cpp index 40a85b0ffe..eac0c327f0 100644 --- a/plugin/samples/HelloPlugins/Classes/TestAds/TestAdsScene.cpp +++ b/plugin/samples/HelloPlugins/Classes/TestAds/TestAdsScene.cpp @@ -216,31 +216,31 @@ void TestAds::caseChanged(Object* pSender) default: break; } - CCLog("case selected change to : %s", strLog.c_str()); + log("case selected change to : %s", strLog.c_str()); } void TestAds::typeChanged(Object* pSender) { int selectIndex = _typeItem->getSelectedIndex(); _type = (ProtocolAds::AdsType) selectIndex; - CCLog("type selected change to : %d", _type); + log("type selected change to : %d", _type); } void TestAds::posChanged(Object* pSender) { int selectIndex = _posItem->getSelectedIndex(); _pos = (ProtocolAds::AdsPos) selectIndex; - CCLog("pos selected change to : %d", _pos); + log("pos selected change to : %d", _pos); } void MyAdsListener::onAdsResult(AdsResultCode code, const char* msg) { - CCLog("OnAdsResult, code : %d, msg : %s", code, msg); + log("OnAdsResult, code : %d, msg : %s", code, msg); } void MyAdsListener::onPlayerGetPoints(cocos2d::plugin::ProtocolAds* pAdsPlugin, int points) { - CCLog("Player get points : %d", points); + log("Player get points : %d", points); // @warning should add code to give game-money to player here diff --git a/plugin/samples/HelloPlugins/Classes/TestAnalytics/TestAnalyticsScene.cpp b/plugin/samples/HelloPlugins/Classes/TestAnalytics/TestAnalyticsScene.cpp index b24d7b409f..a27c210b85 100644 --- a/plugin/samples/HelloPlugins/Classes/TestAnalytics/TestAnalyticsScene.cpp +++ b/plugin/samples/HelloPlugins/Classes/TestAnalytics/TestAnalyticsScene.cpp @@ -153,7 +153,7 @@ void TestAnalytics::eventMenuCallback(Object* pSender) case TAG_LOG_ONLINE_CONFIG: { PluginParam param("abc"); - CCLog("Online config = %s", _pluginAnalytics->callStringFuncWithParam("getConfigParams", ¶m, NULL).c_str()); + log("Online config = %s", _pluginAnalytics->callStringFuncWithParam("getConfigParams", ¶m, NULL).c_str()); } break; case TAG_LOG_EVENT_ID_DURATION: @@ -259,7 +259,7 @@ void TestAnalytics::loadPlugins() _pluginAnalytics->setSessionContinueMillis(10000); const char* sdkVer = _pluginAnalytics->getSDKVersion().c_str(); - CCLog("SDK version : %s", sdkVer); + log("SDK version : %s", sdkVer); _pluginAnalytics->callFuncWithParam("updateOnlineConfig", NULL); diff --git a/plugin/samples/HelloPlugins/Classes/TestIAPOnline/MyIAPOLManager.cpp b/plugin/samples/HelloPlugins/Classes/TestIAPOnline/MyIAPOLManager.cpp index 0d631924a8..50551fda78 100644 --- a/plugin/samples/HelloPlugins/Classes/TestIAPOnline/MyIAPOLManager.cpp +++ b/plugin/samples/HelloPlugins/Classes/TestIAPOnline/MyIAPOLManager.cpp @@ -170,6 +170,6 @@ void MyIAPOnlineResult::onPayResult(PayResultCode ret, const char* msg, TProduct MessageBox(goodInfo , msg); if (ret == kPaySuccess) { - CCLog("Pay success locally, should check the real result by game server!"); + log("Pay success locally, should check the real result by game server!"); } } diff --git a/plugin/samples/HelloPlugins/Classes/TestUser/MyUserManager.cpp b/plugin/samples/HelloPlugins/Classes/TestUser/MyUserManager.cpp index d0f5e653ec..8a8836b75f 100644 --- a/plugin/samples/HelloPlugins/Classes/TestUser/MyUserManager.cpp +++ b/plugin/samples/HelloPlugins/Classes/TestUser/MyUserManager.cpp @@ -215,8 +215,8 @@ void MyUserActionResult::onActionResult(ProtocolUser* pPlugin, UserActionResultC // get session ID std::string sessionID = pPlugin->getSessionID(); - CCLog("User Session ID of plugin %s is : %s", pPlugin->getPluginName(), sessionID.c_str()); + log("User Session ID of plugin %s is : %s", pPlugin->getPluginName(), sessionID.c_str()); std::string strStatus = pPlugin->isLogined() ? "online" : "offline"; - CCLog("User status of plugin %s is : %s", pPlugin->getPluginName(), strStatus.c_str()); + log("User status of plugin %s is : %s", pPlugin->getPluginName(), strStatus.c_str()); }