Fix codding style

9 files changed, 14 insertions, 21 deletions

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;
 };