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

delete semicolon after NS_CC_BEGIN and NS_CC_END

This commit is contained in:
James Chen 2012-04-19 11:56:22 +08:00
parent 4068be84e9
commit 84ffaf130a
33 changed files with 72 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos2dx/platform/android/CCApplication_android.cpp
View File

@ -11,7 +11,7 @@
#define LOG_TAG "CCApplication_android Debug" #define LOG_TAG "CCApplication_android Debug"
#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
NS_CC_BEGIN; NS_CC_BEGIN
// sharedApplication pointer // sharedApplication pointer
CCApplication * CCApplication::sm_pSharedApplication = 0; CCApplication * CCApplication::sm_pSharedApplication = 0;
@ -113,4 +113,4 @@ ccLanguageType CCApplication::getCurrentLanguage()
return ret; return ret;
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/android/CCApplication_android.h
View File

@ -5,7 +5,7 @@
#include "CCCommon.h" #include "CCCommon.h"
NS_CC_BEGIN; NS_CC_BEGIN
class CCRect; class CCRect;
@ -90,6 +90,6 @@ protected:
static CCApplication * sm_pSharedApplication; static CCApplication * sm_pSharedApplication;
}; };
NS_CC_END; NS_CC_END
#endif // __CCX_APPLICATION_ANDROID_H__ #endif // __CCX_APPLICATION_ANDROID_H__

4
cocos2dx/platform/android/CCFileUtils_android.cpp
View File

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
NS_CC_BEGIN; NS_CC_BEGIN
#include "CCCommon.h" #include "CCCommon.h"
#include "jni/SystemInfoJni.h" #include "jni/SystemInfoJni.h"
@ -144,4 +144,4 @@ string CCFileUtils::getWriteablePath()
} }
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/android/CCImage_android.cpp
View File

@ -33,7 +33,7 @@ THE SOFTWARE.
#include "jni/JniHelper.h" #include "jni/JniHelper.h"
NS_CC_BEGIN; NS_CC_BEGIN
class BitmapDC class BitmapDC
{ {
@ -135,7 +135,7 @@ bool CCImage::initWithString(
return bRet; return bRet;
} }
NS_CC_END; NS_CC_END
// this method is called by Cocos2dxBitmap // this method is called by Cocos2dxBitmap
extern "C" extern "C"

4
cocos2dx/platform/bada/CCAccelerometer_bada.cpp
View File

@ -29,7 +29,7 @@ THE SOFTWARE.
using namespace Osp::Ui; using namespace Osp::Ui;
using namespace Osp::Uix; using namespace Osp::Uix;
NS_CC_BEGIN; NS_CC_BEGIN
CCAccelerometer::CCAccelerometer() CCAccelerometer::CCAccelerometer()
@ -146,4 +146,4 @@ void CCAccelerometer::setEnable(bool bEnable)
} }
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/bada/CCApplication_bada.cpp
View File

@ -31,7 +31,7 @@ using namespace Osp::Base;
using namespace Osp::Base::Runtime; using namespace Osp::Base::Runtime;
using namespace Osp::Locales; using namespace Osp::Locales;
NS_CC_BEGIN; NS_CC_BEGIN
static CCApplication * s_pApplication = NULL; static CCApplication * s_pApplication = NULL;
static long long s_nAnimationInterval = 1000/60; static long long s_nAnimationInterval = 1000/60;
@ -179,4 +179,4 @@ void CCApplication::OnTimerExpired(Timer& timer)
CCDirector::sharedDirector()->mainLoop(); CCDirector::sharedDirector()->mainLoop();
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/bada/CCApplication_bada.h
View File

@ -32,7 +32,7 @@ THE SOFTWARE.
#include <FApp.h> #include <FApp.h>
#include <FSystem.h> #include <FSystem.h>
NS_CC_BEGIN; NS_CC_BEGIN
@ -120,6 +120,6 @@ protected:
Osp::Base::Runtime::Timer* m_pTimer; Osp::Base::Runtime::Timer* m_pTimer;
}; };
NS_CC_END; NS_CC_END
#endif // end of __CCX_APPLICATION_WIN32_H__ #endif // end of __CCX_APPLICATION_WIN32_H__

