rename some files

cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-63ebe9b06aa15d229d0546427ccdae5cde18b857
+2abd573d3cb41c16925cbdf14bd55be5f97d88a4

cocos2dx/Android.mk

@@ -45,18 +45,18 @@ draw_nodes/CCDrawingPrimitives.cpp \
 draw_nodes/CCDrawNode.cpp \
 effects/CCGrabber.cpp \
 effects/CCGrid.cpp \
-event_dispatcher/CCAccelerationEvent.cpp \
-event_dispatcher/CCAccelerationEventListener.cpp \
-event_dispatcher/CCCustomEvent.cpp \
-event_dispatcher/CCCustomEventListener.cpp \
+event_dispatcher/CCEventAcceleration.cpp \
+event_dispatcher/CCEventListenerAcceleration.cpp \
+event_dispatcher/CCEventCustom.cpp \
+event_dispatcher/CCEventListenerCustom.cpp \
 event_dispatcher/CCEvent.cpp \
 event_dispatcher/CCEventDispatcher.cpp \
 event_dispatcher/CCEventListener.cpp \
-event_dispatcher/CCKeyboardEvent.cpp \
-event_dispatcher/CCKeyboardEventListener.cpp \
+event_dispatcher/CCEventKeyboard.cpp \
+event_dispatcher/CCEventListenerKeyboard.cpp \
 event_dispatcher/CCTouch.cpp \
-event_dispatcher/CCTouchEvent.cpp \
-event_dispatcher/CCTouchEventListener.cpp \
+event_dispatcher/CCEventTouch.cpp \
+event_dispatcher/CCEventListenerTouch.cpp \
 kazmath/src/aabb.c \
 kazmath/src/mat3.c \
 kazmath/src/mat4.c \

cocos2dx/base_nodes/CCNode.cpp

@@ -42,7 +42,7 @@ THE SOFTWARE.
 #include "shaders/CCGLProgram.h"
 #include "event_dispatcher/CCEventDispatcher.h"
 #include "event_dispatcher/CCEvent.h"
-#include "event_dispatcher/CCTouchEvent.h"
+#include "event_dispatcher/CCEventTouch.h"
 
 // externals
 #include "kazmath/GL/matrix.h"

cocos2dx/event_dispatcher/CCEventAcceleration.cpp

@@ -22,7 +22,7 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCAccelerationEvent.h"
+#include "CCEventAcceleration.h"
 
 NS_CC_BEGIN
 

cocos2dx/event_dispatcher/CCEventCustom.cpp

@@ -22,7 +22,7 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCCustomEvent.h"
+#include "CCEventCustom.h"
 
 NS_CC_BEGIN
 

cocos2dx/event_dispatcher/CCEventDispatcher.cpp

@@ -23,8 +23,8 @@
  ****************************************************************************/
 #include "CCEventDispatcher.h"
 #include "CCEvent.h"
-#include "CCTouchEvent.h"
-#include "CCTouchEventListener.h"
+#include "CCEventTouch.h"
+#include "CCEventListenerTouch.h"
 #include "base_nodes/CCNode.h"
 #include "CCDirector.h"
 

cocos2dx/event_dispatcher/CCEventKeyboard.cpp

@@ -23,7 +23,7 @@
  
  ****************************************************************************/
 
-#include "CCKeyboardEvent.h"
+#include "CCEventKeyboard.h"
 
 NS_CC_BEGIN
 

cocos2dx/event_dispatcher/CCEventListenerAcceleration.cpp

@@ -22,8 +22,8 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCAccelerationEventListener.h"
-#include "CCAccelerationEvent.h"
+#include "CCEventListenerAcceleration.h"
+#include "CCEventAcceleration.h"
 
 NS_CC_BEGIN
 

cocos2dx/event_dispatcher/CCEventListenerCustom.cpp

@@ -22,8 +22,8 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCCustomEventListener.h"
-#include "CCCustomEvent.h"
+#include "CCEventListenerCustom.h"
+#include "CCEventCustom.h"
 
 NS_CC_BEGIN
 

