Changeset 12773

Timestamp:

Aug 28, 2011, 12:07:30 AM (12 years ago)

Author:

livings124

Message:

remove redundant code

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (2 diffs)
• TorrentCell.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -4231 +4231 @@
 - (void) rpcUpdateQueue
 {
-    NSLog(@"rpcUpdateQueue");
-    
     for (Torrent * torrent in fTorrents)
         [torrent update];

trunk/macosx/Torrent.h

@@ -76 +76 @@
 - (void) update;
 
+- (void) startTransferIgnoringQueue: (BOOL) ignoreQueue;
 - (void) startTransferNoQueue;
 - (void) startTransfer;

trunk/macosx/Torrent.m

@@ -301 +301 @@
 }
 
-- (void) startTransferNoQueue
+- (void) startTransferIgnoringQueue: (BOOL) ignoreQueue
 {
     if ([self alertForRemainingDiskSpace])
     {
-        tr_torrentStartNow(fHandle);
+        ignoreQueue ? tr_torrentStartNow(fHandle) : tr_torrentStart(fHandle);
         [self update];
         
@@ -313 +313 @@
 }
 
-#warning merge
+- (void) startTransferNoQueue
+{
+    [self startTransferIgnoringQueue: YES];
+}
+
 - (void) startTransfer
 {
-    if ([self alertForRemainingDiskSpace])
-    {
-        tr_torrentStart(fHandle);
-        [self update];
-        
-        //capture, specifically, stop-seeding settings changing to unlimited
-        [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptions" object: nil];
-    }
+    [self startTransferIgnoringQueue: NO];
 }
 

trunk/macosx/TorrentCell.m

@@ -470 +470 @@
         NSString * actionImageString;
         if (fMouseDownActionButton)
-            #warning we can get rid of the on 10.7
+            #warning we can get rid of this on 10.7
             actionImageString = @"ActionOn.png";
         else if (!fTracking && fHoverAction)