Changeset 1284 for trunk/macosx/Controller.m

Timestamp:

Dec 26, 2006, 9:18:42 PM (16 years ago)

Author:

livings124

Message:

while loops instead of for loops

File:

• trunk/macosx/Controller.m (modified) (5 diffs)

trunk/macosx/Controller.m

@@ -2259 +2259 @@
     if ([ident isEqualToString: TOOLBAR_PAUSE_SELECTED])
     {
+        NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator];
         Torrent * torrent;
-        NSIndexSet * indexSet = [fTableView selectedRowIndexes];
-        unsigned int i;
-        
-        for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-        {
-            torrent = [fDisplayedTorrents objectAtIndex: i];
+        while ((torrent = [enumerator nextObject]))
+        {
             if ([torrent isActive] || [torrent waitingToStart])
                 return YES;
@@ -2275 +2272 @@
     if ([ident isEqualToString: TOOLBAR_RESUME_SELECTED])
     {
+        NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator];
         Torrent * torrent;
-        NSIndexSet * indexSet = [fTableView selectedRowIndexes];
-        unsigned int i;
-        
-        for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-        {
-            torrent = [fDisplayedTorrents objectAtIndex: i];
+        while ((torrent = [enumerator nextObject]))
+        {
             if ([torrent isPaused] && ![torrent waitingToStart])
                 return YES;
@@ -2358 +2352 @@
             onlyDownloading = [fDefaults boolForKey: @"CheckRemoveDownloading"],
             canDelete = action != @selector(removeDeleteTorrent:) && action != @selector(removeDeleteDataAndTorrent:);
+        
+        NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator];
         Torrent * torrent;
-        NSIndexSet * indexSet = [fTableView selectedRowIndexes];
-        unsigned int i;
-        
-        for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-        {
-            torrent = [fDisplayedTorrents objectAtIndex: i];
+        while ((torrent = [enumerator nextObject]))
+        {
             if (!warning && [torrent isActive])
             {
@@ -2437 +2429 @@
             return NO;
     
+        NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator];
         Torrent * torrent;
-        NSIndexSet * indexSet = [fTableView selectedRowIndexes];
-        unsigned int i;
-        
-        for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-        {
-            torrent = [fDisplayedTorrents objectAtIndex: i];
+        while ((torrent = [enumerator nextObject]))
+        {
             if ([torrent isPaused] && [torrent progress] < 1.0)
                 return YES;
@@ -2456 +2445 @@
             return NO;
     
+        NSEnumerator * enumerator = [[fDisplayedTorrents objectsAtIndexes: [fTableView selectedRowIndexes]] objectEnumerator];
         Torrent * torrent;
-        NSIndexSet * indexSet = [fTableView selectedRowIndexes];
-        unsigned int i;
-        
-        for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-        {
-            torrent = [fDisplayedTorrents objectAtIndex: i];
+        while ((torrent = [enumerator nextObject]))
+        {
             if ([torrent isActive] || [torrent waitingToStart])
                 return YES;