summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-06-08 16:29:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-06-08 16:29:41 +0200
commitf6ec07a3963a401dc736baa9bdd2ed3c7325bb66 (patch)
tree9cad620eb2cd5846464cf151b10949a8e36e5200 /vcl/unx/gtk
parent9f356d3e66127bf14fe957962e8451dbd27c8ac8 (diff)
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I07bf1403e6b992807541a499b786d47f835b2f81
Diffstat (limited to 'vcl/unx/gtk')
-rw-r--r--vcl/unx/gtk/a11y/atkcomponent.cxx4
-rw-r--r--vcl/unx/gtk/a11y/atkfactory.cxx8
-rw-r--r--vcl/unx/gtk/a11y/atkhypertext.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkregistry.cxx6
-rw-r--r--vcl/unx/gtk/a11y/atktextattributes.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkutil.cxx8
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.cxx8
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.cxx6
-rw-r--r--vcl/unx/gtk/app/gtkdata.cxx2
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx16
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx2
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx68
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx20
-rw-r--r--vcl/unx/gtk/window/hudawareness.cxx2
14 files changed, 77 insertions, 77 deletions
diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx b/vcl/unx/gtk/a11y/atkcomponent.cxx
index f40cfe004733..08fd93afa6a7 100644
--- a/vcl/unx/gtk/a11y/atkcomponent.cxx
+++ b/vcl/unx/gtk/a11y/atkcomponent.cxx
@@ -321,14 +321,14 @@ component_wrapper_add_focus_handler (AtkComponent *component,
signal_id = g_signal_lookup( "focus-event", ATK_TYPE_OBJECT );
ret = g_signal_handler_find( component, match_type, signal_id, 0, NULL,
- (gpointer) &handler, NULL);
+ static_cast<gpointer>(&handler), NULL);
if (!ret)
{
return g_signal_connect_closure_by_id (component,
signal_id, 0,
g_cclosure_new (
G_CALLBACK (handler), NULL,
- (GClosureNotify) NULL),
+ nullptr),
FALSE);
}
else
diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx
index fb0cc7741799..581f4d0091ac 100644
--- a/vcl/unx/gtk/a11y/atkfactory.cxx
+++ b/vcl/unx/gtk/a11y/atkfactory.cxx
@@ -58,14 +58,14 @@ atk_noop_object_wrapper_get_type()
static const GTypeInfo typeInfo =
{
sizeof (AtkNoOpObjectClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
+ nullptr,
+ nullptr,
reinterpret_cast<GClassInitFunc>(atk_noop_object_wrapper_class_init),
- (GClassFinalizeFunc) NULL,
+ nullptr,
NULL,
sizeof (AtkObjectWrapper),
0,
- (GInstanceInitFunc) NULL,
+ nullptr,
NULL
} ;
diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx
index e11f4987b6e5..47872486a55a 100644
--- a/vcl/unx/gtk/a11y/atkhypertext.cxx
+++ b/vcl/unx/gtk/a11y/atkhypertext.cxx
@@ -173,7 +173,7 @@ hyper_link_get_type()
static const GInterfaceInfo atk_action_info = {
reinterpret_cast<GInterfaceInitFunc>(actionIfaceInit),
- (GInterfaceFinalizeFunc) NULL,
+ nullptr,
NULL
};
diff --git a/vcl/unx/gtk/a11y/atkregistry.cxx b/vcl/unx/gtk/a11y/atkregistry.cxx
index 10b76c3bffba..ee34ee1209c5 100644
--- a/vcl/unx/gtk/a11y/atkregistry.cxx
+++ b/vcl/unx/gtk/a11y/atkregistry.cxx
@@ -32,7 +32,7 @@ ooo_wrapper_registry_get(const Reference< XAccessible >& rxAccessible)
if( uno_to_gobject )
{
gpointer cached =
- g_hash_table_lookup(uno_to_gobject, (gpointer) rxAccessible.get());
+ g_hash_table_lookup(uno_to_gobject, static_cast<gpointer>(rxAccessible.get()));
if( cached )
return ATK_OBJECT( cached );
@@ -49,7 +49,7 @@ ooo_wrapper_registry_add(const Reference< XAccessible >& rxAccessible, AtkObject
if( !uno_to_gobject )
uno_to_gobject = g_hash_table_new (NULL, NULL);
- g_hash_table_insert( uno_to_gobject, (gpointer) rxAccessible.get(), obj );
+ g_hash_table_insert( uno_to_gobject, static_cast<gpointer>(rxAccessible.get()), obj );
}
/*****************************************************************************/
@@ -58,7 +58,7 @@ void
ooo_wrapper_registry_remove(XAccessible *pAccessible)
{
if( uno_to_gobject )
- g_hash_table_remove( uno_to_gobject, (gpointer) pAccessible );
+ g_hash_table_remove( uno_to_gobject, static_cast<gpointer>(pAccessible) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index 283ff59db9e8..484336773906 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -988,7 +988,7 @@ TabStopList2String( const uno::Any& rAny, bool default_tabs )
if( ret )
{
gchar * old_tab_str = ret;
- ret = g_strconcat(old_tab_str, " ", tab_str, (const char*)NULL);
+ ret = g_strconcat(old_tab_str, " ", tab_str, nullptr);
g_free( old_tab_str );
}
else
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 03f08e4f30c6..cc2fe84c39bd 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -742,14 +742,14 @@ ooo_atk_util_get_type()
static const GTypeInfo typeInfo =
{
static_cast<guint16>(type_query.class_size),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
+ nullptr,
+ nullptr,
reinterpret_cast<GClassInitFunc>(ooo_atk_util_class_init),
- (GClassFinalizeFunc) NULL,
+ nullptr,
NULL,
static_cast<guint16>(type_query.instance_size),
0,
- (GInstanceInitFunc) NULL,
+ nullptr,
NULL
} ;
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index b845389c6437..635645f234e3 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -293,14 +293,14 @@ ooo_window_wrapper_get_type()
static const GTypeInfo typeInfo =
{
static_cast<guint16>(type_query.class_size),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
+ nullptr,
+ nullptr,
reinterpret_cast<GClassInitFunc>(ooo_window_wrapper_class_init),
- (GClassFinalizeFunc) NULL,
+ nullptr,
NULL,
static_cast<guint16>(type_query.instance_size),
0,
- (GInstanceInitFunc) NULL,
+ nullptr,
NULL
} ;
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 30cfa9c05074..ad27b6a3c6ff 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -665,10 +665,10 @@ atk_object_wrapper_get_type()
static const GTypeInfo typeInfo =
{
sizeof (AtkObjectWrapperClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
+ nullptr,
+ nullptr,
reinterpret_cast<GClassInitFunc>(atk_object_wrapper_class_init),
- (GClassFinalizeFunc) NULL,
+ nullptr,
NULL,
sizeof (AtkObjectWrapper),
0,
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index df1546ac9e43..df4470ba09ba 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -964,7 +964,7 @@ void GtkData::PostUserEvent()
g_source_set_priority (m_pUserEvent, G_PRIORITY_HIGH);
g_source_set_can_recurse (m_pUserEvent, TRUE);
g_source_set_callback (m_pUserEvent, call_userEventFn,
- (gpointer) this, NULL);
+ static_cast<gpointer>(this), NULL);
g_source_attach (m_pUserEvent, g_main_context_default ());
}
}
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 6c98ca6f72bf..d6e082fd4eb4 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -122,7 +122,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- (char *)NULL );
+ nullptr );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
@@ -240,7 +240,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
cell = gtk_cell_renderer_text_new ();
gtk_tree_view_column_set_expand (column, true);
gtk_tree_view_column_pack_start (column, cell, false);
- gtk_tree_view_column_set_attributes (column, cell, "text", i, (char *)NULL);
+ gtk_tree_view_column_set_attributes (column, cell, "text", i, nullptr);
gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
}
@@ -272,7 +272,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
pango_layout_get_pixel_extents (layout, NULL, &row_height);
g_object_unref (layout);
- g_object_get (cell, "ypad", &ypad, (char *)NULL);
+ g_object_get (cell, "ypad", &ypad, nullptr);
guint height = (row_height.height + 2*ypad) * 5;
gtk_widget_set_size_request (m_pFilterView, -1, height);
gtk_widget_set_size_request (m_pPreview, 1, height);
@@ -896,11 +896,11 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std
mnHID_FolderChange =
g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "current-folder-changed",
- G_CALLBACK( folder_changed_cb ), ( gpointer )this );
+ G_CALLBACK( folder_changed_cb ), static_cast<gpointer>(this) );
mnHID_SelectionChange =
g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "selection-changed",
- G_CALLBACK( selection_changed_cb ), ( gpointer )this );
+ G_CALLBACK( selection_changed_cb ), static_cast<gpointer>(this) );
int btn = GTK_RESPONSE_NO;
@@ -1352,7 +1352,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString&
}
else if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL )
g_object_set( pWidget, "label", aTxt.getStr(),
- "use_underline", true, (char *)NULL );
+ "use_underline", true, nullptr );
else
OSL_TRACE("Can't set label on list");
}
@@ -1535,7 +1535,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) throw( u
{
mHID_Preview = g_signal_connect(
GTK_FILE_CHOOSER( m_pDialog ), "update-preview",
- G_CALLBACK( update_preview_cb ), ( gpointer )this );
+ G_CALLBACK( update_preview_cb ), static_cast<gpointer>(this) );
}
gtk_widget_show( m_pPreview );
}
@@ -1823,7 +1823,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O
gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI,
case_insensitive_filter,
g_strdup( OUStringToOString(aToken, RTL_TEXTENCODING_UTF8).getStr() ),
- (GDestroyNotify) g_free );
+ g_free );
OSL_TRACE( "fustering with %s", OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr());
}
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 0754101b3631..3a2fc6caf93f 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -54,7 +54,7 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon
m_pDialog = gtk_file_chooser_dialog_new(
OUStringToOString( getResString( FOLDERPICKER_TITLE ), RTL_TEXTENCODING_UTF8 ).getStr(),
NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (char *)NULL );
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, nullptr );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
#if ENABLE_GNOME_VFS || ENABLE_GIO
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index a34c143b99f9..463d9fe00ced 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -529,10 +529,10 @@ void GtkData::initNWF()
gint vertical_padding = 1;
gtk_widget_style_get( gWidgetData[0].gMenuWidget,
"horizontal-padding", &horizontal_padding,
- (char *)NULL);
+ nullptr);
gtk_widget_style_get( gWidgetData[0].gMenuWidget,
"vertical-padding", &vertical_padding,
- (char *)NULL);
+ nullptr);
gint xthickness = gWidgetData[0].gMenuWidget->style->xthickness;
gint ythickness = gWidgetData[0].gMenuWidget->style->ythickness;
pSVData->maNWFData.mnMenuFormatBorderX = xthickness + horizontal_padding;
@@ -774,7 +774,7 @@ bool GtkSalGraphics::hitTestNativeControl( ControlType nType,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
"has-secondary-backward-stepper", &has_backward2,
- (char *)NULL );
+ nullptr );
Rectangle aForward;
Rectangle aBackward;
@@ -1199,7 +1199,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType,
gWidgetData[m_nXScreen].gMenuItemCheckMenuWidget : gWidgetData[m_nXScreen].gMenuItemRadioMenuWidget;
gtk_widget_style_get( pWidget,
"indicator_size", &indicator_size,
- (char *)NULL );
+ nullptr );
rNativeBoundingRegion = rControlRegion;
Rectangle aIndicatorRect( Point( 0,
(rControlRegion.GetHeight()-indicator_size)/2),
@@ -1263,7 +1263,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType,
"indicator_spacing", &indicator_spacing,
"focus-line-width", &focusWidth,
"focus-padding", &focusPad,
- (char *)NULL);
+ nullptr);
indicator_size += 2*indicator_spacing + 2*(focusWidth + focusWidth);
rNativeBoundingRegion = rControlRegion;
Rectangle aIndicatorRect( Point( 0,
@@ -1295,7 +1295,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType,
gtk_widget_style_get( widget,
"slider-width", &slider_width,
"slider-length", &slider_length,
- (char *)NULL);
+ nullptr);
Rectangle aRect( rControlRegion );
if( nPart == PART_THUMB_HORZ )
{
@@ -1642,10 +1642,10 @@ bool GtkSalGraphics::NWPaintGTKButtonReal(
gtk_widget_style_get( gWidgetData[m_nXScreen].gBtnWidget, "focus-line-width", &focusWidth,
"focus-padding", &focusPad,
"interior_focus", &interiorFocus,
- (char *)NULL );
+ nullptr );
gtk_widget_style_get( gWidgetData[m_nXScreen].gBtnWidget,
"default_border", &pBorder,
- (char *)NULL );
+ nullptr );
// Make sure the border values exist, otherwise use some defaults
if ( pBorder )
@@ -1748,7 +1748,7 @@ static Rectangle NWGetButtonArea( SalX11Screen nScreen,
"focus-padding", &focusPad,
"interior_focus", &interiorFocus,
"default_border", &pBorder,
- (char *)NULL );
+ nullptr );
// Make sure the border values exist, otherwise use some defaults
if ( pBorder )
@@ -1821,7 +1821,7 @@ bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
gint indicator_size;
- gtk_widget_style_get( gWidgetData[m_nXScreen].gRadioWidget, "indicator_size", &indicator_size, (char *)NULL);
+ gtk_widget_style_get( gWidgetData[m_nXScreen].gRadioWidget, "indicator_size", &indicator_size, nullptr);
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1878,7 +1878,7 @@ bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
gint indicator_size;
- gtk_widget_style_get( gWidgetData[m_nXScreen].gCheckWidget, "indicator_size", &indicator_size, (char *)NULL);
+ gtk_widget_style_get( gWidgetData[m_nXScreen].gCheckWidget, "indicator_size", &indicator_size, nullptr);
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1976,7 +1976,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
"stepper_size", &stepper_size,
"trough_border", &trough_border,
"stepper_spacing", &stepper_spacing,
- "min_slider_length", &min_slider_length, (char *)NULL );
+ "min_slider_length", &min_slider_length, nullptr );
gboolean has_forward;
gboolean has_forward2;
gboolean has_backward;
@@ -1985,7 +1985,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
gtk_widget_style_get( gWidgetData[m_nXScreen].gScrollHorizWidget, "has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, (char *)NULL );
+ "has-secondary-backward-stepper", &has_backward2, nullptr );
gint magic = trough_border ? 1 : 0;
gint nFirst = 0;
@@ -2253,7 +2253,7 @@ static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPa
"slider-width", &slider_width,
"stepper-size", &stepper_size,
"trough-border", &trough_border,
- "stepper-spacing", &stepper_spacing, (char *)NULL );
+ "stepper-spacing", &stepper_spacing, nullptr );
gboolean has_forward;
gboolean has_forward2;
@@ -2264,7 +2264,7 @@ static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPa
"has-forward-stepper", &has_forward,
"has-secondary-forward-stepper", &has_forward2,
"has-backward-stepper", &has_backward,
- "has-secondary-backward-stepper", &has_backward2, (char *)NULL );
+ "has-secondary-backward-stepper", &has_backward2, nullptr );
gint buttonWidth;
gint buttonHeight;
Rectangle buttonRect;
@@ -2369,7 +2369,7 @@ static Rectangle NWGetEditBoxPixmapRect(SalX11Screen nScreen,
// Grab some entry style attributes
gtk_widget_style_get( gWidgetData[nScreen].gEditBoxWidget,
"focus-line-width", &focusWidth,
- "interior-focus", &interiorFocus, (char *)NULL );
+ "interior-focus", &interiorFocus, nullptr );
if ( !interiorFocus )
{
@@ -2435,7 +2435,7 @@ static void NWPaintOneEditBox( SalX11Screen nScreen,
gtk_widget_style_get( widget,
"interior-focus", &bInteriorFocus,
"focus-line-width", &nFocusLineWidth,
- (char *)NULL);
+ nullptr);
if ( !bInteriorFocus )
{
xborder += nFocusLineWidth;
@@ -2527,7 +2527,7 @@ bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
}
NWSetWidgetState( gWidgetData[m_nXScreen].gSpinButtonWidget, nState, stateType );
- gtk_widget_style_get( gWidgetData[m_nXScreen].gSpinButtonWidget, "shadow_type", &shadowType, (char *)NULL );
+ gtk_widget_style_get( gWidgetData[m_nXScreen].gSpinButtonWidget, "shadow_type", &shadowType, nullptr );
if ( shadowType != GTK_SHADOW_NONE )
{
@@ -2734,7 +2734,7 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen,
// Grab some button style attributes
gtk_widget_style_get( gWidgetData[nScreen].gDropdownWidget,
"focus-line-width", &nFocusWidth,
- "focus-padding", &nFocusPad, (char *)NULL );
+ "focus-padding", &nFocusPad, nullptr );
nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gWidgetData[nScreen].gArrowWidget)->xpad * 2);
nButtonWidth = nArrowWidth +
@@ -2961,7 +2961,7 @@ bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable,
"interior_focus", &bInteriorFocus,
"focus_line_width", &nFocusLineWidth,
"focus_padding", &nFocusPadding,
- (char *)NULL);
+ nullptr);
}
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
@@ -3200,7 +3200,7 @@ bool GtkSalGraphics::NWPaintGTKMenubar(
{
gtk_widget_style_get( gWidgetData[m_nXScreen].gMenuItemMenubarWidget,
"selected_shadow_type", &selected_shadow_type,
- (char *)NULL);
+ nullptr);
}
}
@@ -3291,7 +3291,7 @@ bool GtkSalGraphics::NWPaintGTKPopupMenu(
{
gtk_widget_style_get( gWidgetData[m_nXScreen].gMenuItemMenuWidget,
"selected_shadow_type", &selected_shadow_type,
- (char *)NULL);
+ nullptr);
}
NWSetWidgetState( gWidgetData[m_nXScreen].gMenuWidget, nState, stateType );
@@ -3685,7 +3685,7 @@ static Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen,
gtk_widget_style_get( gWidgetData[nScreen].gOptionMenuWidget,
"indicator_size", &pIndicatorSize,
- "indicator_spacing",&pIndicatorSpacing, (char *)NULL);
+ "indicator_spacing",&pIndicatorSpacing, nullptr);
if ( pIndicatorSize )
width = pIndicatorSize->width;
@@ -3748,7 +3748,7 @@ static Rectangle NWGetListBoxIndicatorRect( SalX11Screen nScreen,
gtk_widget_style_get( gWidgetData[nScreen].gOptionMenuWidget,
"indicator_size", &pIndicatorSize,
- "indicator_spacing",&pIndicatorSpacing, (char *)NULL);
+ "indicator_spacing",&pIndicatorSpacing, nullptr);
if ( pIndicatorSize )
{
@@ -3868,7 +3868,7 @@ void GtkSalGraphics::refreshFontconfig( GtkSettings *pSettings )
{
guint latest_fontconfig_timestamp = 0;
static guint our_fontconfig_timestamp = 0;
- g_object_get( pSettings, "gtk-fontconfig-timestamp", &latest_fontconfig_timestamp, (char *)NULL );
+ g_object_get( pSettings, "gtk-fontconfig-timestamp", &latest_fontconfig_timestamp, nullptr );
if (latest_fontconfig_timestamp != our_fontconfig_timestamp)
{
bool bFirstTime = our_fontconfig_timestamp == 0;
@@ -4147,11 +4147,11 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
// get cursor blink time
gboolean blink = false;
- g_object_get( pSettings, "gtk-cursor-blink", &blink, (char *)NULL );
+ g_object_get( pSettings, "gtk-cursor-blink", &blink, nullptr );
if( blink )
{
gint blink_time = static_cast<gint>(STYLE_CURSOR_NOBLINKTIME);
- g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, (char *)NULL );
+ g_object_get( pSettings, "gtk-cursor-blink-time", &blink_time, nullptr );
// set the blink_time if there is a setting and it is reasonable
// else leave the default value
if( blink_time > 100 && blink_time != gint(STYLE_CURSOR_NOBLINKTIME) )
@@ -4167,7 +4167,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
"gtk-double-click-distance", &iDoubleClickDistance,
"gtk-dnd-drag-threshold", &iDragThreshold,
"gtk-menu-popup-delay", &iMenuPopupDelay,
- (char *)NULL );
+ nullptr );
aMouseSettings.SetDoubleClickTime( iDoubleClickTime );
aMouseSettings.SetDoubleClickWidth( iDoubleClickDistance );
aMouseSettings.SetDoubleClickHeight( iDoubleClickDistance );
@@ -4179,13 +4179,13 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
gboolean showmenuicons = true, primarybuttonwarps = false;
g_object_get( pSettings,
"gtk-menu-images", &showmenuicons,
- (char *)NULL );
+ nullptr );
if( g_object_class_find_property(
G_OBJECT_GET_CLASS(pSettings), "gtk-primary-button-warps-slider") )
{
g_object_get( pSettings,
"gtk-primary-button-warps-slider", &primarybuttonwarps,
- (char *)NULL );
+ nullptr );
}
aStyleSet.SetPreferredUseImagesInMenus(showmenuicons);
aStyleSet.SetPrimaryButtonWarpsSlider(primarybuttonwarps);
@@ -4200,14 +4200,14 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
"slider-width", &slider_width,
"trough-border", &trough_border,
"min-slider-length", &min_slider_length,
- (char *)NULL );
+ nullptr );
gint magic = trough_border ? 1 : 0;
aStyleSet.SetScrollBarSize( slider_width + 2*trough_border );
aStyleSet.SetMinThumbSize( min_slider_length - magic );
// preferred icon style
gchar* pIconThemeName = NULL;
- g_object_get( pSettings, "gtk-icon-theme-name", &pIconThemeName, (char *)NULL );
+ g_object_get( pSettings, "gtk-icon-theme-name", &pIconThemeName, nullptr );
aStyleSet.SetPreferredIconTheme( OUString::createFromAscii( pIconThemeName ) );
g_free( pIconThemeName );
@@ -4322,7 +4322,7 @@ static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen )
{
rData.gCacheWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
g_object_set_data( G_OBJECT( rData.gCacheWindow ), "libo-version",
- (gpointer)LIBO_VERSION_DOTTED );
+ const_cast<char *>(LIBO_VERSION_DOTTED) );
GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(),
nScreen.getXScreen() );
@@ -4487,7 +4487,7 @@ static void NWEnsureGTKToolbar( SalX11Screen nScreen )
gtk_widget_ensure_style( gWidgetData[nScreen].gToolbarWidget );
gtk_widget_style_get( gWidgetData[nScreen].gToolbarWidget,
"button_relief", &aRelief,
- (char *)NULL);
+ nullptr);
gtk_button_set_relief( GTK_BUTTON(gWidgetData[nScreen].gToolbarButtonWidget), aRelief );
GTK_WIDGET_UNSET_FLAGS( gWidgetData[nScreen].gToolbarButtonWidget, GTK_CAN_FOCUS );
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 874f250b0b16..e590a8ab1bcd 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -956,14 +956,14 @@ ooo_fixed_get_type()
static const GTypeInfo tinfo =
{
sizeof (GtkFixedClass),
- (GBaseInitFunc) NULL, /* base init */
- (GBaseFinalizeFunc) NULL, /* base finalize */
- (GClassInitFunc) NULL, /* class init */
- (GClassFinalizeFunc) NULL, /* class finalize */
+ nullptr, /* base init */
+ nullptr, /* base finalize */
+ nullptr, /* class init */
+ nullptr, /* class finalize */
NULL, /* class data */
sizeof (GtkFixed), /* instance size */
0, /* nb preallocs */
- (GInstanceInitFunc) NULL, /* instance init */
+ nullptr, /* instance init */
NULL /* value table */
};
@@ -1296,7 +1296,7 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle )
m_pWindow = gtk_widget_new( GTK_TYPE_WINDOW, "type", eWinType,
"visible", FALSE, NULL );
g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
- g_object_set_data( G_OBJECT( m_pWindow ), "libo-version", (gpointer)LIBO_VERSION_DOTTED);
+ g_object_set_data( G_OBJECT( m_pWindow ), "libo-version", const_cast<char *>(LIBO_VERSION_DOTTED));
// force wm class hint
m_nExtStyle = ~0;
@@ -4048,7 +4048,7 @@ void GtkSalFrame::IMHandler::doCallEndExtTextInput()
void GtkSalFrame::IMHandler::updateIMSpotLocation()
{
SalExtTextInputPosEvent aPosEvent;
- m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUTPOS, (void*)&aPosEvent );
+ m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUTPOS, static_cast<void*>(&aPosEvent) );
GdkRectangle aArea;
aArea.x = aPosEvent.mnX;
aArea.y = aPosEvent.mnY;
@@ -4070,7 +4070,7 @@ void GtkSalFrame::IMHandler::sendEmptyCommit()
aEmptyEv.mnCursorPos = 0;
aEmptyEv.mnCursorFlags = 0;
aEmptyEv.mbOnlyCursor = False;
- m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&aEmptyEv );
+ m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, static_cast<void*>(&aEmptyEv) );
if( ! aDel.isDeleted() )
m_pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
}
@@ -4289,7 +4289,7 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* pContext, gchar* pTex
}
if( ! bSingleCommit )
{
- pThis->m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&pThis->m_aInputEvent);
+ pThis->m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, static_cast<void*>(&pThis->m_aInputEvent));
if( ! aDel.isDeleted() )
pThis->doCallEndExtTextInput();
}
@@ -4413,7 +4413,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_
SolarMutexGuard aGuard;
vcl::DeletionListener aDel( pThis->m_pFrame );
- pThis->m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void*)&pThis->m_aInputEvent);
+ pThis->m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, static_cast<void*>(&pThis->m_aInputEvent));
if( bEndPreedit && ! aDel.isDeleted() )
pThis->doCallEndExtTextInput();
if( ! aDel.isDeleted() )
diff --git a/vcl/unx/gtk/window/hudawareness.cxx b/vcl/unx/gtk/window/hudawareness.cxx
index 947f404f9d52..760103314d7c 100644
--- a/vcl/unx/gtk/window/hudawareness.cxx
+++ b/vcl/unx/gtk/window/hudawareness.cxx
@@ -61,7 +61,7 @@ hud_awareness_register (GDBusConnection *connection,
HudAwarenessHandle *handle;
guint object_id;
- memset ((void *)&vtable, 0, sizeof (vtable));
+ memset (static_cast<void *>(&vtable), 0, sizeof (vtable));
vtable.method_call = hud_awareness_method_call;
if G_UNLIKELY (iface == NULL)