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

This reverts commit bba4ff6672494fab59286b50f6c645ad62a47e60.

31 files changed, 60 insertions, 60 deletions

diff --git a/src/ui/widget/addtoicon.cpp b/src/ui/widget/addtoicon.cpp
index a8a5b0d9e..e5119fc60 100644
--- a/src/ui/widget/addtoicon.cpp
+++ b/src/ui/widget/addtoicon.cpp
@@ -16,9 +16,9 @@
 
 #include <gtkmm/icontheme.h>
 
-#include "layertypeicon.h"
-#include "ui/icon-names.h"
 #include "widgets/toolbox.h"
+#include "ui/icon-names.h"
+#include "layertypeicon.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/clipmaskicon.cpp b/src/ui/widget/clipmaskicon.cpp
index bd6375f80..eceff13ca 100644
--- a/src/ui/widget/clipmaskicon.cpp
+++ b/src/ui/widget/clipmaskicon.cpp
@@ -15,9 +15,9 @@
 
 #include <gtkmm/icontheme.h>
 
-#include "layertypeicon.h"
-#include "ui/icon-names.h"
 #include "widgets/toolbox.h"
+#include "ui/icon-names.h"
+#include "layertypeicon.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index a37559323..32f99747a 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -4,8 +4,8 @@
 
 #include <set>
 
-#include <glibmm/i18n.h>
 #include <gtkmm/adjustment.h>
+#include <glibmm/i18n.h>
 
 #include "colorspace.h"
 #include "document.h"
@@ -23,9 +23,9 @@
 #define noDEBUG_LCMS
 
 #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
+#include "object/color-profile.h"
 #include "cms-system.h"
 #include "color-profile-cms-fns.h"
-#include "object/color-profile.h"
 
 #ifdef DEBUG_LCMS
 #include "preferences.h"
diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index 4b74759f9..5c6820e83 100644
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -11,10 +11,10 @@
  */
 
 #include "color-picker.h"
+#include "inkscape.h"
 #include "desktop.h"
-#include "document-undo.h"
 #include "document.h"
-#include "inkscape.h"
+#include "document-undo.h"
 #include "ui/dialog-events.h"
 
 #include "ui/widget/color-notebook.h"
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp
index 6d8621027..cb6349c4b 100644
--- a/src/ui/widget/color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -6,8 +6,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm/adjustment.h>
+#include <glibmm/i18n.h>
 
 #include "ui/dialog-events.h"
 #include "ui/widget/color-scales.h"
diff --git a/src/ui/widget/color-slider.cpp b/src/ui/widget/color-slider.cpp
index 3af52e469..ed034598e 100644
--- a/src/ui/widget/color-slider.cpp
+++ b/src/ui/widget/color-slider.cpp
@@ -20,9 +20,9 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm/stylecontext.h>
 
-#include "preferences.h"
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-slider.h"
+#include "preferences.h"
 
 static const gint SLIDER_WIDTH = 96;
 static const gint SLIDER_HEIGHT = 8;
diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp
index c8f1f8e30..ffdf173ba 100644
--- a/src/ui/widget/color-wheel-selector.cpp
+++ b/src/ui/widget/color-wheel-selector.cpp
@@ -4,14 +4,14 @@
 
 #include "color-wheel-selector.h"
 
-#include "ui/dialog-events.h"
-#include "ui/widget/color-scales.h"
-#include "ui/widget/color-slider.h"
-#include "widgets/gimp/gimpcolorwheel.h"
 #include <glibmm/i18n.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/label.h>
 #include <gtkmm/spinbutton.h>
+#include "ui/dialog-events.h"
+#include "ui/widget/color-scales.h"
+#include "ui/widget/color-slider.h"
+#include "widgets/gimp/gimpcolorwheel.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 85671e3d9..29f22977a 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -13,8 +13,8 @@
 #include "inkscape.h"
 #include "ui/icon-names.h"
 
