Changeset 421

Timestamp:

Jun 21, 2006, 2:07:56 PM (16 years ago)

Author:

livings124

Message:

A lot of cleanup; remove cantfindaname once and for all.

Location:

trunk/macosx

Files:

• Controller.m (modified) (21 diffs)
• FileTableView.m (modified) (1 diff)
• PrefsController.m (modified) (17 diffs)
• StringAdditions.m (modified) (2 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (15 diffs)
• TorrentTableView.m (modified) (9 diffs)

trunk/macosx/Controller.m

@@ -46 +46 @@
 #define GROWL_PATH  @"/Library/PreferencePanes/Growl.prefPane/Contents/Resources/GrowlHelperApp.app"
 
-static void sleepCallBack( void * controller, io_service_t y,
-        natural_t messageType, void * messageArgument )
+static void sleepCallBack(void * controller, io_service_t y,
+        natural_t messageType, void * messageArgument)
 {
     Controller * c = controller;
@@ -135 +135 @@
         [NSArray arrayWithObject: NSFilenamesPboardType]];
 
-    //Register for sleep notifications
+    //register for sleep notifications
     IONotificationPortRef notify;
-    io_object_t anIterator;
-    if (fRootPort = IORegisterForSystemPower(self, & notify,
-                                sleepCallBack, & anIterator))
-    {
-        CFRunLoopAddSource( CFRunLoopGetCurrent(),
-                            IONotificationPortGetRunLoopSource( notify ),
-                            kCFRunLoopCommonModes );
+    io_object_t iterator;
+    if (fRootPort = IORegisterForSystemPower(self, & notify, sleepCallBack, & iterator))
+    {
+        CFRunLoopAddSource(CFRunLoopGetCurrent(), IONotificationPortGetRunLoopSource(notify),
+                            kCFRunLoopCommonModes);
     }
     else
@@ -260 +258 @@
                     @"There are %d active transfers. Do you really want to quit?", active];
 
-            NSBeginAlertSheet(@"Confirm Quit",
-                                @"Quit", @"Cancel", nil,
-                                fWindow, self,
+            NSBeginAlertSheet(@"Confirm Quit", @"Quit", @"Cancel", nil, fWindow, self,
                                 @selector(quitSheetDidEnd:returnCode:contextInfo:),
                                 nil, nil, message);
@@ -317 +313 @@
 }
 
-- (void) folderChoiceClosed: (NSOpenPanel *) s returnCode: (int) code
+- (void) folderChoiceClosed: (NSOpenPanel *) openPanel returnCode: (int) code
     contextInfo: (Torrent *) torrent
 {
     if (code == NSOKButton)
     {
-        [torrent setDownloadFolder: [[s filenames] objectAtIndex: 0]];
+        [torrent setDownloadFolder: [[openPanel filenames] objectAtIndex: 0]];
         if ([fDefaults boolForKey: @"AutoStartDownload"])
             [torrent start];
@@ -423 +419 @@
 - (void) open: (NSArray *) files
 {
-    [self performSelectorOnMainThread: @selector(cantFindAName:)
-                withObject: files waitUntilDone: NO];
+    [self performSelectorOnMainThread: @selector(openFromSheet:) withObject: files waitUntilDone: NO];
 }
 
@@ -470 +465 @@
     unsigned int i;
     for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-    {
-        torrent = [fTorrents objectAtIndex: i];
-        [torrent start];
-    }
+        [[fTorrents objectAtIndex: i] start];
     
     [self updateUI: nil];
@@ -492 +484 @@
 - (void) stopTorrentWithIndex: (NSIndexSet *) indexSet
 {
+    unsigned int i;
     Torrent * torrent;
-    unsigned int i;
     for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
     {
@@ -521 +513 @@
             torrents, @"Torrents",
             [NSNumber numberWithBool: deleteData], @"DeleteData",
-            [NSNumber numberWithBool: deleteTorrent], @"DeleteTorrent",
-            nil];
+            [NSNumber numberWithBool: deleteTorrent], @"DeleteTorrent", nil];
 
         NSString * title, * message;
@@ -551 +542 @@
         NSBeginAlertSheet(title,
             @"Remove", @"Cancel", nil, fWindow, self,
-            @selector(removeSheetDidEnd:returnCode:contextInfo:),
-            nil, dict, message);
+            @selector(removeSheetDidEnd:returnCode:contextInfo:), nil, dict, message);
     }
     else
@@ -723 +713 @@
     NSEnumerator * enumerator = [fTorrents objectEnumerator];
     Torrent * torrent;
-    while( ( torrent = [enumerator nextObject] ) )
+    while ((torrent = [enumerator nextObject]))
     {
         [torrent update];
 
-        if( [torrent justFinished] )
+        if ([torrent justFinished])
         {
-            /* Notifications */
+            //notifications
             [self notifyGrowl: [torrent name]];
-            if( ![fWindow isKeyWindow] )
+            if (![fWindow isKeyWindow])
                 fCompleted++;
         }
@@ -741 +731 @@
         [fTableView reloadData];
     
-    //Update the global DL/UL rates
+    //update the global DL/UL rates
     float downloadRate, uploadRate;
     tr_torrentRates(fLib, & downloadRate, & uploadRate);
@@ -1127 +1117 @@
         Torrent * torrent;
         NSEnumerator * enumerator = [fTorrents objectEnumerator];
-        while( ( torrent = [enumerator nextObject] ) )
-            if( [torrent isActive] )
+        while ((torrent = [enumerator nextObject]))
+            if ([torrent isActive])
                 return YES;
         return NO;
@@ -1138 +1128 @@
         Torrent * torrent;
         NSEnumerator * enumerator = [fTorrents objectEnumerator];
-        while( ( torrent = [enumerator nextObject] ) )
-            if( [torrent isPaused] )
+        while ((torrent = [enumerator nextObject]))
+            if ([torrent isPaused])
                 return YES;
         return NO;
@@ -1152 +1142 @@
         
         for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-        {
-            torrent = [fTorrents objectAtIndex: i];
-            if ([torrent isActive])
+            if ([[fTorrents objectAtIndex: i] isActive])
                 return YES;
-        }
         return NO;
     }
@@ -1163 +1150 @@
     if ([ident isEqualToString: TOOLBAR_RESUME_SELECTED])
     {
-        Torrent * torrent;
         NSIndexSet * indexSet = [fTableView selectedRowIndexes];
         unsigned int i;
         
         for (i = [indexSet firstIndex]; i != NSNotFound; i = [indexSet indexGreaterThanIndex: i])
-        {
-            torrent = [fTorrents objectAtIndex: i];
-            if ([torrent isPaused])
+            if ([[fTorrents objectAtIndex: i] isPaused])
                 return YES;
-        }
         return NO;
     }
@@ -1215 +1198 @@
         Torrent * torrent;
         NSEnumerator * enumerator = [fTorrents objectEnumerator];
-        while( ( torrent = [enumerator nextObject] ) )
-            if( [torrent isPaused] )
+        while ((torrent = [enumerator nextObject]))
+            if ([torrent isPaused])
                 return YES;
         return NO;
@@ -1226 +1209 @@
         Torrent * torrent;
         NSEnumerator * enumerator = [fTorrents objectEnumerator];
-        while( ( torrent = [enumerator nextObject] ) )
-            if( [torrent isActive] )
+        while ((torrent = [enumerator nextObject]))
+            if ([torrent isActive])
                 return YES;
         return NO;
@@ -1242 +1225 @@
     {
         BOOL active = NO,
-            canDelete = !(action == @selector(removeDeleteTorrent:)
-                            || action == @selector(removeDeleteBoth:));
+            canDelete = action != @selector(removeDeleteTorrent:) && action != @selector(removeDeleteBoth:);
         Torrent * torrent;
         NSIndexSet * indexSet = [fTableView selectedRowIndexes];
@@ -1275 +1257 @@
         {
             if ([title hasSuffix: ellipsis])
-                [menuItem setTitle: [title substringToIndex:
-                            [title rangeOfString: ellipsis].location]];
+                [menuItem setTitle: [title substringToIndex: [title rangeOfString: ellipsis].location]];
         }
         
@@ -1441 +1422 @@
     NSAppleScript * appleScript = [[NSAppleScript alloc] initWithSource: growlScript];
     NSDictionary * error;
-    if (![appleScript executeAndReturnError: &error])
+    if (![appleScript executeAndReturnError: & error])
         NSLog(@"Growl notify failed");
     [appleScript release];
@@ -1465 +1446 @@
     NSAppleScript * appleScript = [[NSAppleScript alloc] initWithSource: growlScript];
     NSDictionary * error;
-    if (![appleScript executeAndReturnError: &error])
+    if (![appleScript executeAndReturnError: & error])
         NSLog(@"Growl registration failed");
     [appleScript release];

trunk/macosx/FileTableView.m

@@ -40 +40 @@
     {
         if (![self isRowSelected: row])
-            [self selectRowIndexes: [NSIndexSet indexSetWithIndex: row]
-                byExtendingSelection: NO];
+            [self selectRowIndexes: [NSIndexSet indexSetWithIndex: row] byExtendingSelection: NO];
     }
     else

trunk/macosx/PrefsController.m

@@ -26 +26 @@
 #import "StringAdditions.h"
 
-#define MIN_PORT            1
-#define MAX_PORT            65535
+#define MIN_PORT    1
+#define MAX_PORT    65535
 
 #define DOWNLOAD_FOLDER     0
@@ -33 +33 @@
 #define DOWNLOAD_ASK        3
 
-#define UPDATE_DAILY        0
-#define UPDATE_WEEKLY       1
-#define UPDATE_NEVER        2
+#define UPDATE_DAILY    0
+#define UPDATE_WEEKLY   1
+#define UPDATE_NEVER    2
 
 #define TOOLBAR_GENERAL     @"General"
@@ -49 +49 @@
 - (void) setPrefView: (NSView *) view;
 
-- (void) folderSheetClosed: (NSOpenPanel *) s returnCode: (int) code
-                                contextInfo: (void *) info;
+- (void) folderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info;
 - (void) updatePopUp;
 
@@ -86 +85 @@
     
     //set download folder
-    NSString * downloadChoice  = [fDefaults stringForKey: @"DownloadChoice"];
+    NSString * downloadChoice = [fDefaults stringForKey: @"DownloadChoice"];
     fDownloadFolder = [[fDefaults stringForKey: @"DownloadFolder"] stringByExpandingTildeInPath];
     [fDownloadFolder retain];
@@ -101 +100 @@
     int bindPort = [fDefaults integerForKey: @"BindPort"];
     [fPortField setIntValue: bindPort];
-    fHandle = handle;
-    tr_setBindPort( fHandle, bindPort );
+    tr_setBindPort(fHandle, bindPort);
     
     //checks for old version upload speed of -1
@@ -119 +117 @@
     [fUploadField setEnabled: checkUpload];
     
-    tr_setUploadLimit( fHandle, checkUpload ? uploadLimit : -1 );
+    tr_setUploadLimit(fHandle, checkUpload ? uploadLimit : -1);
 
         //set download limit
@@ -129 +127 @@
     [fDownloadField setEnabled: checkDownload];
     
-    tr_setDownloadLimit( fHandle, checkDownload ? downloadLimit : -1 );
+    tr_setDownloadLimit(fHandle, checkDownload ? downloadLimit : -1);
     
     //set ratio limit
@@ -254 +252 @@
 
     int limit = [sender intValue];
-    if (![[sender stringValue] isEqualToString:
-            [NSString stringWithFormat: @"%d", limit]]
+    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%d", limit]]
             || limit < 0)
     {
@@ -264 +261 @@
     else
     {
-        if( sender == fUploadField )
-            tr_setUploadLimit( fHandle,
-                ( [fUploadCheck state] == NSOffState ) ? -1 : limit );
+        if (sender == fUploadField)
+            tr_setUploadLimit(fHandle, [fUploadCheck state] == NSOffState ? -1 : limit);
         else
-            tr_setDownloadLimit( fHandle,
-                ( [fDownloadCheck state] == NSOffState ) ? -1 : limit );
+            tr_setDownloadLimit(fHandle, [fDownloadCheck state] == NSOffState ? -1 : limit);
         
         [fDefaults setInteger: limit forKey: key];
@@ -278 +273 @@
                                     [NSNumber numberWithInt: limit], @"Limit",
                                     type, @"Type", nil];
-    [[NSNotificationCenter defaultCenter] postNotificationName:
-                            @"LimitGlobalChange" object: dict];
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"LimitGlobalChange" object: dict];
 }
 
@@ -306 +300 @@
 - (void) setLimitEnabled: (BOOL) enable type: (NSString *) type
 {
-    NSButton * check = [type isEqualToString: @"Upload"]
-                        ? fUploadCheck : fDownloadCheck;
+    NSButton * check = [type isEqualToString: @"Upload"] ? fUploadCheck : fDownloadCheck;
     [check setState: enable ? NSOnState : NSOffState];
     [self setLimitCheck: check];
@@ -332 +325 @@
 {
     float ratioLimit = [sender floatValue];
-    if (![[sender stringValue] isEqualToString:
-            [NSString stringWithFormat: @"%.2f", ratioLimit]]
+    if (![[sender stringValue] isEqualToString: [NSString stringWithFormat: @"%.2f", ratioLimit]]
             || ratioLimit < 0)
     {
@@ -346 +338 @@
                                     [NSNumber numberWithBool: [fRatioCheck state]], @"Enable",
                                     [NSNumber numberWithFloat: ratioLimit], @"Ratio", nil];
-    [[NSNotificationCenter defaultCenter] postNotificationName:
-                                @"RatioGlobalChange" object: dict];
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"RatioGlobalChange" object: dict];
 }
 
@@ -443 +434 @@
 {
     //Download folder
-    switch( [fFolderPopUp indexOfSelectedItem] )
+    switch ([fFolderPopUp indexOfSelectedItem])
     {
         case DOWNLOAD_FOLDER:
@@ -466 +457 @@
     NSOpenPanel * panel = [NSOpenPanel openPanel];
 
-    [panel setPrompt:                  @"Select"];
-    [panel setAllowsMultipleSelection:        NO];
-    [panel setCanChooseFiles:                 NO];
-    [panel setCanChooseDirectories:          YES];
+    [panel setPrompt: @"Select"];
+    [panel setAllowsMultipleSelection: NO];
+    [panel setCanChooseFiles: NO];
+    [panel setCanChooseDirectories: YES];
 
     [panel beginSheetForDirectory: nil file: nil types: nil
@@ -513 +504 @@
 }
 
-- (void) folderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code
-    contextInfo: (void *) info
+- (void) folderSheetClosed: (NSOpenPanel *) openPanel returnCode: (int) code contextInfo: (void *) info
 {
    if (code == NSOKButton)
@@ -532 +522 @@
        //reset if cancelled
        NSString * downloadChoice = [fDefaults stringForKey: @"DownloadChoice"];
-       if( [downloadChoice isEqualToString: @"Constant"] )
-       {
+       if ([downloadChoice isEqualToString: @"Constant"])
            [fFolderPopUp selectItemAtIndex: DOWNLOAD_FOLDER];
-       }
-       else if( [downloadChoice isEqualToString: @"Torrent"] )
-       {
+       else if ([downloadChoice isEqualToString: @"Torrent"])
            [fFolderPopUp selectItemAtIndex: DOWNLOAD_TORRENT];
-       }
        else
-       {
            [fFolderPopUp selectItemAtIndex: DOWNLOAD_ASK];
-       }
    }
 }

trunk/macosx/StringAdditions.m

@@ -69 +69 @@
     if (size < 10240)
         /* 1.00 to 9.99 XB */
-        value = [NSString stringWithFormat: @"%lld.%02lld",
-                    size / 1024, ( size % 1024 ) * 100 / 1024];
+        value = [NSString stringWithFormat: @"%lld.%02lld", size / 1024, ( size % 1024 ) * 100 / 1024];
     else if (size < 102400)
         /* 10.0 to 99.9 XB */
-        value = [NSString stringWithFormat: @"%lld.%lld",
-                    size / 1024, ( size % 1024 ) * 10 / 1024];
+        value = [NSString stringWithFormat: @"%lld.%lld", size / 1024, ( size % 1024 ) * 10 / 1024];
     else
         /* 100+ XB */
@@ -84 +82 @@
 + (NSString *) stringForSpeed: (float) speed
 {
-    return [[self stringForSpeedAbbrev: speed]
-        stringByAppendingString: @"B/s"];
+    return [[self stringForSpeedAbbrev: speed] stringByAppendingString: @"B/s"];
 }
 

trunk/macosx/Torrent.h

@@ -101 +101 @@
 
 - (float)   progress;
+- (int)     eta;
+
 - (BOOL)    isActive;
 - (BOOL)    isSeeding;

trunk/macosx/Torrent.m

@@ -42 +42 @@
 - (id) initWithPath: (NSString *) path lib: (tr_handle_t *) lib
 {
-    self = [self initWithHash: nil path: path lib: lib
-            privateTorrent: nil publicTorrent: nil
+    self = [self initWithHash: nil path: path lib: lib privateTorrent: nil publicTorrent: nil
             date: nil stopRatioSetting: nil ratioLimit: nil];
     
@@ -68 +67 @@
         NSString * downloadFolder;
         if (!(downloadFolder = [history objectForKey: @"DownloadFolder"]))
-            downloadFolder = [[fDefaults stringForKey: @"DownloadFolder"]
-                                stringByExpandingTildeInPath];
+            downloadFolder = [[fDefaults stringForKey: @"DownloadFolder"] stringByExpandingTildeInPath];
         [self setDownloadFolder: downloadFolder];
 
@@ -101 +99 @@
 - (void) dealloc
 {
-    if( fHandle )
-    {
-        tr_torrentClose( fLib, fHandle );
+    if (fHandle)
+    {
+        tr_torrentClose(fLib, fHandle);
         
         if (fPublicTorrentLocation)
@@ -119 +117 @@
 - (void) setDownloadFolder: (NSString *) path
 {
-    tr_torrentSetFolder( fHandle, [path UTF8String] );
+    tr_torrentSetFolder(fHandle, [path UTF8String]);
 }
 
 - (NSString *) downloadFolder
 {
-    return [NSString stringWithUTF8String: tr_torrentGetFolder( fHandle )];
+    return [NSString stringWithUTF8String: tr_torrentGetFolder(fHandle)];
 }
 
 - (void) getAvailability: (int8_t *) tab size: (int) size
 {
-    tr_torrentAvailability( fHandle, tab, size );
+    tr_torrentAvailability(fHandle, tab, size);
 }
 
 - (void) update
 {
-    fStat = tr_torrentStat( fHandle );
-    
-    if ([self isSeeding]
-        && ((fStopRatioSetting == RATIO_CHECK && [self ratio] >= fRatioLimit)
+    fStat = tr_torrentStat(fHandle);
+    
+    if ([self isSeeding] && ((fStopRatioSetting == RATIO_CHECK && [self ratio] >= fRatioLimit)
             || (fStopRatioSetting == RATIO_GLOBAL && [fDefaults boolForKey: @"RatioCheck"]
             && [self ratio] >= [fDefaults floatForKey: @"RatioLimit"])))
@@ -145 +142 @@
         fFinishedSeeding = YES;
         
-        fStat = tr_torrentStat( fHandle );
+        fStat = tr_torrentStat(fHandle);
         
         [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentRatioChanged" object: self];
@@ -159 +156 @@
                 [NSString stringForRatioWithDownload: [self downloadedTotal] upload: [self uploadedTotal]]];
 
-    switch( fStat->status )
+    switch (fStat->status)
     {
         case TR_STATUS_PAUSE:
@@ -172 +169 @@
             [fStatusString setString: @""];
             [fStatusString appendFormat:
-                @"Downloading from %d of %d peer%s",
-                [self peersUploading], [self totalPeers],
+                @"Downloading from %d of %d peer%s", [self peersUploading], [self totalPeers],
                 ([self totalPeers] == 1) ? "" : "s"];
             
-            int eta = fStat->eta;
+            int eta = [self eta];
             if (eta < 0)
                 [fProgressString appendString: @" - remaining time unknown"];
@@ -223 +219 @@
 - (void) start
 {
-    if( fStat->status & TR_STATUS_INACTIVE )
-    {
-        tr_torrentStart( fHandle );
+    if (![self isActive])
+    {
+        tr_torrentStart(fHandle);
         fFinishedSeeding = NO;
     }
@@ -232 +228 @@
 - (void) stop
 {
-    if( fStat->status & TR_STATUS_ACTIVE )
-    {
-        tr_torrentStop( fHandle );
-    }
+    if ([self isActive])
+        tr_torrentStop(fHandle);
 }
 
@@ -246 +240 @@
 - (void) sleep
 {
-    if( ( fResumeOnWake = ( fStat->status & TR_STATUS_ACTIVE ) ) )
-    {
+    if ((fResumeOnWake = [self isActive]))
         [self stop];
-    }
 }
 
 - (void) wakeUp
 {
-    if( fResumeOnWake )
-    {
+    if (fResumeOnWake)
         [self start];
-    }
 }
 
@@ -289 +279 @@
 - (void) reveal
 {
-    [[NSWorkspace sharedWorkspace] selectFile: [self dataLocation]
-        inFileViewerRootedAtPath: nil];
+    [[NSWorkspace sharedWorkspace] selectFile: [self dataLocation] inFileViewerRootedAtPath: nil];
 }
 
@@ -326 +315 @@
 - (NSString *) tracker
 {
-    return [NSString stringWithFormat: @"%s:%d",
-            fInfo->trackerAddress, fInfo->trackerPort];
+    return [NSString stringWithFormat: @"%s:%d", fInfo->trackerAddress, fInfo->trackerPort];
 }
 
@@ -415 +403 @@
 }
 
+- (int) eta
+{
+    return fStat->eta;
+}
+
 - (BOOL) isActive
 {
-    return ( fStat->status & TR_STATUS_ACTIVE );
+    return fStat->status & TR_STATUS_ACTIVE;
 }
 
 - (BOOL) isSeeding
 {
-    return ( fStat->status == TR_STATUS_SEED );
+    return fStat->status == TR_STATUS_SEED;
 }
 
 - (BOOL) isPaused
 {
-    return ( fStat->status == TR_STATUS_PAUSE );
+    return fStat->status == TR_STATUS_PAUSE;
 }
 
 - (BOOL) justFinished
 {
-    return tr_getFinished( fHandle );
+    return tr_getFinished(fHandle);
 }
 
@@ -514 +507 @@
 - (NSNumber *) stateSortKey
 {
-    if (fStat->status & TR_STATUS_INACTIVE)
+    if (![self isActive])
         return [NSNumber numberWithInt: 0];
-    else if (fStat->status == TR_STATUS_SEED)
+    else if ([self isSeeding])
         return [NSNumber numberWithInt: 1];
     else
@@ -572 +565 @@
     fFinishedSeeding = NO;
     
-    NSString * fileType = fInfo->multifile ?
-        NSFileTypeForHFSTypeCode('fldr') : [[self name] pathExtension];
+    NSString * fileType = fInfo->multifile ? NSFileTypeForHFSTypeCode('fldr') : [[self name] pathExtension];
     fIcon = [[NSWorkspace sharedWorkspace] iconForFileType: fileType];
     [fIcon retain];

trunk/macosx/TorrentTableView.m

@@ -71 +71 @@
 }
 
-- (void) mouseDown: (NSEvent *) e
-{
-    fClickPoint = [self convertPoint: [e locationInWindow] fromView: nil];
-    int row = [self rowAtPoint: fClickPoint];
-
-    if( [e modifierFlags] & NSAlternateKeyMask )
+- (void) mouseDown: (NSEvent *) event
+{
+    fClickPoint = [self convertPoint: [event locationInWindow] fromView: nil];
+
+    if ([event modifierFlags] & NSAlternateKeyMask)
     {
         [fController advancedChanged: self];
-        fClickPoint = NSMakePoint( 0, 0 );
-    }
-    else if( ![self pointInPauseRect: fClickPoint] &&
-             ![self pointInRevealRect: fClickPoint] )
-        [super mouseDown: e];
+        fClickPoint = NSZeroPoint;
+    }
+    else if (![self pointInPauseRect: fClickPoint] && ![self pointInRevealRect: fClickPoint])
+        [super mouseDown: event];
     else;
 
@@ -89 +87 @@
 }
 
-- (void) mouseUp: (NSEvent *) e
-{
-    NSPoint point;
-    int row;
-    bool sameRow;
-    Torrent * torrent;
-
-    point = [self convertPoint: [e locationInWindow] fromView: nil];
-    row   = [self rowAtPoint: point];
-    sameRow = row == [self rowAtPoint: fClickPoint];
-    
-    if( sameRow && [self pointInPauseRect: point]
-            && [self pointInPauseRect: fClickPoint] )
-    {
-        torrent = [fTorrents objectAtIndex: row];
-
-                if( [torrent isPaused] )
+- (void) mouseUp: (NSEvent *) event
+{
+    NSPoint point = [self convertPoint: [event locationInWindow] fromView: nil];
+    int row = [self rowAtPoint: point];
+    BOOL sameRow = row == [self rowAtPoint: fClickPoint];
+    
+    if (sameRow && [self pointInPauseRect: point] && [self pointInPauseRect: fClickPoint])
+    {
+        Torrent * torrent = [fTorrents objectAtIndex: row];
+
+                if ([torrent isPaused])
                         [fController resumeTorrentWithIndex: [NSIndexSet indexSetWithIndex: row]];
-                else if( [torrent isActive] )
+                else if ([torrent isActive])
                         [fController stopTorrentWithIndex: [NSIndexSet indexSetWithIndex: row]];
                 else;
     }
-    else if( sameRow && [self pointInRevealRect: point]
-                && [self pointInRevealRect: fClickPoint] )
+    else if (sameRow && [self pointInRevealRect: point] && [self pointInRevealRect: fClickPoint])
         [[fTorrents objectAtIndex: row] reveal];
-        else if ([e clickCount] == 2)
+        else if ([event clickCount] == 2)
     {
         if ([self pointInIconRect: point])
@@ -123 +114 @@
     else;
     
-        [super mouseUp: e];
-
-    fClickPoint = NSMakePoint( 0, 0 );
+        [super mouseUp: event];
+
+    fClickPoint = NSZeroPoint;
     [self display];
 }
 
-- (NSMenu *) menuForEvent: (NSEvent *) e
-{
-    int row = [self rowAtPoint: [self convertPoint: [e locationInWindow] fromView: nil]];
+- (NSMenu *) menuForEvent: (NSEvent *) event
+{
+    int row = [self rowAtPoint: [self convertPoint: [event locationInWindow] fromView: nil]];
     
     if (row >= 0)
     {
         if (![self isRowSelected: row])
-            [self selectRowIndexes: [NSIndexSet indexSetWithIndex: row]
-                byExtendingSelection: NO];
+            [self selectRowIndexes: [NSIndexSet indexSetWithIndex: row] byExtendingSelection: NO];
                 
         return fContextRow;
@@ -150 +140 @@
 - (void) drawRect: (NSRect) r
 {
-    unsigned i;
     NSRect rect;
+    Torrent * torrent;
     NSImage * image;
-    Torrent * torrent;
 
     [super drawRect: r];
 
-    for( i = 0; i < [fTorrents count]; i++ )
+    int i;
+    for (i = 0; i < [fTorrents count]; i++)
     {
         torrent = [fTorrents objectAtIndex: i];
@@ -172 +162 @@
         {
             [image setFlipped: YES];
-            [image drawAtPoint: rect.origin fromRect:
-                NSMakeRect(0, 0, BUTTON_WIDTH, BUTTON_WIDTH) operation:
-                NSCompositeSourceOver fraction: 1.0];
+            [image drawAtPoint: rect.origin fromRect: NSMakeRect(0, 0, BUTTON_WIDTH, BUTTON_WIDTH)
+                operation: NSCompositeSourceOver fraction: 1.0];
         }
 
@@ -180 +169 @@
         image = NSPointInRect(fClickPoint, rect) ? fRevealOnIcon : fRevealOffIcon;
         [image setFlipped: YES];
-        [image drawAtPoint: rect.origin fromRect:
-            NSMakeRect(0, 0, BUTTON_WIDTH, BUTTON_WIDTH) operation:
-            NSCompositeSourceOver fraction: 1.0];
+        [image drawAtPoint: rect.origin fromRect: NSMakeRect(0, 0, BUTTON_WIDTH, BUTTON_WIDTH)
+            operation: NSCompositeSourceOver fraction: 1.0];
     }
 }
@@ -192 +180 @@
 - (NSRect) pauseRectForRow: (int) row
 {
-    NSRect cellRect = [self frameOfCellAtColumn:
-                [self columnWithIdentifier: @"Torrent"] row: row];
+    NSRect cellRect = [self frameOfCellAtColumn: [self columnWithIdentifier: @"Torrent"] row: row];
                 
     return NSMakeRect(cellRect.origin.x + cellRect.size.width
@@ -202 +189 @@
 - (NSRect) revealRectForRow: (int) row
 {
-    NSRect cellRect = [self frameOfCellAtColumn:
-                [self columnWithIdentifier: @"Torrent"] row: row];
-    
-    return NSMakeRect(cellRect.origin.x + cellRect.size.width
-                        - AREA_CENTER + DISTANCE_FROM_CENTER,
+    NSRect cellRect = [self frameOfCellAtColumn: [self columnWithIdentifier: @"Torrent"] row: row];
+    
+    return NSMakeRect(cellRect.origin.x + cellRect.size.width - AREA_CENTER + DISTANCE_FROM_CENTER,
                         cellRect.origin.y + BUTTON_TO_TOP, BUTTON_WIDTH, BUTTON_WIDTH);
 }
@@ -216 +201 @@
         return NO;
     
-    NSRect cellRect = [self frameOfCellAtColumn:
-                [self columnWithIdentifier: @"Torrent"] row: row];
+    NSRect cellRect = [self frameOfCellAtColumn: [self columnWithIdentifier: @"Torrent"] row: row];
     NSSize iconSize = [[[fTorrents objectAtIndex: row] iconFlipped] size];
     
     NSRect iconRect = NSMakeRect(cellRect.origin.x + 3.0, cellRect.origin.y
-                        + (cellRect.size.height - iconSize.height) * 0.5,
-                        iconSize.width, iconSize.height);
+            + (cellRect.size.height - iconSize.height) * 0.5, iconSize.width, iconSize.height);
     
     return NSPointInRect(point, iconRect);