From fe9d002ef55e30aa3629f4e1951beb18ebb692b0 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 19 Jan 2015 15:10:10 +0100
Subject: Some more loplugin:cstylecast: vcl

Change-Id: I74d35630b9fcdaa97af0b1f1e6d1e5c72488964d
---
 vcl/unx/generic/app/i18n_ic.cxx | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'vcl/unx/generic/app/i18n_ic.cxx')

diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index 379243fbe846..c055ff44c2e2 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -201,12 +201,12 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
                 static XIMCallback aStatusDoneCallback;
                 static XIMCallback aStatusDrawCallback;
 
-                aStatusStartCallback.callback    = (XIMProc)StatusStartCallback;
-                aStatusStartCallback.client_data = (XPointer)&maClientData;
-                aStatusDoneCallback.callback     = (XIMProc)StatusDoneCallback;
-                aStatusDoneCallback.client_data  = (XPointer)&maClientData;
-                aStatusDrawCallback.callback     = (XIMProc)StatusDrawCallback;
-                aStatusDrawCallback.client_data  = (XPointer)&maClientData;
+                aStatusStartCallback.callback    = reinterpret_cast<XIMProc>(StatusStartCallback);
+                aStatusStartCallback.client_data = reinterpret_cast<XPointer>(&maClientData);
+                aStatusDoneCallback.callback     = reinterpret_cast<XIMProc>(StatusDoneCallback);
+                aStatusDoneCallback.client_data  = reinterpret_cast<XPointer>(&maClientData);
+                aStatusDrawCallback.callback     = reinterpret_cast<XIMProc>(StatusDrawCallback);
+                aStatusDrawCallback.client_data  = reinterpret_cast<XPointer>(&maClientData);
 
                 mpStatusAttributes = XVaCreateNestedList (
                                                           0,
@@ -235,14 +235,14 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
         {
             case XIMPreeditCallbacks:
 
-                maPreeditCaretCallback.callback = (XIMProc)PreeditCaretCallback;
-                maPreeditStartCallback.callback = (XIMProc)PreeditStartCallback;
-                maPreeditDoneCallback.callback  = (XIMProc)PreeditDoneCallback;
-                maPreeditDrawCallback.callback  = (XIMProc)PreeditDrawCallback;
-                maPreeditCaretCallback.client_data = (XPointer)&maClientData;
-                maPreeditStartCallback.client_data = (XPointer)&maClientData;
-                maPreeditDoneCallback.client_data  = (XPointer)&maClientData;
-                maPreeditDrawCallback.client_data  = (XPointer)&maClientData;
+                maPreeditCaretCallback.callback = reinterpret_cast<XIMProc>(PreeditCaretCallback);
+                maPreeditStartCallback.callback = reinterpret_cast<XIMProc>(PreeditStartCallback);
+                maPreeditDoneCallback.callback  = reinterpret_cast<XIMProc>(PreeditDoneCallback);
+                maPreeditDrawCallback.callback  = reinterpret_cast<XIMProc>(PreeditDrawCallback);
+                maPreeditCaretCallback.client_data = reinterpret_cast<XPointer>(&maClientData);
+                maPreeditStartCallback.client_data = reinterpret_cast<XPointer>(&maClientData);
+                maPreeditDoneCallback.client_data  = reinterpret_cast<XPointer>(&maClientData);
+                maPreeditDrawCallback.client_data  = reinterpret_cast<XPointer>(&maClientData);
 
                 mpPreeditAttributes = XVaCreateNestedList (
                                                            0,
@@ -357,7 +357,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
     if ( maContext != NULL)
     {
         maDestroyCallback.callback    = (XIMProc)IC_IMDestroyCallback;
-        maDestroyCallback.client_data = (XPointer)this;
+        maDestroyCallback.client_data = reinterpret_cast<XPointer>(this);
         XSetICValues( maContext,
                       XNDestroyCallback,      &maDestroyCallback,
                       NULL );
-- 
cgit