Fix include order with clang-tidy check llvm-include-order

22 files changed, 51 insertions, 51 deletions

diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index 34b29f3bb..d88e2982f 100644
--- a/src/ui/tools/arc-tool.cpp
+++ b/src/ui/tools/arc-tool.cpp
@@ -19,8 +19,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <glibmm/i18n.h>
 #include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
 
 #include "context-fns.h"
 #include "desktop-style.h"
@@ -34,20 +34,20 @@
 #include "snap.h"
 #include "verbs.h"
 
-#include "display/sp-canvas.h"
 #include "display/sp-canvas-item.h"
+#include "display/sp-canvas.h"
 
 #include "object/sp-ellipse.h"
 #include "object/sp-namedview.h"
 
 #include "pixmaps/cursor-ellipse.xpm"
 
-#include "ui/tools/arc-tool.h"
 #include "ui/shape-editor.h"
+#include "ui/tools/arc-tool.h"
 #include "ui/tools/tool-base.h"
 
-#include "xml/repr.h"
 #include "xml/node-event-vector.h"
+#include "xml/repr.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp
index c080571d0..3d8784c01 100644
--- a/src/ui/tools/calligraphic-tool.cpp
+++ b/src/ui/tools/calligraphic-tool.cpp
@@ -23,16 +23,16 @@
 
 #define noDYNA_DRAW_VERBOSE
 
-#include <gtk/gtk.h>
+#include <cstring>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
-#include <string>
-#include <cstring>
+#include <gtk/gtk.h>
 #include <numeric>
+#include <string>
 
-#include <2geom/pathvector.h>
 #include <2geom/bezier-utils.h>
 #include <2geom/circle.h>
+#include <2geom/pathvector.h>
 
 #include "context-fns.h"
 #include "desktop-events.h"
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index c1175f592..6ae39431d 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -66,12 +66,12 @@
  *
  */
 
-#include <string>
 #include <cstring>
+#include <string>
 
+#include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 #include <glibmm/stringutils.h>
-#include <gdk/gdkkeysyms.h>
 
 #include "context-fns.h"
 #include "desktop-style.h"
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index 07fc4b719..d66af2c65 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -15,12 +15,12 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
 
-#include <2geom/transforms.h>
 #include <2geom/circle.h>
+#include <2geom/transforms.h>
 
 #include "color-rgba.h"
 #include "desktop-style.h"
@@ -33,10 +33,10 @@
 #include "sp-cursor.h"
 #include "verbs.h"
 
-#include "display/canvas-bpath.h"
+#include "display/cairo-utils.h"
 #include "display/canvas-arena.h"
+#include "display/canvas-bpath.h"
 #include "display/curve.h"
-#include "display/cairo-utils.h"
 
 #include "object/sp-namedview.h"
 
diff --git a/src/ui/tools/dynamic-base.cpp b/src/ui/tools/dynamic-base.cpp
index 1026c26c6..fa913e37b 100644
--- a/src/ui/tools/dynamic-base.cpp
+++ b/src/ui/tools/dynamic-base.cpp
@@ -1,10 +1,10 @@
 
 #include "ui/tools/dynamic-base.h"
 
-#include "message-context.h"
-#include "display/sp-canvas-item.h"
 #include "desktop.h"
 #include "display/curve.h"
+#include "display/sp-canvas-item.h"
+#include "message-context.h"
 
 #define MIN_PRESSURE      0.0
 #define MAX_PRESSURE      1.0
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index 6d1c24f07..4920de584 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -24,13 +24,13 @@
 
 #define noERASER_VERBOSE
 
-#include <string>
 #include <cstring>
 #include <numeric>
+#include <string>
 
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
+#include <gtk/gtk.h>
 
 #include <2geom/bezier-utils.h>
 #include <2geom/pathvector.h>
@@ -52,10 +52,10 @@
 #include "splivarot.h"
 #include "verbs.h"
 
-#include "display/sp-canvas.h"
 #include "display/canvas-arena.h"
 #include "display/canvas-bpath.h"
 #include "display/curve.h"
