diff options
24 files changed, 39 insertions, 39 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 93a79b1649ac..e7c73023452c 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -192,7 +192,7 @@ void FtFontFile::Unmap() // wrap FtFontInfo's table function const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, size_t *len) { - const FtFontInfo * pFontInfo = reinterpret_cast<const FtFontInfo*>(appFaceHandle); + const FtFontInfo * pFontInfo = static_cast<const FtFontInfo*>(appFaceHandle); typedef union { char m_c[5]; unsigned int m_id; @@ -1473,7 +1473,7 @@ extern "C" { // then uncomment the const-tokens in the function interfaces below static int FT_move_to( FT_Vector_CPtr p0, void* vpPolyArgs ) { - PolyArgs& rA = *reinterpret_cast<PolyArgs*>(vpPolyArgs); + PolyArgs& rA = *static_cast<PolyArgs*>(vpPolyArgs); // move_to implies a new polygon => finish old polygon first rA.ClosePolygon(); @@ -1484,14 +1484,14 @@ static int FT_move_to( FT_Vector_CPtr p0, void* vpPolyArgs ) static int FT_line_to( FT_Vector_CPtr p1, void* vpPolyArgs ) { - PolyArgs& rA = *reinterpret_cast<PolyArgs*>(vpPolyArgs); + PolyArgs& rA = *static_cast<PolyArgs*>(vpPolyArgs); rA.AddPoint( p1->x, p1->y, POLY_NORMAL ); return 0; } static int FT_conic_to( FT_Vector_CPtr p1, FT_Vector_CPtr p2, void* vpPolyArgs ) { - PolyArgs& rA = *reinterpret_cast<PolyArgs*>(vpPolyArgs); + PolyArgs& rA = *static_cast<PolyArgs*>(vpPolyArgs); // VCL's Polygon only knows cubic beziers const long nX1 = (2 * rA.GetPosX() + 4 * p1->x + 3) / 6; @@ -1508,7 +1508,7 @@ static int FT_conic_to( FT_Vector_CPtr p1, FT_Vector_CPtr p2, void* vpPolyArgs ) static int FT_cubic_to( FT_Vector_CPtr p1, FT_Vector_CPtr p2, FT_Vector_CPtr p3, void* vpPolyArgs ) { - PolyArgs& rA = *reinterpret_cast<PolyArgs*>(vpPolyArgs); + PolyArgs& rA = *static_cast<PolyArgs*>(vpPolyArgs); rA.AddPoint( p1->x, p1->y, POLY_CONTROL ); rA.AddPoint( p2->x, p2->y, POLY_CONTROL ); rA.AddPoint( p3->x, p3->y, POLY_NORMAL ); diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx index 3549c01c8bab..84cdcf8ce044 100644 --- a/vcl/generic/glyphs/graphite_serverfont.cxx +++ b/vcl/generic/glyphs/graphite_serverfont.cxx @@ -32,7 +32,7 @@ float freetypeServerFontAdvance(const void* appFontHandle, gr_uint16 glyphId) { ServerFont * pServerFont = const_cast<ServerFont*> - (reinterpret_cast<const ServerFont*>(appFontHandle)); + (static_cast<const ServerFont*>(appFontHandle)); if (pServerFont) { return static_cast<float>(pServerFont->GetGlyphMetric(glyphId).GetCharWidth()); diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index e2adb731b48e..403232c0c91f 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -43,7 +43,7 @@ extern "C" { if( pXUnoSMgr ) { Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( - reinterpret_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pXUnoSMgr ) + static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pXUnoSMgr ) ); Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory; if( vcl_session_getImplementationName().equalsAscii( pImplementationName ) ) diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 37c78ae08e85..1e6c2e5fcd22 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -595,7 +595,7 @@ bool Button::set_property(const OString &rKey, const OString &rValue) sal_IntPtr Button::dispatchCommandHandler(void *, void *pCaller) { - const Button *pButton = reinterpret_cast<Button*>(pCaller); + const Button *pButton = static_cast<Button*>(pCaller); if (pButton == NULL) return 0; diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index ab451c3f81bc..7782bd473134 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -801,7 +801,7 @@ bool BitmapEx::Create( const ::com::sun::star::uno::Reference< { // 0 means get BitmapEx uno::Any aAny = xFastPropertySet->getFastPropertyValue( 0 ); - std::unique_ptr<BitmapEx> xBitmapEx(reinterpret_cast<BitmapEx*>( *reinterpret_cast<const sal_Int64*>(aAny.getValue()))); + std::unique_ptr<BitmapEx> xBitmapEx(reinterpret_cast<BitmapEx*>( *static_cast<const sal_Int64*>(aAny.getValue()))); if( xBitmapEx ) { *this = *xBitmapEx; diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index fb7d1368672d..8e3be59283a7 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -944,7 +944,7 @@ Font Font::identifyFont( const void* i_pBuffer, sal_uInt32 i_nSize ) Font aResult; if( ! identifyTrueTypeFont( i_pBuffer, i_nSize, aResult ) ) { - const char* pStream = reinterpret_cast<const char*>(i_pBuffer); + const char* pStream = static_cast<const char*>(i_pBuffer); if( pStream && i_nSize > 100 && *pStream == '%' && pStream[1] == '!' ) { diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index f62fa731ecb2..a85e7515e513 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -6390,7 +6390,7 @@ const SEC_ASN1Template Accuracy_Template[] = size_t AppendToBuffer(char *ptr, size_t size, size_t nmemb, void *userdata) { - OStringBuffer *pBuffer = reinterpret_cast<OStringBuffer*>(userdata); + OStringBuffer *pBuffer = static_cast<OStringBuffer*>(userdata); pBuffer->append(ptr, size*nmemb); return size*nmemb; diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index 0ef5034076b6..24740920f2ff 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -1277,7 +1277,7 @@ sal_uInt32 RegionBand::getRectangleCount() const #ifdef DBG_UTIL const char* ImplDbgTestRegionBand(const void* pObj) { - const RegionBand* pRegionBand = reinterpret_cast< const RegionBand* >(pObj); + const RegionBand* pRegionBand = static_cast< const RegionBand* >(pObj); if(pRegionBand) { diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index ec1b255eb454..18457163e660 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -1157,7 +1157,7 @@ bool OpenGLContext::initWindow() m_pChildWindow->SetControlForeground(); m_pChildWindow->SetControlBackground(); - m_aGLWin.dpy = reinterpret_cast<Display*>(pChildSysData->pDisplay); + m_aGLWin.dpy = static_cast<Display*>(pChildSysData->pDisplay); m_aGLWin.win = pChildSysData->aWindow; m_aGLWin.screen = pChildSysData->nScreen; @@ -1292,7 +1292,7 @@ SystemWindowData OpenGLContext::generateWinData(vcl::Window* pParent, bool) #if !defined(LIBO_HEADLESS) const SystemEnvData* sysData(pParent->GetSystemData()); - Display *dpy = reinterpret_cast<Display*>(sysData->pDisplay); + Display *dpy = static_cast<Display*>(sysData->pDisplay); Window win = sysData->aWindow; if( dpy == 0 || !glXQueryExtension( dpy, NULL, NULL ) ) diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 50bdd7e0ba08..f82e274d3c12 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -158,7 +158,7 @@ void SystemChildWindow::EnableEraseBackground( bool bEnable ) void SystemChildWindow::ImplTestJavaException( void* pEnv ) { #if HAVE_FEATURE_JAVA - JNIEnv* pJavaEnv = reinterpret_cast< JNIEnv* >( pEnv ); + JNIEnv* pJavaEnv = static_cast< JNIEnv* >( pEnv ); jthrowable jtThrowable = pJavaEnv->ExceptionOccurred(); if( jtThrowable ) diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 6d9d74871686..05e60966f340 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -258,7 +258,7 @@ void CairoTextRender::DrawServerFontLayout( const ServerFontLayout& rLayout ) const ImplFontOptions *pOptions = rFont.GetFontOptions().get(); void *pPattern = pOptions ? pOptions->GetPattern(aFace, aId.mbEmbolden, aId.mbVerticalMetrics) : NULL; if (pPattern) - font_face = cairo_ft_font_face_create_for_pattern(reinterpret_cast<FcPattern*>(pPattern)); + font_face = cairo_ft_font_face_create_for_pattern(static_cast<FcPattern*>(pPattern)); if (!font_face) font_face = cairo_ft_font_face_create_for_ft_face(reinterpret_cast<FT_Face>(aFace), rFont.GetLoadFlags()); CairoFontsCache::CacheFont(font_face, aId); diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx index 01f2365c365c..545630cbc18b 100644 --- a/vcl/unx/gtk/a11y/atkaction.cxx +++ b/vcl/unx/gtk/a11y/atkaction.cxx @@ -55,7 +55,7 @@ static accessibility::XAccessibleAction* if( !pWrap->mpAction && pWrap->mpContext ) { uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleAction>::get() ); - pWrap->mpAction = reinterpret_cast< accessibility::XAccessibleAction * > (any.pReserved); + pWrap->mpAction = static_cast< accessibility::XAccessibleAction * > (any.pReserved); pWrap->mpAction->acquire(); } diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx b/vcl/unx/gtk/a11y/atkcomponent.cxx index 222f4b609e65..f40cfe004733 100644 --- a/vcl/unx/gtk/a11y/atkcomponent.cxx +++ b/vcl/unx/gtk/a11y/atkcomponent.cxx @@ -36,7 +36,7 @@ static accessibility::XAccessibleComponent* if( !pWrap->mpComponent && pWrap->mpContext ) { uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleComponent>::get() ); - pWrap->mpComponent = reinterpret_cast< accessibility::XAccessibleComponent * > (any.pReserved); + pWrap->mpComponent = static_cast< accessibility::XAccessibleComponent * > (any.pReserved); pWrap->mpComponent->acquire(); } diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx index 2918da6496e6..8155c455367a 100644 --- a/vcl/unx/gtk/a11y/atkeditabletext.cxx +++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx @@ -37,7 +37,7 @@ static accessibility::XAccessibleEditableText* if( !pWrap->mpEditableText && pWrap->mpContext ) { uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleEditableText>::get() ); - pWrap->mpEditableText = reinterpret_cast< accessibility::XAccessibleEditableText * > (any.pReserved); + pWrap->mpEditableText = static_cast< accessibility::XAccessibleEditableText * > (any.pReserved); pWrap->mpEditableText->acquire(); } diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index 6b6b4199d8ae..909ee30a8063 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -200,7 +200,7 @@ static accessibility::XAccessibleHypertext* if( !pWrap->mpHypertext && pWrap->mpContext ) { uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleHypertext>::get() ); - pWrap->mpHypertext = reinterpret_cast< accessibility::XAccessibleHypertext * > (any.pReserved); + pWrap->mpHypertext = static_cast< accessibility::XAccessibleHypertext * > (any.pReserved); pWrap->mpHypertext->acquire(); } diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx index 347103254564..d8d220d1f7ab 100644 --- a/vcl/unx/gtk/a11y/atkimage.cxx +++ b/vcl/unx/gtk/a11y/atkimage.cxx @@ -46,7 +46,7 @@ static accessibility::XAccessibleImage* if( !pWrap->mpImage && pWrap->mpContext ) { uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleImage>::get() ); - pWrap->mpImage = reinterpret_cast< accessibility::XAccessibleImage * > (any.pReserved); + pWrap->mpImage = static_cast< accessibility::XAccessibleImage * > (any.pReserved); pWrap->mpImage->acquire(); } diff --git a/vcl/unx/gtk/a11y/atkselection.cxx b/vcl/unx/gtk/a11y/atkselection.cxx index 016cb03447ec..7e7f3fddebec 100644 --- a/vcl/unx/gtk/a11y/atkselection.cxx +++ b/vcl/unx/gtk/a11y/atkselection.cxx @@ -34,7 +34,7 @@ static accessibility::XAccessibleSelection* if( !pWrap->mpSelection && pWrap->mpContext ) { uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleSelection>::get() ); - pWrap->mpSelection = reinterpret_cast< accessibility::XAccessibleSelection * > (any.pReserved); + pWrap->mpSelection = static_cast< accessibility::XAccessibleSelection * > (any.pReserved); pWrap->mpSelection->acquire(); } diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx index 12b598bf9fa3..3715263892a5 100644 --- a/vcl/unx/gtk/a11y/atktable.cxx +++ b/vcl/unx/gtk/a11y/atktable.cxx @@ -65,7 +65,7 @@ static accessibility::XAccessibleTable* if( !pWrap->mpTable && pWrap->mpContext ) { uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleTable>::get() ); - pWrap->mpTable = reinterpret_cast< accessibility::XAccessibleTable * > (any.pReserved); + pWrap->mpTable = static_cast< accessibility::XAccessibleTable * > (any.pReserved); pWrap->mpTable->acquire(); } diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx index 35187ba820c5..2a919ee8a5f1 100644 --- a/vcl/unx/gtk/a11y/atktext.cxx +++ b/vcl/unx/gtk/a11y/atktext.cxx @@ -154,7 +154,7 @@ static accessibility::XAccessibleText* if( !pWrap->mpText && pWrap->mpContext ) { uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleText>::get() ); - pWrap->mpText = reinterpret_cast< accessibility::XAccessibleText * > (any.pReserved); + pWrap->mpText = static_cast< accessibility::XAccessibleText * > (any.pReserved); pWrap->mpText->acquire(); } @@ -181,7 +181,7 @@ static accessibility::XAccessibleTextMarkup* */ if( typelib_TypeClass_INTERFACE == any.pType->eTypeClass ) { - pWrap->mpTextMarkup = reinterpret_cast< accessibility::XAccessibleTextMarkup * > (any.pReserved); + pWrap->mpTextMarkup = static_cast< accessibility::XAccessibleTextMarkup * > (any.pReserved); if( pWrap->mpTextMarkup ) pWrap->mpTextMarkup->acquire(); } @@ -210,7 +210,7 @@ static accessibility::XAccessibleTextAttributes* */ if( typelib_TypeClass_INTERFACE == any.pType->eTypeClass ) { - pWrap->mpTextAttributes = reinterpret_cast< accessibility::XAccessibleTextAttributes * > (any.pReserved); + pWrap->mpTextAttributes = static_cast< accessibility::XAccessibleTextAttributes * > (any.pReserved); pWrap->mpTextAttributes->acquire(); } } @@ -238,7 +238,7 @@ static accessibility::XAccessibleMultiLineText* */ if( typelib_TypeClass_INTERFACE == any.pType->eTypeClass ) { - pWrap->mpMultiLineText = reinterpret_cast< accessibility::XAccessibleMultiLineText * > (any.pReserved); + pWrap->mpMultiLineText = static_cast< accessibility::XAccessibleMultiLineText * > (any.pReserved); pWrap->mpMultiLineText->acquire(); } } @@ -270,7 +270,7 @@ text_wrapper_get_text (AtkText *text, if( pData != NULL ) { accessibility::TextSegment * pTextSegment = - reinterpret_cast <accessibility::TextSegment *> (pData); + static_cast <accessibility::TextSegment *> (pData); if( pTextSegment->SegmentStart == start_offset && pTextSegment->SegmentEnd == end_offset ) diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index afa89e0fcf5d..283ff59db9e8 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -216,7 +216,7 @@ static accessibility::XAccessibleComponent* if( !pWrap->mpComponent && pWrap->mpContext ) { uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleComponent>::get() ); - pWrap->mpComponent = reinterpret_cast< accessibility::XAccessibleComponent * > (any.pReserved); + pWrap->mpComponent = static_cast< accessibility::XAccessibleComponent * > (any.pReserved); pWrap->mpComponent->acquire(); } diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index c108bb4272f9..5ffa45a4c03c 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -76,7 +76,7 @@ atk_wrapper_focus_idle_handler (gpointer data) focus_notify_handler = 0; uno::Reference< accessibility::XAccessible > xAccessible = theNextFocusObject::get(); - if( xAccessible.get() == reinterpret_cast < accessibility::XAccessible * > (data) ) + if( xAccessible.get() == static_cast < accessibility::XAccessible * > (data) ) { AtkObject *atk_obj = xAccessible.is() ? atk_object_wrapper_ref( xAccessible ) : NULL; // Gail does not notify focus changes to NULL, so do we .. @@ -100,7 +100,7 @@ atk_wrapper_focus_idle_handler (gpointer data) if ( typelib_TypeClass_INTERFACE == any.pType->eTypeClass && any.pReserved != 0 ) { - wrapper_obj->mpText = reinterpret_cast< accessibility::XAccessibleText * > (any.pReserved); + wrapper_obj->mpText = static_cast< accessibility::XAccessibleText * > (any.pReserved); if ( wrapper_obj->mpText != 0 ) { wrapper_obj->mpText->acquire(); @@ -599,7 +599,7 @@ static void handle_menu_highlighted(::VclMenuEvent const * pEvent) sal_IntPtr WindowEventHandler(void *, void * p) { - VclSimpleEvent * pEvent = reinterpret_cast<VclSimpleEvent *>(p); + VclSimpleEvent * pEvent = static_cast<VclSimpleEvent *>(p); try { switch (pEvent->GetId()) diff --git a/vcl/unx/gtk/a11y/atkvalue.cxx b/vcl/unx/gtk/a11y/atkvalue.cxx index 7e1256e334c3..50874b7798d9 100644 --- a/vcl/unx/gtk/a11y/atkvalue.cxx +++ b/vcl/unx/gtk/a11y/atkvalue.cxx @@ -35,7 +35,7 @@ static accessibility::XAccessibleValue* if( !pWrap->mpValue && pWrap->mpContext ) { uno::Any any = pWrap->mpContext->queryInterface( cppu::UnoType<accessibility::XAccessibleValue>::get() ); - pWrap->mpValue = reinterpret_cast< accessibility::XAccessibleValue * > (any.pReserved); + pWrap->mpValue = static_cast< accessibility::XAccessibleValue * > (any.pReserved); pWrap->mpValue->acquire(); } diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 4392f5d3924d..796db52baf0e 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -744,7 +744,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno // Convert to OOo for( GSList *pElem = pPathList; pElem; pElem = pElem->next) { - gchar *pURI = reinterpret_cast<gchar*>(pElem->data); + gchar *pURI = static_cast<gchar*>(pElem->data); aSelectedFiles[ nIndex ] = uritounicode(pURI); if( GTK_FILE_CHOOSER_ACTION_SAVE == eAction ) @@ -1743,7 +1743,7 @@ void SalGtkFilePicker::SetCurFilter( const OUString& rFilter ) for( GSList *iter = filters; !bFound && iter; iter = iter->next ) { - GtkFileFilter* pFilter = reinterpret_cast<GtkFileFilter *>( iter->data ); + GtkFileFilter* pFilter = static_cast<GtkFileFilter *>( iter->data ); G_CONST_RETURN gchar * filtername = gtk_file_filter_get_name( pFilter ); OUString sFilterName( filtername, strlen( filtername ), RTL_TEXTENCODING_UTF8 ); diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 9ca17bdb9deb..acf170f2da09 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -580,7 +580,7 @@ static void hud_activated( gboolean hud_active, gpointer user_data ) if ( hud_active ) { SolarMutexGuard aGuard; - GtkSalFrame* pSalFrame = reinterpret_cast< GtkSalFrame* >( user_data ); + GtkSalFrame* pSalFrame = static_cast< GtkSalFrame* >( user_data ); GtkSalMenu* pSalMenu = reinterpret_cast< GtkSalMenu* >( pSalFrame->GetMenu() ); if ( pSalMenu ) @@ -655,7 +655,7 @@ static const GActionEntry app_entries[] = { gboolean ensure_dbus_setup( gpointer data ) { - GtkSalFrame* pSalFrame = reinterpret_cast< GtkSalFrame* >( data ); + GtkSalFrame* pSalFrame = static_cast< GtkSalFrame* >( data ); GdkWindow* gdkWindow = widget_get_window( pSalFrame->getWindow() ); if ( gdkWindow != NULL && g_object_get_data( G_OBJECT( gdkWindow ), "g-lo-menubar" ) == NULL ) @@ -782,7 +782,7 @@ void on_registrar_available( GDBusConnection * /*connection*/, { SolarMutexGuard aGuard; - GtkSalFrame* pSalFrame = reinterpret_cast< GtkSalFrame* >( user_data ); + GtkSalFrame* pSalFrame = static_cast< GtkSalFrame* >( user_data ); SalMenu* pSalMenu = pSalFrame->GetMenu(); @@ -804,7 +804,7 @@ void on_registrar_unavailable( GDBusConnection * /*connection*/, SAL_INFO("vcl.unity", "on_registrar_unavailable"); //pSessionBus = NULL; - GtkSalFrame* pSalFrame = reinterpret_cast< GtkSalFrame* >( user_data ); + GtkSalFrame* pSalFrame = static_cast< GtkSalFrame* >( user_data ); SalMenu* pSalMenu = pSalFrame->GetMenu(); |