Changeset 9822 for trunk/macosx/Controller.m

Timestamp:

Dec 26, 2009, 12:02:20 AM (13 years ago)

Author:

livings124

Message:

assorted code cleanup

File:

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

trunk/macosx/Controller.m

@@ -2184 +2184 @@
         [allTorrents sortUsingDescriptors: [NSArray arrayWithObject: groupDescriptor]];
         
-        NSMutableArray * groupTorrents;
+        TorrentGroup * group = nil;
         NSInteger lastGroupValue = -2, currentOldGroupIndex = 0;
         for (Torrent * torrent in allTorrents)
         {
-            NSInteger groupValue = [torrent groupValue];
+            const NSInteger groupValue = [torrent groupValue];
             if (groupValue != lastGroupValue)
             {
                 lastGroupValue = groupValue;
                 
-                TorrentGroup * group = nil;
+                group = nil;
                 
                 //try to see if the group already exists
@@ -2215 +2215 @@
                     group = [[[TorrentGroup alloc] initWithGroup: groupValue] autorelease];
                 [fDisplayedTorrents addObject: group];
-                
-                groupTorrents = [group torrents];
             }
             
-            [groupTorrents addObject: torrent];
+            NSAssert(group != nil, @"No group object to add torrents to");
+            [[group torrents] addObject: torrent];
         }
     }