loplugin:cstylecast (MACOSX)

Change-Id: Ia4c8920ce2ce44286c5042d4b5dbeaa41fe355cc

6 files changed, 12 insertions, 7 deletions

diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx
index 9cd9e6fbd5e0..e45f74aad21a 100644
--- a/vcl/inc/osx/a11yfocustracker.hxx
+++ b/vcl/inc/osx/a11yfocustracker.hxx
@@ -74,7 +74,7 @@ protected:
     void toolbox_open_floater(vcl::Window *pWindow);
 
     // callback function for Application::addEventListener
-    static long WindowEventHandler(AquaA11yFocusTracker *pFocusTracker, ::VclSimpleEvent const *pEvent);
+    static sal_IntPtr WindowEventHandler(void * pThis, void * pCaller);
 
 private:
     // the accessible object that has the keyboard focus (if any)
diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx
index 5601d25e1b2f..5cf1602b6bfe 100644
--- a/vcl/osx/DragSource.cxx
+++ b/vcl/osx/DragSource.cxx
@@ -192,7 +192,7 @@ void SAL_CALL DragSource::initialize(const Sequence< Any >& aArguments)
       throw Exception("DragSource::initialize: Provided view is not attached to a vcl frame",
                       static_cast<OWeakObject*>(this));
   }
-  mpFrame = (AquaSalFrame*)[pWin performSelector: @selector(getSalFrame)];
+  mpFrame = static_cast<AquaSalFrame*>([pWin performSelector: @selector(getSalFrame)]);
 
   mDragSourceHelper = [[DragSourceHelper alloc] initWithDragSource: this];
 
diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx
index 877d2a7060e4..47dd65242fc2 100644
--- a/vcl/osx/a11yfocustracker.cxx
+++ b/vcl/osx/a11yfocustracker.cxx
@@ -43,8 +43,12 @@ getWindow(const ::VclSimpleEvent *pEvent)
 
 // callback function for Application::addEventListener
 
-long AquaA11yFocusTracker::WindowEventHandler(AquaA11yFocusTracker *pFocusTracker, ::VclSimpleEvent const *pEvent)
+sal_IntPtr AquaA11yFocusTracker::WindowEventHandler(
+    void * pThis, void * pCaller)
 {
+    AquaA11yFocusTracker *pFocusTracker = static_cast<AquaA11yFocusTracker *>(
+        pThis);
+    VclSimpleEvent const *pEvent = static_cast<VclSimpleEvent const *>(pCaller);
     switch (pEvent->GetId())
     {
     case VCLEVENT_WINDOW_PAINT:
@@ -89,7 +93,7 @@ long AquaA11yFocusTracker::WindowEventHandler(AquaA11yFocusTracker *pFocusTracke
 }
 
 AquaA11yFocusTracker::AquaA11yFocusTracker() :
-    m_aWindowEventLink(this, (PSTUB) WindowEventHandler),
+    m_aWindowEventLink(this, WindowEventHandler),
     m_xDocumentFocusListener(new DocumentFocusListener(*this))
 {
     Application::AddEventListener(m_aWindowEventLink);
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 248c8eb6b4de..04c6e90cfd84 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1726,7 +1726,8 @@ private:
 }
 
 -(id)parentAttribute {
-    return (NSView*) mpFrame->getNSWindow();
+    return reinterpret_cast<NSView*>(mpFrame->getNSWindow());
+        //TODO: odd cast really needed for fdo#74121?
 }
 
 -(::com::sun::star::accessibility::XAccessibleContext *)accessibleContext
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 6d2c6d83c4b0..a69d8847f0d5 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -246,7 +246,7 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) :
     if( ! mbMenuBar )
     {
         mpMenu = [[SalNSMenu alloc] initWithMenu: this];
-        [mpMenu setDelegate: (id<NSMenuDelegate>)mpMenu];
+        [mpMenu setDelegate: static_cast<id<NSMenuDelegate>>(mpMenu)];
     }
     else
     {
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 78064c210d14..1de819593964 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -400,7 +400,7 @@ public:
 
     virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE
     {
-        pData16 = (sal_uInt16*)pLine;
+        pData16 = reinterpret_cast<sal_uInt16*>(pLine);
     }
     virtual void SkipPixel( sal_uInt32 nPixel ) SAL_OVERRIDE
     {