Get rid of CCProgressNode private header + general header clean-up

Author: s1ddok

cocos2d-ext/TileMaps/CCTiledMapLayer.m

@@ -37,7 +37,6 @@
 #import "CCTextureCache.h"
 #import "CCShader.h"
 #import "Support/CGPointExtension.h"
-#import "CCSprite_Private.h"
 #import "CCTiledMapLayer_Private.h"
 #import "CCTexture_Private.h"
 // #import "CCMathTypesAndroid.h"

cocos2d-ui-tests/tests/VertexZTest.m

@@ -8,7 +8,6 @@
 
 #import "TestBase.h"
 #import "CCTextureCache.h"
-#import "CCSprite_Private.h"
 
 @interface GlobalSortSprite : CCSprite @end
 

cocos2d-ui/CCProgressNode.m

@@ -31,9 +31,6 @@
 #import "CCShader.h"
 #import "CCDirector.h"
 #import "Support/CGPointExtension.h"
-#import "CCSprite_Private.h"
-
-#import "CCProgressNode_Private.h"
 
 #import "CCTexture_Private.h"
 

cocos2d.xcodeproj/project.pbxproj

@@ -181,7 +181,6 @@
 		08F4AB441C6E98A1004DAAF7 /* NSThread+performBlock.h in Headers */ = {isa = PBXBuildFile; fileRef = A0C87D1814F9A3A100C0E8B2 /* NSThread+performBlock.h */; };
 		08F4AB451C6E98A1004DAAF7 /* CCMetalView.h in Headers */ = {isa = PBXBuildFile; fileRef = D3903B12199528B6003AA81A /* CCMetalView.h */; };
 		08F4AB461C6E98A1004DAAF7 /* CCTransition.h in Headers */ = {isa = PBXBuildFile; fileRef = A6DC4E0718055DCC00C280A6 /* CCTransition.h */; };
-		08F4AB471C6E98A1004DAAF7 /* CCProgressNode_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B791E85A182074C500DAE1D7 /* CCProgressNode_Private.h */; };
 		08F4AB491C6E98A1004DAAF7 /* CCActionCatmullRom.h in Headers */ = {isa = PBXBuildFile; fileRef = A0A7A53A1514F27D00C8BD16 /* CCActionCatmullRom.h */; };
 		08F4AB4A1C6E98A1004DAAF7 /* CCNode+Debug.h in Headers */ = {isa = PBXBuildFile; fileRef = A039EBFD155C686B0061EE37 /* CCNode+Debug.h */; };
 		08F4AB4B1C6E98A1004DAAF7 /* CCDrawNode.h in Headers */ = {isa = PBXBuildFile; fileRef = A0DA0BC115BCDCA200E80A92 /* CCDrawNode.h */; };
@@ -296,7 +295,6 @@
 		7A5946AC19E372F200F65F90 /* CCTransition.h in Headers */ = {isa = PBXBuildFile; fileRef = A6DC4E0718055DCC00C280A6 /* CCTransition.h */; };
 		7A5946B919E372F300F65F90 /* CCNodeColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5018F25E0DFDEAFF00C013A5 /* CCNodeColor.h */; };
 		7A5946C119E372F400F65F90 /* CCRenderTexture.h in Headers */ = {isa = PBXBuildFile; fileRef = 50316AA410291280003ACFE7 /* CCRenderTexture.h */; };
-		7A5946C319E372F400F65F90 /* CCProgressNode_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B791E85A182074C500DAE1D7 /* CCProgressNode_Private.h */; };
 		7A5946C419E372F400F65F90 /* CCRenderTexture_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D2B840C31909F447008063EA /* CCRenderTexture_Private.h */; };
 		7A5946DD19E372F700F65F90 /* CCActionManager_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 92FF6C7318F33A2A005B7139 /* CCActionManager_Private.h */; };
 		7A5946DE19E372F800F65F90 /* CCActionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 50CB3B0C100AC43A00B7A750 /* CCActionManager.h */; };
@@ -472,7 +470,6 @@
 		B78AE46917E7AF1C0028BE0B /* CCScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = B78AE46117E7AF1C0028BE0B /* CCScrollView.m */; };
 		B78AE46C17E7AF6C0028BE0B /* UITouch+CC.h in Headers */ = {isa = PBXBuildFile; fileRef = B78AE46A17E7AF6C0028BE0B /* UITouch+CC.h */; };
 		B78AE46D17E7AF6C0028BE0B /* UITouch+CC.m in Sources */ = {isa = PBXBuildFile; fileRef = B78AE46B17E7AF6C0028BE0B /* UITouch+CC.m */; };
-		B791E85D182074C500DAE1D7 /* CCProgressNode_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B791E85A182074C500DAE1D7 /* CCProgressNode_Private.h */; };
 		B798D143181F469100E7BFCD /* CCLabelBMFont_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = B798D142181F469100E7BFCD /* CCLabelBMFont_Private.h */; };
 		B79F905A17FE2A2E00908504 /* CCTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = B79F905817FE2A2E00908504 /* CCTableView.h */; };
 		B79F905B17FE2A2E00908504 /* CCTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = B79F905917FE2A2E00908504 /* CCTableView.m */; };
