Skip to content

Commit fb3f66c

Browse files
s1ddoks1ddok
authored andcommitted
Get rid of CCActiomManager_Private
1 parent f7104cc commit fb3f66c

File tree

5 files changed

+1
-34
lines changed

5 files changed

+1
-34
lines changed

cocos2d.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@
295295
7A5946B919E372F300F65F90 /* CCNodeColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5018F25E0DFDEAFF00C013A5 /* CCNodeColor.h */; };
296296
7A5946C119E372F400F65F90 /* CCRenderTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = 50316AA410291280003ACFE7 /* CCRenderTexture.h */; };
297297
7A5946C419E372F400F65F90 /* CCRenderTexture_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D2B840C31909F447008063EA /* CCRenderTexture_Private.h */; };
298-
7A5946DD19E372F700F65F90 /* CCActionManager_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 92FF6C7318F33A2A005B7139 /* CCActionManager_Private.h */; };
299298
7A5946DE19E372F800F65F90 /* CCActionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 50CB3B0C100AC43A00B7A750 /* CCActionManager.h */; };
300299
7A5946E019E372F800F65F90 /* CCAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 5018F2520DFDEAFF00C013A5 /* CCAction.h */; };
301300
7A5946E219E372F800F65F90 /* CCActionInstant.h in Headers */ = {isa = PBXBuildFile; fileRef = 5018F2580DFDEAFF00C013A5 /* CCActionInstant.h */; };
@@ -638,7 +637,6 @@
638637
7A4037C519E37126007B6E8F /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
639638
7A4037C719E3712A007B6E8F /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; };
640639
83E1A88D19C8C19D000A3BCA /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
641-
92FF6C7318F33A2A005B7139 /* CCActionManager_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCActionManager_Private.h; sourceTree = "<group>"; };
642640
A003AC8B1657071100C7B792 /* ccFPSImages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccFPSImages.h; sourceTree = "<group>"; };
643641
A003AC8E16572D6000C7B792 /* ccFPSImages.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ccFPSImages.m; sourceTree = "<group>"; };
644642
A039EBFD155C686B0061EE37 /* CCNode+Debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCNode+Debug.h"; sourceTree = "<group>"; };
@@ -1030,7 +1028,6 @@
10301028
50A24E770F3780A2007CAEB0 /* Actions */ = {
10311029
isa = PBXGroup;
10321030
children = (
1033-
92FF6C7318F33A2A005B7139 /* CCActionManager_Private.h */,
10341031
50CB3B0C100AC43A00B7A750 /* CCActionManager.h */,
10351032
50CB3B0D100AC43A00B7A750 /* CCActionManager.m */,
10361033
5018F2520DFDEAFF00C013A5 /* CCAction.h */,
@@ -1519,7 +1516,6 @@
15191516
7A5946B919E372F300F65F90 /* CCNodeColor.h in Headers */,
15201517
7A5946C119E372F400F65F90 /* CCRenderTexture.h in Headers */,
15211518
7A5946C419E372F400F65F90 /* CCRenderTexture_Private.h in Headers */,
1522-
7A5946DD19E372F700F65F90 /* CCActionManager_Private.h in Headers */,
15231519
7A5946DE19E372F800F65F90 /* CCActionManager.h in Headers */,
15241520
7A5946E019E372F800F65F90 /* CCAction.h in Headers */,
15251521
7A5946E219E372F800F65F90 /* CCActionInstant.h in Headers */,

cocos2d/CCActionManager.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ typedef struct _hashElement {
147147
*/
148148
-(void)resumeTargets:(NSSet *)targetsToResume;
149149

150+
-(void)migrateActions:(id)target from:(CCActionManager*)oldManager;
150151
@end
151152

152153

cocos2d/CCActionManager.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929

3030
#import "CCActionManager.h"
31-
#import "CCActionManager_Private.h"
3231
#import "ccMacros.h"
3332

3433
@interface CCActionManager (Private)

cocos2d/CCActionManager_Private.h

Lines changed: 0 additions & 28 deletions
This file was deleted.

cocos2d/CCNode.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
#import "CCDirector_Private.h"
4444
#import "CCRenderer_Private.h"
4545
#import "CCTexture_Private.h"
46-
#import "CCActionManager_Private.h"
4746

4847
#if CC_NODE_RENDER_SUBPIXEL
4948
#define RENDER_IN_SUBPIXEL

0 commit comments

Comments
 (0)