+#include "display/sp-canvas.h"
 
 #include "object/sp-clippath.h"
 #include "object/sp-item-group.h"
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index a9b3ff8f5..8a22dfe94 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -30,8 +30,8 @@
 
 #include "live_effects/lpe-bendpath.h"
 #include "live_effects/lpe-patternalongpath.h"
-#include "live_effects/lpe-simplify.h"
 #include "live_effects/lpe-powerstroke.h"
+#include "live_effects/lpe-simplify.h"
 
 #include "svg/svg.h"
 
diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index b0c2a0185..1e2347769 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -16,8 +16,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
 
 #include "desktop.h"
 #include "document-undo.h"
diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp
index f62a70c34..d52a19121 100644
--- a/src/ui/tools/lpe-tool.cpp
+++ b/src/ui/tools/lpe-tool.cpp
@@ -29,9 +29,9 @@
 #include "message-stack.h"
 #include "selection.h"
 
-#include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "display/canvas-text.h"
+#include "display/curve.h"
 
 #include "object/sp-path.h"
 
@@ -39,8 +39,8 @@
 
 #include "util/units.h"
 
-#include "ui/tools/lpe-tool.h"
 #include "ui/shape-editor.h"
+#include "ui/tools/lpe-tool.h"
 
 using Inkscape::Util::unit_table;
 using Inkscape::UI::Tools::PenTool;
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index c2bc23d8b..e2e55a580 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -14,8 +14,8 @@
 #include <config.h>
 #endif
 
-#include <gtkmm.h>
 #include <glibmm/i18n.h>
+#include <gtkmm.h>
 
 #include <boost/none_t.hpp>
 
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index e94da4813..5cf7316a7 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -29,8 +29,8 @@
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
-#include "gradient-drag.h"
 #include "gradient-chemistry.h"
+#include "gradient-drag.h"
 #include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
@@ -39,8 +39,8 @@
 #include "snap.h"
 #include "verbs.h"
 
-#include "display/sp-ctrlcurve.h"
 #include "display/curve.h"
+#include "display/sp-ctrlcurve.h"
 
 #include "object/sp-defs.h"
 #include "object/sp-mesh-gradient.h"
@@ -48,8 +48,8 @@
 #include "object/sp-text.h"
 #include "style.h"
 
-#include "pixmaps/cursor-gradient.xpm"
 #include "pixmaps/cursor-gradient-add.xpm"
+#include "pixmaps/cursor-gradient.xpm"
 
 #include "ui/control-manager.h"
 #include "ui/tools/mesh-tool.h"
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index d54adba89..301566f6e 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -10,8 +10,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 
 
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 7dd120077..6f98919ef 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -50,8 +50,8 @@
 #include "ui/tools/pen-tool.h"
 
 // we include the necessary files for BSpline & Spiro
-#include "live_effects/lpeobject.h"
 #include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpeobject.h"
 #include "live_effects/parameter/path.h"
 
 #define INKSCAPE_LPE_SPIRO_C
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index 590ef3634..ff84ee138 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -19,8 +19,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 
-#include <2geom/sbasis-to-bezier.h>
 #include <2geom/bezier-utils.h>
+#include <2geom/sbasis-to-bezier.h>
 
 #include "ui/tools/pencil-tool.h"
 
@@ -40,8 +40,8 @@
 #include "display/curve.h"
 #include "display/sp-canvas.h"
 
-#include "live_effects/lpe-powerstroke.h"
 #include "live_effects/lpe-powerstroke-interpolators.h"
+#include "live_effects/lpe-powerstroke.h"
 
 #include "object/sp-path.h"
 #include "style.h"
diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp
index 7442c6eca..c4d942435 100644
--- a/src/ui/tools/rect-tool.cpp
+++ b/src/ui/tools/rect-tool.cpp
@@ -34,8 +34,8 @@
 #include "display/sp-canvas-item.h"
 #include "display/sp-canvas.h"
 
-#include "object/sp-rect.h"
 #include "object/sp-namedview.h"
+#include "object/sp-rect.h"
 
 #include "pixmaps/cursor-rect.xpm"
 
diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index ddc6e2881..a70620be8 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -37,8 +37,8 @@
 #include "sp-cursor.h"
 
 #include "display/drawing-item.h"
-#include "display/sp-canvas.h"
 #include "display/sp-canvas-item.h"
+#include "display/sp-canvas.h"
 
 #include "object/box3d.h"
 #include "style.h"
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 603d5e80a..8f5800f72 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -57,11 +57,11 @@
 
 #include "pixmaps/cursor-spray.xpm"
 
-#include "svg/svg.h"
 #include "svg/svg-color.h"
+#include "svg/svg.h"
 
-#include "ui/tools/spray-tool.h"
 #include "ui/dialog/dialog-manager.h"
+#include "ui/tools/spray-tool.h"
 
 
 using Inkscape::DocumentUndo;
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index 3a5615c3b..46412a6ab 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -34,8 +34,8 @@
 #include "selection.h"
 #include "verbs.h"
 
-#include "display/sp-canvas.h"
 #include "display/sp-canvas-item.h"
+#include "display/sp-canvas.h"
 
 #include "object/sp-namedview.h"
 #include "object/sp-star.h"
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index 8db6c323c..41c2f4061 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -18,11 +18,11 @@
 #endif
 
 #include <gdk/gdkkeysyms.h>
-#include <gtkmm/clipboard.h>
 #include <glibmm/i18n.h>
+#include <gtkmm/clipboard.h>
 
-#include <display/sp-ctrlline.h>
 #include <display/sodipodi-ctrlrect.h>
+#include <display/sp-ctrlline.h>
 #include <display/sp-ctrlquadr.h>
 
 #include "context-fns.h"
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 9f9a155c2..c643f16e1 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -21,8 +21,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 
-#include "shortcuts.h"
 #include "file.h"
+#include "shortcuts.h"
 
 
 
@@ -38,24 +38,24 @@
 #include "selection.h"
 #include "sp-cursor.h"
 
-#include "display/sp-canvas.h"
-#include "display/sp-canvas-group.h"
 #include "display/canvas-rotate.h"
+#include "display/sp-canvas-group.h"
+#include "display/sp-canvas.h"
 
 #include "object/sp-guide.h"
 
 #include "ui/contextmenu.h"
-#include "ui/interface.h"
 #include "ui/event-debug.h"
-#include "ui/tool/control-point.h"
+#include "ui/interface.h"
 #include "ui/shape-editor.h"
-#include "ui/tools/tool-base.h"
-#include "ui/tools-switch.h"
-#include "ui/tools/lpe-tool.h"
 #include "ui/tool/commit-events.h"
+#include "ui/tool/control-point.h"
 #include "ui/tool/event-utils.h"
-#include "ui/tools/node-tool.h"
 #include "ui/tool/shape-record.h"
+#include "ui/tools-switch.h"
+#include "ui/tools/lpe-tool.h"
+#include "ui/tools/node-tool.h"
+#include "ui/tools/tool-base.h"
 
 #include "widgets/desktop-widget.h"
 
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index 6698316c7..e8bc87ecc 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -13,9 +13,9 @@
 
 #include <numeric>
 
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
+#include <gtk/gtk.h>
 
 #include <2geom/circle.h>
 
diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp
index 6f7fca242..3ebb987c4 100644
--- a/src/ui/tools/zoom-tool.cpp
+++ b/src/ui/tools/zoom-tool.cpp
@@ -15,12 +15,12 @@
 #include <gdk/gdkkeysyms.h>
 
 #include "macros.h"
-#include "rubberband.h"
+#include "desktop.h"
 #include "display/sp-canvas-item.h"
 #include "display/sp-canvas-util.h"
-#include "desktop.h"
-#include "pixmaps/cursor-zoom.xpm"
 #include "pixmaps/cursor-zoom-out.xpm"
+#include "pixmaps/cursor-zoom.xpm"
+#include "rubberband.h"
 #include "selection-chemistry.h"
 
 #include "ui/tools/zoom-tool.h"