diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-01-02 10:56:56 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-01-02 10:56:56 +0000 |
| commit | c9e6cec9f909db85df80688c7a5b2a0c97e56c3f (patch) | |
| tree | dfe5beb9f147998c235386b3cf09c2d598d33067 /src/ui | |
| parent | protect includes in c file (diff) | |
| download | inkscape-c9e6cec9f909db85df80688c7a5b2a0c97e56c3f.tar.gz inkscape-c9e6cec9f909db85df80688c7a5b2a0c97e56c3f.zip | |
run clang tidy modernize pass
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 6 | ||||
| -rw-r--r-- | src/ui/dialog/pixelartdialog.cpp | 8 | ||||
| -rw-r--r-- | src/ui/toolbar/connector-toolbar.cpp | 6 | ||||
| -rw-r--r-- | src/ui/toolbar/measure-toolbar.cpp | 10 | ||||
| -rw-r--r-- | src/ui/toolbar/mesh-toolbar.cpp | 12 | ||||
| -rw-r--r-- | src/ui/toolbar/node-toolbar.cpp | 32 | ||||
| -rw-r--r-- | src/ui/widget/ink-flow-box.cpp | 2 |
7 files changed, 38 insertions, 38 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index e2be3d431..429fab403 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -875,8 +875,8 @@ void InkscapePreferences::initPageUI() std::vector<Glib::ustring> values; for (l = list; l; l = l->next) { theme = (gchar *)l->data; - labels.push_back(Glib::ustring(theme)); - values.push_back(Glib::ustring(theme)); + labels.emplace_back(theme); + values.emplace_back(theme); } g_list_free(list); @@ -913,7 +913,7 @@ void InkscapePreferences::initPageUI() std::sort(values.begin(), values.end()); labels.erase(unique(labels.begin(), labels.end()), labels.end()); values.erase(unique(values.begin(), values.end()), values.end()); - labels.push_back(_("Use system icons")); + labels.emplace_back(_("Use system icons")); values.push_back(prefs->getString("/theme/defaultIconTheme")); _icon_theme.init("/theme/iconTheme", labels, values, "hicolor"); _page_theme.add_line(false, _("Change icon theme:"), _icon_theme, "", "", false); diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp index e040d3be9..a0d5c9495 100644 --- a/src/ui/dialog/pixelartdialog.cpp +++ b/src/ui/dialog/pixelartdialog.cpp @@ -429,13 +429,13 @@ void PixelArtDialogImpl::processLibdepixelize(const Input &input) } if ( voronoiRadioButton.get_active() ) { - output.push_back(Output(Tracer::Kopf2011::to_voronoi(input.pixbuf, + output.emplace_back(Tracer::Kopf2011::to_voronoi(input.pixbuf, lastOptions), - input.x, input.y)); + input.x, input.y); } else { - output.push_back(Output(Tracer::Kopf2011::to_splines(input.pixbuf, + output.emplace_back(Tracer::Kopf2011::to_splines(input.pixbuf, lastOptions), - input.x, input.y)); + input.x, input.y); } } diff --git a/src/ui/toolbar/connector-toolbar.cpp b/src/ui/toolbar/connector-toolbar.cpp index 9a1261aba..77308c9ec 100644 --- a/src/ui/toolbar/connector-toolbar.cpp +++ b/src/ui/toolbar/connector-toolbar.cpp @@ -61,13 +61,13 @@ using Inkscape::UI::PrefPusher; //## Connector ## //######################### -static void sp_connector_path_set_avoid(void) +static void sp_connector_path_set_avoid() { Inkscape::UI::Tools::cc_selection_set_avoid(true); } -static void sp_connector_path_set_ignore(void) +static void sp_connector_path_set_ignore() { Inkscape::UI::Tools::cc_selection_set_avoid(false); } @@ -215,7 +215,7 @@ static void connector_spacing_changed(GtkAdjustment *adj, GObject* tbl) g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) ); } -static void sp_connector_graph_layout(void) +static void sp_connector_graph_layout() { if (!SP_ACTIVE_DESKTOP) { return; diff --git a/src/ui/toolbar/measure-toolbar.cpp b/src/ui/toolbar/measure-toolbar.cpp index eca4cf911..fa0d8827e 100644 --- a/src/ui/toolbar/measure-toolbar.cpp +++ b/src/ui/toolbar/measure-toolbar.cpp @@ -236,7 +236,7 @@ sp_toggle_show_in_between( GtkToggleAction* act, gpointer data ) } } static void -sp_reverse_knots(void){ +sp_reverse_knots(){ MeasureTool *mt = get_measure_tool(); if (mt) { mt->reverseKnots(); @@ -244,7 +244,7 @@ sp_reverse_knots(void){ } static void -sp_to_mark_dimension(void){ +sp_to_mark_dimension(){ MeasureTool *mt = get_measure_tool(); if (mt) { mt->toMarkDimension(); @@ -252,7 +252,7 @@ sp_to_mark_dimension(void){ } static void -sp_to_guides(void){ +sp_to_guides(){ MeasureTool *mt = get_measure_tool(); if (mt) { mt->toGuides(); @@ -260,7 +260,7 @@ sp_to_guides(void){ } static void -sp_to_phantom(void){ +sp_to_phantom(){ MeasureTool *mt = get_measure_tool(); if (mt) { mt->toPhantom(); @@ -268,7 +268,7 @@ sp_to_phantom(void){ } static void -sp_to_item(void){ +sp_to_item(){ MeasureTool *mt = get_measure_tool(); if (mt) { mt->toItem(); diff --git a/src/ui/toolbar/mesh-toolbar.cpp b/src/ui/toolbar/mesh-toolbar.cpp index 6dad5a189..b3f37f3e5 100644 --- a/src/ui/toolbar/mesh-toolbar.cpp +++ b/src/ui/toolbar/mesh-toolbar.cpp @@ -285,7 +285,7 @@ static MeshTool *get_mesh_tool() return tool; } -static void ms_toggle_sides(void) +static void ms_toggle_sides() { MeshTool *mt = get_mesh_tool(); if (mt) { @@ -293,7 +293,7 @@ static void ms_toggle_sides(void) } } -static void ms_make_elliptical(void) +static void ms_make_elliptical() { MeshTool *mt = get_mesh_tool(); if (mt) { @@ -301,7 +301,7 @@ static void ms_make_elliptical(void) } } -static void ms_pick_colors(void) +static void ms_pick_colors() { MeshTool *mt = get_mesh_tool(); if (mt) { @@ -309,7 +309,7 @@ static void ms_pick_colors(void) } } -static void ms_fit_mesh(void) +static void ms_fit_mesh() { MeshTool *mt = get_mesh_tool(); if (mt) { @@ -317,7 +317,7 @@ static void ms_fit_mesh(void) } } -static void ms_toggle_handles(void) +static void ms_toggle_handles() { MeshTool *mt = get_mesh_tool(); if (mt) { @@ -338,7 +338,7 @@ static void ms_toggle_fill_stroke(InkToggleAction * /*act*/, gpointer data) } } -static void ms_warning_popup(void) +static void ms_warning_popup() { char *msg = _("Mesh gradients are part of SVG 2:\n" "* Syntax may change.\n" diff --git a/src/ui/toolbar/node-toolbar.cpp b/src/ui/toolbar/node-toolbar.cpp index 1026aff59..86d2f4d52 100644 --- a/src/ui/toolbar/node-toolbar.cpp +++ b/src/ui/toolbar/node-toolbar.cpp @@ -77,7 +77,7 @@ static NodeTool *get_node_tool() return tool; } -static void sp_node_path_edit_add(void) +static void sp_node_path_edit_add() { NodeTool *nt = get_node_tool(); if (nt) { @@ -85,28 +85,28 @@ static void sp_node_path_edit_add(void) } } -static void sp_node_path_edit_add_min_x(void) +static void sp_node_path_edit_add_min_x() { NodeTool *nt = get_node_tool(); if (nt) { nt->_multipath->insertNodesAtExtrema(Inkscape::UI::PointManipulator::EXTR_MIN_X); } } -static void sp_node_path_edit_add_max_x(void) +static void sp_node_path_edit_add_max_x() { NodeTool *nt = get_node_tool(); if (nt) { nt->_multipath->insertNodesAtExtrema(Inkscape::UI::PointManipulator::EXTR_MAX_X); } } -static void sp_node_path_edit_add_min_y(void) +static void sp_node_path_edit_add_min_y() { NodeTool *nt = get_node_tool(); if (nt) { nt->_multipath->insertNodesAtExtrema(Inkscape::UI::PointManipulator::EXTR_MIN_Y); } } -static void sp_node_path_edit_add_max_y(void) +static void sp_node_path_edit_add_max_y() { NodeTool *nt = get_node_tool(); if (nt) { @@ -114,7 +114,7 @@ static void sp_node_path_edit_add_max_y(void) } } -static void sp_node_path_edit_delete(void) +static void sp_node_path_edit_delete() { NodeTool *nt = get_node_tool(); if (nt) { @@ -123,7 +123,7 @@ static void sp_node_path_edit_delete(void) } } -static void sp_node_path_edit_delete_segment(void) +static void sp_node_path_edit_delete_segment() { NodeTool *nt = get_node_tool(); if (nt) { @@ -131,7 +131,7 @@ static void sp_node_path_edit_delete_segment(void) } } -static void sp_node_path_edit_break(void) +static void sp_node_path_edit_break() { NodeTool *nt = get_node_tool(); if (nt) { @@ -139,7 +139,7 @@ static void sp_node_path_edit_break(void) } } -static void sp_node_path_edit_join(void) +static void sp_node_path_edit_join() { NodeTool *nt = get_node_tool(); if (nt) { @@ -147,7 +147,7 @@ static void sp_node_path_edit_join(void) } } -static void sp_node_path_edit_join_segment(void) +static void sp_node_path_edit_join_segment() { NodeTool *nt = get_node_tool(); if (nt) { @@ -155,7 +155,7 @@ static void sp_node_path_edit_join_segment(void) } } -static void sp_node_path_edit_toline(void) +static void sp_node_path_edit_toline() { NodeTool *nt = get_node_tool(); if (nt) { @@ -163,7 +163,7 @@ static void sp_node_path_edit_toline(void) } } -static void sp_node_path_edit_tocurve(void) +static void sp_node_path_edit_tocurve() { NodeTool *nt = get_node_tool(); if (nt) { @@ -171,7 +171,7 @@ static void sp_node_path_edit_tocurve(void) } } -static void sp_node_path_edit_cusp(void) +static void sp_node_path_edit_cusp() { NodeTool *nt = get_node_tool(); if (nt) { @@ -179,7 +179,7 @@ static void sp_node_path_edit_cusp(void) } } -static void sp_node_path_edit_smooth(void) +static void sp_node_path_edit_smooth() { NodeTool *nt = get_node_tool(); if (nt) { @@ -187,7 +187,7 @@ static void sp_node_path_edit_smooth(void) } } -static void sp_node_path_edit_symmetrical(void) +static void sp_node_path_edit_symmetrical() { NodeTool *nt = get_node_tool(); if (nt) { @@ -195,7 +195,7 @@ static void sp_node_path_edit_symmetrical(void) } } -static void sp_node_path_edit_auto(void) +static void sp_node_path_edit_auto() { NodeTool *nt = get_node_tool(); if (nt) { diff --git a/src/ui/widget/ink-flow-box.cpp b/src/ui/widget/ink-flow-box.cpp index 127da3107..215e9d954 100644 --- a/src/ui/widget/ink-flow-box.cpp +++ b/src/ui/widget/ink-flow-box.cpp @@ -47,7 +47,7 @@ InkFlowBox::InkFlowBox(const gchar *name) sensitive = true; } -InkFlowBox::~InkFlowBox() {} +InkFlowBox::~InkFlowBox() = default; Glib::ustring InkFlowBox::getPrefsPath(gint pos) { |