4
cocos2dx/platform/bada/CCEGLView_bada.cpp
View File

@ -43,7 +43,7 @@ using namespace Osp::Ui;
using namespace Osp::Ui::Controls; using namespace Osp::Ui::Controls;
using namespace Osp::Graphics; using namespace Osp::Graphics;
NS_CC_BEGIN; NS_CC_BEGIN
static CCEGLView * s_pMainWindow; static CCEGLView * s_pMainWindow;
static HashMapT<int, CCTouch*> s_mapTouches; // key: pointer id; value: CCTouch* static HashMapT<int, CCTouch*> s_mapTouches; // key: pointer id; value: CCTouch*
@ -674,4 +674,4 @@ CCEGLView& CCEGLView::sharedOpenGLView()
return *s_pMainWindow; return *s_pMainWindow;
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/bada/CCEGLView_bada.h
View File

@ -34,7 +34,7 @@ THE SOFTWARE.
#include <GLES/gl.h> #include <GLES/gl.h>
#include <GLES/glext.h> #include <GLES/glext.h>
NS_CC_BEGIN; NS_CC_BEGIN
class CCSet; class CCSet;
class CCTouch; class CCTouch;
@ -152,6 +152,6 @@ private:
Osp::Ui::Orientation m_nowOrientation; Osp::Ui::Orientation m_nowOrientation;
}; };
NS_CC_END; NS_CC_END
#endif // end of __CCX_EGLVIEW_WIN32_H__ #endif // end of __CCX_EGLVIEW_WIN32_H__

4
cocos2dx/platform/bada/CCFileUtils_bada.cpp
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
using namespace std; using namespace std;
NS_CC_BEGIN; NS_CC_BEGIN
// record the resource path // record the resource path
static string s_strResourcePath = ""; static string s_strResourcePath = "";
@ -134,5 +134,5 @@ string CCFileUtils::getWriteablePath()
return "/Home/"; return "/Home/";
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/bada/CCImage_bada.cpp
View File

