Fix codding style

36 files changed, 50 insertions, 60 deletions

diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index a0dfa0a61..f68331f18 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -529,7 +529,7 @@ Application::Application(const char* argv, bool use_gui) :
             g_object_set(settings, "gtk-application-prefer-dark-theme",
                          prefs->getBool("/theme/darkTheme", gtkApplicationPreferDarkTheme), NULL);
         }
-        
+
         load_menus();
         Inkscape::DeviceManager::getManager().loadConfig();
     }
diff --git a/src/live_effects/parameter/item.cpp b/src/live_effects/parameter/item.cpp
index bb8f0be69..6683fa861 100644
--- a/src/live_effects/parameter/item.cpp
+++ b/src/live_effects/parameter/item.cpp
@@ -20,10 +20,10 @@
 #include "svg/svg.h"
 
 #include "desktop.h"
-#include "ui/icon-loader.h"
 #include "inkscape.h"
 #include "message-stack.h"
 #include "selection-chemistry.h"
+#include "ui/icon-loader.h"
 #include "xml/repr.h"
 // clipboard support
 #include "ui/clipboard.h"
diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp
index eaa22a217..8182b0d9c 100644
--- a/src/live_effects/parameter/originalitemarray.cpp
+++ b/src/live_effects/parameter/originalitemarray.cpp
@@ -15,12 +15,12 @@
 
 #include <glibmm/i18n.h>
 
-#include "ui/icon-loader.h"
 #include "inkscape.h"
 #include "originalitem.h"
 #include "svg/stringstream.h"
 #include "svg/svg.h"
 #include "ui/clipboard.h"
+#include "ui/icon-loader.h"
 
 #include "object/uri.h"
 
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index 7443acafb..788c8b288 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -26,10 +26,10 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "ui/icon-loader.h"
 #include "inkscape.h"
 #include "message-stack.h"
 #include "selection-chemistry.h"
+#include "ui/icon-loader.h"
 #include "verbs.h"
 #include "xml/repr.h"
 // needed for on-canvas editing:
diff --git a/src/live_effects/parameter/togglebutton.cpp b/src/live_effects/parameter/togglebutton.cpp
index ff1066eac..bc275e876 100644
--- a/src/live_effects/parameter/togglebutton.cpp
+++ b/src/live_effects/parameter/togglebutton.cpp
@@ -12,13 +12,13 @@
 #include <utility>
 
 #include "helper-fns.h"
-#include "ui/icon-loader.h"
 #include "inkscape.h"
 #include "live_effects/effect.h"
 #include "live_effects/parameter/togglebutton.h"
 #include "selection.h"
 #include "svg/stringstream.h"
 #include "svg/svg.h"
