From 46808db7fdaf3d0a16c9cbec1b607c488f3152b5 Mon Sep 17 00:00:00 2001 From: Walzer Date: Wed, 10 Aug 2011 11:35:44 +0800 Subject: [PATCH] issue #658, rename _PROJECTNAMEASIDENTIFIER__AppController.* to AppController.* in xcode3 template. Left cases: untested in xcode3; have no RootViewController in xcode3 templates. --- .../project.pbxproj.REMOVED.git-id | 2 +- ...CTNAMEASIDENTIFIER___AppController.h => AppController.h} | 2 +- ...NAMEASIDENTIFIER___AppController.mm => AppController.mm} | 6 +++--- template/xcode3/cocos2d-x_app/ios/main.m | 2 +- .../project.pbxproj.REMOVED.git-id | 2 +- .../ios/AppController.h} | 2 +- ...NAMEASIDENTIFIER___AppController.mm => AppController.mm} | 6 +++--- template/xcode3/cocos2d-x_box2d_app/ios/main.m | 2 +- .../project.pbxproj.REMOVED.git-id | 2 +- .../ios/AppController.h} | 2 +- ...NAMEASIDENTIFIER___AppController.mm => AppController.mm} | 6 +++--- template/xcode3/cocos2d-x_chipmunk_app/ios/main.m | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) rename template/xcode3/cocos2d-x_app/ios/{___PROJECTNAMEASIDENTIFIER___AppController.h => AppController.h} (59%) rename template/xcode3/cocos2d-x_app/ios/{___PROJECTNAMEASIDENTIFIER___AppController.mm => AppController.mm} (95%) rename template/xcode3/{cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h => cocos2d-x_box2d_app/ios/AppController.h} (59%) rename template/xcode3/cocos2d-x_box2d_app/ios/{___PROJECTNAMEASIDENTIFIER___AppController.mm => AppController.mm} (95%) rename template/xcode3/{cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h => cocos2d-x_chipmunk_app/ios/AppController.h} (59%) rename template/xcode3/cocos2d-x_chipmunk_app/ios/{___PROJECTNAMEASIDENTIFIER___AppController.mm => AppController.mm} (95%) diff --git a/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id b/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id index 39f9b5dbad..07b1ebe830 100644 --- a/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -fd240a3cf678487c690dd028abcba1a5ff1a3c6c \ No newline at end of file +8a8e4250f3cfe00ec9909ad8b1cedfcccb4acf64 \ No newline at end of file diff --git a/template/xcode3/cocos2d-x_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h b/template/xcode3/cocos2d-x_app/ios/AppController.h similarity index 59% rename from template/xcode3/cocos2d-x_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h rename to template/xcode3/cocos2d-x_app/ios/AppController.h index 6a407a9375..c7b2955669 100644 --- a/template/xcode3/cocos2d-x_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h +++ b/template/xcode3/cocos2d-x_app/ios/AppController.h @@ -6,7 +6,7 @@ // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. // -@interface ___PROJECTNAMEASIDENTIFIER___AppController : NSObject { +@interface AppController : NSObject { UIWindow *window; } diff --git a/template/xcode3/cocos2d-x_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm b/template/xcode3/cocos2d-x_app/ios/AppController.mm similarity index 95% rename from template/xcode3/cocos2d-x_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm rename to template/xcode3/cocos2d-x_app/ios/AppController.mm index b598d5f01e..cf823c55d7 100644 --- a/template/xcode3/cocos2d-x_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm +++ b/template/xcode3/cocos2d-x_app/ios/AppController.mm @@ -6,12 +6,12 @@ // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. // #import -#import "___PROJECTNAMEASIDENTIFIER___AppController.h" +#import "AppController.h" #import "cocos2d.h" #import "EAGLView.h" -#import "___PROJECTNAMEASIDENTIFIER___AppDelegate.h" +#import "AppDelegate.h" -@implementation ___PROJECTNAMEASIDENTIFIER___AppController +@implementation AppController #pragma mark - #pragma mark Application lifecycle diff --git a/template/xcode3/cocos2d-x_app/ios/main.m b/template/xcode3/cocos2d-x_app/ios/main.m index 106d54c93e..97b8f80ce0 100755 --- a/template/xcode3/cocos2d-x_app/ios/main.m +++ b/template/xcode3/cocos2d-x_app/ios/main.m @@ -10,7 +10,7 @@ int main(int argc, char *argv[]) { NSAutoreleasePool *pool = [NSAutoreleasePool new]; - int retVal = UIApplicationMain(argc, argv, nil, @"___PROJECTNAMEASIDENTIFIER___AppController"); + int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); [pool release]; return retVal; } diff --git a/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id b/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id index 47a9d9b622..1d569d2df6 100644 --- a/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -e11ed677bce9b5ea1798fdbfff120ddba0182dd9 \ No newline at end of file +66024535e3177e78e142dc5f54f603198c2c7550 \ No newline at end of file diff --git a/template/xcode3/cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h b/template/xcode3/cocos2d-x_box2d_app/ios/AppController.h similarity index 59% rename from template/xcode3/cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h rename to template/xcode3/cocos2d-x_box2d_app/ios/AppController.h index 6a407a9375..c7b2955669 100644 --- a/template/xcode3/cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h +++ b/template/xcode3/cocos2d-x_box2d_app/ios/AppController.h @@ -6,7 +6,7 @@ // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. // -@interface ___PROJECTNAMEASIDENTIFIER___AppController : NSObject { +@interface AppController : NSObject { UIWindow *window; } diff --git a/template/xcode3/cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm b/template/xcode3/cocos2d-x_box2d_app/ios/AppController.mm similarity index 95% rename from template/xcode3/cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm rename to template/xcode3/cocos2d-x_box2d_app/ios/AppController.mm index 8d92bf4f29..be45ef991c 100644 --- a/template/xcode3/cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm +++ b/template/xcode3/cocos2d-x_box2d_app/ios/AppController.mm @@ -6,12 +6,12 @@ // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. // #import -#import "___PROJECTNAMEASIDENTIFIER___AppController.h" +#import "AppController.h" #import "cocos2d.h" #import "EAGLView.h" -#import "___PROJECTNAMEASIDENTIFIER___AppDelegate.h" +#import "AppDelegate.h" -@implementation ___PROJECTNAMEASIDENTIFIER___AppController +@implementation AppController #pragma mark - #pragma mark Application lifecycle diff --git a/template/xcode3/cocos2d-x_box2d_app/ios/main.m b/template/xcode3/cocos2d-x_box2d_app/ios/main.m index 106d54c93e..97b8f80ce0 100755 --- a/template/xcode3/cocos2d-x_box2d_app/ios/main.m +++ b/template/xcode3/cocos2d-x_box2d_app/ios/main.m @@ -10,7 +10,7 @@ int main(int argc, char *argv[]) { NSAutoreleasePool *pool = [NSAutoreleasePool new]; - int retVal = UIApplicationMain(argc, argv, nil, @"___PROJECTNAMEASIDENTIFIER___AppController"); + int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); [pool release]; return retVal; } diff --git a/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id b/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id index 874246e5b5..0f18eb8789 100644 --- a/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -bd9603372ffc87e1e3fc5cb80030bdc28112f961 \ No newline at end of file +a6ca12b0bdd905d2b0dd4cad0ca30ea437326572 \ No newline at end of file diff --git a/template/xcode3/cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h b/template/xcode3/cocos2d-x_chipmunk_app/ios/AppController.h similarity index 59% rename from template/xcode3/cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h rename to template/xcode3/cocos2d-x_chipmunk_app/ios/AppController.h index 6a407a9375..c7b2955669 100644 --- a/template/xcode3/cocos2d-x_box2d_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.h +++ b/template/xcode3/cocos2d-x_chipmunk_app/ios/AppController.h @@ -6,7 +6,7 @@ // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. // -@interface ___PROJECTNAMEASIDENTIFIER___AppController : NSObject { +@interface AppController : NSObject { UIWindow *window; } diff --git a/template/xcode3/cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm b/template/xcode3/cocos2d-x_chipmunk_app/ios/AppController.mm similarity index 95% rename from template/xcode3/cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm rename to template/xcode3/cocos2d-x_chipmunk_app/ios/AppController.mm index bd7adc4d4a..481f105daa 100644 --- a/template/xcode3/cocos2d-x_chipmunk_app/ios/___PROJECTNAMEASIDENTIFIER___AppController.mm +++ b/template/xcode3/cocos2d-x_chipmunk_app/ios/AppController.mm @@ -6,12 +6,12 @@ // Copyright ___ORGANIZATIONNAME___ ___YEAR___. All rights reserved. // #import -#import "___PROJECTNAMEASIDENTIFIER___AppController.h" +#import "AppController.h" #import "cocos2d.h" #import "EAGLView.h" -#import "___PROJECTNAMEASIDENTIFIER___AppDelegate.h" +#import "AppDelegate.h" -@implementation ___PROJECTNAMEASIDENTIFIER___AppController +@implementation AppController #pragma mark - #pragma mark Application lifecycle diff --git a/template/xcode3/cocos2d-x_chipmunk_app/ios/main.m b/template/xcode3/cocos2d-x_chipmunk_app/ios/main.m index 106d54c93e..97b8f80ce0 100755 --- a/template/xcode3/cocos2d-x_chipmunk_app/ios/main.m +++ b/template/xcode3/cocos2d-x_chipmunk_app/ios/main.m @@ -10,7 +10,7 @@ int main(int argc, char *argv[]) { NSAutoreleasePool *pool = [NSAutoreleasePool new]; - int retVal = UIApplicationMain(argc, argv, nil, @"___PROJECTNAMEASIDENTIFIER___AppController"); + int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); [pool release]; return retVal; }