diff options
Diffstat (limited to 'vcl/unx/gtk')
-rw-r--r-- | vcl/unx/gtk/a11y/atkfactory.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atkhypertext.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atktextattributes.cxx | 10 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atkwindow.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/a11y/atkwrapper.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 10 | ||||
-rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gloactiongroup.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtkobject.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtksalframe.cxx | 48 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtksalmenu.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/gtk/window/hudawareness.cxx | 6 |
12 files changed, 51 insertions, 51 deletions
diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx index f960b4e65632..d3cb30ad94c4 100644 --- a/vcl/unx/gtk/a11y/atkfactory.cxx +++ b/vcl/unx/gtk/a11y/atkfactory.cxx @@ -79,7 +79,7 @@ atk_noop_object_wrapper_new() { AtkObject *accessible; - accessible = (AtkObject *) g_object_new (atk_noop_object_wrapper_get_type(), NULL); + accessible = static_cast<AtkObject *>(g_object_new (atk_noop_object_wrapper_get_type(), NULL)); g_return_val_if_fail (accessible != NULL, NULL); accessible->role = ATK_ROLE_INVALID; diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index 1074dad8ad8a..6b6b4199d8ae 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -142,7 +142,7 @@ hyper_link_class_init (AtkHyperlinkClass *klass) gobject_class->finalize = hyper_link_finalize; - hyper_parent_class = (GObjectClass *)g_type_class_peek_parent (klass); + hyper_parent_class = static_cast<GObjectClass *>(g_type_class_peek_parent (klass)); klass->get_uri = hyper_link_get_uri; klass->get_object = hyper_link_get_object; @@ -218,7 +218,7 @@ hypertext_get_link( AtkHypertext *hypertext, accessibility::XAccessibleHypertext* pHypertext = getHypertext( hypertext ); if( pHypertext ) { - HyperLink *pLink = (HyperLink *)g_object_new( hyper_link_get_type(), NULL ); + HyperLink *pLink = static_cast<HyperLink *>(g_object_new( hyper_link_get_type(), NULL )); pLink->xLink = pHypertext->getHyperLink( link_index ); if( !pLink->xLink.is() ) { g_object_unref( G_OBJECT( pLink ) ); diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 4bf7d08ffbfb..afa89e0fcf5d 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -1016,8 +1016,8 @@ DefaultTabStops2String( const uno::Any& rAny ) extern "C" int attr_compare(const void *p1,const void *p2) { - const rtl_uString * pustr = (const rtl_uString *) p1; - const char * pc = *((const char **) p2); + const rtl_uString * pustr = static_cast<const rtl_uString *>(p1); + const char * pc = *static_cast<const char * const *>(p2); return rtl_ustr_ascii_compare_WithLength(pustr->buffer, pustr->length, pc); } @@ -1028,9 +1028,9 @@ find_exported_attributes( sal_Int32 *pArray, { for( sal_Int32 i = 0; i < rAttributeList.getLength(); i++ ) { - const char ** pAttr = (const char **) bsearch(rAttributeList[i].Name.pData, + const char ** pAttr = static_cast<const char **>(bsearch(rAttributeList[i].Name.pData, ExportedTextAttributes, TEXT_ATTRIBUTE_LAST, sizeof(const char *), - attr_compare); + attr_compare)); if( pAttr ) { @@ -1049,7 +1049,7 @@ attribute_set_prepend( AtkAttributeSet* attribute_set, { if( value ) { - AtkAttribute *at = (AtkAttribute *) g_malloc( sizeof (AtkAttribute) ); + AtkAttribute *at = static_cast<AtkAttribute *>(g_malloc( sizeof (AtkAttribute) )); at->name = g_strdup( atk_text_attribute_get_name( attribute ) ); at->value = value; diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index cd9bf9e49c74..84ef89198fe9 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -238,7 +238,7 @@ ooo_window_wrapper_real_initialize(AtkObject *obj, gpointer data) static void ooo_window_wrapper_real_finalize (GObject *obj) { - ooo_wrapper_registry_remove( (XAccessible *) g_object_get_data( obj, "ooo:atk-wrapper-key" )); + ooo_wrapper_registry_remove( static_cast<XAccessible *>(g_object_get_data( obj, "ooo:atk-wrapper-key" ))); window_real_finalize( obj ); } diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index 80f347888f68..e2fc450d2918 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -524,7 +524,7 @@ wrapper_ref_relation_set( AtkObject *atk_obj ) { accessibility::AccessibleRelation aRelation = xRelationSet->getRelation( n ); sal_uInt32 nTargetCount = aRelation.TargetSet.getLength(); - AtkObject **pTargets = (AtkObject **) alloca( nTargetCount * sizeof(AtkObject *) ); + AtkObject **pTargets = static_cast<AtkObject **>(alloca( nTargetCount * sizeof(AtkObject *) )); for( sal_uInt32 i = 0; i < nTargetCount; i++ ) { @@ -622,7 +622,7 @@ atk_object_wrapper_class_init (AtkObjectWrapperClass *klass) GObjectClass *gobject_class = G_OBJECT_CLASS( klass ); AtkObjectClass *atk_class = ATK_OBJECT_CLASS( klass ); - parent_class = (GObjectClass *) g_type_class_peek_parent (klass); + parent_class = static_cast<GObjectClass *>(g_type_class_peek_parent (klass)); // GObject methods gobject_class->finalize = atk_object_wrapper_finalize; diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index cdbfd0a1b7c7..93b2be8b92d3 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -56,7 +56,7 @@ GdkFilterReturn call_filterGdkEvent( GdkXEvent* sys_event, GdkEvent* event, gpointer data ) { - GtkSalDisplay *pDisplay = (GtkSalDisplay *)data; + GtkSalDisplay *pDisplay = static_cast<GtkSalDisplay *>(data); return pDisplay->filterGdkEvent( sys_event, event ); } } @@ -110,13 +110,13 @@ extern "C" { void signalScreenSizeChanged( GdkScreen* pScreen, gpointer data ) { - GtkSalDisplay* pDisp = (GtkSalDisplay*)data; + GtkSalDisplay* pDisp = static_cast<GtkSalDisplay*>(data); pDisp->screenSizeChanged( pScreen ); } void signalMonitorsChanged( GdkScreen* pScreen, gpointer data ) { - GtkSalDisplay* pDisp = (GtkSalDisplay*)data; + GtkSalDisplay* pDisp = static_cast<GtkSalDisplay*>(data); pDisp->monitorsChanged( pScreen ); } @@ -127,7 +127,7 @@ GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* sys_event, { #if !GTK_CHECK_VERSION(3,0,0) GdkFilterReturn aFilterReturn = GDK_FILTER_CONTINUE; - XEvent *pEvent = (XEvent *)sys_event; + XEvent *pEvent = static_cast<XEvent *>(sys_event); // dispatch all XEvents to event callback if( GetSalData()->m_pInstance-> @@ -919,7 +919,7 @@ void GtkSalTimer::Stop() gboolean GtkData::userEventFn( gpointer data ) { gboolean bContinue = FALSE; - GtkData *pThis = (GtkData *) data; + GtkData *pThis = static_cast<GtkData *>(data); SalGenericData *pData = GetGenericData(); osl::Guard< comphelper::SolarMutex > aGuard( pData->m_pInstance->GetYieldMutex() ); const SalGenericDisplay *pDisplay = pData->GetDisplay(); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index fb14bdbd33a9..4392f5d3924d 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -1765,7 +1765,7 @@ static gboolean case_insensitive_filter (const GtkFileFilterInfo *filter_info, gpointer data) { gboolean bRetval = false; - const char *pFilter = (const char *) data; + const char *pFilter = static_cast<const char *>(data); g_return_val_if_fail( data != NULL, false ); g_return_val_if_fail( filter_info != NULL, false ); diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx index 11145e3c44c3..69dea4054880 100644 --- a/vcl/unx/gtk/window/gloactiongroup.cxx +++ b/vcl/unx/gtk/window/gloactiongroup.cxx @@ -132,7 +132,7 @@ g_lo_action_group_list_actions (GActionGroup *group) g_hash_table_iter_init (&iter, loGroup->priv->table); while (g_hash_table_iter_next (&iter, &key, NULL)) - keys[i++] = g_strdup ((gchar*) key); + keys[i++] = g_strdup (static_cast<gchar*>(key)); g_assert_cmpint (i, ==, n); keys[n] = NULL; @@ -428,7 +428,7 @@ g_lo_action_group_clear (GLOActionGroup *group) for (GList* element = g_list_first (keys); element != NULL; element = g_list_next (element)) { - g_lo_action_group_remove (group, (gchar*) element->data); + g_lo_action_group_remove (group, static_cast<gchar*>(element->data)); } g_list_free (keys); diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index 0299d6826ec5..2690513ce742 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -173,7 +173,7 @@ const SystemEnvData* GtkSalObject::GetSystemData() const gboolean GtkSalObject::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer object ) { - GtkSalObject* pThis = (GtkSalObject*)object; + GtkSalObject* pThis = static_cast<GtkSalObject*>(object); if( pEvent->type == GDK_BUTTON_PRESS ) { @@ -185,7 +185,7 @@ gboolean GtkSalObject::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointe gboolean GtkSalObject::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer object ) { - GtkSalObject* pThis = (GtkSalObject*)object; + GtkSalObject* pThis = static_cast<GtkSalObject*>(object); pThis->CallCallback( pEvent->in ? SALOBJ_EVENT_GETFOCUS : SALOBJ_EVENT_LOSEFOCUS, NULL ); @@ -194,7 +194,7 @@ gboolean GtkSalObject::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer void GtkSalObject::signalDestroy( GtkWidget* pObj, gpointer object ) { - GtkSalObject* pThis = (GtkSalObject*)object; + GtkSalObject* pThis = static_cast<GtkSalObject*>(object); if( pObj == pThis->m_pSocket ) { pThis->m_pSocket = NULL; diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 1b8bdc52da46..f56bbade1247 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1253,7 +1253,7 @@ static void lcl_set_user_time( GtkWindow* i_pWindow, guint32 i_nTime ) GtkSalFrame *GtkSalFrame::getFromWindow( GtkWindow *pWindow ) { - return (GtkSalFrame *) g_object_get_data( G_OBJECT( pWindow ), "SalFrame" ); + return static_cast<GtkSalFrame *>(g_object_get_data( G_OBJECT( pWindow ), "SalFrame" )); } void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle ) @@ -1588,7 +1588,7 @@ bitmapToPixbuf( SalBitmap *pSalBitmap, SalBitmap *pSalAlpha ) g_return_val_if_fail( pSalAlpha->GetSize() == aSize, NULL ); int nX, nY; - guchar *pPixbufData = (guchar *)g_malloc (4 * aSize.Width() * aSize.Height() ); + guchar *pPixbufData = static_cast<guchar *>(g_malloc (4 * aSize.Width() * aSize.Height() )); guchar *pDestData = pPixbufData; for( nY = 0; nY < pBitmap->mnHeight; nY++ ) @@ -3217,7 +3217,7 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent ) gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); SalMouseEvent aEvent; sal_uInt16 nEventType = 0; @@ -3308,7 +3308,7 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); GdkEventScroll* pSEvent = reinterpret_cast<GdkEventScroll*>(pEvent); #if GTK_CHECK_VERSION(3,0,0) @@ -3349,7 +3349,7 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame #if GTK_CHECK_VERSION(3,14,0) void GtkSalFrame::gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdouble velocity_y, gpointer frame) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); SalSwipeEvent aEvent; aEvent.mnVelocityX = velocity_x; @@ -3369,7 +3369,7 @@ void GtkSalFrame::gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdo void GtkSalFrame::gestureLongPress(GtkGestureLongPress* gesture, gpointer frame) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); SalLongPressEvent aEvent; @@ -3386,7 +3386,7 @@ void GtkSalFrame::gestureLongPress(GtkGestureLongPress* gesture, gpointer frame) gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); SalMouseEvent aEvent; aEvent.mnTime = pEvent->time; @@ -3428,7 +3428,7 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer gboolean GtkSalFrame::signalCrossing( GtkWidget*, GdkEventCrossing* pEvent, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); SalMouseEvent aEvent; aEvent.mnTime = pEvent->time; aEvent.mnX = (long)pEvent->x_root - pThis->maGeometry.nX; @@ -3493,7 +3493,7 @@ void GtkSalFrame::damaged (const basegfx::B2IBox& rDamageRect) // blit our backing basebmp buffer to the target cairo context cr gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); cairo_save(cr); @@ -3515,7 +3515,7 @@ gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame ) #else gboolean GtkSalFrame::signalExpose( GtkWidget*, GdkEventExpose* pEvent, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); struct SalPaintEvent aEvent( pEvent->area.x, pEvent->area.y, pEvent->area.width, pEvent->area.height ); @@ -3550,7 +3550,7 @@ void GtkSalFrame::TriggerPaintEvent() gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); X11SalInstance *pSalInstance = static_cast< X11SalInstance* >(GetSalData()->m_pInstance); @@ -3603,7 +3603,7 @@ static OString getDisplayString() gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); #if !GTK_CHECK_VERSION(3,8,0) //Spawn off a helper program that will attempt to set this fullscreen @@ -3658,7 +3658,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame ) gboolean GtkSalFrame::signalUnmap( GtkWidget*, GdkEvent*, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); pThis->CallCallback( SALEVENT_RESIZE, NULL ); @@ -3667,7 +3667,7 @@ gboolean GtkSalFrame::signalUnmap( GtkWidget*, GdkEvent*, gpointer frame ) gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); bool bMoved = false, bSized = false; int x = pEvent->x, y = pEvent->y; @@ -3753,7 +3753,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); vcl::DeletionListener aDel( pThis ); @@ -3869,7 +3869,7 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame gboolean GtkSalFrame::signalDelete( GtkWidget*, GdkEvent*, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); pThis->CallCallback( SALEVENT_CLOSE, NULL ); @@ -3878,7 +3878,7 @@ gboolean GtkSalFrame::signalDelete( GtkWidget*, GdkEvent*, gpointer frame ) void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); // every frame gets an initial style set on creation // do not post these as the whole application tends to @@ -3919,7 +3919,7 @@ void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer fram gboolean GtkSalFrame::signalState( GtkWidget*, GdkEvent* pEvent, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); if( (pThis->m_nState & GDK_WINDOW_STATE_ICONIFIED) != (pEvent->window_state.new_window_state & GDK_WINDOW_STATE_ICONIFIED ) ) { pThis->getDisplay()->SendInternalEvent( pThis, NULL, SALEVENT_RESIZE ); @@ -3949,14 +3949,14 @@ gboolean GtkSalFrame::signalState( GtkWidget*, GdkEvent* pEvent, gpointer frame gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* pEvent, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); pThis->m_nVisibility = pEvent->state; return true; } void GtkSalFrame::signalDestroy( GtkWidget* pObj, gpointer frame ) { - GtkSalFrame* pThis = (GtkSalFrame*)frame; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); if( pObj == pThis->m_pWindow ) { pThis->m_pFixedContainer = NULL; @@ -4232,7 +4232,7 @@ static bool checkSingleKeyCommitHack( guint keyval, sal_Unicode cCode ) #endif void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* CONTEXT_ARG, gchar* pText, gpointer im_handler ) { - GtkSalFrame::IMHandler* pThis = (GtkSalFrame::IMHandler*)im_handler; + GtkSalFrame::IMHandler* pThis = static_cast<GtkSalFrame::IMHandler*>(im_handler); SolarMutexGuard aGuard; vcl::DeletionListener aDel( pThis->m_pFrame ); @@ -4302,7 +4302,7 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* CONTEXT_ARG, gchar* p void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_handler ) { - GtkSalFrame::IMHandler* pThis = (GtkSalFrame::IMHandler*)im_handler; + GtkSalFrame::IMHandler* pThis = static_cast<GtkSalFrame::IMHandler*>(im_handler); char* pText = NULL; PangoAttrList* pAttrs = NULL; @@ -4356,7 +4356,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ tmp_list = attr_list = pango_attr_iterator_get_attrs (iter); while (tmp_list) { - PangoAttribute *pango_attr = (PangoAttribute *)(tmp_list->data); + PangoAttribute *pango_attr = static_cast<PangoAttribute *>(tmp_list->data); switch (pango_attr->klass->type) { @@ -4414,7 +4414,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditStart( GtkIMContext*, gpointer /*im_ void GtkSalFrame::IMHandler::signalIMPreeditEnd( GtkIMContext*, gpointer im_handler ) { - GtkSalFrame::IMHandler* pThis = (GtkSalFrame::IMHandler*)im_handler; + GtkSalFrame::IMHandler* pThis = static_cast<GtkSalFrame::IMHandler*>(im_handler); pThis->m_bPreeditJustChanged = true; diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index afe9e7a4be1b..3a92b6b45cd7 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -209,7 +209,7 @@ void RemoveSpareSectionsFromNativeMenu( GLOMenu* pMenu, GList** pOldCommandList, gint CompareStr( gpointer str1, gpointer str2 ) { - return g_strcmp0( (const gchar*) str1, (const gchar*) str2 ); + return g_strcmp0( static_cast<const gchar*>(str1), static_cast<const gchar*>(str2) ); } void RemoveUnusedCommands( GLOActionGroup* pActionGroup, GList* pOldCommandList, GList* pNewCommandList ) @@ -244,7 +244,7 @@ void RemoveUnusedCommands( GLOActionGroup* pActionGroup, GList* pOldCommandList, GList* pCommand = g_list_first( pOldCommandList ); pOldCommandList = g_list_remove_link( pOldCommandList, pCommand ); - gchar* aCommand = (gchar*) g_list_nth_data( pCommand, 0 ); + gchar* aCommand = static_cast<gchar*>(g_list_nth_data( pCommand, 0 )); g_lo_action_group_remove( pActionGroup, aCommand ); diff --git a/vcl/unx/gtk/window/hudawareness.cxx b/vcl/unx/gtk/window/hudawareness.cxx index 866c1b1f0701..947f404f9d52 100644 --- a/vcl/unx/gtk/window/hudawareness.cxx +++ b/vcl/unx/gtk/window/hudawareness.cxx @@ -33,7 +33,7 @@ hud_awareness_method_call (GDBusConnection * /* connection */, GDBusMethodInvocation *invocation, gpointer user_data) { - HudAwarenessHandle *handle = (HudAwarenessHandle*) user_data; + HudAwarenessHandle *handle = static_cast<HudAwarenessHandle*>(user_data); if (g_str_equal (method_name, "HudActiveChanged")) { @@ -82,7 +82,7 @@ hud_awareness_register (GDBusConnection *connection, g_assert (iface != NULL); } - handle = (HudAwarenessHandle*) g_malloc (sizeof (HudAwarenessHandle)); + handle = static_cast<HudAwarenessHandle*>(g_malloc (sizeof (HudAwarenessHandle))); object_id = g_dbus_connection_register_object (connection, object_path, iface, &vtable, handle, &g_free, error); @@ -92,7 +92,7 @@ hud_awareness_register (GDBusConnection *connection, return 0; } - handle->connection = (GDBusConnection*) g_object_ref (connection); + handle->connection = static_cast<GDBusConnection*>(g_object_ref (connection)); handle->callback = callback; handle->user_data = user_data; handle->notify = notify; |