Ticket #6042: DeadCode.diff

macosx/CreatorWindowController.m

@@ -140 +140 @@
 
 - (void) awakeFromNib
 {
-    if ([NSApp isOnLionOrBetter])
-        [[self window] setRestorationClass: [self class]];
+    [[self window] setRestorationClass: [self class]];
     
     NSString * name = [fPath lastPathComponent];
     
@@ -544 +543 @@
     [fDefaults setBool: [fOpenCheck state] == NSOnState forKey: @"CreatorOpen"];
     fOpenWhenCreated = [fOpenCheck state] == NSOnState; //need this since the check box might not exist, and value in prefs might have changed from another creator window
     [fDefaults setURL: [fLocation URLByDeletingLastPathComponent] forKey: @"CreatorLocationURL"];
+
+    [[self window] setRestorable: NO];
     
-    if ([NSApp isOnLionOrBetter])
-        [[self window] setRestorable: NO];
-    
     [[NSNotificationCenter defaultCenter] postNotificationName: @"BeginCreateTorrentFile" object: fLocation userInfo: nil];
     tr_makeMetaInfo(fInfo, [[fLocation path] UTF8String], trackerInfo, [fTrackers count], [[fCommentView string] UTF8String], [fPrivateCheck state] == NSOnState);
     tr_free(trackerInfo);

macosx/GroupsPrefsController.m

@@ -120 +120 @@
     if ([[pasteboard types] containsObject: GROUP_TABLE_VIEW_DATA_TYPE])
     {
         NSIndexSet * indexes = [NSKeyedUnarchiver unarchiveObjectWithData: [pasteboard dataForType: GROUP_TABLE_VIEW_DATA_TYPE]];
-        NSInteger oldRow = [indexes firstIndex], selectedRow = [fTableView selectedRow];
+        NSInteger oldRow = [indexes firstIndex];
         
         if (oldRow < newRow)
             newRow--;
+
+        [fTableView beginUpdates];
         
-        if ([NSApp isOnLionOrBetter])
-            [fTableView beginUpdates];
-        
         [[GroupsController groups] moveGroupAtRow: oldRow toRow: newRow];
-        
-        if ([NSApp isOnLionOrBetter])
-        {
-            [fTableView moveRowAtIndex: oldRow toIndex: newRow];
-            [fTableView endUpdates];
-        }
-        else
-        {
-            if (selectedRow == oldRow)
-                selectedRow = newRow;
-            else if (selectedRow > oldRow && selectedRow <= newRow)
-                selectedRow--;
-            else if (selectedRow < oldRow && selectedRow >= newRow)
-                selectedRow++;
-            else;
-            
-            [fTableView selectRowIndexes: [NSIndexSet indexSetWithIndex: selectedRow] byExtendingSelection: NO];
-            [fTableView reloadData];
-        }
+
+        [fTableView moveRowAtIndex: oldRow toIndex: newRow];
+        [fTableView endUpdates];
     }
     
     return YES;

macosx/MessageWindowController.m

@@ -57 +57 @@
     NSWindow * window = [self window];
     [window setFrameAutosaveName: @"MessageWindowFrame"];
     [window setFrameUsingName: @"MessageWindowFrame"];
+    [window setRestorationClass: [self class]];
     
-    if ([NSApp isOnLionOrBetter])
-        [window setRestorationClass: [self class]];
-    
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(resizeColumn)
         name: NSTableViewColumnDidResizeNotification object: fMessageTable];
     

macosx/PrefsController.m

