Ignore:
Timestamp:
Sep 28, 2007, 2:31:20 PM (15 years ago)
Author:
livings124
Message:

remove an unused dictionary

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Torrent.m

    r3216 r3218  
    4444
    4545- (void) createFileList;
    46 - (void) insertPath: (NSMutableArray *) components forSiblings: (NSMutableArray *) siblings
    47             withParent: (NSMutableDictionary *) parent previousPath: (NSString *) previousPath
    48             flatList: (NSMutableArray *) flatList fileSize: (uint64_t) size index: (int) index;
     46- (void) insertPath: (NSMutableArray *) components forSiblings: (NSMutableArray *) siblings withParent: (NSMutableDictionary *) parent
     47            previousPath: (NSString *) previousPath fileSize: (uint64_t) size index: (int) index;
    4948
    5049- (void) quickPause;
     
    159158   
    160159    [fFileList release];
    161     [fFlatFileList release];
    162160   
    163161    [fFileMenu release];
     
    968966                    string = [NSString stringWithFormat: NSLocalizedString(@"Seeding to %d of 1 peer", "Torrent -> status string"),
    969967                                                    [self peersGettingFromUs]];
    970                    
    971968               
    972969                string = [string stringByAppendingFormat: @" - UL: %@", [NSString stringForSpeed: [self uploadRate]]];
     
    10421039- (NSString *) remainingTimeString
    10431040{
    1044     int eta, days;
    1045    
    1046     NSString * string;
    10471041    switch (fStat->status)
    10481042    {
    10491043        case TR_STATUS_CHECK_WAIT:
    1050             string = [NSLocalizedString(@"Waiting to check existing data", "Torrent -> status string") stringByAppendingEllipsis];
     1044            return [NSLocalizedString(@"Waiting to check existing data", "Torrent -> status string") stringByAppendingEllipsis];
    10511045            break;
    10521046
    10531047        case TR_STATUS_CHECK:
    1054             string = [NSString stringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)",
     1048            return [NSString stringWithFormat: NSLocalizedString(@"Checking existing data (%.2f%%)",
    10551049                                    "Torrent -> status string"), 100.0 * fStat->recheckProgress];
    10561050            break;
    10571051
    10581052        case TR_STATUS_DOWNLOAD:
    1059             string = [self eta] >= 0 ? [self etaString] : NSLocalizedString(@"Unknown", "Torrent -> remaining time");
     1053            return [self eta] >= 0 ? [self etaString] : NSLocalizedString(@"Unknown", "Torrent -> remaining time");
    10601054            break;
    10611055       
    10621056        case TR_STATUS_SEED:
    10631057        case TR_STATUS_DONE:
    1064             string = [NSLocalizedString(@"Ratio: ", "Torrent -> status string") stringByAppendingString:
     1058            return [NSLocalizedString(@"Ratio: ", "Torrent -> status string") stringByAppendingString:
    10651059                                                                            [NSString stringForRatio: [self ratio]]];
    10661060            break;
    10671061       
    10681062        default:
    1069             string = @"";
    1070     }
    1071 
    1072     return string;
     1063            return @"";
     1064    }
    10731065}
    10741066
     
    15551547    NSString * path;
    15561548   
    1557     NSMutableArray * fileList = [[NSMutableArray alloc] init],
     1549    NSMutableArray * fileList = [[NSMutableArray alloc] initWithCapacity: count],
    15581550                    * flatFileList = [[NSMutableArray alloc] initWithCapacity: count];
    15591551   
     
    15711563            path = @"";
    15721564       
    1573         [self insertPath: pathComponents forSiblings: fileList withParent: nil previousPath: path
    1574                 flatList: flatFileList fileSize: file->length index: i];
     1565        [self insertPath: pathComponents forSiblings: fileList withParent: nil previousPath: path fileSize: file->length index: i];
    15751566        [pathComponents autorelease];
    15761567    }
     
    15781569    fFileList = [[NSArray alloc] initWithArray: fileList];
    15791570    [fileList release];
    1580     fFlatFileList = [[NSArray alloc] initWithArray: flatFileList];
    15811571    [flatFileList release];
    15821572}
    15831573
    1584 - (void) insertPath: (NSMutableArray *) components forSiblings: (NSMutableArray *) siblings
    1585         withParent: (NSMutableDictionary *) parent previousPath: (NSString *) previousPath
    1586         flatList: (NSMutableArray *) flatList fileSize: (uint64_t) size index: (int) index
     1574- (void) insertPath: (NSMutableArray *) components forSiblings: (NSMutableArray *) siblings withParent: (NSMutableDictionary *) parent
     1575            previousPath: (NSString *) previousPath fileSize: (uint64_t) size index: (int) index
    15871576{
    15881577    NSString * name = [components objectAtIndex: 0];
     
    16201609            [icon setFlipped: YES];
    16211610            [dict setObject: icon forKey: @"Icon"];
    1622            
    1623             [flatList addObject: dict];
    16241611        }
    16251612       
     
    16331620    {
    16341621        [components removeObjectAtIndex: 0];
    1635         [self insertPath: components forSiblings: [dict objectForKey: @"Children"]
    1636             withParent: dict previousPath: currentPath flatList: flatList fileSize: size index: index];
     1622        [self insertPath: components forSiblings: [dict objectForKey: @"Children"] withParent: dict
     1623                previousPath: currentPath fileSize: size index: index];
    16371624    }
    16381625}
Note: See TracChangeset for help on using the changeset viewer.