@ -29,7 +29,7 @@ using namespace Osp::Base::Collection;
using namespace Osp::Graphics; using namespace Osp::Graphics;
NS_CC_BEGIN; NS_CC_BEGIN
/** /**
@brief A memory DC which uses to draw text on bitmap. @brief A memory DC which uses to draw text on bitmap.
@ -249,4 +249,4 @@ bool CCImage::initWithString(
return bRet; return bRet;
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/ios/CCApplication_ios.h
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#include "CCCommon.h" #include "CCCommon.h"
NS_CC_BEGIN; NS_CC_BEGIN
class CCRect; class CCRect;
@ -112,6 +112,6 @@ protected:
static CCApplication * sm_pSharedApplication; static CCApplication * sm_pSharedApplication;
}; };
NS_CC_END; NS_CC_END
#endif // end of __CC_APPLICATION_IOS_H__ #endif // end of __CC_APPLICATION_IOS_H__

4
cocos2dx/platform/ios/CCApplication_ios.mm
View File

@ -29,7 +29,7 @@
#import "CCGeometry.h" #import "CCGeometry.h"
#import "CCDirectorCaller.h" #import "CCDirectorCaller.h"
NS_CC_BEGIN; NS_CC_BEGIN
CCApplication* CCApplication::sm_pSharedApplication = 0; CCApplication* CCApplication::sm_pSharedApplication = 0;
@ -145,4 +145,4 @@ ccLanguageType CCApplication::getCurrentLanguage()
return ret; return ret;
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/ios/CCCommon_ios.mm
View File

@ -29,7 +29,7 @@
#import <UIKit/UIAlert.h> #import <UIKit/UIAlert.h>
NS_CC_BEGIN; NS_CC_BEGIN
void CCLog(const char * pszFormat, ...) void CCLog(const char * pszFormat, ...)
{ {
@ -58,4 +58,4 @@ void CCMessageBox(const char * pszMsg, const char * pszTitle)
[messageBox show]; [messageBox show];
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/ios/CCImage_ios.mm
View File

@ -483,7 +483,7 @@ static bool _initWithString(const char * pText, cocos2d::CCImage::ETextAlign eAl
return bRet; return bRet;
} }
NS_CC_BEGIN; NS_CC_BEGIN
CCImage::CCImage() CCImage::CCImage()
: m_nWidth(0) : m_nWidth(0)
@ -706,5 +706,5 @@ bool CCImage::saveToFile(const char *pszFilePath, bool bIsToRGB)
return true; return true;
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/ios/CCThread_ios.mm
View File

@ -24,7 +24,7 @@ THE SOFTWARE.
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#include "CCThread.h" #include "CCThread.h"
NS_CC_BEGIN; NS_CC_BEGIN
CCThread::~CCThread() CCThread::~CCThread()
{ {
@ -36,4 +36,4 @@ void CCThread::createAutoreleasePool()
m_pAutoreasePool = [[NSAutoreleasePool alloc] init]; m_pAutoreasePool = [[NSAutoreleasePool alloc] init];
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/linux/CCApplication_linux.cpp
View File

@ -10,7 +10,7 @@
#include "CCDirector.h" #include "CCDirector.h"
NS_CC_BEGIN; NS_CC_BEGIN
// sharedApplication pointer // sharedApplication pointer
CCApplication * CCApplication::sm_pSharedApplication = 0; CCApplication * CCApplication::sm_pSharedApplication = 0;
@ -100,4 +100,4 @@ ccLanguageType CCApplication::getCurrentLanguage()
return kLanguageEnglish; return kLanguageEnglish;
} }
NS_CC_END; NS_CC_END

5
cocos2dx/platform/linux/CCApplication_linux.h
View File

@ -10,7 +10,8 @@
#include "CCCommon.h" #include "CCCommon.h"
NS_CC_BEGIN; NS_CC_BEGIN
class CCRect; class CCRect;
class CCApplication { class CCApplication {
@ -94,6 +95,6 @@ protected:
static CCApplication * sm_pSharedApplication; static CCApplication * sm_pSharedApplication;
}; };
NS_CC_END; NS_CC_END
#endif /* CCAPPLICATION_LINUX_H_ */ #endif /* CCAPPLICATION_LINUX_H_ */

8
cocos2dx/platform/linux/CCEGLView_linux.cpp
View File

@ -6,11 +6,8 @@
*/ */
#include "CCEGLView_linux.h" #include "CCEGLView_linux.h"
#include "CCGL.h" #include "CCGL.h"
#include "GL/glfw.h" #include "GL/glfw.h"
#include "CCSet.h" #include "CCSet.h"
#include "ccMacros.h" #include "ccMacros.h"
#include "CCDirector.h" #include "CCDirector.h"
@ -77,7 +74,8 @@ bool initExtensions() {
return bRet; return bRet;
} }
NS_CC_BEGIN; NS_CC_BEGIN
static CCEGLView* s_pMainWindow = NULL; static CCEGLView* s_pMainWindow = NULL;
CCEGLView::CCEGLView() CCEGLView::CCEGLView()
@ -361,4 +359,4 @@ CCEGLView& CCEGLView::sharedOpenGLView()
return *s_pMainWindow; return *s_pMainWindow;
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/linux/CCEGLView_linux.h
View File

@ -13,7 +13,7 @@
bool initExtensions(); bool initExtensions();
NS_CC_BEGIN; NS_CC_BEGIN
class CCSet; class CCSet;
class CCTouch; class CCTouch;
@ -92,6 +92,6 @@ private:
float m_fScreenScaleFactor; float m_fScreenScaleFactor;
}; };
NS_CC_END; NS_CC_END
#endif /* CCEGLVIEWLINUX_H_ */ #endif /* CCEGLVIEWLINUX_H_ */