cocos2dx/event_dispatcher/CCEventListenerKeyboard.cpp

@@ -23,8 +23,8 @@
  
  ****************************************************************************/
 
-#include "CCKeyboardEventListener.h"
-#include "CCKeyboardEvent.h"
+#include "CCEventListenerKeyboard.h"
+#include "CCEventKeyboard.h"
 #include "ccMacros.h"
 
 NS_CC_BEGIN

cocos2dx/event_dispatcher/CCEventListenerKeyboard.h

@@ -27,7 +27,7 @@
 #define __cocos2d_libs__CCKeyboardEventListener__
 
 #include "CCEventListener.h"
-#include "CCKeyboardEvent.h"
+#include "CCEventKeyboard.h"
 
 NS_CC_BEGIN
 

cocos2dx/event_dispatcher/CCEventListenerTouch.cpp

@@ -22,9 +22,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCTouchEventListener.h"
+#include "CCEventListenerTouch.h"
 #include "CCEventDispatcher.h"
-#include "CCTouchEvent.h"
+#include "CCEventTouch.h"
 
 #include <algorithm>
 

cocos2dx/event_dispatcher/CCEventTouch.cpp

@@ -22,7 +22,7 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "CCTouchEvent.h"
+#include "CCEventTouch.h"
 
 NS_CC_BEGIN
 

cocos2dx/include/cocos2d.h

@@ -262,14 +262,14 @@ THE SOFTWARE.
 
 // EventDispatcher
 #include "event_dispatcher/CCEventDispatcher.h"
-#include "event_dispatcher/CCTouchEventListener.h"
-#include "event_dispatcher/CCTouchEvent.h"
-#include "event_dispatcher/CCKeyboardEventListener.h"
-#include "event_dispatcher/CCKeyboardEvent.h"
-#include "event_dispatcher/CCAccelerationEvent.h"
-#include "event_dispatcher/CCAccelerationEventListener.h"
-#include "event_dispatcher/CCCustomEvent.h"
-#include "event_dispatcher/CCCustomEventListener.h"
+#include "event_dispatcher/CCEventListenerTouch.h"
+#include "event_dispatcher/CCEventTouch.h"
+#include "event_dispatcher/CCEventListenerKeyboard.h"
+#include "event_dispatcher/CCEventKeyboard.h"
+#include "event_dispatcher/CCEventAcceleration.h"
+#include "event_dispatcher/CCEventListenerAcceleration.h"
+#include "event_dispatcher/CCEventCustom.h"
+#include "event_dispatcher/CCEventListenerCustom.h"
 
 // root
 #include "CCCamera.h"

cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp

@@ -35,12 +35,12 @@ THE SOFTWARE.
 // extern
 #include "kazmath/GL/matrix.h"
 #include "event_dispatcher/CCEventDispatcher.h"
-#include "event_dispatcher/CCTouchEventListener.h"
-#include "event_dispatcher/CCTouchEvent.h"
-#include "event_dispatcher/CCKeyboardEvent.h"
-#include "event_dispatcher/CCKeyboardEventListener.h"
-#include "event_dispatcher/CCAccelerationEvent.h"
-#include "event_dispatcher/CCAccelerationEventListener.h"
+#include "event_dispatcher/CCEventListenerTouch.h"
+#include "event_dispatcher/CCEventTouch.h"
+#include "event_dispatcher/CCEventKeyboard.h"
+#include "event_dispatcher/CCEventListenerKeyboard.h"
+#include "event_dispatcher/CCEventAcceleration.h"
+#include "event_dispatcher/CCEventListenerAcceleration.h"
 #include "platform/CCDevice.h"
 #include "CCScene.h"
 

cocos2dx/layers_scenes_transitions_nodes/CCLayer.h

@@ -35,7 +35,7 @@ THE SOFTWARE.
 #endif // EMSCRIPTEN
 #include "physics/CCPhysicsSetting.h"
 
