From 619a2cfec7997e60e234b4ea927ee69641a16ece Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Fri, 28 Mar 2014 11:07:01 +0700 Subject: [PATCH] =?UTF-8?q?Change=20a=20few=20instances=20of=20floorf/fabs?= =?UTF-8?q?f=20=E2=86=92=20floor/fabs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frameworks/HTMLOutput/src/browser/HOBrowserView.mm | 2 +- Frameworks/OakAppKit/src/OakPasteboardChooser.mm | 2 +- Frameworks/OakAppKit/src/OakPasteboardSelector.mm | 2 +- Frameworks/OakAppKit/tests/gui_dictionary.mm | 2 +- Frameworks/OakFileBrowser/src/OakFileBrowser.mm | 2 +- Frameworks/OakFilterList/src/OakFilterList.mm | 2 +- Frameworks/OakFilterList/src/ui/TableView.mm | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Frameworks/HTMLOutput/src/browser/HOBrowserView.mm b/Frameworks/HTMLOutput/src/browser/HOBrowserView.mm index 6f328f33..20a665f0 100644 --- a/Frameworks/HTMLOutput/src/browser/HOBrowserView.mm +++ b/Frameworks/HTMLOutput/src/browser/HOBrowserView.mm @@ -102,7 +102,7 @@ - (void)scrollWheel:(NSEvent*)anEvent { - if(![NSEvent isSwipeTrackingFromScrollEventsEnabled] || [anEvent phase] == NSEventPhaseNone || fabsf([anEvent scrollingDeltaX]) <= fabsf([anEvent scrollingDeltaY])) + if(![NSEvent isSwipeTrackingFromScrollEventsEnabled] || [anEvent phase] == NSEventPhaseNone || fabs([anEvent scrollingDeltaX]) <= fabs([anEvent scrollingDeltaY])) return; [anEvent trackSwipeEventWithOptions:0 dampenAmountThresholdMin:(_webView.canGoForward ? -1 : 0) max:(_webView.canGoBack ? +1 : 0) usingHandler:^(CGFloat gestureAmount, NSEventPhase phase, BOOL isComplete, BOOL* stop) { diff --git a/Frameworks/OakAppKit/src/OakPasteboardChooser.mm b/Frameworks/OakAppKit/src/OakPasteboardChooser.mm index 650263af..fcd3b0ca 100644 --- a/Frameworks/OakAppKit/src/OakPasteboardChooser.mm +++ b/Frameworks/OakAppKit/src/OakPasteboardChooser.mm @@ -376,7 +376,7 @@ static void* kOakPasteboardChooserCurrentEntryBinding = &kOakPasteboardChooserCu } } -- (int)visibleRows { return (int)floorf(NSHeight([_tableView visibleRect]) / ([_tableView rowHeight]+[_tableView intercellSpacing].height)) - 1; } +- (int)visibleRows { return (int)floor(NSHeight([_tableView visibleRect]) / ([_tableView rowHeight]+[_tableView intercellSpacing].height)) - 1; } - (void)moveUp:(id)sender { [self moveSelectedRowByOffset:-1 extendingSelection:NO]; } - (void)moveDown:(id)sender { [self moveSelectedRowByOffset:+1 extendingSelection:NO]; } diff --git a/Frameworks/OakAppKit/src/OakPasteboardSelector.mm b/Frameworks/OakAppKit/src/OakPasteboardSelector.mm index 31b813b3..1ee34ea3 100644 --- a/Frameworks/OakAppKit/src/OakPasteboardSelector.mm +++ b/Frameworks/OakAppKit/src/OakPasteboardSelector.mm @@ -254,7 +254,7 @@ static size_t line_count (std::string const& text) } } -- (int)visibleRows { return (int)floorf(NSHeight([tableView visibleRect]) / ([tableView rowHeight]+[tableView intercellSpacing].height)) - 1; } +- (int)visibleRows { return (int)floor(NSHeight([tableView visibleRect]) / ([tableView rowHeight]+[tableView intercellSpacing].height)) - 1; } - (void)moveUp:(id)sender { [self moveSelectedRowByOffset:-1]; } - (void)moveDown:(id)sender { [self moveSelectedRowByOffset:+1];} diff --git a/Frameworks/OakAppKit/tests/gui_dictionary.mm b/Frameworks/OakAppKit/tests/gui_dictionary.mm index edd4f873..ccca0ab1 100644 --- a/Frameworks/OakAppKit/tests/gui_dictionary.mm +++ b/Frameworks/OakAppKit/tests/gui_dictionary.mm @@ -122,7 +122,7 @@ - (NSUInteger)characterIndexForPoint:(NSPoint)thePoint { - NSUInteger index = floorf([self convertPoint:[[self window] convertScreenToBase:thePoint] fromView:nil].x / 7.0f); + NSUInteger index = floor([self convertPoint:[[self window] convertScreenToBase:thePoint] fromView:nil].x / 7.0f); NSLog(@"%s %@ (%lu)", sel_getName(_cmd), NSStringFromPoint(thePoint), index); return index; } diff --git a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm index 85402323..7c80c23b 100644 --- a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm +++ b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm @@ -1193,7 +1193,7 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot - (void)scrollWheel:(NSEvent*)anEvent { - if(![NSEvent isSwipeTrackingFromScrollEventsEnabled] || [anEvent phase] == NSEventPhaseNone || fabsf([anEvent scrollingDeltaX]) <= fabsf([anEvent scrollingDeltaY])) + if(![NSEvent isSwipeTrackingFromScrollEventsEnabled] || [anEvent phase] == NSEventPhaseNone || fabs([anEvent scrollingDeltaX]) <= fabs([anEvent scrollingDeltaY])) return; [anEvent trackSwipeEventWithOptions:0 dampenAmountThresholdMin:(self.canGoForward ? -1 : 0) max:(self.canGoBack ? +1 : 0) usingHandler:^(CGFloat gestureAmount, NSEventPhase phase, BOOL isComplete, BOOL* stop) { diff --git a/Frameworks/OakFilterList/src/OakFilterList.mm b/Frameworks/OakFilterList/src/OakFilterList.mm index f6b20156..fff708ac 100644 --- a/Frameworks/OakFilterList/src/OakFilterList.mm +++ b/Frameworks/OakFilterList/src/OakFilterList.mm @@ -169,7 +169,7 @@ } } -- (int)visibleRows { return (int)floorf(NSHeight([filterView visibleRect]) / ([filterView rowHeight]+[filterView intercellSpacing].height)) - 1; } +- (int)visibleRows { return (int)floor(NSHeight([filterView visibleRect]) / ([filterView rowHeight]+[filterView intercellSpacing].height)) - 1; } - (void)moveUp:(id)sender { [self moveSelectedRowByOffset:-1 extendingSelection:NO]; } - (void)moveDown:(id)sender { [self moveSelectedRowByOffset:+1 extendingSelection:NO]; } diff --git a/Frameworks/OakFilterList/src/ui/TableView.mm b/Frameworks/OakFilterList/src/ui/TableView.mm index f159544f..4e05ab41 100644 --- a/Frameworks/OakFilterList/src/ui/TableView.mm +++ b/Frameworks/OakFilterList/src/ui/TableView.mm @@ -43,7 +43,7 @@ APPKIT_EXTERN NSString *const NSAccessibilityAnnouncementKey NS_AVAIL } } -- (int)visibleRows { return (int)floorf(NSHeight([_tableView visibleRect]) / ([_tableView rowHeight]+[_tableView intercellSpacing].height)) - 1; } +- (int)visibleRows { return (int)floor(NSHeight([_tableView visibleRect]) / ([_tableView rowHeight]+[_tableView intercellSpacing].height)) - 1; } - (void)moveUp:(id)sender { [self moveSelectedRowByOffset:-1 extendingSelection:NO sender:sender]; } - (void)moveDown:(id)sender { [self moveSelectedRowByOffset:+1 extendingSelection:NO sender:sender]; }