@@ -166 +166 @@
 - (void) awakeFromNib
 {
     fHasLoaded = YES;
+
+    [[self window] setRestorationClass: [self class]];
     
-    if ([NSApp isOnLionOrBetter])
-        [[self window] setRestorationClass: [self class]];
-    
     NSToolbar * toolbar = [[NSToolbar alloc] initWithIdentifier: @"Preferences Toolbar"];
     [toolbar setDelegate: self];
     [toolbar setAllowsUserCustomization: NO];

macosx/StatsWindowController.m

@@ -66 +66 @@
     fTimer = [[NSTimer scheduledTimerWithTimeInterval: UPDATE_SECONDS target: self selector: @selector(updateStats) userInfo: nil repeats: YES] retain];
     [[NSRunLoop currentRunLoop] addTimer: fTimer forMode: NSModalPanelRunLoopMode];
     [[NSRunLoop currentRunLoop] addTimer: fTimer forMode: NSEventTrackingRunLoopMode];
+
+    [[self window] setRestorationClass: [self class]];
     
-    if ([NSApp isOnLionOrBetter])
-        [[self window] setRestorationClass: [self class]];
-    
     [[self window] setTitle: NSLocalizedString(@"Statistics", "Stats window -> title")];
     
     //set label text

macosx/StatusBarView.m

@@ -42 +42 @@
         NSColor * darkColor = [NSColor colorWithCalibratedRed: 155.0/255.0 green: 155.0/255.0 blue: 155.0/255.0 alpha: 1.0];
         fGradient = [[NSGradient alloc] initWithStartingColor: lightColor endingColor: darkColor];
         
-        if([NSApp isOnLionOrBetter] && ![NSApp isOnYosemiteOrBetter])
+        if (![NSApp isOnYosemiteOrBetter])
         {
             CIFilter * randomFilter = [CIFilter filterWithName: @"CIRandomGenerator"];
             [randomFilter setDefaults];

macosx/TorrentTableView.h

@@ -43 +43 @@
     
     IBOutlet NSMenu * fContextRow, * fContextNoRow;
     
-    NSInteger fMouseRow, fMouseControlRow, fMouseRevealRow, fMouseActionRow, fActionPushedRow;
+    NSInteger fMouseRow, fMouseControlRow, fMouseRevealRow, fMouseActionRow;
     NSArray * fSelectedValues;
     
     IBOutlet NSMenu * fActionMenu, * fUploadMenu, * fDownloadMenu, * fRatioMenu, * fPriorityMenu;

macosx/TorrentTableView.m

@@ -73 +73 @@
         fMouseControlRow = -1;
         fMouseRevealRow = -1;
         fMouseActionRow = -1;
-        #warning we can get rid of the on 10.7
-        fActionPushedRow = -1;
         
         fActionPopoverShown = NO;
         
@@ -169 +167 @@
             [cell setControlHover: row == fMouseControlRow];
             [cell setRevealHover: row == fMouseRevealRow];
             [cell setActionHover: row == fMouseActionRow];
-            [cell setActionPushed: row == fActionPushedRow];
         }
     }
     else
@@ -403 +400 @@
     //avoid weird behavior when showing menu by doing this after mouse down
     if (row != -1 && fMouseActionRow == row)
     {
-        if (![NSApp isOnLionOrBetter])
-        {
-            fActionPushedRow = row;
-            [self setNeedsDisplayInRect: [self rectOfRow: row]]; //ensure button is pushed down
-        }
-        
         #warning maybe make appear on mouse down
         [self displayTorrentActionPopoverForEvent: event];
-        
-        if (![NSApp isOnLionOrBetter])
-        {
-            fActionPushedRow = -1;
-            [self setNeedsDisplayInRect: [self rectOfRow: row]];
-        }
     }
     else if (!pushed && [event clickCount] == 2) //double click
     {
@@ -548 +533 @@
     NSURL * url;
     if ((url = [NSURL URLFromPasteboard: [NSPasteboard generalPasteboard]]))
         [fController openURL: [url absoluteString]];
-    else if ([NSApp isOnLionOrBetter])
+    else
     {
         NSArray * items = [[NSPasteboard generalPasteboard] readObjectsForClasses: [NSArray arrayWithObject: [NSString class]] options: nil];
         if (items)