-#include "event_dispatcher/CCKeyboardEvent.h"
+#include "event_dispatcher/CCEventKeyboard.h"
 
 NS_CC_BEGIN
 

cocos2dx/menu_nodes/CCMenu.cpp

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include "event_dispatcher/CCTouch.h"
 #include "CCStdC.h"
 #include "cocoa/CCInteger.h"
-#include "event_dispatcher/CCTouchEventListener.h"
+#include "event_dispatcher/CCEventListenerTouch.h"
 
 
 #include <vector>

cocos2dx/menu_nodes/CCMenu.h

@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include "CCMenuItem.h"
 #include "layers_scenes_transitions_nodes/CCLayer.h"
 
-#include "event_dispatcher/CCTouchEvent.h"
+#include "event_dispatcher/CCEventTouch.h"
 
 NS_CC_BEGIN
 

cocos2dx/platform/CCEGLViewProtocol.h

@@ -2,7 +2,7 @@
 #define __CCEGLVIEWPROTOCOL_H__
 
 #include "ccTypes.h"
-#include "event_dispatcher/CCTouchEvent.h"
+#include "event_dispatcher/CCEventTouch.h"
 
 #include <vector>
 

cocos2dx/platform/android/nativeactivity.cpp

@@ -25,8 +25,8 @@
 #include "shaders/CCShaderCache.h"
 #include "textures/CCTextureCache.h"
 #include "event_dispatcher/CCEventDispatcher.h"
-#include "event_dispatcher/CCAccelerationEvent.h"
-#include "event_dispatcher/CCKeyboardEvent.h"
+#include "event_dispatcher/CCEventAcceleration.h"
+#include "event_dispatcher/CCEventKeyboard.h"
 
 #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h"
 

cocos2dx/platform/ios/CCDevice.mm

@@ -1,7 +1,7 @@
 #include "CCDevice.h"
 #include "ccTypes.h"
 #include "event_dispatcher/CCEventDispatcher.h"
-#include "event_dispatcher/CCAccelerationEvent.h"
+#include "event_dispatcher/CCEventAcceleration.h"
 
 #import <UIKit/UIKit.h>
 

cocos2dx/platform/linux/CCEGLView.cpp

@@ -12,7 +12,7 @@
 #include "event_dispatcher/CCTouch.h"
 #include "text_input_node/CCIMEDispatcher.h"
 #include "event_dispatcher/CCEventDispatcher.h"
-#include "event_dispatcher/CCKeyboardEvent.h"
+#include "event_dispatcher/CCEventKeyboard.h"
 #include <unistd.h>
 
 NS_CC_BEGIN

cocos2dx/platform/mac/CCEGLView.mm

@@ -27,7 +27,7 @@
 #include "CCSet.h"
 #include "event_dispatcher/CCTouch.h"
 #include "event_dispatcher/CCEventDispatcher.h"
-#include "event_dispatcher/CCKeyboardEvent.h"
+#include "event_dispatcher/CCEventKeyboard.h"
 #include "CCIMEDispatcher.h"
 
 NS_CC_BEGIN

cocos2dx/platform/win32/CCEGLView.cpp

@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include "CCApplication.h"
 #include "event_dispatcher/CCTouch.h"
 #include "event_dispatcher/CCEventDispatcher.h"
-#include "event_dispatcher/CCKeyboardEvent.h"
+#include "event_dispatcher/CCEventKeyboard.h"
 
 
 NS_CC_BEGIN

cocos2dx/proj.linux/Makefile

@@ -39,18 +39,18 @@ SOURCES = ../actions/CCAction.cpp \
 ../cocoa/CCString.cpp \
 ../cocoa/CCDataVisitor.cpp \
 ../cocoa/CCData.cpp \
