Changeset 5973


Ignore:
Timestamp:
May 29, 2008, 10:16:03 PM (14 years ago)
Author:
livings124
Message:

"isFolder" is a better method name than "folder"

Location:
trunk/macosx
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/AddWindowController.m

    r5559 r5973  
    208208{
    209209    NSString * statusString = [NSString stringForFileSize: [fTorrent size]];
    210     if ([fTorrent folder])
     210    if ([fTorrent isFolder])
    211211    {
    212212        NSString * fileString;
  • trunk/macosx/Controller.m

    r5965 r5973  
    40614061    while ((torrent = [enumerator nextObject]))
    40624062    {
    4063         if ([torrent folder] || [torrent isComplete])
     4063        if ([torrent isFolder] || [torrent isComplete])
    40644064            [urlArray addObject: [NSURL fileURLWithPath: [torrent dataLocation]]];
    40654065    }
     
    40764076    while ((torrent = [enumerator nextObject]))
    40774077    {
    4078         if ([torrent folder] || [torrent isComplete])
     4078        if ([torrent isFolder] || [torrent isComplete])
    40794079            return YES;
    40804080    }
  • trunk/macosx/InfoWindowController.m

    r5966 r5973  
    364364       
    365365        NSString * basicString = [NSString stringForFileSize: [torrent size]];
    366         if ([torrent folder])
     366        if ([torrent isFolder])
    367367        {
    368368            NSString * fileString;
     
    11771177        [fStateField setStringValue: [torrent stateString]];
    11781178       
    1179         if ([torrent folder])
     1179        if ([torrent isFolder])
    11801180            [fProgressField setStringValue: [NSString localizedStringWithFormat: NSLocalizedString(@"%.2f%% (%.2f%% selected)",
    11811181                "Inspector -> Activity tab -> progress"), 100.0 * [torrent progress], 100.0 * [torrent progressDone]]];
  • trunk/macosx/Torrent.h

    r5950 r5973  
    135135
    136136- (NSString *) name;
    137 - (BOOL) folder;
     137- (BOOL) isFolder;
    138138- (uint64_t) size;
    139139- (uint64_t) sizeLeft;
  • trunk/macosx/Torrent.m

    r5950 r5973  
    700700    if (!fIcon)
    701701    {
    702         fIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: [self folder] ? NSFileTypeForHFSTypeCode('fldr')
     702        fIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: [self isFolder] ? NSFileTypeForHFSTypeCode('fldr')
    703703                                                : [[self name] pathExtension]] retain];
    704704        [fIcon setFlipped: YES];
     
    712712}
    713713
    714 - (BOOL) folder
     714- (BOOL) isFolder
    715715{
    716716    return fInfo->isMultifile;
     
    991991    {
    992992        float progress;
    993         if ([self folder] && [fDefaults boolForKey: @"DisplayStatusProgressSelected"])
     993        if ([self isFolder] && [fDefaults boolForKey: @"DisplayStatusProgressSelected"])
    994994        {
    995995            string = [NSString stringWithFormat: NSLocalizedString(@"%@ of %@ selected", "Torrent -> progress string"),
     
    16521652- (void) createFileList
    16531653{
    1654     if ([self folder])
     1654    if ([self isFolder])
    16551655    {
    16561656        int count = [self fileCount], i;
Note: See TracChangeset for help on using the changeset viewer.