-#include <glibmm/exceptionhandler.h>
 #include <gtkmm/icontheme.h>
+#include <glibmm/exceptionhandler.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp
index f72c05836..9c1f0f783 100644
--- a/src/ui/widget/dock.cpp
+++ b/src/ui/widget/dock.cpp
@@ -11,9 +11,9 @@
  */
 
 #include "dock.h"
-#include "desktop.h"
 #include "inkscape.h"
 #include "preferences.h"
+#include "desktop.h"
 
 #include <gtkmm/adjustment.h>
 #include <gtkmm/paned.h>
diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index f15f55911..67412b1e0 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.cpp
@@ -19,8 +19,8 @@
 
 #include "entity-entry.h"
 
-#include <gtkmm/entry.h>
 #include <gtkmm/scrolledwindow.h>
+#include <gtkmm/entry.h>
 
 #include "document-private.h"
 #include "document-undo.h"
diff --git a/src/ui/widget/font-selector-toolbar.cpp b/src/ui/widget/font-selector-toolbar.cpp
index fa6cf4c28..c997e0920 100644
--- a/src/ui/widget/font-selector-toolbar.cpp
+++ b/src/ui/widget/font-selector-toolbar.cpp
@@ -16,14 +16,14 @@
 
 #include "font-selector-toolbar.h"
 
-#include "libnrtype/font-instance.h"
 #include "libnrtype/font-lister.h"
+#include "libnrtype/font-instance.h"
 
 #include "ui/icon-names.h"
 
 // For updating from selection
-#include "desktop.h"
 #include "inkscape.h"
+#include "desktop.h"
 #include "object/sp-text.h"
 
 // TEMP TEMP TEMP
diff --git a/src/ui/widget/font-selector.cpp b/src/ui/widget/font-selector.cpp
index c83e80350..70f7d55db 100644
--- a/src/ui/widget/font-selector.cpp
+++ b/src/ui/widget/font-selector.cpp
@@ -15,12 +15,12 @@
 
 #include "font-selector.h"
 
-#include "libnrtype/font-instance.h"
 #include "libnrtype/font-lister.h"
+#include "libnrtype/font-instance.h"
 
 // For updating from selection
-#include "desktop.h"
 #include "inkscape.h"
