Changeset 7514

Timestamp:

Dec 26, 2008, 7:25:17 AM (12 years ago)

Author:

livings124

Message:

eliminate some more enumerator objects

Location:

trunk/macosx

Files:

• DragOverlayWindow.m (modified) (1 diff)
• FileOutlineController.m (modified) (1 diff)
• FileOutlineView.m (modified) (1 diff)
• PrefsController.m (modified) (4 diffs)
• Torrent.m (modified) (4 diffs)
• TorrentGroup.m (modified) (3 diffs)

trunk/macosx/DragOverlayWindow.m

@@ -82 +82 @@
     NSInteger fileCount = 0;
     
-    NSString * file;
-    NSEnumerator * enumerator = [files objectEnumerator];
-    while ((file = [enumerator nextObject]))
+    for (NSString * file in files)
     {
         if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)

trunk/macosx/FileOutlineController.m

@@ -114 +114 @@
         NSMutableArray * list = [NSMutableArray arrayWithCapacity: [fTorrent fileCount]];
         
-        NSEnumerator * enumerator = [[fTorrent flatFileList] objectEnumerator];
-        FileListNode * node;
-        while ((node = [enumerator nextObject]))
+        for (FileListNode * node in [fTorrent flatFileList])
             if ([[node name] rangeOfString: fFilterText options: NSCaseInsensitiveSearch].location != NSNotFound)
                 [list addObject: node];

trunk/macosx/FileOutlineView.m

@@ -127 +127 @@
     [super updateTrackingAreas];
     
-    NSEnumerator * enumerator = [[self trackingAreas] objectEnumerator];
-    NSTrackingArea * area;
-    while ((area = [enumerator nextObject]))
+    for (NSTrackingArea * area in [self trackingAreas])
     {
         if ([area owner] == self && [[area userInfo] objectForKey: @"Row"])

trunk/macosx/PrefsController.m

@@ -407 +407 @@
     NSArray * directories = [NSArray arrayWithObjects: @"/System/Library/Sounds", @"/Library/Sounds", @"Library/Sounds", nil];
     
-    BOOL isDirectory;
-    NSString * directory;
-    NSEnumerator * enumerator = [directories objectEnumerator];
-    while ((directory = [enumerator nextObject]))
+    for (NSString * directory in directories)
+    {
+        BOOL isDirectory;
         if ([[NSFileManager defaultManager] fileExistsAtPath: directory isDirectory: &isDirectory] && isDirectory)
         {
-            NSString * sound;
-            NSEnumerator * soundEnumerator = [[[NSFileManager defaultManager] directoryContentsAtPath: directory] objectEnumerator];
-            while ((sound = [soundEnumerator nextObject]))
+            NSArray * directoryContents = [[NSFileManager defaultManager] directoryContentsAtPath: directory];
+            for (NSString * sound in directoryContents)
             {
                 sound = [sound stringByDeletingPathExtension];
@@ -422 +420 @@
             }
         }
+    }
     
     return sounds;
@@ -946 +945 @@
     {
         valid = true;
-        NSEnumerator * enumerator = [components objectEnumerator];
-        NSString * component;
-        while ((component = [enumerator nextObject]))
+        for (NSString * component in components)
         {
             if ([component isEqualToString: @"*"])
@@ -1143 +1140 @@
         NSToolbar * toolbar = [window toolbar];
         NSString * itemIdentifier = [toolbar selectedItemIdentifier];
-        NSEnumerator * enumerator = [[toolbar items] objectEnumerator];
-        NSToolbarItem * item;
-        while ((item = [enumerator nextObject]))
+        for (NSToolbarItem * item in [toolbar items])
             if ([[item itemIdentifier] isEqualToString: itemIdentifier])
             {

trunk/macosx/Torrent.m

@@ -1745 +1745 @@
             {
                 //determine if folder node already exists
-                NSEnumerator * enumerator = [fileList objectEnumerator];
-                FileListNode * node;
-                while ((node = [enumerator nextObject]))
+                FileListNode * node = nil;
+                for (node in fileList)
                     if ([[node name] isEqualToString: name] && [node isFolder])
                         break;
@@ -1796 +1795 @@
     if (isFolder)
     {
-        NSEnumerator * enumerator = [[parent children] objectEnumerator];
-        while ((node = [enumerator nextObject]))
+        for (node in [parent children])
             if ([[node name] isEqualToString: name] && [node isFolder])
                 break;
@@ -1945 +1943 @@
     //get count
     NSInteger count = 0;
-    NSEnumerator * enumerator = [trackers objectEnumerator];
-    id object;
-    while ((object = [enumerator nextObject]))
+    for (id object in trackers)
         if (![object isKindOfClass: [NSNumber class]])
             count++;
@@ -1954 +1950 @@
     tr_tracker_info * trackerStructs = tr_new(tr_tracker_info, count);
     NSInteger tier = 0, i = 0;
-    enumerator = [trackers objectEnumerator];
-    while ((object = [enumerator nextObject]))
+    for (id object in trackers)
     {
         if (![object isKindOfClass: [NSNumber class]])

trunk/macosx/TorrentGroup.m

@@ -58 +58 @@
 {
     uint64_t uploaded = 0, downloaded = 0;
-    NSEnumerator * enumerator = [fTorrents objectEnumerator];
-    Torrent * torrent;
-    while ((torrent = [enumerator nextObject]))
+    for (Torrent * torrent in fTorrents)
     {
         uploaded += [torrent uploadedTotal];
@@ -72 +70 @@
 {
     CGFloat rate = 0.0f;
-    NSEnumerator * enumerator = [fTorrents objectEnumerator];
-    Torrent * torrent;
-    while ((torrent = [enumerator nextObject]))
+    for (Torrent * torrent in fTorrents)
         rate += [torrent uploadRate];
     
@@ -83 +79 @@
 {
     CGFloat rate = 0.0f;
-    NSEnumerator * enumerator = [fTorrents objectEnumerator];
-    Torrent * torrent;
-    while ((torrent = [enumerator nextObject]))
+    for (Torrent * torrent in fTorrents)
         rate += [torrent downloadRate];