diff --git a/cocos2dx/platform/android/CCApplication_android.cpp b/cocos2dx/platform/android/CCApplication_android.cpp index 8c6c587da8..1cb2cff826 100644 --- a/cocos2dx/platform/android/CCApplication_android.cpp +++ b/cocos2dx/platform/android/CCApplication_android.cpp @@ -11,7 +11,7 @@ #define LOG_TAG "CCApplication_android Debug" #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) -NS_CC_BEGIN; +NS_CC_BEGIN // sharedApplication pointer CCApplication * CCApplication::sm_pSharedApplication = 0; @@ -113,4 +113,4 @@ ccLanguageType CCApplication::getCurrentLanguage() return ret; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/android/CCApplication_android.h b/cocos2dx/platform/android/CCApplication_android.h index a86045c0a2..fab2df2046 100644 --- a/cocos2dx/platform/android/CCApplication_android.h +++ b/cocos2dx/platform/android/CCApplication_android.h @@ -5,7 +5,7 @@ #include "CCCommon.h" -NS_CC_BEGIN; +NS_CC_BEGIN class CCRect; @@ -90,6 +90,6 @@ protected: static CCApplication * sm_pSharedApplication; }; -NS_CC_END; +NS_CC_END #endif // __CCX_APPLICATION_ANDROID_H__ diff --git a/cocos2dx/platform/android/CCFileUtils_android.cpp b/cocos2dx/platform/android/CCFileUtils_android.cpp index 8093e0838d..092ef6f9ef 100644 --- a/cocos2dx/platform/android/CCFileUtils_android.cpp +++ b/cocos2dx/platform/android/CCFileUtils_android.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -NS_CC_BEGIN; +NS_CC_BEGIN #include "CCCommon.h" #include "jni/SystemInfoJni.h" @@ -144,4 +144,4 @@ string CCFileUtils::getWriteablePath() } } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/android/CCImage_android.cpp b/cocos2dx/platform/android/CCImage_android.cpp index e142fb038b..d3776c010f 100644 --- a/cocos2dx/platform/android/CCImage_android.cpp +++ b/cocos2dx/platform/android/CCImage_android.cpp @@ -33,7 +33,7 @@ THE SOFTWARE. #include "jni/JniHelper.h" -NS_CC_BEGIN; +NS_CC_BEGIN class BitmapDC { @@ -135,7 +135,7 @@ bool CCImage::initWithString( return bRet; } -NS_CC_END; +NS_CC_END // this method is called by Cocos2dxBitmap extern "C" diff --git a/cocos2dx/platform/bada/CCAccelerometer_bada.cpp b/cocos2dx/platform/bada/CCAccelerometer_bada.cpp index 4d8db9dc06..868f499fef 100644 --- a/cocos2dx/platform/bada/CCAccelerometer_bada.cpp +++ b/cocos2dx/platform/bada/CCAccelerometer_bada.cpp @@ -29,7 +29,7 @@ THE SOFTWARE. using namespace Osp::Ui; using namespace Osp::Uix; -NS_CC_BEGIN; +NS_CC_BEGIN CCAccelerometer::CCAccelerometer() @@ -146,4 +146,4 @@ void CCAccelerometer::setEnable(bool bEnable) } } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/bada/CCApplication_bada.cpp b/cocos2dx/platform/bada/CCApplication_bada.cpp index 6e4cc84d78..6933fb61c4 100644 --- a/cocos2dx/platform/bada/CCApplication_bada.cpp +++ b/cocos2dx/platform/bada/CCApplication_bada.cpp @@ -31,7 +31,7 @@ using namespace Osp::Base; using namespace Osp::Base::Runtime; using namespace Osp::Locales; -NS_CC_BEGIN; +NS_CC_BEGIN static CCApplication * s_pApplication = NULL; static long long s_nAnimationInterval = 1000/60; @@ -179,4 +179,4 @@ void CCApplication::OnTimerExpired(Timer& timer) CCDirector::sharedDirector()->mainLoop(); } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/bada/CCApplication_bada.h b/cocos2dx/platform/bada/CCApplication_bada.h index 9680a1d900..b290a6364e 100644 --- a/cocos2dx/platform/bada/CCApplication_bada.h +++ b/cocos2dx/platform/bada/CCApplication_bada.h @@ -32,7 +32,7 @@ THE SOFTWARE. #include #include -NS_CC_BEGIN; +NS_CC_BEGIN @@ -120,6 +120,6 @@ protected: Osp::Base::Runtime::Timer* m_pTimer; }; -NS_CC_END; +NS_CC_END #endif // end of __CCX_APPLICATION_WIN32_H__ diff --git a/cocos2dx/platform/bada/CCEGLView_bada.cpp b/cocos2dx/platform/bada/CCEGLView_bada.cpp index 28e4890fe4..81bca09244 100644 --- a/cocos2dx/platform/bada/CCEGLView_bada.cpp +++ b/cocos2dx/platform/bada/CCEGLView_bada.cpp @@ -43,7 +43,7 @@ using namespace Osp::Ui; using namespace Osp::Ui::Controls; using namespace Osp::Graphics; -NS_CC_BEGIN; +NS_CC_BEGIN static CCEGLView * s_pMainWindow; static HashMapT s_mapTouches; // key: pointer id; value: CCTouch* @@ -674,4 +674,4 @@ CCEGLView& CCEGLView::sharedOpenGLView() return *s_pMainWindow; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/bada/CCEGLView_bada.h b/cocos2dx/platform/bada/CCEGLView_bada.h index 15feb29aa3..9cec57f4e3 100644 --- a/cocos2dx/platform/bada/CCEGLView_bada.h +++ b/cocos2dx/platform/bada/CCEGLView_bada.h @@ -34,7 +34,7 @@ THE SOFTWARE. #include #include -NS_CC_BEGIN; +NS_CC_BEGIN class CCSet; class CCTouch; @@ -152,6 +152,6 @@ private: Osp::Ui::Orientation m_nowOrientation; }; -NS_CC_END; +NS_CC_END #endif // end of __CCX_EGLVIEW_WIN32_H__ diff --git a/cocos2dx/platform/bada/CCFileUtils_bada.cpp b/cocos2dx/platform/bada/CCFileUtils_bada.cpp index 3d4b61a99e..1c601ca550 100644 --- a/cocos2dx/platform/bada/CCFileUtils_bada.cpp +++ b/cocos2dx/platform/bada/CCFileUtils_bada.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. using namespace std; -NS_CC_BEGIN; +NS_CC_BEGIN // record the resource path static string s_strResourcePath = ""; @@ -134,5 +134,5 @@ string CCFileUtils::getWriteablePath() return "/Home/"; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/bada/CCImage_bada.cpp b/cocos2dx/platform/bada/CCImage_bada.cpp index 896bab9c76..7e9faf49d9 100644 --- a/cocos2dx/platform/bada/CCImage_bada.cpp +++ b/cocos2dx/platform/bada/CCImage_bada.cpp @@ -29,7 +29,7 @@ using namespace Osp::Base::Collection; using namespace Osp::Graphics; -NS_CC_BEGIN; +NS_CC_BEGIN /** @brief A memory DC which uses to draw text on bitmap. @@ -249,4 +249,4 @@ bool CCImage::initWithString( return bRet; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/ios/CCApplication_ios.h b/cocos2dx/platform/ios/CCApplication_ios.h index 3e3276a8ba..ce60f04149 100644 --- a/cocos2dx/platform/ios/CCApplication_ios.h +++ b/cocos2dx/platform/ios/CCApplication_ios.h @@ -27,7 +27,7 @@ THE SOFTWARE. #include "CCCommon.h" -NS_CC_BEGIN; +NS_CC_BEGIN class CCRect; @@ -112,6 +112,6 @@ protected: static CCApplication * sm_pSharedApplication; }; -NS_CC_END; +NS_CC_END #endif // end of __CC_APPLICATION_IOS_H__ diff --git a/cocos2dx/platform/ios/CCApplication_ios.mm b/cocos2dx/platform/ios/CCApplication_ios.mm index b2fefa67ba..fae9ca1bda 100644 --- a/cocos2dx/platform/ios/CCApplication_ios.mm +++ b/cocos2dx/platform/ios/CCApplication_ios.mm @@ -29,7 +29,7 @@ #import "CCGeometry.h" #import "CCDirectorCaller.h" -NS_CC_BEGIN; +NS_CC_BEGIN CCApplication* CCApplication::sm_pSharedApplication = 0; @@ -145,4 +145,4 @@ ccLanguageType CCApplication::getCurrentLanguage() return ret; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/ios/CCCommon_ios.mm b/cocos2dx/platform/ios/CCCommon_ios.mm index f0bcfa0f67..5bfc440560 100644 --- a/cocos2dx/platform/ios/CCCommon_ios.mm +++ b/cocos2dx/platform/ios/CCCommon_ios.mm @@ -29,7 +29,7 @@ #import -NS_CC_BEGIN; +NS_CC_BEGIN void CCLog(const char * pszFormat, ...) { @@ -58,4 +58,4 @@ void CCMessageBox(const char * pszMsg, const char * pszTitle) [messageBox show]; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/ios/CCImage_ios.mm b/cocos2dx/platform/ios/CCImage_ios.mm index 9a92fd9c70..6974a65c67 100644 --- a/cocos2dx/platform/ios/CCImage_ios.mm +++ b/cocos2dx/platform/ios/CCImage_ios.mm @@ -483,7 +483,7 @@ static bool _initWithString(const char * pText, cocos2d::CCImage::ETextAlign eAl return bRet; } -NS_CC_BEGIN; +NS_CC_BEGIN CCImage::CCImage() : m_nWidth(0) @@ -706,5 +706,5 @@ bool CCImage::saveToFile(const char *pszFilePath, bool bIsToRGB) return true; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/ios/CCThread_ios.mm b/cocos2dx/platform/ios/CCThread_ios.mm index a287d71586..72811dd061 100644 --- a/cocos2dx/platform/ios/CCThread_ios.mm +++ b/cocos2dx/platform/ios/CCThread_ios.mm @@ -24,7 +24,7 @@ THE SOFTWARE. #import #include "CCThread.h" -NS_CC_BEGIN; +NS_CC_BEGIN CCThread::~CCThread() { @@ -36,4 +36,4 @@ void CCThread::createAutoreleasePool() m_pAutoreasePool = [[NSAutoreleasePool alloc] init]; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/linux/CCApplication_linux.cpp b/cocos2dx/platform/linux/CCApplication_linux.cpp index 0cd9980f9b..f56f32ea9e 100644 --- a/cocos2dx/platform/linux/CCApplication_linux.cpp +++ b/cocos2dx/platform/linux/CCApplication_linux.cpp @@ -10,7 +10,7 @@ #include "CCDirector.h" -NS_CC_BEGIN; +NS_CC_BEGIN // sharedApplication pointer CCApplication * CCApplication::sm_pSharedApplication = 0; @@ -100,4 +100,4 @@ ccLanguageType CCApplication::getCurrentLanguage() return kLanguageEnglish; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/linux/CCApplication_linux.h b/cocos2dx/platform/linux/CCApplication_linux.h index b521ad63b0..7ea54f4e48 100644 --- a/cocos2dx/platform/linux/CCApplication_linux.h +++ b/cocos2dx/platform/linux/CCApplication_linux.h @@ -10,7 +10,8 @@ #include "CCCommon.h" -NS_CC_BEGIN; +NS_CC_BEGIN + class CCRect; class CCApplication { @@ -94,6 +95,6 @@ protected: static CCApplication * sm_pSharedApplication; }; -NS_CC_END; +NS_CC_END #endif /* CCAPPLICATION_LINUX_H_ */ diff --git a/cocos2dx/platform/linux/CCEGLView_linux.cpp b/cocos2dx/platform/linux/CCEGLView_linux.cpp index 28d7ab007d..f2555b8620 100644 --- a/cocos2dx/platform/linux/CCEGLView_linux.cpp +++ b/cocos2dx/platform/linux/CCEGLView_linux.cpp @@ -6,11 +6,8 @@ */ #include "CCEGLView_linux.h" - #include "CCGL.h" - #include "GL/glfw.h" - #include "CCSet.h" #include "ccMacros.h" #include "CCDirector.h" @@ -77,7 +74,8 @@ bool initExtensions() { return bRet; } -NS_CC_BEGIN; +NS_CC_BEGIN + static CCEGLView* s_pMainWindow = NULL; CCEGLView::CCEGLView() @@ -361,4 +359,4 @@ CCEGLView& CCEGLView::sharedOpenGLView() return *s_pMainWindow; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/linux/CCEGLView_linux.h b/cocos2dx/platform/linux/CCEGLView_linux.h index 28133afcb7..689faa1b33 100644 --- a/cocos2dx/platform/linux/CCEGLView_linux.h +++ b/cocos2dx/platform/linux/CCEGLView_linux.h @@ -13,7 +13,7 @@ bool initExtensions(); -NS_CC_BEGIN; +NS_CC_BEGIN class CCSet; class CCTouch; @@ -92,6 +92,6 @@ private: float m_fScreenScaleFactor; }; -NS_CC_END; +NS_CC_END #endif /* CCEGLVIEWLINUX_H_ */ diff --git a/cocos2dx/platform/linux/CCFileUtils_linux.cpp b/cocos2dx/platform/linux/CCFileUtils_linux.cpp index b2952f30a4..9631ec8eb6 100644 --- a/cocos2dx/platform/linux/CCFileUtils_linux.cpp +++ b/cocos2dx/platform/linux/CCFileUtils_linux.cpp @@ -14,7 +14,7 @@ using namespace std; -NS_CC_BEGIN; +NS_CC_BEGIN static string s_strResourcePath = ""; @@ -90,4 +90,4 @@ string CCFileUtils::getWriteablePath() { return s_strResourcePath; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/linux/CCImage_linux.cpp b/cocos2dx/platform/linux/CCImage_linux.cpp index f312b30bac..5b81025ab7 100644 --- a/cocos2dx/platform/linux/CCImage_linux.cpp +++ b/cocos2dx/platform/linux/CCImage_linux.cpp @@ -23,7 +23,8 @@ struct TextLine { int iLineWidth; }; -NS_CC_BEGIN; +NS_CC_BEGIN + class BitmapDC { public: @@ -341,4 +342,4 @@ bool CCImage::initWithString( return bRet; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/marmalade/CCApplication_marmalade.cpp b/cocos2dx/platform/marmalade/CCApplication_marmalade.cpp index 00b4a4b07e..c01187cac9 100644 --- a/cocos2dx/platform/marmalade/CCApplication_marmalade.cpp +++ b/cocos2dx/platform/marmalade/CCApplication_marmalade.cpp @@ -33,7 +33,7 @@ #include -NS_CC_BEGIN; +NS_CC_BEGIN // sharedApplication pointer CCApplication * CCApplication::sm_pSharedApplication = 0; @@ -186,4 +186,4 @@ ccLanguageType CCApplication::getCurrentLanguage() } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/marmalade/CCApplication_marmalade.h b/cocos2dx/platform/marmalade/CCApplication_marmalade.h index c0fdd9f1b0..ab948deeb9 100644 --- a/cocos2dx/platform/marmalade/CCApplication_marmalade.h +++ b/cocos2dx/platform/marmalade/CCApplication_marmalade.h @@ -31,7 +31,8 @@ #include "CCDirector.h" #include "IwUtil.h" #include "IwUtilInitTerm.h" -NS_CC_BEGIN; + +NS_CC_BEGIN class CCRect; @@ -118,5 +119,6 @@ protected: static CCApplication * sm_pSharedApplication; }; -NS_CC_END; +NS_CC_END + #endif // end of __CC_APPLICATION_MARMALADE_H__ diff --git a/cocos2dx/platform/marmalade/CCEGLView_marmalade.cpp b/cocos2dx/platform/marmalade/CCEGLView_marmalade.cpp index e917c88f0d..f9e8d9870a 100644 --- a/cocos2dx/platform/marmalade/CCEGLView_marmalade.cpp +++ b/cocos2dx/platform/marmalade/CCEGLView_marmalade.cpp @@ -23,9 +23,7 @@ ****************************************************************************/ #include "CCEGLView.h" - #include "IwGL.h" - #include "CCApplication.h" #include "CCDirector.h" #include "CCSet.h" @@ -38,7 +36,7 @@ #include #include -NS_CC_BEGIN; +NS_CC_BEGIN CCEGLView* CCEGLView::m_pInstance = 0 ; @@ -397,4 +395,4 @@ CCRect CCEGLView::getViewPort() } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/marmalade/CCEGLView_marmalade.h b/cocos2dx/platform/marmalade/CCEGLView_marmalade.h index cd1828bb5b..0b1d928b52 100644 --- a/cocos2dx/platform/marmalade/CCEGLView_marmalade.h +++ b/cocos2dx/platform/marmalade/CCEGLView_marmalade.h @@ -30,7 +30,8 @@ #include "s3ePointer.h" #include "IwUtil.h" -NS_CC_BEGIN; +NS_CC_BEGIN + class CCSet; class CCTouch; class EGLTouchDelegate; @@ -144,6 +145,6 @@ private: } }; -NS_CC_END; +NS_CC_END #endif // end of __CC_EGLVIEW_MARMALADE_H__ diff --git a/cocos2dx/platform/marmalade/CCFileUtils_marmalade.cpp b/cocos2dx/platform/marmalade/CCFileUtils_marmalade.cpp index 687cc76066..43b6c4ab66 100644 --- a/cocos2dx/platform/marmalade/CCFileUtils_marmalade.cpp +++ b/cocos2dx/platform/marmalade/CCFileUtils_marmalade.cpp @@ -26,10 +26,9 @@ #include "string.h" #include "stack" #include "CCString.h" - #include "CCApplication.h" -NS_CC_BEGIN; +NS_CC_BEGIN static char s_pszResourcePath[S3E_FILE_MAX_PATH] = {0}; @@ -105,5 +104,5 @@ std::string CCFileUtils::getWriteablePath() return string("ram://"); } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/marmalade/CCImage_marmalade.cpp b/cocos2dx/platform/marmalade/CCImage_marmalade.cpp index 5eb836bdf3..9f89208a3b 100644 --- a/cocos2dx/platform/marmalade/CCImage_marmalade.cpp +++ b/cocos2dx/platform/marmalade/CCImage_marmalade.cpp @@ -24,7 +24,6 @@ #include #include #include - #include "CCImage.h" #include "CCCommon.h" #include "CCStdC.h" @@ -59,7 +58,7 @@ struct TextLine { int iLineWidth; }; -NS_CC_BEGIN; +NS_CC_BEGIN class CC_DLL CCImageHelper { @@ -856,4 +855,4 @@ bool CCImage::_saveImageToJPG(const char * pszFilePath) return false; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/qnx/CCApplication_qnx.cpp b/cocos2dx/platform/qnx/CCApplication_qnx.cpp index 7bf797048f..aa254aeef8 100644 --- a/cocos2dx/platform/qnx/CCApplication_qnx.cpp +++ b/cocos2dx/platform/qnx/CCApplication_qnx.cpp @@ -10,7 +10,7 @@ #define LOGD(...) fprintf(stderr, __VA_ARGS__) -NS_CC_BEGIN; +NS_CC_BEGIN // sharedApplication pointer CCApplication * CCApplication::sm_pSharedApplication = 0; @@ -144,4 +144,4 @@ ccLanguageType CCApplication::getCurrentLanguage() return ret_language; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/qnx/CCApplication_qnx.h b/cocos2dx/platform/qnx/CCApplication_qnx.h index c614342f46..3962dee617 100644 --- a/cocos2dx/platform/qnx/CCApplication_qnx.h +++ b/cocos2dx/platform/qnx/CCApplication_qnx.h @@ -5,7 +5,7 @@ #include "CCCommon.h" -NS_CC_BEGIN; +NS_CC_BEGIN class CCRect; @@ -95,6 +95,6 @@ private: static long m_animationInterval; }; -NS_CC_END; +NS_CC_END #endif // __CCX_APPLICATION_QNX_H__ diff --git a/cocos2dx/platform/qnx/CCFileUtils_qnx.cpp b/cocos2dx/platform/qnx/CCFileUtils_qnx.cpp index 1c6fac4a66..6610b38e86 100644 --- a/cocos2dx/platform/qnx/CCFileUtils_qnx.cpp +++ b/cocos2dx/platform/qnx/CCFileUtils_qnx.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #include #include -NS_CC_BEGIN; +NS_CC_BEGIN #define MAX_PATH 256 @@ -158,4 +158,4 @@ std::string CCFileUtils::getWriteablePath() return path; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/qnx/CCImage_qnx.cpp b/cocos2dx/platform/qnx/CCImage_qnx.cpp index 7283602b12..1066013be1 100644 --- a/cocos2dx/platform/qnx/CCImage_qnx.cpp +++ b/cocos2dx/platform/qnx/CCImage_qnx.cpp @@ -31,7 +31,7 @@ THE SOFTWARE. using namespace std; -NS_CC_BEGIN; +NS_CC_BEGIN class BitmapDC { @@ -240,5 +240,5 @@ bool CCImage::initWithString( return bRet; } -NS_CC_END; +NS_CC_END diff --git a/cocos2dx/platform/win32/CCImage_win32.cpp b/cocos2dx/platform/win32/CCImage_win32.cpp index d293810283..55c776805f 100644 --- a/cocos2dx/platform/win32/CCImage_win32.cpp +++ b/cocos2dx/platform/win32/CCImage_win32.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -NS_CC_BEGIN; +NS_CC_BEGIN /** @brief A memory DC which uses to draw text on bitmap. @@ -428,4 +428,4 @@ bool CCImage::initWithString( return bRet; } -NS_CC_END; +NS_CC_END