+#include "ui/icon-loader.h"
 #include "verbs.h"
 
 namespace Inkscape {
@@ -161,7 +161,7 @@ ToggleButtonParam::refresh_button()
     }
     if ( _icon_active ) {
         GdkPixbuf * icon_pixbuf = nullptr;
-        Gtk::Widget *im = dynamic_cast<Gtk::Image*>(children[0]);
+        Gtk::Widget *im = dynamic_cast<Gtk::Image *>(children[0]);
         if (!im) return;
         if (!value) {
             im = Glib::wrap(sp_get_icon_image(_icon_inactive, _icon_size));
diff --git a/src/ui/contextmenu.cpp b/src/ui/contextmenu.cpp
index 0f80dec6c..7d57e78a8 100644
--- a/src/ui/contextmenu.cpp
+++ b/src/ui/contextmenu.cpp
@@ -40,8 +40,8 @@
 #include "selection-chemistry.h"
 #include "shortcuts.h"
 
-#include "helper/action.h"
 #include "helper/action-context.h"
+#include "helper/action.h"
 #include "ui/icon-loader.h"
 
 #include "include/gtkmm_version.h"
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index c55220973..e179d3692 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -40,8 +40,8 @@
 #include "display/drawing-context.h"
 #include "display/drawing.h"
 
-#include "ui/icon-loader.h"
 #include "helper/window.h"
+#include "ui/icon-loader.h"
 
 #include "object/sp-item.h"
 #include "object/sp-namedview.h"
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index f61b52968..3153e2ac5 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -30,12 +30,12 @@
 #include "display/canvas-grid.h"
 #include "document-properties.h"
 #include "helper/action.h"
-#include "ui/icon-loader.h"
 #include "include/gtkmm_version.h"
 #include "io/sys.h"
 #include "object/sp-root.h"
 #include "object/sp-script.h"
 #include "ui/dialog/filedialog.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "ui/shape-editor.h"
 #include "ui/tools-switch.h"
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 19048bc23..552877a52 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -26,10 +26,10 @@
 #include <glibmm/markup.h>
 #include <glibmm/miscutils.h>
 #include <gtk/gtksettings.h>
+#include <gtkmm/cssprovider.h>
 #include <gtkmm/main.h>
 #include <gtkmm/recentinfo.h>
 #include <gtkmm/recentmanager.h>
-#include <gtkmm/cssprovider.h>
 
 #include "cms-system.h"
 #include "document.h"
@@ -919,7 +919,7 @@ void InkscapePreferences::initPageUI()
     _symbolic_icons.signal_clicked().connect(sigc::mem_fun(*this, &InkscapePreferences::symbolicAddClass));
     _page_theme.add_line(true, "", _symbolic_icons, "", "", true),
     _symbolic_color.init(_("Color for symbolic icons:"), "/theme/symbolicColor", 0x000000ff);
-    Gtk::Button * _apply_color = new Gtk::Button(_("Apply color"));
+    Gtk::Button *_apply_color = new Gtk::Button(_("Apply color"));
     _apply_color->set_tooltip_text(_("Apply color to symbolic icons)"));
     _apply_color->signal_clicked().connect(sigc::mem_fun(*this, &InkscapePreferences::symbolicAddClass));
     _page_theme.add_line(false, "", _symbolic_color, _("Color for symbolic icons"), "", false, _apply_color);
@@ -2434,7 +2434,7 @@ void InkscapePreferences::on_pagelist_selection_changed()
             Gtk::Main::iteration();
         }
         this->show_all_children();
-        if (prefs->getInt("/dialogs/preferences/page",0) == PREFS_PAGE_UI_THEME) {
+        if (prefs->getInt("/dialogs/preferences/page", 0) == PREFS_PAGE_UI_THEME) {
             symbolicThemeCheck();
         }
     }
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 5bdda62c5..52692999a 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -16,10 +16,10 @@
 #include "ocaldialogs.h"
 
 #include "filedialogimpl-gtkmm.h"
-#include "ui/icon-loader.h"
 #include "io/sys.h"
 #include "path-prefix.h"
 #include "preferences.h"
+#include "ui/icon-loader.h"
 #include "ui/interface.h"
 
 #include <gtkmm/notebook.h>
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 85f395f26..ec49a2317 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -35,7 +35,6 @@
 
 #include "display/cairo-utils.h"
 #include "helper/action.h"
-#include "ui/icon-loader.h"
 #include "include/gtkmm_version.h"
 #include "io/resource.h"
 #include "io/sys.h"
@@ -45,6 +44,7 @@
 #include "object/sp-use.h"
 #include "ui/cache/svg_preview_cache.h"
 #include "ui/clipboard.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 
 #ifdef WITH_LIBVISIO
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index f0678c2b2..4ed279444 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -26,13 +26,12 @@
 #include "verbs.h"
 
 #include "helper/action.h"
-#include "ui/icon-loader.h"
-#include "ui/icon-loader.h"
 #include "include/gtkmm_version.h"
 #include "object/sp-defs.h"
 #include "object/sp-item.h"
 #include "object/sp-object-group.h"
 #include "svg/css-ostringstream.h"
+#include "ui/icon-loader.h"
 #include "ui/tools/tool-base.h"
 #include "ui/widget/color-notebook.h"
 #include "ui/widget/iconrenderer.h"
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index ed06f849a..a074f081b 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -26,9 +26,9 @@
 #include "transformation.h"
 #include "verbs.h"
 
-#include "ui/icon-loader.h"
 #include "object/sp-item-transform.h"
 #include "object/sp-namedview.h"
+#include "ui/icon-loader.h"
 
 #include "ui/icon-names.h"
 
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index 1306eefd9..eae9ea6c8 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -16,8 +16,8 @@
 
 #include "document-undo.h"
 #include "document.h"
-#include "ui/icon-loader.h"
 #include "inkscape.h"
+#include "ui/icon-loader.h"
 #include "util/signal-blocker.h"
 
 #include "desktop.h"
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index f0c04828e..d0cbf99cb 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -36,8 +36,8 @@
 #include "object/sp-root.h"
 #include "object/sp-string.h"
 
-#include "ui/icon-loader.h"
 #include "ui/dialog-events.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "ui/interface.h"
 #include "ui/tools/tool-base.h"
diff --git a/src/ui/icon-loader.cpp b/src/ui/icon-loader.cpp
index 0d9166beb..d42cb7837 100644
--- a/src/ui/icon-loader.cpp
+++ b/src/ui/icon-loader.cpp
@@ -20,9 +20,7 @@
 #include <gtkmm/icontheme.h>
 #include <gtkmm/toolitem.h>
 
-void sp_load_theme()
-{
-   }
+void sp_load_theme() {}
 
 Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size)
 {
@@ -36,9 +34,9 @@ Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size)
     }
     // TODO all calls to "sp_get_icon_pixbuf" need to be removed in thew furture
     // Put here temporary for allow use symbolic in a few icons require pixbug instead Gtk::Image