4
cocos2dx/platform/linux/CCFileUtils_linux.cpp
View File

@ -14,7 +14,7 @@
using namespace std; using namespace std;
NS_CC_BEGIN; NS_CC_BEGIN
static string s_strResourcePath = ""; static string s_strResourcePath = "";
@ -90,4 +90,4 @@ string CCFileUtils::getWriteablePath() {
return s_strResourcePath; return s_strResourcePath;
} }
NS_CC_END; NS_CC_END

5
cocos2dx/platform/linux/CCImage_linux.cpp
View File

@ -23,7 +23,8 @@ struct TextLine {
int iLineWidth; int iLineWidth;
}; };
NS_CC_BEGIN; NS_CC_BEGIN
class BitmapDC class BitmapDC
{ {
public: public:
@ -341,4 +342,4 @@ bool CCImage::initWithString(
return bRet; return bRet;
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/marmalade/CCApplication_marmalade.cpp
View File

@ -33,7 +33,7 @@
#include <IwMemBucketHelpers.h> #include <IwMemBucketHelpers.h>
NS_CC_BEGIN; NS_CC_BEGIN
// sharedApplication pointer // sharedApplication pointer
CCApplication * CCApplication::sm_pSharedApplication = 0; CCApplication * CCApplication::sm_pSharedApplication = 0;
@ -186,4 +186,4 @@ ccLanguageType CCApplication::getCurrentLanguage()
} }
NS_CC_END; NS_CC_END

6
cocos2dx/platform/marmalade/CCApplication_marmalade.h
View File

@ -31,7 +31,8 @@
#include "CCDirector.h" #include "CCDirector.h"
#include "IwUtil.h" #include "IwUtil.h"
#include "IwUtilInitTerm.h" #include "IwUtilInitTerm.h"
NS_CC_BEGIN;
NS_CC_BEGIN
class CCRect; class CCRect;
@ -118,5 +119,6 @@ protected:
static CCApplication * sm_pSharedApplication; static CCApplication * sm_pSharedApplication;
}; };
NS_CC_END; NS_CC_END
#endif // end of __CC_APPLICATION_MARMALADE_H__ #endif // end of __CC_APPLICATION_MARMALADE_H__

6
cocos2dx/platform/marmalade/CCEGLView_marmalade.cpp
View File

@ -23,9 +23,7 @@
****************************************************************************/ ****************************************************************************/
#include "CCEGLView.h" #include "CCEGLView.h"
#include "IwGL.h" #include "IwGL.h"
#include "CCApplication.h" #include "CCApplication.h"
#include "CCDirector.h" #include "CCDirector.h"
#include "CCSet.h" #include "CCSet.h"
@ -38,7 +36,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <s3eOSReadString.h> #include <s3eOSReadString.h>
NS_CC_BEGIN; NS_CC_BEGIN
CCEGLView* CCEGLView::m_pInstance = 0 ; CCEGLView* CCEGLView::m_pInstance = 0 ;
@ -397,4 +395,4 @@ CCRect CCEGLView::getViewPort()
} }
NS_CC_END; NS_CC_END

5
cocos2dx/platform/marmalade/CCEGLView_marmalade.h
View File

@ -30,7 +30,8 @@
#include "s3ePointer.h" #include "s3ePointer.h"
#include "IwUtil.h" #include "IwUtil.h"
NS_CC_BEGIN; NS_CC_BEGIN
class CCSet; class CCSet;
class CCTouch; class CCTouch;
class EGLTouchDelegate; class EGLTouchDelegate;
@ -144,6 +145,6 @@ private:
} }
}; };
NS_CC_END; NS_CC_END
#endif // end of __CC_EGLVIEW_MARMALADE_H__ #endif // end of __CC_EGLVIEW_MARMALADE_H__

