Changeset 3218

Timestamp:

Sep 28, 2007, 2:31:20 PM (15 years ago)

Author:

livings124

Message:

remove an unused dictionary

Location:

trunk/macosx

Files:

• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (9 diffs)

trunk/macosx/Torrent.h

@@ -60 +60 @@
     
     tr_file_stat * fileStat;
-    NSArray * fFileList, * fFlatFileList;
+    NSArray * fFileList;
     
     NSMenu * fFileMenu;

trunk/macosx/Torrent.m

@@ -44 +44 @@
 
 - (void) createFileList;
-- (void) insertPath: (NSMutableArray *) components forSiblings: (NSMutableArray *) siblings
-            withParent: (NSMutableDictionary *) parent previousPath: (NSString *) previousPath
-            flatList: (NSMutableArray *) flatList fileSize: (uint64_t) size index: (int) index;
+- (void) insertPath: (NSMutableArray *) components forSiblings: (NSMutableArray *) siblings withParent: (NSMutableDictionary *) parent
+            previousPath: (NSString *) previousPath fileSize: (uint64_t) size index: (int) index;
 
 - (void) quickPause;
@@ -159 +158 @@
     
     [fFileList release];
-    [fFlatFileList release];
     
     [fFileMenu release];
@@ -968 +966 @@
                     string = [NSString stringWithFormat: NSLocalizedString(@"Seeding to %d of 1 peer", "Torrent -> status string"),
                                                     [self peersGettingFromUs]];
-                    
                 
                 string = [string stringByAppendingFormat: @" - UL: %@", [NSString stringForSpeed: [self uploadRate]]];
@@ -1042 +1039 @@
 - (NSString *) remainingTimeString
 {
-    int eta, days;
-    
-    NSString * string;
     switch (fStat->status)
     {
         case TR_STATUS_CHECK_WAIT:
-            string = [NSLocalizedString(@"Waiting to check existing data", "Torrent -> status string") stringByAppendingEllipsis];
+            return [NSLocalizedString(@"Waiting to check existing data", "Torrent -> status string") stringByAppendingEllipsis];
             break;
 
         case TR_STATUS_CHECK:
-            string = [NSString stringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)",
+            return [NSString stringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)",
                                     "Torrent -> status string"), 100.0 * fStat->recheckProgress];
             break;
 
         case TR_STATUS_DOWNLOAD:
-            string = [self eta] >= 0 ? [self etaString] : NSLocalizedString(@"Unknown", "Torrent -> remaining time");
+            return [self eta] >= 0 ? [self etaString] : NSLocalizedString(@"Unknown", "Torrent -> remaining time");
             break;
         
         case TR_STATUS_SEED:
         case TR_STATUS_DONE:
-            string = [NSLocalizedString(@"Ratio: ", "Torrent -> status string") stringByAppendingString:
+            return [NSLocalizedString(@"Ratio: ", "Torrent -> status string") stringByAppendingString:
                                                                             [NSString stringForRatio: [self ratio]]];
             break;
         
         default:
-            string = @"";
-    }
-
-    return string;
+            return @"";
+    }
 }
 
@@ -1555 +1547 @@
     NSString * path;
     
-    NSMutableArray * fileList = [[NSMutableArray alloc] init],
+    NSMutableArray * fileList = [[NSMutableArray alloc] initWithCapacity: count],
                     * flatFileList = [[NSMutableArray alloc] initWithCapacity: count];
     
@@ -1571 +1563 @@
             path = @"";
         
-        [self insertPath: pathComponents forSiblings: fileList withParent: nil previousPath: path
-                flatList: flatFileList fileSize: file->length index: i];
+        [self insertPath: pathComponents forSiblings: fileList withParent: nil previousPath: path fileSize: file->length index: i];
         [pathComponents autorelease];
     }
@@ -1578 +1569 @@
     fFileList = [[NSArray alloc] initWithArray: fileList];
     [fileList release];
-    fFlatFileList = [[NSArray alloc] initWithArray: flatFileList];
     [flatFileList release];
 }
 
-- (void) insertPath: (NSMutableArray *) components forSiblings: (NSMutableArray *) siblings
-        withParent: (NSMutableDictionary *) parent previousPath: (NSString *) previousPath
-        flatList: (NSMutableArray *) flatList fileSize: (uint64_t) size index: (int) index
+- (void) insertPath: (NSMutableArray *) components forSiblings: (NSMutableArray *) siblings withParent: (NSMutableDictionary *) parent
+            previousPath: (NSString *) previousPath fileSize: (uint64_t) size index: (int) index
 {
     NSString * name = [components objectAtIndex: 0];
@@ -1620 +1609 @@
             [icon setFlipped: YES];
             [dict setObject: icon forKey: @"Icon"];
-            
-            [flatList addObject: dict];
         }
         
@@ -1633 +1620 @@
     {
         [components removeObjectAtIndex: 0];
-        [self insertPath: components forSiblings: [dict objectForKey: @"Children"]
-            withParent: dict previousPath: currentPath flatList: flatList fileSize: size index: index];
+        [self insertPath: components forSiblings: [dict objectForKey: @"Children"] withParent: dict
+                previousPath: currentPath fileSize: size index: index];
     }
 }