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

21 files changed, 77 insertions, 77 deletions

diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp
index bfbda2bfd..fa0195aaa 100644
--- a/src/live_effects/parameter/bool.cpp
+++ b/src/live_effects/parameter/bool.cpp
@@ -5,13 +5,13 @@
  */
 
 #include "ui/widget/registered-widget.h"
-#include "live_effects/parameter/bool.h"
+#include "helper-fns.h"
+#include "inkscape.h"
 #include "live_effects/effect.h"
-#include "svg/svg.h"
+#include "live_effects/parameter/bool.h"
 #include "svg/stringstream.h"
-#include "inkscape.h"
+#include "svg/svg.h"
 #include "verbs.h"
-#include "helper-fns.h"
 #include <glibmm/i18n.h>
 
 namespace Inkscape {
diff --git a/src/live_effects/parameter/colorpicker.cpp b/src/live_effects/parameter/colorpicker.cpp
index f6521d0c0..9b5ff67d1 100644
--- a/src/live_effects/parameter/colorpicker.cpp
+++ b/src/live_effects/parameter/colorpicker.cpp
@@ -4,19 +4,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-#include "ui/widget/registered-widget.h"
-#include "live_effects/parameter/colorpicker.h"
-#include "live_effects/effect.h"
-#include "ui/widget/color-picker.h"
-#include "svg/svg.h"
-#include "svg/svg-color.h"
 #include "color.h"
+#include "document-undo.h"
+#include "document.h"
 #include "inkscape.h"
+#include "live_effects/effect.h"
+#include "live_effects/parameter/colorpicker.h"
 #include "svg/stringstream.h"
+#include "svg/svg-color.h"
+#include "svg/svg.h"
+#include "ui/widget/color-picker.h"
+#include "ui/widget/registered-widget.h"
 #include "verbs.h"
-#include "document.h"
-#include "document-undo.h"
+#include <gtkmm.h>
 
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/parameter/fontbutton.cpp b/src/live_effects/parameter/fontbutton.cpp
index 49edb850a..337b1d7a4 100644
--- a/src/live_effects/parameter/fontbutton.cpp
+++ b/src/live_effects/parameter/fontbutton.cpp
@@ -4,14 +4,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-#include "ui/widget/registered-widget.h"
-#include "live_effects/parameter/fontbutton.h"
 #include "live_effects/effect.h"
-#include "ui/widget/font-button.h"
-#include "svg/svg.h"
+#include "live_effects/parameter/fontbutton.h"
 #include "svg/stringstream.h"
+#include "svg/svg.h"
+#include "ui/widget/font-button.h"
+#include "ui/widget/registered-widget.h"
 #include "verbs.h"
+#include <gtkmm.h>
 
 #include <glibmm/i18n.h>
 
diff --git a/src/live_effects/parameter/hidden.cpp b/src/live_effects/parameter/hidden.cpp
index 5a21f572b..a68a7229c 100644
--- a/src/live_effects/parameter/hidden.cpp
+++ b/src/live_effects/parameter/hidden.cpp
@@ -13,8 +13,8 @@
 
 #include "live_effects/parameter/hidden.h"
 #include "live_effects/effect.h"
-#include "svg/svg.h"
 #include "svg/stringstream.h"
+#include "svg/svg.h"
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/item-reference.cpp b/src/live_effects/parameter/item-reference.cpp
index 6540245d3..407dc3be9 100644
--- a/src/live_effects/parameter/item-reference.cpp
+++ b/src/live_effects/parameter/item-reference.cpp
@@ -8,9 +8,9 @@
 
 #include "live_effects/parameter/item-reference.h"
 
+#include "object/sp-item-group.h"
 #include "object/sp-shape.h"
 #include "object/sp-text.h"
-#include "object/sp-item-group.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
diff --git a/src/live_effects/parameter/item.cpp b/src/live_effects/parameter/item.cpp
index 2107a5912..d3bc96f98 100644
--- a/src/live_effects/parameter/item.cpp
+++ b/src/live_effects/parameter/item.cpp
@@ -18,11 +18,11 @@
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 
-#include "selection-chemistry.h"
-#include "xml/repr.h"
 #include "desktop.h"
 #include "inkscape.h"
 #include "message-stack.h"
+#include "selection-chemistry.h"
+#include "xml/repr.h"
 
 // clipboard support
 #include "ui/clipboard.h"
diff --git a/src/live_effects/parameter/message.cpp b/src/live_effects/parameter/message.cpp
index 03eb2219f..693396ce0 100644
--- a/src/live_effects/parameter/message.cpp
+++ b/src/live_effects/parameter/message.cpp
@@ -4,10 +4,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtkmm.h>
-#include "live_effects/parameter/message.h"
 #include "live_effects/effect.h"
+#include "live_effects/parameter/message.h"
 #include <glibmm/i18n.h>
+#include <gtkmm.h>
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/originalitem.cpp b/src/live_effects/parameter/originalitem.cpp
index 52e4c2fd8..8e4bb0849 100644
--- a/src/live_effects/parameter/originalitem.cpp
+++ b/src/live_effects/parameter/originalitem.cpp
@@ -8,8 +8,8 @@
 # include "config.h"
 #endif
 
-#include <gtkmm/box.h>
 #include "live_effects/parameter/originalitem.h"
+#include <gtkmm/box.h>
 
 #include <glibmm/i18n.h>
 #include <gtkmm/button.h>
@@ -18,8 +18,8 @@
 #include "display/curve.h"
 #include "live_effects/effect.h"
 
-#include "inkscape.h"
 #include "desktop.h"
+#include "inkscape.h"
 #include "selection.h"
 
 #include "object/uri.h"
diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp
index a801d25f6..f2ead5cea 100644
--- a/src/live_effects/parameter/originalitemarray.cpp
+++ b/src/live_effects/parameter/originalitemarray.cpp
@@ -10,27 +10,27 @@
 
 #include "live_effects/parameter/originalitemarray.h"
 
-#include <gtkmm/widget.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/imagemenuitem.h>
-#include <gtkmm/separatormenuitem.h>
 #include <gtkmm/scrolledwindow.h>
+#include <gtkmm/separatormenuitem.h>
+#include <gtkmm/widget.h>
 
 #include <glibmm/i18n.h>
 
 #include "inkscape.h"
-#include "ui/clipboard.h"
-#include "svg/svg.h"
-#include "svg/stringstream.h"
 #include "originalitem.h"
+#include "svg/stringstream.h"
+#include "svg/svg.h"
+#include "ui/clipboard.h"
 
 #include "object/uri.h"
 
 #include "live_effects/effect.h"
 
-#include "verbs.h"
 #include "document-undo.h"
 #include "document.h"
+#include "verbs.h"
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp
index 018e1e69e..e71df4a54 100644
--- a/src/live_effects/parameter/originalpath.cpp
+++ b/src/live_effects/parameter/originalpath.cpp
@@ -8,8 +8,8 @@
 # include "config.h"
 #endif
 
-#include <gtkmm/box.h>
 #include "live_effects/parameter/originalpath.h"
+#include <gtkmm/box.h>
 
 #include <glibmm/i18n.h>
 #include <gtkmm/button.h>
@@ -18,12 +18,12 @@
 #include "display/curve.h"
 #include "live_effects/effect.h"
 
-#include "object/uri.h"
 #include "object/sp-shape.h"
 #include "object/sp-text.h"
+#include "object/uri.h"
 
-#include "inkscape.h"
 #include "desktop.h"
+#include "inkscape.h"
 #include "selection.h"
 #include "ui/icon-names.h"
 
diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp
index 70f17ccb8..309b6c989 100644
--- a/src/live_effects/parameter/originalpatharray.cpp
+++ b/src/live_effects/parameter/originalpatharray.cpp
@@ -8,26 +8,26 @@
 # include "config.h"
 #endif
 
-#include "live_effects/parameter/originalpatharray.h"
-#include "live_effects/lpe-spiro.h"
 #include "live_effects/lpe-bspline.h"
-#include "live_effects/lpeobject.h"
+#include "live_effects/lpe-spiro.h"
 #include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpeobject.h"
+#include "live_effects/parameter/originalpatharray.h"
 
-#include <gtkmm/widget.h>
 #include <gtkmm/icontheme.h>
 #include <gtkmm/imagemenuitem.h>
-#include <gtkmm/separatormenuitem.h>
 #include <gtkmm/scrolledwindow.h>
+#include <gtkmm/separatormenuitem.h>
+#include <gtkmm/widget.h>
 
 #include <glibmm/i18n.h>
 
+#include "display/curve.h"
 #include "inkscape.h"
-#include "ui/clipboard.h"
-#include "svg/svg.h"
-#include "svg/stringstream.h"
 #include "originalpath.h"
-#include "display/curve.h"
+#include "svg/stringstream.h"
+#include "svg/svg.h"
+#include "ui/clipboard.h"
 
 #include <2geom/coord.h>
 #include <2geom/point.h>
@@ -38,9 +38,9 @@
 
 #include "live_effects/effect.h"
 
-#include "verbs.h"
 #include "document-undo.h"
 #include "document.h"
+#include "verbs.h"
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index ab385daa6..706b6d105 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -17,38 +17,38 @@
 
 #include "live_effects/effect.h"
 #include "svg/svg.h"
-#include <2geom/svg-path-parser.h>
-#include <2geom/sbasis-to-bezier.h>
-#include <2geom/pathvector.h>
 #include <2geom/d2.h>
+#include <2geom/pathvector.h>
+#include <2geom/sbasis-to-bezier.h>
+#include <2geom/svg-path-parser.h>
 
-#include "selection-chemistry.h"
-#include "xml/repr.h"
 #include "desktop.h"
+#include "document-undo.h"
+#include "document.h"
 #include "inkscape.h"
 #include "message-stack.h"
+#include "selection-chemistry.h"
 #include "verbs.h"
-#include "document.h"
-#include "document-undo.h"
+#include "xml/repr.h"
 
 // needed for on-canvas editing:
-#include "ui/tools-switch.h"
 #include "ui/shape-editor.h"
+#include "ui/tools-switch.h"
 
 #include "selection.h"
 // clipboard support
 #include "ui/clipboard.h"
 // required for linking to other paths
 
-#include "object/uri.h"
 #include "object/sp-shape.h"
 #include "object/sp-text.h"
+#include "object/uri.h"
 
 #include "display/curve.h"
 
-#include "ui/tools/node-tool.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/shape-record.h"
+#include "ui/tools/node-tool.h"
 
 #include "ui/icon-names.h"
 
diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp
index b811b7f2b..2261ec59a 100644
--- a/src/live_effects/parameter/point.cpp
+++ b/src/live_effects/parameter/point.cpp
@@ -5,13 +5,13 @@
  */
 
 #include "live_effects/parameter/point.h"
+#include "inkscape.h"
+#include "knotholder.h"
 #include "live_effects/effect.h"
-#include "svg/svg.h"
 #include "svg/stringstream.h"
+#include "svg/svg.h"
 #include "ui/widget/point.h"
-#include "inkscape.h"
 #include "verbs.h"
-#include "knotholder.h"
 #include <glibmm/i18n.h>
 
 namespace Inkscape {
diff --git a/src/live_effects/parameter/powerstrokepointarray.cpp b/src/live_effects/parameter/powerstrokepointarray.cpp
index cf4adc5fd..a3739a09f 100644
--- a/src/live_effects/parameter/powerstrokepointarray.cpp
+++ b/src/live_effects/parameter/powerstrokepointarray.cpp
@@ -7,8 +7,8 @@
 #include "ui/dialog/lpe-powerstroke-properties.h"
 #include "live_effects/parameter/powerstrokepointarray.h"
 
-#include "live_effects/effect.h"
 #include "knotholder.h"
+#include "live_effects/effect.h"
 
 
 #include <2geom/piecewise.h>
diff --git a/src/live_effects/parameter/random.cpp b/src/live_effects/parameter/random.cpp
index 23912bedb..642a62bb4 100644
--- a/src/live_effects/parameter/random.cpp
+++ b/src/live_effects/parameter/random.cpp
@@ -5,11 +5,11 @@
  */
 
 #include "ui/widget/registered-widget.h"
-#include "live_effects/parameter/random.h"
 #include "live_effects/effect.h"
-#include <glibmm/i18n.h>
+#include "live_effects/parameter/random.h"
 #include "svg/svg.h"
 #include "ui/widget/random.h"
+#include <glibmm/i18n.h>
 
 #include "svg/stringstream.h"
 
diff --git a/src/live_effects/parameter/satellitesarray.cpp b/src/live_effects/parameter/satellitesarray.cpp
index c6f5492d1..d4254ec19 100644
--- a/src/live_effects/parameter/satellitesarray.cpp
+++ b/src/live_effects/parameter/satellitesarray.cpp
@@ -7,9 +7,9 @@
  */
 
 #include "knotholder.h"
-#include "ui/dialog/lpe-fillet-chamfer-properties.h"
-#include "live_effects/parameter/satellitesarray.h"
 #include "live_effects/effect.h"
+#include "live_effects/parameter/satellitesarray.h"
+#include "ui/dialog/lpe-fillet-chamfer-properties.h"
 
 #include "inkscape.h"
 #include <preferences.h>
diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index 37ae3a1d7..2f48f87d5 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -11,13 +11,13 @@
 #include "ui/widget/registered-widget.h"
 #include <gtkmm/alignment.h>
 
-#include "live_effects/parameter/text.h"
+#include "display/canvas-text.h"
+#include "inkscape.h"
 #include "live_effects/effect.h"
-#include "svg/svg.h"
+#include "live_effects/parameter/text.h"
 #include "svg/stringstream.h"
-#include "inkscape.h"
+#include "svg/svg.h"
 #include "verbs.h"
-#include "display/canvas-text.h"
 #include <2geom/sbasis-geometric.h>
 
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/parameter/togglebutton.cpp b/src/live_effects/parameter/togglebutton.cpp
index bb9d9a90e..74ceda456 100644
--- a/src/live_effects/parameter/togglebutton.cpp
+++ b/src/live_effects/parameter/togglebutton.cpp
@@ -8,14 +8,14 @@
 #include "ui/widget/registered-widget.h"
 #include <glibmm/i18n.h>
 
-#include "live_effects/parameter/togglebutton.h"
+#include "helper-fns.h"
+#include "inkscape.h"
 #include "live_effects/effect.h"
-#include "svg/svg.h"
-#include "svg/stringstream.h"
+#include "live_effects/parameter/togglebutton.h"
 #include "selection.h"
-#include "inkscape.h"
+#include "svg/stringstream.h"
+#include "svg/svg.h"
 #include "verbs.h"
-#include "helper-fns.h"
 
 namespace Inkscape {
 
diff --git a/src/live_effects/parameter/transformedpoint.cpp b/src/live_effects/parameter/transformedpoint.cpp
index ab66e7256..bbdbc43f8 100644
--- a/src/live_effects/parameter/transformedpoint.cpp
+++ b/src/live_effects/parameter/transformedpoint.cpp
@@ -8,11 +8,11 @@
 #include "live_effects/parameter/transformedpoint.h"
 
 #include "knotholder.h"
-#include "svg/svg.h"
 #include "svg/stringstream.h"
+#include "svg/svg.h"
 
-#include "live_effects/effect.h"
 #include "desktop.h"
+#include "live_effects/effect.h"
 #include "verbs.h"
 
 #include <glibmm/i18n.h>
diff --git a/src/live_effects/parameter/unit.cpp b/src/live_effects/parameter/unit.cpp
index 9199e592d..9216c06ef 100644
--- a/src/live_effects/parameter/unit.cpp
+++ b/src/live_effects/parameter/unit.cpp
@@ -7,10 +7,10 @@
 #include "ui/widget/registered-widget.h"
 #include <glibmm/i18n.h>
 
-#include "live_effects/parameter/unit.h"
 #include "live_effects/effect.h"
-#include "verbs.h"
+#include "live_effects/parameter/unit.h"
 #include "util/units.h"
+#include "verbs.h"
 
 using Inkscape::Util::unit_table;
 
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index 1207a05da..2bcd6c83f 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -10,8 +10,8 @@
 #include "live_effects/parameter/vector.h"
 
 #include "knotholder.h"
-#include "svg/svg.h"
 #include "svg/stringstream.h"
+#include "svg/svg.h"
 
 #include "live_effects/effect.h"
 #include "verbs.h"