5
cocos2dx/platform/marmalade/CCFileUtils_marmalade.cpp
View File

@ -26,10 +26,9 @@
#include "string.h" #include "string.h"
#include "stack" #include "stack"
#include "CCString.h" #include "CCString.h"
#include "CCApplication.h" #include "CCApplication.h"
NS_CC_BEGIN; NS_CC_BEGIN
static char s_pszResourcePath[S3E_FILE_MAX_PATH] = {0}; static char s_pszResourcePath[S3E_FILE_MAX_PATH] = {0};
@ -105,5 +104,5 @@ std::string CCFileUtils::getWriteablePath()
return string("ram://"); return string("ram://");
} }
NS_CC_END; NS_CC_END

5
cocos2dx/platform/marmalade/CCImage_marmalade.cpp
View File

@ -24,7 +24,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <sstream> #include <sstream>
#include "CCImage.h" #include "CCImage.h"
#include "CCCommon.h" #include "CCCommon.h"
#include "CCStdC.h" #include "CCStdC.h"
@ -59,7 +58,7 @@ struct TextLine {
int iLineWidth; int iLineWidth;
}; };
NS_CC_BEGIN; NS_CC_BEGIN
class CC_DLL CCImageHelper class CC_DLL CCImageHelper
{ {
@ -856,4 +855,4 @@ bool CCImage::_saveImageToJPG(const char * pszFilePath)
return false; return false;
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/qnx/CCApplication_qnx.cpp
View File

@ -10,7 +10,7 @@
#define LOGD(...) fprintf(stderr, __VA_ARGS__) #define LOGD(...) fprintf(stderr, __VA_ARGS__)
NS_CC_BEGIN; NS_CC_BEGIN
// sharedApplication pointer // sharedApplication pointer
CCApplication * CCApplication::sm_pSharedApplication = 0; CCApplication * CCApplication::sm_pSharedApplication = 0;
@ -144,4 +144,4 @@ ccLanguageType CCApplication::getCurrentLanguage()
return ret_language; return ret_language;
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/qnx/CCApplication_qnx.h
View File

@ -5,7 +5,7 @@
#include "CCCommon.h" #include "CCCommon.h"
NS_CC_BEGIN; NS_CC_BEGIN
class CCRect; class CCRect;
@ -95,6 +95,6 @@ private:
static long m_animationInterval; static long m_animationInterval;
}; };
NS_CC_END; NS_CC_END
#endif // __CCX_APPLICATION_QNX_H__ #endif // __CCX_APPLICATION_QNX_H__

4
cocos2dx/platform/qnx/CCFileUtils_qnx.cpp
View File

@ -28,7 +28,7 @@ THE SOFTWARE.
#include <string> #include <string>
#include <unistd.h> #include <unistd.h>
NS_CC_BEGIN; NS_CC_BEGIN
#define MAX_PATH 256 #define MAX_PATH 256
@ -158,4 +158,4 @@ std::string CCFileUtils::getWriteablePath()
return path; return path;
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/qnx/CCImage_qnx.cpp
View File

@ -31,7 +31,7 @@ THE SOFTWARE.
using namespace std; using namespace std;
NS_CC_BEGIN; NS_CC_BEGIN
class BitmapDC class BitmapDC
{ {
@ -240,5 +240,5 @@ bool CCImage::initWithString(
return bRet; return bRet;
} }
NS_CC_END; NS_CC_END

4
cocos2dx/platform/win32/CCImage_win32.cpp
View File

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
NS_CC_BEGIN; NS_CC_BEGIN
/** /**
@brief A memory DC which uses to draw text on bitmap. @brief A memory DC which uses to draw text on bitmap.
@ -428,4 +428,4 @@ bool CCImage::initWithString(
return bRet; return bRet;
} }
NS_CC_END; NS_CC_END