-../event_dispatcher/CCAccelerationEvent.cpp \
-../event_dispatcher/CCAccelerationEventListener.cpp \
+../event_dispatcher/CCEventAcceleration.cpp \
+../event_dispatcher/CCEventListenerAcceleration.cpp \
 ../event_dispatcher/CCEvent.cpp \
 ../event_dispatcher/CCEventDispatcher.cpp \
 ../event_dispatcher/CCEventListener.cpp \
-../event_dispatcher/CCKeyboardEvent.cpp \
-../event_dispatcher/CCKeyboardEventListener.cpp \
+../event_dispatcher/CCEventKeyboard.cpp \
+../event_dispatcher/CCEventListenerKeyboard.cpp \
 ../event_dispatcher/CCTouch.cpp \
-../event_dispatcher/CCTouchEvent.cpp \
-../event_dispatcher/CCTouchEventListener.cpp \
-../event_dispatcher/CCCustomEvent.cpp \
-../event_dispatcher/CCCustomEventListener.cpp \
+../event_dispatcher/CCEventTouch.cpp \
+../event_dispatcher/CCEventListenerTouch.cpp \
+../event_dispatcher/CCEventCustom.cpp \
+../event_dispatcher/CCEventListenerCustom.cpp \
 ../draw_nodes/CCDrawingPrimitives.cpp \
 ../draw_nodes/CCDrawNode.cpp \
 ../effects/CCGrabber.cpp \

cocos2dx/proj.nacl/Makefile

@@ -34,18 +34,18 @@ SOURCES = ../actions/CCAction.cpp \
 ../draw_nodes/CCDrawNode.cpp \
 ../effects/CCGrabber.cpp \
 ../effects/CCGrid.cpp \
-../event_dispatcher/CCAccelerationEvent.cpp \
-../event_dispatcher/CCAccelerationEventListener.cpp \
+../event_dispatcher/CCEventAcceleration.cpp \
+../event_dispatcher/CCEventListenerAcceleration.cpp \
 ../event_dispatcher/CCEvent.cpp \
 ../event_dispatcher/CCEventDispatcher.cpp \
 ../event_dispatcher/CCEventListener.cpp \
-../event_dispatcher/CCKeyboardEvent.cpp \
-../event_dispatcher/CCKeyboardEventListener.cpp \
+../event_dispatcher/CCEventKeyboard.cpp \
+../event_dispatcher/CCEventListenerKeyboard.cpp \
 ../event_dispatcher/CCTouch.cpp \
-../event_dispatcher/CCTouchEvent.cpp \
-../event_dispatcher/CCTouchEventListener.cpp \
-../event_dispatcher/CCCustomEvent.cpp \
-../event_dispatcher/CCCustomEventListener.cpp \
+../event_dispatcher/CCEventTouch.cpp \
+../event_dispatcher/CCEventListenerTouch.cpp \
+../event_dispatcher/CCEventCustom.cpp \
+../event_dispatcher/CCEventListenerCustom.cpp \
 ../label_nodes/CCLabelAtlas.cpp \
 ../label_nodes/CCLabelBMFont.cpp \
 ../label_nodes/CCLabelTTF.cpp \

cocos2dx/script_support/CCScriptSupport.h

@@ -27,8 +27,8 @@
 
 #include "platform/CCCommon.h"
 #include "event_dispatcher/CCTouch.h"
-#include "event_dispatcher/CCTouchEvent.h"
-#include "event_dispatcher/CCKeyboardEvent.h"
+#include "event_dispatcher/CCEventTouch.h"
+#include "event_dispatcher/CCEventKeyboard.h"
 #include "cocoa/CCSet.h"
 #include <map>
 #include <string>

extensions/GUI/CCControlExtension/CCControl.cpp

@@ -33,7 +33,7 @@
 #include "event_dispatcher/CCTouch.h"
 #include "CCInvocation.h"
 #include "event_dispatcher/CCEventDispatcher.h"
-#include "event_dispatcher/CCTouchEventListener.h"
+#include "event_dispatcher/CCEventListenerTouch.h"
 
 NS_CC_EXT_BEGIN