Changeset 7514
- Timestamp:
- Dec 26, 2008, 7:25:17 AM (12 years ago)
- Location:
- trunk/macosx
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/DragOverlayWindow.m
r7468 r7514 82 82 NSInteger fileCount = 0; 83 83 84 NSString * file; 85 NSEnumerator * enumerator = [files objectEnumerator]; 86 while ((file = [enumerator nextObject])) 84 for (NSString * file in files) 87 85 { 88 86 if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame) -
trunk/macosx/FileOutlineController.m
r7508 r7514 114 114 NSMutableArray * list = [NSMutableArray arrayWithCapacity: [fTorrent fileCount]]; 115 115 116 NSEnumerator * enumerator = [[fTorrent flatFileList] objectEnumerator]; 117 FileListNode * node; 118 while ((node = [enumerator nextObject])) 116 for (FileListNode * node in [fTorrent flatFileList]) 119 117 if ([[node name] rangeOfString: fFilterText options: NSCaseInsensitiveSearch].location != NSNotFound) 120 118 [list addObject: node]; -
trunk/macosx/FileOutlineView.m
r7508 r7514 127 127 [super updateTrackingAreas]; 128 128 129 NSEnumerator * enumerator = [[self trackingAreas] objectEnumerator]; 130 NSTrackingArea * area; 131 while ((area = [enumerator nextObject])) 129 for (NSTrackingArea * area in [self trackingAreas]) 132 130 { 133 131 if ([area owner] == self && [[area userInfo] objectForKey: @"Row"]) -
trunk/macosx/PrefsController.m
r7508 r7514 407 407 NSArray * directories = [NSArray arrayWithObjects: @"/System/Library/Sounds", @"/Library/Sounds", @"Library/Sounds", nil]; 408 408 409 BOOL isDirectory; 410 NSString * directory; 411 NSEnumerator * enumerator = [directories objectEnumerator]; 412 while ((directory = [enumerator nextObject])) 409 for (NSString * directory in directories) 410 { 411 BOOL isDirectory; 413 412 if ([[NSFileManager defaultManager] fileExistsAtPath: directory isDirectory: &isDirectory] && isDirectory) 414 413 { 415 NSString * sound; 416 NSEnumerator * soundEnumerator = [[[NSFileManager defaultManager] directoryContentsAtPath: directory] objectEnumerator]; 417 while ((sound = [soundEnumerator nextObject])) 414 NSArray * directoryContents = [[NSFileManager defaultManager] directoryContentsAtPath: directory]; 415 for (NSString * sound in directoryContents) 418 416 { 419 417 sound = [sound stringByDeletingPathExtension]; … … 422 420 } 423 421 } 422 } 424 423 425 424 return sounds; … … 946 945 { 947 946 valid = true; 948 NSEnumerator * enumerator = [components objectEnumerator]; 949 NSString * component; 950 while ((component = [enumerator nextObject])) 947 for (NSString * component in components) 951 948 { 952 949 if ([component isEqualToString: @"*"]) … … 1143 1140 NSToolbar * toolbar = [window toolbar]; 1144 1141 NSString * itemIdentifier = [toolbar selectedItemIdentifier]; 1145 NSEnumerator * enumerator = [[toolbar items] objectEnumerator]; 1146 NSToolbarItem * item; 1147 while ((item = [enumerator nextObject])) 1142 for (NSToolbarItem * item in [toolbar items]) 1148 1143 if ([[item itemIdentifier] isEqualToString: itemIdentifier]) 1149 1144 { -
trunk/macosx/Torrent.m
r7508 r7514 1745 1745 { 1746 1746 //determine if folder node already exists 1747 NSEnumerator * enumerator = [fileList objectEnumerator]; 1748 FileListNode * node; 1749 while ((node = [enumerator nextObject])) 1747 FileListNode * node = nil; 1748 for (node in fileList) 1750 1749 if ([[node name] isEqualToString: name] && [node isFolder]) 1751 1750 break; … … 1796 1795 if (isFolder) 1797 1796 { 1798 NSEnumerator * enumerator = [[parent children] objectEnumerator]; 1799 while ((node = [enumerator nextObject])) 1797 for (node in [parent children]) 1800 1798 if ([[node name] isEqualToString: name] && [node isFolder]) 1801 1799 break; … … 1945 1943 //get count 1946 1944 NSInteger count = 0; 1947 NSEnumerator * enumerator = [trackers objectEnumerator]; 1948 id object; 1949 while ((object = [enumerator nextObject])) 1945 for (id object in trackers) 1950 1946 if (![object isKindOfClass: [NSNumber class]]) 1951 1947 count++; … … 1954 1950 tr_tracker_info * trackerStructs = tr_new(tr_tracker_info, count); 1955 1951 NSInteger tier = 0, i = 0; 1956 enumerator = [trackers objectEnumerator]; 1957 while ((object = [enumerator nextObject])) 1952 for (id object in trackers) 1958 1953 { 1959 1954 if (![object isKindOfClass: [NSNumber class]]) -
trunk/macosx/TorrentGroup.m
r7200 r7514 58 58 { 59 59 uint64_t uploaded = 0, downloaded = 0; 60 NSEnumerator * enumerator = [fTorrents objectEnumerator]; 61 Torrent * torrent; 62 while ((torrent = [enumerator nextObject])) 60 for (Torrent * torrent in fTorrents) 63 61 { 64 62 uploaded += [torrent uploadedTotal]; … … 72 70 { 73 71 CGFloat rate = 0.0f; 74 NSEnumerator * enumerator = [fTorrents objectEnumerator]; 75 Torrent * torrent; 76 while ((torrent = [enumerator nextObject])) 72 for (Torrent * torrent in fTorrents) 77 73 rate += [torrent uploadRate]; 78 74 … … 83 79 { 84 80 CGFloat rate = 0.0f; 85 NSEnumerator * enumerator = [fTorrents objectEnumerator]; 86 Torrent * torrent; 87 while ((torrent = [enumerator nextObject])) 81 for (Torrent * torrent in fTorrents) 88 82 rate += [torrent downloadRate]; 89 83
Note: See TracChangeset
for help on using the changeset viewer.