diff --git a/ChangeLog b/ChangeLog index 6b6e53c..6795f40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,14 @@ * Modules/Parsers/ProjectCenter/ObjCMethodHandler.m NSUInteger / NSInteger transitions for count/length variables. + * Modules/Projects/Application/PCAppProject.m + * Modules/Projects/Bundle/PCBundleProject.m + * Modules/Projects/Framework/PCFrameworkProject.m + * Modules/Projects/Library/PCLibProject.m + * Modules/Projects/ResourceSet/PCResourceSetProject.m + * Modules/Projects/Tool/PCToolProject.m + Transition to NSUInteger. + 2013-09-21 Riccardo Mottola * Modules/Parsers/ProjectCenter/PCParser.h diff --git a/Modules/Projects/Application/PCAppProject.m b/Modules/Projects/Application/PCAppProject.m index 3db4241..ce78d87 100644 --- a/Modules/Projects/Application/PCAppProject.m +++ b/Modules/Projects/Application/PCAppProject.m @@ -1,7 +1,7 @@ /* GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html - Copyright (C) 2001-2010 Free Software Foundation + Copyright (C) 2001-2012 Free Software Foundation Authors: Philippe C.D. Robert Serg Stoyan @@ -441,7 +441,7 @@ - (BOOL)writeMakefile { PCMakefileFactory *mf = [PCMakefileFactory sharedFactory]; - int i,count; + NSUInteger i,count; NSString *mfl = nil; NSData *mfd = nil; NSString *key = nil; @@ -484,11 +484,11 @@ } // Remove localized resource files from gathered array localizedResources = [projectDict objectForKey:PCLocalizedResources]; - for (i = [resources count] - 1; i >= 0; i--) + for (i = [resources count]; i > 0; i--) { - if ([localizedResources containsObject:[resources objectAtIndex:i]]) + if ([localizedResources containsObject:[resources objectAtIndex:i-1]]) { - [resources removeObjectAtIndex:i]; + [resources removeObjectAtIndex:i-1]; } } [mf appendResources:resources inDir:@"Resources"]; diff --git a/Modules/Projects/Bundle/PCBundleProject.m b/Modules/Projects/Bundle/PCBundleProject.m index 7b20761..ad962eb 100644 --- a/Modules/Projects/Bundle/PCBundleProject.m +++ b/Modules/Projects/Bundle/PCBundleProject.m @@ -1,7 +1,7 @@ /* GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html - Copyright (C) 2001-2010 Free Software Foundation + Copyright (C) 2001-2013 Free Software Foundation Authors: Philippe C.D. Robert Serg Stoyan @@ -170,7 +170,7 @@ - (BOOL)writeMakefile { PCMakefileFactory *mf = [PCMakefileFactory sharedFactory]; - int i,count; + NSUInteger i,count; NSString *mfl = nil; NSData *mfd = nil; NSString *key = nil; @@ -210,11 +210,11 @@ } // Remove localized resource files from gathered array localizedResources = [projectDict objectForKey:PCLocalizedResources]; - for (i = [resources count] - 1; i >= 0; i--) + for (i = [resources count]; i > 0; i--) { - if ([localizedResources containsObject:[resources objectAtIndex:i]]) + if ([localizedResources containsObject:[resources objectAtIndex:i-1]]) { - [resources removeObjectAtIndex:i]; + [resources removeObjectAtIndex:i-1]; } } [mf appendResources:resources inDir:@"Resources"]; diff --git a/Modules/Projects/Framework/PCFrameworkProject.m b/Modules/Projects/Framework/PCFrameworkProject.m index e49f4ec..ddb68cd 100644 --- a/Modules/Projects/Framework/PCFrameworkProject.m +++ b/Modules/Projects/Framework/PCFrameworkProject.m @@ -1,7 +1,7 @@ /* GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html - Copyright (C) 2005 Free Software Foundation + Copyright (C) 2005-2013 Free Software Foundation Authors: Serg Stoyan @@ -193,7 +193,7 @@ - (BOOL)writeMakefile { PCMakefileFactory *mf = [PCMakefileFactory sharedFactory]; - int i,count; + NSUInteger i,count; NSString *mfl = nil; NSData *mfd = nil; NSString *key = nil; @@ -233,11 +233,11 @@ } // Remove localized resource files from gathered array localizedResources = [projectDict objectForKey:PCLocalizedResources]; - for (i = [resources count] - 1; i >= 0; i--) + for (i = [resources count]; i > 0; i--) { - if ([localizedResources containsObject:[resources objectAtIndex:i]]) + if ([localizedResources containsObject:[resources objectAtIndex:i-1]]) { - [resources removeObjectAtIndex:i]; + [resources removeObjectAtIndex:i-1]; } } [mf appendResources:resources inDir:@"Resources"]; diff --git a/Modules/Projects/Library/PCLibProject.m b/Modules/Projects/Library/PCLibProject.m index 98a2447..eab0e52 100644 --- a/Modules/Projects/Library/PCLibProject.m +++ b/Modules/Projects/Library/PCLibProject.m @@ -1,7 +1,7 @@ /* GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html - Copyright (C) 2001-2004 Free Software Foundation + Copyright (C) 2001-2013 Free Software Foundation Authors: Philippe C.D. Robert Serg Stoyan @@ -201,7 +201,7 @@ - (BOOL)writeMakefile { PCMakefileFactory *mf = [PCMakefileFactory sharedFactory]; - int i,count; + NSUInteger i,count; NSString *mfl = nil; NSData *mfd = nil; NSString *key = nil; @@ -241,11 +241,11 @@ } // Remove localized resource files from gathered array localizedResources = [projectDict objectForKey:PCLocalizedResources]; - for (i = [resources count] - 1; i >= 0; i--) + for (i = [resources count]; i > 0; i--) { - if ([localizedResources containsObject:[resources objectAtIndex:i]]) + if ([localizedResources containsObject:[resources objectAtIndex:i-1]]) { - [resources removeObjectAtIndex:i]; + [resources removeObjectAtIndex:i-1]; } } [mf appendResources:resources inDir:@"Resources"]; diff --git a/Modules/Projects/ResourceSet/PCResourceSetProject.m b/Modules/Projects/ResourceSet/PCResourceSetProject.m index cfb8ab1..9f7eae2 100644 --- a/Modules/Projects/ResourceSet/PCResourceSetProject.m +++ b/Modules/Projects/ResourceSet/PCResourceSetProject.m @@ -122,7 +122,7 @@ - (BOOL)writeMakefile { PCMakefileFactory *mf = [PCMakefileFactory sharedFactory]; - int i,count; + NSUInteger i,count; NSString *mfl = nil; NSData *mfd = nil; NSString *key = nil; @@ -153,11 +153,11 @@ } // Remove localized resource files from gathered array localizedResources = [projectDict objectForKey:PCLocalizedResources]; - for (i = [resources count] - 1; i >= 0; i--) + for (i = [resources count]; i > 0; i--) { - if ([localizedResources containsObject:[resources objectAtIndex:i]]) + if ([localizedResources containsObject:[resources objectAtIndex:i-1]]) { - [resources removeObjectAtIndex:i]; + [resources removeObjectAtIndex:i-1]; } } [mf appendResources:resources inDir:@"Resources"]; diff --git a/Modules/Projects/Tool/PCToolProject.m b/Modules/Projects/Tool/PCToolProject.m index 26c62c2..2ed05e4 100644 --- a/Modules/Projects/Tool/PCToolProject.m +++ b/Modules/Projects/Tool/PCToolProject.m @@ -1,7 +1,7 @@ /* GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html - Copyright (C) 2001-2010 Free Software Foundation + Copyright (C) 2001-2013 Free Software Foundation Authors: Philippe C.D. Robert Serg Stoyan @@ -265,7 +265,7 @@ - (BOOL)writeMakefile { PCMakefileFactory *mf = [PCMakefileFactory sharedFactory]; - int i,count; + NSUInteger i,count; NSString *mfl = nil; NSData *mfd = nil; NSString *key = nil; @@ -307,11 +307,11 @@ } // Remove localized resource files from gathered array localizedResources = [projectDict objectForKey:PCLocalizedResources]; - for (i = [resources count] - 1; i >= 0; i--) + for (i = [resources count]; i > 0; i--) { - if ([localizedResources containsObject:[resources objectAtIndex:i]]) + if ([localizedResources containsObject:[resources objectAtIndex:i-1]]) { - [resources removeObjectAtIndex:i]; + [resources removeObjectAtIndex:i-1]; } } [mf appendResources:resources inDir:@"Resources"];