From c92e82d1c29279c7eee6ae724b38f75ea1a2fe31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Arias?= Date: Wed, 2 Apr 2014 06:23:08 +0000 Subject: [PATCH] Remove two last commits. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@37780 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Framework/PCFileCreator.m | 27 --------------------------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98e4229..09bda70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-04-02 German Arias + + * Framework/PCFileCreator.m: Removed two last commits. There is + something wrong with these. + 2014-03-30 German Arias * Framework/PCFileCreator.m: Fix last change to ensure all string in the diff --git a/Framework/PCFileCreator.m b/Framework/PCFileCreator.m index 1e46c12..f87ab2e 100644 --- a/Framework/PCFileCreator.m +++ b/Framework/PCFileCreator.m @@ -278,13 +278,7 @@ static NSDictionary *dict = nil; NSString *fn = [aFile stringByDeletingPathExtension]; NSRange subRange; -#ifdef WIN32 - file = [[NSMutableString stringWithContentsOfFile: newFile - encoding: NSUTF8StringEncoding - error: NULL] retain]; -#else file = [[NSMutableString stringWithContentsOfFile:newFile] retain]; -#endif while ((subRange = [file rangeOfString:@"$FULLFILENAME$"]).length) { @@ -303,26 +297,12 @@ static NSDictionary *dict = nil; while ((subRange = [file rangeOfString:@"$USERNAME$"]).length) { -#ifdef WIN32 - // Be sure to use an UTF8 string. - [file replaceCharactersInRange: subRange - withString: [NSString stringWithCString: - [NSUserName() UTF8String]]]; -#else [file replaceCharactersInRange:subRange withString:NSUserName()]; -#endif } while ((subRange = [file rangeOfString:@"$FULLUSERNAME$"]).length) { -#ifdef WIN32 - // Be sure to use an UTF8 string. - [file replaceCharactersInRange: subRange - withString: [NSString stringWithCString: - [NSFullUserName() UTF8String]]]; -#else [file replaceCharactersInRange:subRange withString:NSFullUserName()]; -#endif } while ((subRange = [file rangeOfString:@"$PROJECTNAME$"]).length) @@ -341,14 +321,7 @@ static NSDictionary *dict = nil; withString:[[NSNumber numberWithInt:year] stringValue]]; } -#ifdef WIN32 - [file writeToFile: newFile - atomically: YES - encoding: NSUTF8StringEncoding - error: NULL]; -#else [file writeToFile:newFile atomically:YES]; -#endif [file release];