Changeset 14662 for trunk/macosx/FileOutlineController.m

Timestamp:

Jan 6, 2016, 11:05:37 AM (5 years ago)

Author:

mikedld

Message:

#6042: Remove dead code now that we build for OS X 10.7+ (patch by mattrajca)

In addition to the patch,

• remove unused global actions menu (popover is used instead)
• remove *Lion class macros, use NSPopover and NSDataDetector directly

File:

• trunk/macosx/FileOutlineController.m (modified) (3 diffs)

trunk/macosx/FileOutlineController.m

@@ -112 +112 @@
     if ((!text && !fFilterText) || (text && fFilterText && [text isEqualToString: fFilterText]))
         return;
-    
-    const BOOL onLion = [NSApp isOnLionOrBetter];
-    
-    if (onLion)
-        [fOutline beginUpdates];
+
+    [fOutline beginUpdates];
     
     NSUInteger currentIndex = 0, totalCount = 0;
@@ -180 +177 @@
                 }
                 
-                if (move && onLion)
+                if (move)
                     [fOutline moveItemAtIndex: previousIndex inParent: parent toIndex: currentIndex inParent: nil];
                 
@@ -195 +192 @@
         const NSRange removeRange = NSMakeRange(currentIndex, [fFileList count]-currentIndex);
         [fFileList removeObjectsInRange: removeRange];
-        if (onLion)
-            [fOutline removeItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: removeRange] inParent: nil withAnimation: NSTableViewAnimationSlideDown];
+        [fOutline removeItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: removeRange] inParent: nil withAnimation: NSTableViewAnimationSlideDown];
     }
     
     //add new items
     [fFileList insertObjects: itemsToAdd atIndexes: itemsToAddIndexes];
-    if (onLion)
-        [fOutline insertItemsAtIndexes: itemsToAddIndexes inParent: nil withAnimation: NSTableViewAnimationSlideUp];
-    
-    if (onLion)
-        [fOutline endUpdates];
-    else
-        [fOutline reloadData];
+    [fOutline insertItemsAtIndexes: itemsToAddIndexes inParent: nil withAnimation: NSTableViewAnimationSlideUp];
+
+    [fOutline endUpdates];
     
     [fFilterText release];