-    // We coulden't acces to pixbuf of a symbolic ones with the next order 
+    // We coulden't acces to pixbuf of a symbolic ones with the next order
     // icon_theme->load_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE);
-    // Maybe we can do with Gio, but not sure.  Also can render a icon to pixbuf but need to be 
+    // Maybe we can do with Gio, but not sure.  Also can render a icon to pixbuf but need to be
     // a stock-icon not on named ones I think or access directly to the icon.svg file
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     Glib::RefPtr<Gdk::Pixbuf> _icon_pixbuf;
@@ -105,7 +103,7 @@ Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gchar cons
 
 Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, Gtk::BuiltinIconSize icon_size)
 {
-    
+
     Gtk::Image *icon = new Gtk::Image();
     icon->set_from_icon_name(icon_name, Gtk::IconSize(icon_size));
     return icon;
@@ -113,7 +111,7 @@ Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, Gtk::BuiltinIconSize icon
 
 Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, Gtk::IconSize icon_size)
 {
-    
+
     Gtk::Image *icon = new Gtk::Image();
     icon->set_from_icon_name(icon_name, icon_size);
     return icon;
@@ -121,7 +119,7 @@ Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, Gtk::IconSize icon_size)
 
 Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, gchar const *prefs_size)
 {
-    
+
     Gtk::IconSize icon_size = Inkscape::UI::ToolboxFactory::prefToSize_mm(prefs_size);
     Gtk::Image *icon = new Gtk::Image();
     icon->set_from_icon_name(icon_name, icon_size);
@@ -131,7 +129,7 @@ Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, gchar const *prefs_size)
 
 GtkWidget *sp_get_icon_image(Glib::ustring icon_name, GtkIconSize icon_size)
 {
-    
+
     return gtk_image_new_from_icon_name(icon_name.c_str(), icon_size);
 }
 
diff --git a/src/ui/icon-loader.h b/src/ui/icon-loader.h
index dd4b3a4ce..3f7f1fcb8 100644
--- a/src/ui/icon-loader.h
+++ b/src/ui/icon-loader.h
@@ -24,5 +24,5 @@ Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gchar cons
 Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, Gtk::BuiltinIconSize icon_size);
 Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, Gtk::IconSize icon_size);
 Gtk::Image *sp_get_icon_image(Glib::ustring icon_name, gchar const *prefs_sice);
-GtkWidget  *sp_get_icon_image(Glib::ustring icon_name, GtkIconSize icon_size);
+GtkWidget *sp_get_icon_image(Glib::ustring icon_name, GtkIconSize icon_size);
 #endif // SEEN_INK_STOCK_ITEMS_H
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index edb000432..4aed4843b 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -46,8 +46,8 @@
 #include "extension/input.h"
 
 #include "helper/action.h"
-#include "ui/icon-loader.h"
 #include "helper/window.h"
+#include "ui/icon-loader.h"
 
 #include "io/sys.h"
 
diff --git a/src/ui/widget/clipmaskicon.cpp b/src/ui/widget/clipmaskicon.cpp
index f8c8a9994..1093c1fda 100644
--- a/src/ui/widget/clipmaskicon.cpp
+++ b/src/ui/widget/clipmaskicon.cpp
@@ -10,8 +10,8 @@
 
 #include "ui/widget/clipmaskicon.h"
 
-#include "ui/icon-loader.h"
 #include "layertypeicon.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "widgets/toolbox.h"
 
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index 395aa7b9e..88573f137 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -29,8 +29,8 @@
 #include "preferences.h"
 #include "profile-manager.h"
 
-#include "ui/icon-loader.h"
 #include "object/color-profile.h"
+#include "ui/icon-loader.h"
 
 #include "svg/svg-icc-color.h"
 
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index ae5efb73d..a02009ab5 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -11,8 +11,8 @@
 #include "ui/widget/dock.h"
 
 #include "desktop.h"
-#include "ui/icon-loader.h"
 #include "inkscape.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include <glibmm/exceptionhandler.h>
 #include <gtkmm/icontheme.h>