+#include "desktop.h"
 #include "object/sp-text.h"
 
 namespace Inkscape {
diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp
index bef691260..be5ae255c 100644
--- a/src/ui/widget/font-variants.cpp
+++ b/src/ui/widget/font-variants.cpp
@@ -11,8 +11,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm.h>
+#include <glibmm/i18n.h>
 
 #include <libnrtype/font-instance.h>
 
diff --git a/src/ui/widget/font-variations.cpp b/src/ui/widget/font-variations.cpp
index 7c7aff018..9a8317a79 100644
--- a/src/ui/widget/font-variations.cpp
+++ b/src/ui/widget/font-variations.cpp
@@ -12,11 +12,11 @@
 #include <config.h>
 #endif
 
-#include <iomanip>
 #include <iostream>
+#include <iomanip>
 
-#include <glibmm/i18n.h>
 #include <gtkmm.h>
+#include <glibmm/i18n.h>
 
 #include <libnrtype/font-instance.h>
 
diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp
index 37223a868..8e7df7a68 100644
--- a/src/ui/widget/imageicon.cpp
+++ b/src/ui/widget/imageicon.cpp
@@ -12,11 +12,11 @@
  */
 
 #include "imageicon.h"
+#include "svg-view-widget.h"
 #include "document.h"
 #include "inkscape.h"
-#include "svg-view-widget.h"
-#include <glibmm/convert.h>
 #include <glibmm/fileutils.h>
+#include <glibmm/convert.h>
 
 namespace Inkscape
 {
diff --git a/src/ui/widget/imagetoggler.cpp b/src/ui/widget/imagetoggler.cpp
index b6844ffb3..38c84ca51 100644
--- a/src/ui/widget/imagetoggler.cpp
+++ b/src/ui/widget/imagetoggler.cpp
@@ -13,8 +13,8 @@
 
 #include <gtkmm/icontheme.h>
 
-#include "ui/icon-names.h"
 #include "widgets/toolbox.h"
+#include "ui/icon-names.h"
 
 #include <iostream>
 
diff --git a/src/ui/widget/ink-select-one-action.cpp b/src/ui/widget/ink-select-one-action.cpp
index 9a2c302fb..9ab4a7f45 100644
--- a/src/ui/widget/ink-select-one-action.cpp
+++ b/src/ui/widget/ink-select-one-action.cpp
@@ -19,16 +19,16 @@
 
 #include "ink-select-one-action.h"
 
-#include <gtkmm/box.h>
-#include <gtkmm/combobox.h>
-#include <gtkmm/image.h>
-#include <gtkmm/label.h>
-#include <gtkmm/menu.h>
+#include <iostream>
+#include <gtkmm/toolitem.h>
 #include <gtkmm/menuitem.h>
 #include <gtkmm/radioaction.h>
 #include <gtkmm/radiomenuitem.h>
-#include <gtkmm/toolitem.h>
-#include <iostream>
+#include <gtkmm/combobox.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/box.h>
+#include <gtkmm/label.h>
+#include <gtkmm/image.h>
 
 InkSelectOneAction* InkSelectOneAction::create(const Glib::ustring &name,
                                                const Glib::ustring &group_label,
diff --git a/src/ui/widget/ink-spinscale.cpp b/src/ui/widget/ink-spinscale.cpp
index d05c10a41..87a2bd11c 100644
--- a/src/ui/widget/ink-spinscale.cpp
+++ b/src/ui/widget/ink-spinscale.cpp
@@ -16,9 +16,9 @@
 */
 
 #include "ink-spinscale.h"
+#include <gdkmm/general.h>
 #include <gdkmm/cursor.h>
 #include <gdkmm/event.h>
-#include <gdkmm/general.h>
 
 #include <gtkmm/spinbutton.h>
 
diff --git a/src/ui/widget/insertordericon.cpp b/src/ui/widget/insertordericon.cpp
index 18dd13988..5d1f64a54 100644
--- a/src/ui/widget/insertordericon.cpp
+++ b/src/ui/widget/insertordericon.cpp
@@ -11,9 +11,9 @@
  
 #include <gtkmm/icontheme.h>
 
-#include "layertypeicon.h"
-#include "ui/icon-names.h"
 #include "widgets/toolbox.h"
+#include "ui/icon-names.h"
+#include "layertypeicon.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index 466d5e75e..e0a52a868 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -18,14 +18,14 @@
 #include <string>
 
 #include "ui/dialog/layer-properties.h"
+#include <glibmm/i18n.h>
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/adaptor/reversed.hpp>
-#include <glibmm/i18n.h>
 
 #include "desktop.h"
 
-#include "document-undo.h"
 #include "document.h"
+#include "document-undo.h"
 #include "layer-manager.h"
 #include "ui/icon-names.h"
 #include "ui/util.h"
diff --git a/src/ui/widget/layertypeicon.cpp b/src/ui/widget/layertypeicon.cpp
index 2e33f2453..3a8ffab44 100644
--- a/src/ui/widget/layertypeicon.cpp
+++ b/src/ui/widget/layertypeicon.cpp
@@ -15,8 +15,8 @@
 
 #include <gtkmm/icontheme.h>
 
-#include "ui/icon-names.h"
 #include "widgets/toolbox.h"
+#include "ui/icon-names.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index 58fe644b0..1e9ee361d 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -21,12 +21,12 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/radiobutton.h>
 
-#include "document-private.h"
-#include "document-undo.h"
-#include "inkscape.h"
-#include "rdf.h"
 #include "ui/widget/entity-entry.h"
 #include "ui/widget/registry.h"
+#include "rdf.h"
+#include "inkscape.h"
+#include "document-undo.h"
+#include "document-private.h"
 #include "verbs.h"
 
 
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 70086a5f0..3677233bc 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -17,15 +17,15 @@
 #include "desktop.h"
 
 #include "desktop-style.h"
-#include "display/sp-canvas.h"
-#include "document-undo.h"
 #include "document.h"
+#include "document-undo.h"
 #include "filter-chemistry.h"
 #include "inkscape.h"
 #include "style.h"
 #include "svg/css-ostringstream.h"
-#include "ui/widget/style-subject.h"
 #include "verbs.h"
+#include "display/sp-canvas.h"
+#include "ui/widget/style-subject.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index fa83f7e65..805333f8e 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -22,11 +22,11 @@
 #endif
 
 #include "page-sizer.h"
+#include <glibmm/i18n.h>
+#include "verbs.h"
 #include "helper/action.h"
 #include "object/sp-root.h"
 #include "ui/widget/button.h"
-#include "verbs.h"
-#include <glibmm/i18n.h>
 
 using std::pair;
 using Inkscape::Util::unit_table;
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 0c4aafd63..281e6e21a 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -19,8 +19,8 @@
 
 #include <glibmm/i18n.h>
 
-#include "desktop.h"
 #include "panel.h"
+#include "desktop.h"
 
 #include "inkscape.h"
 #include "widgets/eek-preview.h"
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index d72f5b9d1..078aba9cf 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -14,8 +14,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/convert.h>
 #include <glibmm/i18n.h>
+#include <glibmm/convert.h>
 #include <glibmm/regex.h>
 
 #include <gtkmm/box.h>
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index 02bb3cf6d..753b72c2e 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -25,8 +25,8 @@
 
 #include "object/sp-root.h"
 
-#include "svg/stringstream.h"
 #include "svg/svg-color.h"
+#include "svg/stringstream.h"
 
 #include "widgets/spinbutton-events.h"
 
diff --git a/src/ui/widget/rotateable.cpp b/src/ui/widget/rotateable.cpp
index fef507b88..0e290730d 100644
--- a/src/ui/widget/rotateable.cpp
+++ b/src/ui/widget/rotateable.cpp
@@ -11,11 +11,11 @@
 #include <config.h>
 #endif
 
-#include "rotateable.h"
-#include "ui/tools/tool-base.h"
-#include <2geom/point.h>
 #include <gtkmm/box.h>
 #include <gtkmm/eventbox.h>
+#include <2geom/point.h>
+#include "ui/tools/tool-base.h"
+#include "rotateable.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/spinbutton.cpp b/src/ui/widget/spinbutton.cpp
index 53b329293..0c082d3ce 100644
--- a/src/ui/widget/spinbutton.cpp
+++ b/src/ui/widget/spinbutton.cpp
@@ -13,10 +13,10 @@
 
 #include "spinbutton.h"
 
-#include "ui/tools/tool-base.h"
 #include "unit-menu.h"
 #include "unit-tracker.h"
 #include "util/expression-evaluator.h"
+#include "ui/tools/tool-base.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp
index 5680f7ee5..e23627080 100644
--- a/src/ui/widget/style-subject.cpp
+++ b/src/ui/widget/style-subject.cpp
@@ -7,8 +7,8 @@
 
 #include "style-subject.h"
 
-#include "desktop-style.h"
 #include "desktop.h"
+#include "desktop-style.h"
 #include "selection.h"
 
 #include "xml/sp-css-attr.h"
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index 4e326af19..d2c338571 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -22,10 +22,10 @@
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/scale.h>
 
-#include "desktop.h"
-#include "document-undo.h"
-#include "document.h"
 #include "inkscape.h"
+#include "document.h"
+#include "document-undo.h"
+#include "desktop.h"
 
 #include "object/sp-namedview.h"