Changeset 12773


Ignore:
Timestamp:
Aug 28, 2011, 12:07:30 AM (10 years ago)
Author:
livings124
Message:

remove redundant code

Location:
trunk/macosx
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Controller.m

    r12772 r12773  
    42314231- (void) rpcUpdateQueue
    42324232{
    4233     NSLog(@"rpcUpdateQueue");
    4234    
    42354233    for (Torrent * torrent in fTorrents)
    42364234        [torrent update];
  • trunk/macosx/Torrent.h

    r12664 r12773  
    7676- (void) update;
    7777
     78- (void) startTransferIgnoringQueue: (BOOL) ignoreQueue;
    7879- (void) startTransferNoQueue;
    7980- (void) startTransfer;
  • trunk/macosx/Torrent.m

    r12772 r12773  
    301301}
    302302
    303 - (void) startTransferNoQueue
     303- (void) startTransferIgnoringQueue: (BOOL) ignoreQueue
    304304{
    305305    if ([self alertForRemainingDiskSpace])
    306306    {
    307         tr_torrentStartNow(fHandle);
     307        ignoreQueue ? tr_torrentStartNow(fHandle) : tr_torrentStart(fHandle);
    308308        [self update];
    309309       
     
    313313}
    314314
    315 #warning merge
     315- (void) startTransferNoQueue
     316{
     317    [self startTransferIgnoringQueue: YES];
     318}
     319
    316320- (void) startTransfer
    317321{
    318     if ([self alertForRemainingDiskSpace])
    319     {
    320         tr_torrentStart(fHandle);
    321         [self update];
    322        
    323         //capture, specifically, stop-seeding settings changing to unlimited
    324         [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptions" object: nil];
    325     }
     322    [self startTransferIgnoringQueue: NO];
    326323}
    327324
  • trunk/macosx/TorrentCell.m

    r12769 r12773  
    470470        NSString * actionImageString;
    471471        if (fMouseDownActionButton)
    472             #warning we can get rid of the on 10.7
     472            #warning we can get rid of this on 10.7
    473473            actionImageString = @"ActionOn.png";
    474474        else if (!fTracking && fHoverAction)
Note: See TracChangeset for help on using the changeset viewer.