diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2018-05-01 15:35:09 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2018-05-01 15:35:09 +1000 |
| commit | 792f41af988cd88a530401fc48c69621387d65fc (patch) | |
| tree | 6ae0efd60046434085d068ba2e5a536c565d8313 /cocoa/ScintillaCocoa.mm | |
| parent | f57bf0fdab5a7fc041293c799c473132df4f73d0 (diff) | |
| download | scintilla-mirror-792f41af988cd88a530401fc48c69621387d65fc.tar.gz | |
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.
Diffstat (limited to 'cocoa/ScintillaCocoa.mm')
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 4 |
1 files changed, 2 insertions, 2 deletions
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<int>(sqrt(-10.0 * [event deltaY])); else - dY = (int) sqrt(10.0 * [event deltaY]); + dY = static_cast<int>(sqrt(10.0 * [event deltaY])); if (command) { |