Merge branch 'track' of https://github.com/leon-li/cocos2d-x into leon-li-track

cocos2dx/CCScheduler.cpp

@@ -198,8 +198,8 @@ void CCScheduler::unscheduleAllTimers()
 
 void CCScheduler::scheduleSelector(SEL_SCHEDULE pfnSelector, SelectorProtocol *pTarget, float fInterval, bool bPaused)
 {
-	assert(pfnSelector != NULL);
-	assert(pTarget != NULL);
+	assert(pfnSelector);
+	assert(pTarget);
 
 	tHashSelectorEntry *pElement = NULL;
 	HASH_FIND_INT(m_pHashForSelectors, &pTarget, pElement);
@@ -256,13 +256,13 @@ void CCScheduler::scheduleSelector(SEL_SCHEDULE pfnSelector, SelectorProtocol *p
 void CCScheduler::unscheduleSelector(SEL_SCHEDULE pfnSelector, SelectorProtocol *pTarget)
 {
 	// explicity handle nil arguments when removing an object
-	if (pTarget == NULL || pfnSelector == NULL)
+	if (pTarget == 0 || pfnSelector == 0)
 	{
 		return;
 	}
 
-	assert(pTarget != NULL);
-	assert(pfnSelector != NULL);
+	assert(pTarget);
+	assert(pfnSelector);
 
 	tHashSelectorEntry *pElement = NULL;
 	HASH_FIND_INT(m_pHashForSelectors, &pTarget, pElement);

cocos2dx/base_nodes/CCNode.cpp

@@ -851,7 +851,7 @@ void CCNode::schedule(SEL_SCHEDULE selector, ccTime interval)
 void CCNode::unschedule(SEL_SCHEDULE selector)
 {
 	// explicit nil handling
-	if (selector == NULL)
+	if (selector == 0)
 		return;
 
 	CCScheduler::sharedScheduler()->unscheduleSelector(selector, this);

cocos2dx/include/CCDirector.h

@@ -171,7 +171,7 @@ typedef enum {
 
 class CCLabel;
 class CCScene;
-class cocos2d::CCXEGLView;
+class CCXEGLView;
 
 /**
 @brief Class that creates and handle the main Window and manages how

cocos2dx/include/CCRadialTransition.h

@@ -24,45 +24,45 @@ THE SOFTWARE.
 
 #ifndef __CCRADIAL_TRANSITION_H__
 #define __CCRADIAL_TRANSITION_H__
-#include "CCTransition.h"
-#include "CCProgressTimer.h"
+#include "CCTransition.h"
+#include "CCProgressTimer.h"
 
 namespace   cocos2d {
 
-/**
- @brief A counter colock-wise radial transition to the next scene
- */
-class CCX_DLL CCRadialCCWTransition : public CCTransitionScene
-{
-public:
-	CCRadialCCWTransition(){}
-	virtual ~CCRadialCCWTransition(){}
-
-	virtual void onEnter();
-	virtual void onExit();
-
-    static CCRadialCCWTransition* transitionWithDuration(ccTime t, CCScene* scene);
-
-protected:
-	virtual void sceneOrder();
-	virtual CCProgressTimerType radialType();
-};
-
-/**
- @brief A counter colock-wise radial transition to the next scene
- */
-class CCX_DLL CCRadialCWTransition : public CCRadialCCWTransition
-{
-public:
+/**
+ @brief A counter colock-wise radial transition to the next scene
+ */
+class CCX_DLL CCRadialCCWTransition : public CCTransitionScene
+{
+public:
+	CCRadialCCWTransition(){}
+	virtual ~CCRadialCCWTransition(){}
+
+	virtual void onEnter();
+	virtual void onExit();
+
+    static CCRadialCCWTransition* transitionWithDuration(ccTime t, CCScene* scene);
+
+protected:
+	virtual void sceneOrder();
+	virtual CCProgressTimerType radialType();
+};
+
+/**
+ @brief A counter colock-wise radial transition to the next scene
+ */
+class CCX_DLL CCRadialCWTransition : public CCRadialCCWTransition
+{
+public:
 	CCRadialCWTransition(){}
 	virtual ~CCRadialCWTransition(){}
     static CCRadialCWTransition* transitionWithDuration(ccTime t, CCScene* scene);
 
-protected:
-	virtual CCProgressTimerType radialType();
-};
+protected:
+	virtual CCProgressTimerType radialType();
+};
 
 }//namespace   cocos2d 
 
-#endif __CCRADIAL_TRANSITION_H__
+#endif //__CCRADIAL_TRANSITION_H__
 

cocos2dx/platform/android/CCXEGLView_android.cpp

@@ -28,6 +28,7 @@ THE SOFTWARE.
 #include "NSSet.h"
 #include "CCDirector.h"
 #include "ccMacros.h"
+#include "CCTouchDispatcher.h"
 
 #include <stdlib.h>