Changeset 3944

Timestamp:

Nov 23, 2007, 3:45:58 PM (14 years ago)

Author:

livings124

Message:

get rid of unneeded sort descriptors; hold queue order as an integer instead of an object

Location:

trunk/macosx

Files:

• Controller.m (modified) (7 diffs)
• Torrent.h (modified) (3 diffs)
• Torrent.m (modified) (5 diffs)

trunk/macosx/Controller.m

@@ -1145 +1145 @@
         [torrent setWaitToStart: NO];
 
-    NSNumber * lowestOrderValue = nil, * currentOrderValue;
+    int lowestOrderValue = -1, currentOrderValue;
 
     enumerator = [torrents objectEnumerator];
@@ -1159 +1159 @@
         //determine lowest order value
         currentOrderValue = [torrent orderValue];
-        if (!lowestOrderValue || [lowestOrderValue compare: currentOrderValue] == NSOrderedDescending)
+        if (lowestOrderValue < currentOrderValue)
             lowestOrderValue = currentOrderValue;
         
@@ -1169 +1169 @@
 
     //reset the order values if necessary
-    if ([lowestOrderValue intValue] < [fTorrents count])
+    if (lowestOrderValue < [fTorrents count])
     {
         NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey:
@@ -1179 +1179 @@
 
         int i;
-        for (i = [lowestOrderValue intValue]; i < [tempTorrents count]; i++)
+        for (i = lowestOrderValue; i < [tempTorrents count]; i++)
             [[tempTorrents objectAtIndex: i] setOrderValue: i];
     }
@@ -1603 +1603 @@
                                                 @"stateSortKey" ascending: !asc] autorelease],
                         * progressDescriptor = [[[NSSortDescriptor alloc] initWithKey:
-                                            @"progressSortKey" ascending: !asc] autorelease],
+                                            @"progress" ascending: !asc] autorelease],
                         * ratioDescriptor = [[[NSSortDescriptor alloc] initWithKey:
                                             @"ratioSortKey" ascending: !asc] autorelease];
@@ -1613 +1613 @@
     {
         NSSortDescriptor * progressDescriptor = [[[NSSortDescriptor alloc] initWithKey:
-                                            @"progressSortKey" ascending: asc] autorelease],
+                                            @"progress" ascending: asc] autorelease],
                         * ratioProgressDescriptor = [[[NSSortDescriptor alloc] initWithKey:
                                             @"ratioProgressSortKey" ascending: asc] autorelease],
@@ -2190 +2190 @@
         
         //reinsert into array
-        int insertIndex = newRow > 0 ? [[[fDisplayedTorrents objectAtIndex: newRow-1] orderValue] intValue] + 1 : 0;
+        int insertIndex = newRow > 0 ? [[fDisplayedTorrents objectAtIndex: newRow-1] orderValue] + 1 : 0;
         
         //get all torrents to reorder

trunk/macosx/Torrent.h

@@ -62 +62 @@
     NSMenu * fFileMenu;
     
-    float   fRatioLimit;
-    int     fRatioSetting;
-    BOOL    fFinishedSeeding, fWaitToStart, fError, fChecking, fStalled;
-    
-    NSNumber * fOrderValue;
+    float fRatioLimit;
+    int fRatioSetting;
+    BOOL fFinishedSeeding, fWaitToStart, fError, fChecking, fStalled;
+    
+    int fOrderValue;
     
     NSDictionary * fQuickPauseDict;
@@ -202 +202 @@
 - (void) setPex: (BOOL) enable;
 
-- (NSNumber *) orderValue;
+- (int) orderValue;
 - (void) setOrderValue: (int) orderValue;
 
@@ -230 +230 @@
 
 - (NSNumber *) stateSortKey;
-- (NSNumber *) progressSortKey;
 - (NSNumber *) ratioSortKey;
 - (NSNumber *) ratioProgressSortKey;

trunk/macosx/Torrent.m

@@ -126 +126 @@
                     [NSNumber numberWithFloat: fRatioLimit], @"RatioLimit",
                     [NSNumber numberWithBool: fWaitToStart], @"WaitToStart",
-                    [self orderValue], @"OrderValue", nil];
+                    [NSNumber numberWithInt: fOrderValue], @"OrderValue", nil];
     
     if (fIncompleteFolder)
@@ -162 +162 @@
     [fFileList release];
     [fFileMenu release];
-    
-    [fOrderValue release];
     
     [fQuickPauseDict release];
@@ -1152 +1150 @@
 }
 
-- (NSNumber *) orderValue
+- (int) orderValue
 {
     return fOrderValue;
@@ -1159 +1157 @@
 - (void) setOrderValue: (int) orderValue
 {
-    [fOrderValue release];
-    fOrderValue = [[NSNumber alloc] initWithInt: orderValue];
+    fOrderValue = orderValue;
 }
 
@@ -1365 +1362 @@
     else
         return [NSNumber numberWithInt: 2];
-}
-
-- (NSNumber *) progressSortKey
-{
-    return [NSNumber numberWithFloat: [self progress]];
 }