From a0c8f7e4f982de803838d2a284c94d5f20b95b5d Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 24 Jan 2017 08:45:06 +1100 Subject: Remove casts from id to Objective C object as they are not needed. Use safer static_cast instead of reinterpret_cast between void* and id or Objective C object. --- cocoa/ScintillaCocoa.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cocoa/ScintillaCocoa.mm') diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index c283e4e98..4470d73f7 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -841,7 +841,7 @@ sptr_t ScintillaCocoa::DirectFunction(sptr_t ptr, unsigned int iMessage, uptr_t */ sptr_t scintilla_send_message(void* sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) { - ScintillaView *control = reinterpret_cast(sci); + ScintillaView *control = static_cast(sci); return [control message:iMessage wParam:wParam lParam:lParam]; } @@ -1022,7 +1022,7 @@ bool ScintillaCocoa::SetIdle(bool on) else if (idler.idlerID != NULL) { - [reinterpret_cast(idler.idlerID) invalidate]; + [static_cast(idler.idlerID) invalidate]; idler.idlerID = 0; } } @@ -1198,7 +1198,7 @@ void ScintillaCocoa::CreateCallTipWindow(PRectangle rc) { void ScintillaCocoa::AddToPopUp(const char *label, int cmd, bool enabled) { NSMenuItem* item; - ScintillaContextMenu *menu= reinterpret_cast(popup.GetID()); + ScintillaContextMenu *menu = static_cast(popup.GetID()); [menu setOwner: this]; [menu setAutoenablesItems: NO]; @@ -2562,7 +2562,7 @@ NSMenu* ScintillaCocoa::CreateContextMenu(NSEvent* /* event */) // Call ScintillaBase to create the context menu. ContextMenu(Point(0, 0)); - return reinterpret_cast(popup.GetID()); + return static_cast(popup.GetID()); } //-------------------------------------------------------------------------------------------------- -- cgit v1.2.3