diff --git a/src/ui/widget/iconrenderer.cpp b/src/ui/widget/iconrenderer.cpp
index c6cc1ddcc..a2e6bdb12 100644
--- a/src/ui/widget/iconrenderer.cpp
+++ b/src/ui/widget/iconrenderer.cpp
@@ -11,8 +11,8 @@
 
 #include "ui/widget/iconrenderer.h"
 
-#include "ui/icon-loader.h"
 #include "layertypeicon.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "widgets/toolbox.h"
 
diff --git a/src/ui/widget/insertordericon.cpp b/src/ui/widget/insertordericon.cpp
index aa433947a..0a21f3c37 100644
--- a/src/ui/widget/insertordericon.cpp
+++ b/src/ui/widget/insertordericon.cpp
@@ -10,8 +10,8 @@
 
 #include "ui/widget/insertordericon.h"
 
-#include "ui/icon-loader.h"
 #include "layertypeicon.h"
+#include "ui/icon-loader.h"
 #include "ui/icon-names.h"
 #include "widgets/toolbox.h"
 
diff --git a/src/ui/widget/labelled.cpp b/src/ui/widget/labelled.cpp
index 1e679a01b..a44e69fcb 100644
--- a/src/ui/widget/labelled.cpp
+++ b/src/ui/widget/labelled.cpp
@@ -9,8 +9,8 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
-#include "ui/icon-loader.h"
 #include "labelled.h"
+#include "ui/icon-loader.h"
 #include <gtkmm/image.h>
 #include <gtkmm/label.h>
 
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index 0be876e02..7ad6b483b 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -14,8 +14,8 @@
 #include <cstring>
 #include <string>
 
-#include "ui/icon-loader.h"
 #include "ui/dialog/layer-properties.h"
+#include "ui/icon-loader.h"
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/adaptor/reversed.hpp>
 #include <glibmm/i18n.h>
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index acdf4f01d..7e79abb5b 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -33,8 +33,8 @@
 
 #include "io/sys.h"
 
-#include "ui/icon-loader.h"
 #include "ui/dialog/filedialog.h"
+#include "ui/icon-loader.h"
 #include "ui/widget/preferences-widget.h"
 
 
diff --git a/src/ui/widget/random.cpp b/src/ui/widget/random.cpp
index 32124bfd2..495a778a3 100644
--- a/src/ui/widget/random.cpp
+++ b/src/ui/widget/random.cpp
@@ -10,8 +10,8 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
-#include "ui/icon-loader.h"
 #include "random.h"
+#include "ui/icon-loader.h"
 #include <glibmm/i18n.h>
 
 #include <gtkmm/button.h>
diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index ef17eeed9..e2dedc518 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -18,8 +18,8 @@
 #include "button.h"
 #include "helper/action-context.h"
 #include "helper/action.h"
-#include "ui/icon-loader.h"
 #include "shortcuts.h"
+#include "ui/icon-loader.h"
 #include "ui/interface.h"
 
 static void sp_button_dispose(GObject *object);
diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp
index a76f9024c..8b7524f1b 100644
--- a/src/widgets/ege-adjustment-action.cpp
+++ b/src/widgets/ege-adjustment-action.cpp
@@ -866,8 +866,7 @@ static GtkWidget* create_tool_item( GtkAction* action )
 
             /* Use an icon if available or use short-label */
             if ( act->private_data->iconId && strcmp( act->private_data->iconId, "" ) != 0 ) {
-                GtkWidget *icon =
-                    sp_get_icon_image(act->private_data->iconId, act->private_data->iconSize);
+                GtkWidget *icon = sp_get_icon_image(act->private_data->iconId, act->private_data->iconSize);
                 gtk_box_pack_start( GTK_BOX(hb), icon, FALSE, FALSE, 0 );
             } else {
                 GtkWidget* lbl = gtk_label_new( g_value_get_string( &value ) ? g_value_get_string( &value ) : "wwww" );
diff --git a/src/widgets/ink-action.cpp b/src/widgets/ink-action.cpp
index b80463bbd..ff34624e7 100644
--- a/src/widgets/ink-action.cpp
+++ b/src/widgets/ink-action.cpp
@@ -170,8 +170,7 @@ static GtkWidget* ink_action_create_tool_item( GtkAction* action )
         if ( GTK_IS_TOOL_BUTTON(item) ) {
             GtkToolButton* button = GTK_TOOL_BUTTON(item);
 
-            GtkWidget *child =
-                sp_get_icon_image(act->private_data->iconId, act->private_data->iconSize);
+            GtkWidget *child = sp_get_icon_image(act->private_data->iconId, act->private_data->iconSize);
             gtk_tool_button_set_icon_widget( button, child );
         } else {
             // For now trigger a warning but don't do anything else
diff --git a/src/widgets/ink-radio-action.cpp b/src/widgets/ink-radio-action.cpp
index 693c0d7b0..64b757d24 100644
--- a/src/widgets/ink-radio-action.cpp
+++ b/src/widgets/ink-radio-action.cpp
@@ -167,8 +167,7 @@ static GtkWidget* ink_radio_action_create_tool_item( GtkAction* action )
         if ( GTK_IS_TOOL_BUTTON(item) ) {
             GtkToolButton* button = GTK_TOOL_BUTTON(item);
 
-            GtkWidget *child =
-                sp_get_icon_image(act->private_data->iconId, act->private_data->iconSize);
+            GtkWidget *child = sp_get_icon_image(act->private_data->iconId, act->private_data->iconSize);
             gtk_widget_set_hexpand(child, FALSE);
             gtk_widget_set_vexpand(child, FALSE);
             gtk_tool_button_set_icon_widget(button, child);
diff --git a/src/widgets/ink-toggle-action.cpp b/src/widgets/ink-toggle-action.cpp
index 3978dbd35..aa6fd308f 100644
--- a/src/widgets/ink-toggle-action.cpp
+++ b/src/widgets/ink-toggle-action.cpp
@@ -187,8 +187,7 @@ static GtkWidget* ink_toggle_action_create_tool_item( GtkAction* action )
     if ( GTK_IS_TOOL_BUTTON(item) ) {
         GtkToolButton* button = GTK_TOOL_BUTTON(item);
         if ( act->private_data->iconId ) {
-            GtkWidget *child =
-                sp_get_icon_image(act->private_data->iconId, act->private_data->iconSize);
+            GtkWidget *child = sp_get_icon_image(act->private_data->iconId, act->private_data->iconSize);
 
             gtk_widget_set_hexpand(child, FALSE);
             gtk_widget_set_vexpand(child, FALSE);
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 24422c137..920bae744 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -28,8 +28,8 @@
 #include "paint-selector.h"
 #include "path-prefix.h"
 
-#include "ui/icon-loader.h"
 #include "helper/stock-items.h"
+#include "ui/icon-loader.h"
 
 #include "style.h"
 
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index 0d25aa253..8ab358ce3 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -22,8 +22,8 @@
 #include "path-prefix.h"
 #include "stroke-style.h"
 
-#include "ui/icon-loader.h"
 #include "helper/stock-items.h"
+#include "ui/icon-loader.h"
 
 #include "io/sys.h"
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 41b237b29..0a7c4c79c 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -137,15 +137,12 @@ GtkIconSize ToolboxFactory::prefToSize( Glib::ustring const &path, int base ) {
     return sizeChoices[index];
 }
 
-Gtk::IconSize ToolboxFactory::prefToSize_mm( Glib::ustring const &path, int base ) {
-    static Gtk::IconSize sizeChoices[] = {
-        Gtk::ICON_SIZE_LARGE_TOOLBAR,
-        Gtk::ICON_SIZE_SMALL_TOOLBAR,
-        Gtk::ICON_SIZE_MENU,
-        Gtk::ICON_SIZE_DIALOG 
-    };
+Gtk::IconSize ToolboxFactory::prefToSize_mm(Glib::ustring const &path, int base)
+{
+    static Gtk::IconSize sizeChoices[] = { Gtk::ICON_SIZE_LARGE_TOOLBAR, Gtk::ICON_SIZE_SMALL_TOOLBAR,
+                                           Gtk::ICON_SIZE_MENU, Gtk::ICON_SIZE_DIALOG };
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    int index = prefs->getIntLimited( path, base, 0, G_N_ELEMENTS(sizeChoices) );
+    int index = prefs->getIntLimited(path, base, 0, G_N_ELEMENTS(sizeChoices));
     return sizeChoices[index];
 }
 
diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h
index a5cc98b5c..4a61a7892 100644
--- a/src/widgets/toolbox.h
+++ b/src/widgets/toolbox.h
@@ -62,9 +62,9 @@ public:
     static void updateSnapToolbox(SPDesktop *desktop, Inkscape::UI::Tools::ToolBase *eventcontext, GtkWidget *toolbox);
 
     static GtkIconSize prefToSize(Glib::ustring const &path, int base = 0 );
-    static Gtk::IconSize prefToSize_mm(Glib::ustring const &path, int base = 0 );
+    static Gtk::IconSize prefToSize_mm(Glib::ustring const &path, int base = 0);
 
-private:
+  private:
     ToolboxFactory() = delete;
 };