From 792f41af988cd88a530401fc48c69621387d65fc Mon Sep 17 00:00:00 2001 From: Neil Hodgson Date: Tue, 1 May 2018 15:35:09 +1000 Subject: Backport: Remove dead function and unnecessary casts. Convert C casts to C++ casts. Use nullptr where unambiguous and is C++ as distinct from Objective C. Backport of changeset 6777:cc47e21d83ea. --- cocoa/ScintillaCocoa.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cocoa/ScintillaCocoa.mm') diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 39f0a9726..74113a364 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -2477,9 +2477,9 @@ void ScintillaCocoa::MouseWheel(NSEvent* event) // In order to make scrolling with larger offset smoother we scroll less lines the larger the // delta value is. if ([event deltaY] < 0) - dY = -(int) sqrt(-10.0 * [event deltaY]); + dY = -static_cast(sqrt(-10.0 * [event deltaY])); else - dY = (int) sqrt(10.0 * [event deltaY]); + dY = static_cast(sqrt(10.0 * [event deltaY])); if (command) { -- cgit v1.2.3