From 3e057adf5626b5fcd0e3eedc880ede60b09c783f Mon Sep 17 00:00:00 2001 From: Chris Moeller Date: Thu, 10 Oct 2013 01:44:45 -0700 Subject: [PATCH] Replaced every instance of NSEnumerator with for/in loops --- Audio/AudioPlayer.m | 4 +--- AudioScrobbler/AudioScrobbler.m | 9 ++++----- FileTree/PathNode.m | 4 +--- Plugins/APL/ApeTag.mm | 10 ++++------ Plugins/CueSheet/CueSheet.m | 8 ++------ Plugins/CueSheet/CueSheetContainer.m | 4 +--- Plugins/CueSheet/CueSheetMetadataReader.m | 4 +--- Plugins/M3u/M3uContainer.m | 8 ++++---- Plugins/Pls/PlsContainer.m | 6 ++++-- Plugins/TagLib/TagLibMetadataReader.m | 10 ++-------- ThirdParty/AppleRemote/AppleRemote.m | 4 +--- 11 files changed, 25 insertions(+), 46 deletions(-) diff --git a/Audio/AudioPlayer.m b/Audio/AudioPlayer.m index 91e9a22cb..f95d9e495 100644 --- a/Audio/AudioPlayer.m +++ b/Audio/AudioPlayer.m @@ -57,9 +57,7 @@ [output setVolume: volume]; @synchronized(chainQueue) { - NSEnumerator *enumerator = [chainQueue objectEnumerator]; - id anObject; - while (anObject = [enumerator nextObject]) + for (id anObject in chainQueue) { [anObject setShouldContinue:NO]; } diff --git a/AudioScrobbler/AudioScrobbler.m b/AudioScrobbler/AudioScrobbler.m index ead92e895..eaaa3273e 100644 --- a/AudioScrobbler/AudioScrobbler.m +++ b/AudioScrobbler/AudioScrobbler.m @@ -195,7 +195,6 @@ escapeForLastFM(NSString *string) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; AudioScrobblerClient *client = [[AudioScrobblerClient alloc] init]; mach_timespec_t timeout = { 5, 0 }; - NSEnumerator *enumerator = nil; NSString *command = nil; NSString *response = nil; in_port_t port = 33367; @@ -205,10 +204,10 @@ escapeForLastFM(NSString *string) // Get the first command to be sent @synchronized([self queue]) { - enumerator = [[self queue] objectEnumerator]; - command = [[enumerator nextObject] retain]; - - [[self queue] removeObjectIdenticalTo:command]; + if ([[self queue] count]) { + command = [[self queue] objectAtIndex:0]; + [[self queue] removeObjectAtIndex:0]; + } } if(nil != command) { diff --git a/FileTree/PathNode.m b/FileTree/PathNode.m index 02b0d8f15..0c95a35e6 100644 --- a/FileTree/PathNode.m +++ b/FileTree/PathNode.m @@ -89,9 +89,7 @@ NSURL *resolveAliases(NSURL *url) NSMutableArray *newSubpathsDirs = [[NSMutableArray alloc] init]; NSMutableArray *newSubpaths = [[NSMutableArray alloc] init]; - NSEnumerator *e = [contents objectEnumerator]; - NSString *s; - while ((s = [e nextObject])) + for (NSString *s in contents) { if ([s characterAtIndex:0] == '.') { diff --git a/Plugins/APL/ApeTag.mm b/Plugins/APL/ApeTag.mm index 1dd253d39..253881014 100644 --- a/Plugins/APL/ApeTag.mm +++ b/Plugins/APL/ApeTag.mm @@ -138,10 +138,9 @@ The footer at the end of APE tagged files (can also optionally be at the front o -(NSDictionary*) convertToCogTag { //NSLog(@"Converting ape tag to cog tag"); NSMutableDictionary* d = [NSMutableDictionary dictionaryWithCapacity:6]; - NSEnumerator *e = [fields objectEnumerator]; - ApeTagItem* item; + ApeTagItem* item; int n = 0; - while ((item = [e nextObject]) != nil) { + for (item in fields) { if (![[item tag] compare:APE_TAG_FIELD_ARTIST]) { [d setObject:[item getString] forKey:@"artist"]; n++;} if (![[item tag] compare:APE_TAG_FIELD_ALBUM]) {[d setObject:[item getString] forKey:@"album"]; n++;} if (![[item tag] compare:APE_TAG_FIELD_TITLE]) {[d setObject:[item getString] forKey:@"title"]; n++;} @@ -158,9 +157,8 @@ The footer at the end of APE tagged files (can also optionally be at the front o -(NSData*) pack { int len = 0, num = 0; NSMutableData* d = [NSMutableData dataWithCapacity:8]; - NSEnumerator *e = [fields objectEnumerator]; - id item; - while ((item = [e nextObject]) != nil) + id item; + for (item in fields) { NSData* i = [item pack]; [d appendData:i]; diff --git a/Plugins/CueSheet/CueSheet.m b/Plugins/CueSheet/CueSheet.m index 5fec646b8..aa9581ab5 100644 --- a/Plugins/CueSheet/CueSheet.m +++ b/Plugins/CueSheet/CueSheet.m @@ -98,10 +98,8 @@ NSCharacterSet *whitespace = [NSCharacterSet whitespaceAndNewlineCharacterSet]; - NSString *line; NSScanner *scanner = nil; - NSEnumerator *e = [[contents componentsSeparatedByString:@"\n"] objectEnumerator]; - while (line = [e nextObject]) + for (NSString *line in [contents componentsSeparatedByString:@"\n"]) { [scanner release]; scanner = [[NSScanner alloc] initWithString:line]; @@ -277,9 +275,7 @@ - (CueSheetTrack *)track:(NSString *)fragment { - CueSheetTrack *t; - NSEnumerator *e = [tracks objectEnumerator]; - while (t = [e nextObject]) { + for (CueSheetTrack *t in tracks) { if ([[t track] isEqualToString:fragment]) { return t; } diff --git a/Plugins/CueSheet/CueSheetContainer.m b/Plugins/CueSheet/CueSheetContainer.m index e3b575aca..2f279e1c8 100644 --- a/Plugins/CueSheet/CueSheetContainer.m +++ b/Plugins/CueSheet/CueSheetContainer.m @@ -33,9 +33,7 @@ CueSheet *cuesheet = [CueSheet cueSheetWithFile:[url path]]; - NSEnumerator *e = [[cuesheet tracks] objectEnumerator]; - CueSheetTrack *track; - while (track = [e nextObject]) { + for (CueSheetTrack *track in [cuesheet tracks]) { [tracks addObject:[NSURL URLWithString:[[url absoluteString] stringByAppendingFormat:@"#%@", [track track]]]]; } diff --git a/Plugins/CueSheet/CueSheetMetadataReader.m b/Plugins/CueSheet/CueSheetMetadataReader.m index 09a5390f2..7ed2f9dc2 100644 --- a/Plugins/CueSheet/CueSheetMetadataReader.m +++ b/Plugins/CueSheet/CueSheetMetadataReader.m @@ -33,9 +33,7 @@ CueSheet *cuesheet = [CueSheet cueSheetWithFile:[url path]]; NSArray *tracks = [cuesheet tracks]; - CueSheetTrack *track; - NSEnumerator *e = [tracks objectEnumerator]; - while (track = [e nextObject]) + for (CueSheetTrack *track in tracks) { if ([[url fragment] isEqualToString:[track track]]) { diff --git a/Plugins/M3u/M3uContainer.m b/Plugins/M3u/M3uContainer.m index 916a68c01..c36dc8467 100644 --- a/Plugins/M3u/M3uContainer.m +++ b/Plugins/M3u/M3uContainer.m @@ -93,12 +93,12 @@ return nil; } - NSString *entry; - NSEnumerator *e = [[contents componentsSeparatedByString:@"\n"] objectEnumerator]; NSMutableArray *entries = [NSMutableArray array]; - while ((entry = [[e nextObject] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]])) - { + for (NSString *entry in [contents componentsSeparatedByString:@"\n"]) + { + entry = [entry stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; + if ([entry hasPrefix:@"#"] || [entry isEqualToString:@""]) //Ignore extra info continue; diff --git a/Plugins/Pls/PlsContainer.m b/Plugins/Pls/PlsContainer.m index 4469a0dc7..4a2fed2b6 100644 --- a/Plugins/Pls/PlsContainer.m +++ b/Plugins/Pls/PlsContainer.m @@ -99,8 +99,10 @@ NSEnumerator *e = [[contents componentsSeparatedByString:@"\n"] objectEnumerator]; NSMutableArray *entries = [NSMutableArray array]; - while ((entry = [[e nextObject] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]])) - { + for (NSString *entry in [contents componentsSeparatedByString:@"\n"]) + { + entry = [entry stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; + NSScanner *scanner = [[NSScanner alloc] initWithString:entry]; NSString *lhs = nil; NSString *rhs = nil; diff --git a/Plugins/TagLib/TagLibMetadataReader.m b/Plugins/TagLib/TagLibMetadataReader.m index 479b35e3d..cc4d9c635 100644 --- a/Plugins/TagLib/TagLibMetadataReader.m +++ b/Plugins/TagLib/TagLibMetadataReader.m @@ -97,10 +97,7 @@ NSArray *fileNames = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil]; NSArray *imageFileNames = [fileNames pathsMatchingExtensions:[NSImage imageFileTypes]]; - NSEnumerator *imageEnumerator = [imageFileNames objectEnumerator]; - NSString *fileName; - - while (fileName = [imageEnumerator nextObject]) { + for (NSString *fileName in imageFileNames) { if ([TagLibMetadataReader isCoverFile:fileName]) { image = [NSData dataWithContentsOfFile:[path stringByAppendingPathComponent:fileName]]; break; @@ -118,10 +115,7 @@ + (BOOL)isCoverFile:(NSString *)fileName { - NSEnumerator *coverEnumerator = [[TagLibMetadataReader coverNames] objectEnumerator]; - NSString *coverFileName; - - while (coverFileName = [coverEnumerator nextObject]) { + for (NSString *coverFileName in [TagLibMetadataReader coverNames]) { if ([[[[fileName lastPathComponent] stringByDeletingPathExtension] lowercaseString] hasSuffix:coverFileName]) { return true; } diff --git a/ThirdParty/AppleRemote/AppleRemote.m b/ThirdParty/AppleRemote/AppleRemote.m index e6ba7b8c4..872380de4 100644 --- a/ThirdParty/AppleRemote/AppleRemote.m +++ b/ThirdParty/AppleRemote/AppleRemote.m @@ -348,9 +348,7 @@ static AppleRemote* sharedInstance=nil; - (NSString*) validCookieSubstring: (NSString*) cookieString { if (cookieString == nil || [cookieString length] == 0) return nil; - NSEnumerator* keyEnum = [[self cookieToButtonMapping] keyEnumerator]; - NSString* key; - while(key = [keyEnum nextObject]) { + for (NSString *key in [[self cookieToButtonMapping] allKeys]) { NSRange range = [cookieString rangeOfString:key]; if (range.location == 0) return key; }