From 414d2ceb5f5a7c2e312262e51ea50ea3b26aa8d9 Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Mon, 23 Feb 2015 14:29:50 -0600 Subject: [PATCH] Fix issue caused by rebase merge conflicts --- SpriteBuilder/ccBuilder/CCBProjectCreator.m | 24 --------------------- 1 file changed, 24 deletions(-) diff --git a/SpriteBuilder/ccBuilder/CCBProjectCreator.m b/SpriteBuilder/ccBuilder/CCBProjectCreator.m index ad4ff1303..a9774c840 100644 --- a/SpriteBuilder/ccBuilder/CCBProjectCreator.m +++ b/SpriteBuilder/ccBuilder/CCBProjectCreator.m @@ -202,30 +202,6 @@ - (void)replace:(NSDictionary *)substitutions in:(NSString *)fileName } } -- (void)replace:(NSDictionary *)substitutions in:(NSString *)fileName -{ - NSFileManager *fm = [NSFileManager defaultManager]; - NSString *resultFilename = [NSString stringWithString:fileName]; - - for( NSString*key in substitutions.allKeys) - { - resultFilename = [resultFilename stringByReplacingOccurrencesOfString:key withString:substitutions[key]]; - } - - BOOL renameRequired = ![resultFilename isEqualToString:fileName]; - if(renameRequired) - { - NSError *error; - [fm moveItemAtPath:fileName toPath:resultFilename error:&error]; - NSAssert(!error, @"error occurred renaming %@ - %@", fileName, [error description]); - } - - for( NSString*key in substitutions.allKeys) - { - [self setName:substitutions[key] inFile:resultFilename search:key]; - } -} - - (void)setName:(NSString *)name inFile:(NSString *)fileName search:(NSString *)searchStr { NSMutableData *fileData = [NSMutableData dataWithContentsOfFile:fileName];