Changeset 2016

Timestamp:

Jun 9, 2007, 10:11:10 PM (15 years ago)

Author:

livings124

Message:

change some method names

Location:

branches/file_selection/macosx

Files:

• InfoWindowController.m (modified) (2 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (5 diffs)

branches/file_selection/macosx/InfoWindowController.m

@@ -794 +794 @@
         Torrent * torrent = [fTorrents objectAtIndex: 0];
         if ([[item objectForKey: @"IsFolder"] boolValue])
-            return [NSNumber numberWithInt: [torrent shouldDownloadFolderForFiles: [item objectForKey: @"Indexes"]]];
-        else
-            return [NSNumber numberWithInt: [torrent shouldDownloadFile: [[item objectForKey: @"Index"] intValue]]];
+            return [NSNumber numberWithInt: [torrent checkForFileFolder: [item objectForKey: @"Indexes"]]];
+        else
+            return [NSNumber numberWithInt: [torrent checkForFile: [[item objectForKey: @"Index"] intValue]]];
     }
     else
@@ -833 +833 @@
         Torrent * torrent = [fTorrents objectAtIndex: 0];
         if ([[item objectForKey: @"IsFolder"] boolValue])
-            [cell setEnabled: [torrent canChangeDownloadCheckFoldersForFiles: [item objectForKey: @"Indexes"]]];
+            [cell setEnabled: [torrent canChangeDownloadCheckForFileFolder: [item objectForKey: @"Indexes"]]];
         else
             [cell setEnabled: [torrent canChangeDownloadCheckFile: [[item objectForKey: @"Index"] intValue]]];

branches/file_selection/macosx/Torrent.h

@@ -203 +203 @@
 - (int) fileCount;
 - (float) fileProgress: (int) index;
-- (int) shouldDownloadFile: (int) index;
-- (int) shouldDownloadFolderForFiles: (NSIndexSet *) indexSet;
+- (int) checkForFile: (int) index;
+- (int) checkForFileFolder: (NSIndexSet *) indexSet;
 - (BOOL) canChangeDownloadCheckFile: (int) index;
-- (BOOL) canChangeDownloadCheckFoldersForFiles: (NSIndexSet *) indexSet;
+- (BOOL) canChangeDownloadCheckForFileFolder: (NSIndexSet *) indexSet;
 - (void) setFileCheckState: (int) state forFileItem: (NSDictionary *) item;
 

branches/file_selection/macosx/Torrent.m

@@ -1316 +1316 @@
 }
 
-- (int) shouldDownloadFile: (int) index
+- (int) checkForFile: (int) index
 {
     return (tr_torrentGetFilePriority(fHandle, index) != TR_PRI_DND || [self fileProgress: index] >= 1.0)
@@ -1322 +1322 @@
 }
 
-- (int) shouldDownloadFolderForFiles: (NSIndexSet *) indexSet
+- (int) checkForFileFolder: (NSIndexSet *) indexSet
 {
     BOOL onState = NO, offState = NO;
@@ -1328 +1328 @@
     for (index = [indexSet firstIndex]; index != NSNotFound; index = [indexSet indexGreaterThanIndex: index])
     {
-        if ([self shouldDownloadFile: index] == NSOnState)
+        if ([self checkForFile: index] == NSOnState)
             onState = YES;
         else
@@ -1344 +1344 @@
 }
 
-- (BOOL) canChangeDownloadCheckFoldersForFiles: (NSIndexSet *) indexSet
+- (BOOL) canChangeDownloadCheckForFileFolder: (NSIndexSet *) indexSet
 {
     int index;
@@ -1626 +1626 @@
     {
         if (isFolder)
-        {
-            [dict setObject: [NSNumber numberWithInt: [[dict objectForKey: @"Remaining"] intValue]+1] forKey: @"Remaining"];
             [[dict objectForKey: @"Indexes"] addIndex: index];
-        }
     }