diff --git a/FileTreeWindow/FileTreeDataSource.m b/FileTreeWindow/FileTreeDataSource.m index af156d4e1..bf880d975 100644 --- a/FileTreeWindow/FileTreeDataSource.m +++ b/FileTreeWindow/FileTreeDataSource.m @@ -44,7 +44,7 @@ - (NSURL *)rootURL { - return [rootNode url]; + return [rootNode URL]; } - (void)setRootURL: (NSURL *)rootURL @@ -71,7 +71,7 @@ NSLog(@"COMPONENT: %@", c); BOOL found = NO; for (PathNode *subnode in [node subpaths]) { - if ([[[[subnode url] path] lastPathComponent] isEqualToString:c]) { + if ([[[[subnode URL] path] lastPathComponent] isEqualToString:c]) { node = subnode; found = YES; } @@ -132,7 +132,7 @@ NSMutableArray *urls = [NSMutableArray arrayWithCapacity:[items count]]; for (id p in items) { - [urls addObject:[p url]]; + [urls addObject:[p URL]]; } NSLog(@"URLS: %@", urls); [pboard declareTypes:[NSArray arrayWithObjects:CogUrlsPboardType,nil] owner:nil]; //add it to pboard diff --git a/FileTreeWindow/PathNode.h b/FileTreeWindow/PathNode.h index f8627060b..943a965e1 100644 --- a/FileTreeWindow/PathNode.h +++ b/FileTreeWindow/PathNode.h @@ -24,7 +24,7 @@ - (id)initWithDataSource:(FileTreeDataSource *)ds url:(NSURL *)u; -- (NSURL *)url; +- (NSURL *)URL; - (void)setURL:(NSURL *)url; - (void)processPaths: (NSArray *)contents; diff --git a/FileTreeWindow/PathNode.m b/FileTreeWindow/PathNode.m index 8da8e4838..4a6045723 100644 --- a/FileTreeWindow/PathNode.m +++ b/FileTreeWindow/PathNode.m @@ -76,7 +76,7 @@ NSURL *resolveAliases(NSURL *url) [icon setSize: NSMakeSize(16.0, 16.0)]; } -- (NSURL *)url +- (NSURL *)URL { return url; } @@ -89,7 +89,9 @@ NSURL *resolveAliases(NSURL *url) { NSMutableArray *newSubpaths = [[NSMutableArray alloc] init]; - for (NSString *s in contents) + NSEnumerator *e = [contents objectEnumerator]; + NSString *s; + while ((s = [e nextObject])) { if ([s characterAtIndex:0] == '.') { diff --git a/Playlist/PlaylistEntry.m b/Playlist/PlaylistEntry.m index 29e5a73dc..f9aef6d96 100644 --- a/Playlist/PlaylistEntry.m +++ b/Playlist/PlaylistEntry.m @@ -36,8 +36,8 @@ + (void)initialize { [self setKeys:[NSArray arrayWithObjects:@"artist",@"title",nil] triggerChangeNotificationsForDependentKey:@"display"]; [self setKeys:[NSArray arrayWithObjects:@"totalFrames",nil] triggerChangeNotificationsForDependentKey:@"length"]; - [self setKeys:[NSArray arrayWithObjects:@"url",nil] triggerChangeNotificationsForDependentKey:@"path"]; - [self setKeys:[NSArray arrayWithObjects:@"url",nil] triggerChangeNotificationsForDependentKey:@"filename"]; + [self setKeys:[NSArray arrayWithObjects:@"URL",nil] triggerChangeNotificationsForDependentKey:@"path"]; + [self setKeys:[NSArray arrayWithObjects:@"URL",nil] triggerChangeNotificationsForDependentKey:@"filename"]; } - (void)setProperties:(NSDictionary *)dict