diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-19 15:17:37 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-29 12:50:34 +0200 |
commit | 26f2da07b1c6074e519d28557a3d1d5518ff6cb4 (patch) | |
tree | 6981a11bc7e6fc897771277a7b60a6e3a88cff29 /vcl/unx | |
parent | d9632a6effabe8554c4e7e05ee24c16acd0f4f95 (diff) |
loplugin: cstylecast
Change-Id: I58ec00d6f8a4cc6188877db1330c5e32c9db12e5
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi2.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atkutil.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 20 |
5 files changed, 17 insertions, 17 deletions
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 307b6d5aae3f..c997bc656da8 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -846,7 +846,7 @@ bool X11SalBitmap::GetSystemData( BitmapSystemData& rData ) // Rename/retype pDummy to your likings (though X11 Pixmap is // prolly not a good idea, since it's accessed from // non-platform aware code in vcl/bitmap.hxx) - rData.aPixmap = (void*)mpDDB->ImplGetPixmap(); + rData.aPixmap = reinterpret_cast<void*>(mpDDB->ImplGetPixmap()); rData.mnWidth = mpDDB->ImplGetWidth (); rData.mnHeight = mpDDB->ImplGetHeight (); return true; diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index 84859dad4b85..8059449c1371 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -227,7 +227,7 @@ extern "C" { Bool bRet = False; if( (pEvent->type == GraphicsExpose || pEvent->type == NoExpose) && - pEvent->xnoexpose.drawable == (Drawable)pFrameWindow ) + pEvent->xnoexpose.drawable == reinterpret_cast<Drawable>(pFrameWindow) ) { bRet = True; } @@ -263,7 +263,7 @@ void X11SalGraphics::YieldGraphicsExpose() do { - if( ! GetDisplay()->XIfEventWithTimeout( &aEvent, (XPointer)aWindow, GraphicsExposePredicate ) ) + if( ! GetDisplay()->XIfEventWithTimeout( &aEvent, reinterpret_cast<XPointer>(aWindow), GraphicsExposePredicate ) ) // this should not happen at all; still sometimes it happens break; diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index b99c2aa9a899..0c072ce36913 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2405,10 +2405,10 @@ void X11SalFrame::HandleExtTextEvent (XClientMessageEvent *pEvent) { #if SAL_TYPES_SIZEOFLONG > 4 - void* pExtTextEvent = (void*)( (pEvent->data.l[0] & 0xffffffff) - | (pEvent->data.l[1] << 32) ); + void* pExtTextEvent = reinterpret_cast<void*>( (pEvent->data.l[0] & 0xffffffff) + | (pEvent->data.l[1] << 32) ); #else - void* pExtTextEvent = (void*)(pEvent->data.l[0]); + void* pExtTextEvent = reinterpret_cast<void*>(pEvent->data.l[0]); #endif sal_uInt16 nExtTextEventType = sal_uInt16(pEvent->data.l[2]); diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index b2eae95ea044..fb0d25897111 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -483,7 +483,7 @@ static void create_wrapper_for_child( static void handle_toolbox_buttonchange(VclWindowEvent const *pEvent) { vcl::Window* pWindow = pEvent->GetWindow(); - sal_Int32 index = (sal_Int32)(sal_IntPtr) pEvent->GetData(); + sal_Int32 index = (sal_Int32)reinterpret_cast<sal_IntPtr>(pEvent->GetData()); if( pWindow && pWindow->IsReallyVisible() ) { diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 38e02484cb68..ffacb587dc90 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -2721,7 +2721,7 @@ bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, // Now the tab itself if( nState & CTRL_STATE_ROLLOVER ) - g_object_set_data(G_OBJECT(pixmap),tabPrelitDataName,(gpointer)TRUE); + g_object_set_data(G_OBJECT(pixmap),tabPrelitDataName,reinterpret_cast<gpointer>(TRUE)); gtk_paint_extension( gWidgetData[m_nXScreen].gNotebookWidget->style, pixmap, stateType, GTK_SHADOW_OUT, NULL, gWidgetData[m_nXScreen].gNotebookWidget, (char *)"tab", (tabRect.Left() - pixmapRect.Left()), (tabRect.Top() - pixmapRect.Top()), @@ -4166,7 +4166,7 @@ static void NWSetWidgetState( GtkWidget* widget, ControlState nState, GtkStateTy GTK_WIDGET_UNSET_FLAGS( widget, GTK_HAS_DEFAULT ); GTK_WIDGET_UNSET_FLAGS( widget, GTK_HAS_FOCUS ); GTK_WIDGET_UNSET_FLAGS( widget, GTK_SENSITIVE ); - GTK_WIDGET_SET_FLAGS( widget, gWidgetDefaultFlags[(long)widget] ); + GTK_WIDGET_SET_FLAGS( widget, gWidgetDefaultFlags[reinterpret_cast<long>(widget)] ); if ( nState & CTRL_STATE_DEFAULT ) GTK_WIDGET_SET_FLAGS( widget, GTK_HAS_DEFAULT ); @@ -4209,7 +4209,7 @@ static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen ) gtk_widget_ensure_style( widget ); // Store widget's default flags - gWidgetDefaultFlags[ (long)widget ] = GTK_WIDGET_FLAGS( widget ); + gWidgetDefaultFlags[ reinterpret_cast<long>(widget) ] = GTK_WIDGET_FLAGS( widget ); } static void NWEnsureGTKButton( SalX11Screen nScreen ) @@ -4385,7 +4385,7 @@ static void NWEnsureGTKMenubar( SalX11Screen nScreen ) gtk_widget_realize( gWidgetData[nScreen].gMenuItemMenubarWidget ); gtk_widget_ensure_style( gWidgetData[nScreen].gMenuItemMenubarWidget ); - gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuItemMenubarWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemMenubarWidget ); + gWidgetDefaultFlags[ reinterpret_cast<long>(gWidgetData[nScreen].gMenuItemMenubarWidget) ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemMenubarWidget ); } } @@ -4425,12 +4425,12 @@ static void NWEnsureGTKMenu( SalX11Screen nScreen ) gtk_widget_realize( gWidgetData[nScreen].gImageMenuItem ); gtk_widget_ensure_style( gWidgetData[nScreen].gImageMenuItem ); - gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuWidget ); - gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuItemMenuWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemMenuWidget ); - gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuItemCheckMenuWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemCheckMenuWidget ); - gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuItemRadioMenuWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemRadioMenuWidget ); - gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuItemSeparatorMenuWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemSeparatorMenuWidget ); - gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gImageMenuItem ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gImageMenuItem ); + gWidgetDefaultFlags[ reinterpret_cast<long>(gWidgetData[nScreen].gMenuWidget) ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuWidget ); + gWidgetDefaultFlags[ reinterpret_cast<long>(gWidgetData[nScreen].gMenuItemMenuWidget) ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemMenuWidget ); + gWidgetDefaultFlags[ reinterpret_cast<long>(gWidgetData[nScreen].gMenuItemCheckMenuWidget) ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemCheckMenuWidget ); + gWidgetDefaultFlags[ reinterpret_cast<long>(gWidgetData[nScreen].gMenuItemRadioMenuWidget) ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemRadioMenuWidget ); + gWidgetDefaultFlags[ reinterpret_cast<long>(gWidgetData[nScreen].gMenuItemSeparatorMenuWidget) ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemSeparatorMenuWidget ); + gWidgetDefaultFlags[ reinterpret_cast<long>(gWidgetData[nScreen].gImageMenuItem) ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gImageMenuItem ); } } |