@@ -689,7 +686,6 @@
 		B78AE46117E7AF1C0028BE0B /* CCScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCScrollView.m; path = "cocos2d-ui/CCScrollView.m"; sourceTree = "<group>"; };
 		B78AE46A17E7AF6C0028BE0B /* UITouch+CC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UITouch+CC.h"; sourceTree = "<group>"; };
 		B78AE46B17E7AF6C0028BE0B /* UITouch+CC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITouch+CC.m"; sourceTree = "<group>"; };
-		B791E85A182074C500DAE1D7 /* CCProgressNode_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProgressNode_Private.h; sourceTree = "<group>"; };
 		B798D142181F469100E7BFCD /* CCLabelBMFont_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCLabelBMFont_Private.h; sourceTree = "<group>"; };
 		B79F905817FE2A2E00908504 /* CCTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCTableView.h; path = "cocos2d-ui/CCTableView.h"; sourceTree = "<group>"; };
 		B79F905917FE2A2E00908504 /* CCTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCTableView.m; path = "cocos2d-ui/CCTableView.m"; sourceTree = "<group>"; };
@@ -1098,7 +1094,6 @@
 				5018F25F0DFDEAFF00C013A5 /* CCNodeColor.m */,
 				50316AA410291280003ACFE7 /* CCRenderTexture.h */,
 				50316AA510291280003ACFE7 /* CCRenderTexture.m */,
-				B791E85A182074C500DAE1D7 /* CCProgressNode_Private.h */,
 				D2B840C31909F447008063EA /* CCRenderTexture_Private.h */,
 			);
 			name = "Misc Nodes";
@@ -1395,7 +1390,6 @@
 				08F4AB441C6E98A1004DAAF7 /* NSThread+performBlock.h in Headers */,
 				08F4AB451C6E98A1004DAAF7 /* CCMetalView.h in Headers */,
 				08F4AB461C6E98A1004DAAF7 /* CCTransition.h in Headers */,
-				08F4AB471C6E98A1004DAAF7 /* CCProgressNode_Private.h in Headers */,
 				08F4AB491C6E98A1004DAAF7 /* CCActionCatmullRom.h in Headers */,
 				08F4AB4A1C6E98A1004DAAF7 /* CCNode+Debug.h in Headers */,
 				08F4AB4B1C6E98A1004DAAF7 /* CCDrawNode.h in Headers */,
@@ -1489,7 +1483,6 @@
 				A0C87D1A14F9A3A100C0E8B2 /* NSThread+performBlock.h in Headers */,
 				D3903B14199528B6003AA81A /* CCMetalView.h in Headers */,
 				A6DC4E0918055DCC00C280A6 /* CCTransition.h in Headers */,
-				B791E85D182074C500DAE1D7 /* CCProgressNode_Private.h in Headers */,
 				A0A7A53C1514F27D00C8BD16 /* CCActionCatmullRom.h in Headers */,
 				A039EBFF155C686B0061EE37 /* CCNode+Debug.h in Headers */,
 				A0DA0BC315BCDCA200E80A92 /* CCDrawNode.h in Headers */,
@@ -1532,7 +1525,6 @@
 				7A5946AC19E372F200F65F90 /* CCTransition.h in Headers */,
 				7A5946B919E372F300F65F90 /* CCNodeColor.h in Headers */,
 				7A5946C119E372F400F65F90 /* CCRenderTexture.h in Headers */,
-				7A5946C319E372F400F65F90 /* CCProgressNode_Private.h in Headers */,
 				7A5946C419E372F400F65F90 /* CCRenderTexture_Private.h in Headers */,
 				7A5946DD19E372F700F65F90 /* CCActionManager_Private.h in Headers */,
 				7A5946DE19E372F800F65F90 /* CCActionManager.h in Headers */,

cocos2d/CCLabelBMFont.m

@@ -46,7 +46,6 @@
 #import "Support/CGPointExtension.h"
 #import "Support/uthash.h"
 #import "CCLabelBMFont_Private.h"
-#import "CCSprite_Private.h"
 
 #pragma mark -
 #pragma mark FNTConfig Cache - free functions

cocos2d/CCNoARC.m

@@ -1,5 +1,4 @@
 #import "CCTexture_Private.h"
-#import "CCSprite_Private.h"
 #import "CCRenderer_Private.h"
 #import "CCShader_Private.h"
 

cocos2d/CCProgressNode_Private.h

@@ -38,7 +38,6 @@
 #import "Support/CGPointExtension.h"
 #import "Support/CCProfiling.h"
 #import "CCRenderer_Private.h"
-#import "CCSprite_Private.h"
 #import "CCTexture_Private.h"
 
 #pragma mark -

cocos2d/CCSprite.m

@@ -26,7 +26,6 @@
  */
 
 #import "CCSprite9Slice.h"
-#import "CCSprite_Private.h"
 #import "CCTexture_Private.h"
 
 // ---------------------------------------------------------------------