diff options
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/PlatCocoa.mm | 2 | ||||
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index 39b76f839..678608e11 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -708,7 +708,7 @@ void Scintilla::SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize, Colou } static void ProviderReleaseData(void *, const void *data, size_t) { - const unsigned char *pixels = reinterpret_cast<const unsigned char *>(data); + const unsigned char *pixels = static_cast<const unsigned char *>(data); delete []pixels; } diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 4470d73f7..7d11f9ca4 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -357,7 +357,7 @@ const CGFloat paddingHighlightY = 2; */ - (void) timerFired: (NSTimer*) timer { - reinterpret_cast<ScintillaCocoa*>(mTarget)->TimerFired(timer); + static_cast<ScintillaCocoa*>(mTarget)->TimerFired(timer); } //-------------------------------------------------------------------------------------------------- @@ -388,7 +388,7 @@ const CGFloat paddingHighlightY = 2; - (void) idleTriggered: (NSNotification*) notification { #pragma unused(notification) - reinterpret_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired(); + static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired(); } @end @@ -471,7 +471,7 @@ void ScintillaCocoa::Finalise() //-------------------------------------------------------------------------------------------------- void ScintillaCocoa::UpdateObserver(CFRunLoopObserverRef /* observer */, CFRunLoopActivity /* activity */, void *info) { - ScintillaCocoa* sci = reinterpret_cast<ScintillaCocoa*>(info); + ScintillaCocoa* sci = static_cast<ScintillaCocoa*>(info); sci->IdleWork(); } @@ -1017,7 +1017,7 @@ bool ScintillaCocoa::SetIdle(bool on) userInfo: nil repeats: YES]; [NSRunLoop.currentRunLoop addTimer: idleTimer forMode: NSModalPanelRunLoopMode]; - idler.idlerID = reinterpret_cast<IdlerID>(idleTimer); + idler.idlerID = idleTimer; } else if (idler.idlerID != NULL) |