summaryrefslogtreecommitdiffstats
path: root/src/widgets/ink-toggle-action.cpp
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-15 10:46:15 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2018-06-18 12:27:01 +0000
commitf4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43 (patch)
tree7c6044fd3a17a2665841959dac9b3b2110b27924 /src/widgets/ink-toggle-action.cpp
parentRun clang-tidy’s modernize-use-override pass. (diff)
downloadinkscape-f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43.tar.gz
inkscape-f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43.zip
Run clang-tidy’s modernize-use-nullptr pass.
This replaces all NULL or 0 with nullptr when assigned to or returned as a pointer.
Diffstat (limited to 'src/widgets/ink-toggle-action.cpp')
-rw-r--r--src/widgets/ink-toggle-action.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/ink-toggle-action.cpp b/src/widgets/ink-toggle-action.cpp
index 200d0d558..467f0f24c 100644
--- a/src/widgets/ink-toggle-action.cpp
+++ b/src/widgets/ink-toggle-action.cpp
@@ -63,7 +63,7 @@ static void ink_toggle_action_class_init( InkToggleActionClass* klass )
static void ink_toggle_action_init( InkToggleAction* action )
{
action->private_data = INK_TOGGLE_ACTION_GET_PRIVATE( action );
- action->private_data->iconId = 0;
+ action->private_data->iconId = nullptr;
action->private_data->iconSize = GTK_ICON_SIZE_SMALL_TOOLBAR;
}
@@ -169,11 +169,11 @@ static GtkWidget* ink_toggle_action_create_tool_item( GtkAction* action )
gtk_widget_set_vexpand(child, FALSE);
gtk_tool_button_set_icon_widget(button, child);
} else {
- gchar *label = 0;
+ gchar *label = nullptr;
g_object_get( G_OBJECT(action), "short_label", &label, NULL );
gtk_tool_button_set_label( button, label );
g_free( label );
- label = 0;
+ label = nullptr;
}
} else {
// For now trigger a warning but don't do anything else