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

This reverts commit bba4ff6672494fab59286b50f6c645ad62a47e60.

28 files changed, 60 insertions, 60 deletions

diff --git a/src/widgets/box3d-toolbar.cpp b/src/widgets/box3d-toolbar.cpp
index e6463547a..4b944314d 100644
--- a/src/widgets/box3d-toolbar.cpp
+++ b/src/widgets/box3d-toolbar.cpp
@@ -28,8 +28,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtk/gtk.h>
+#include <glibmm/i18n.h>
 
 #include "box3d-toolbar.h"
 
diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index 79a52c31d..7dcfc9771 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -15,9 +15,9 @@
 
 #include "button.h"
 #include "helper/action-context.h"
-#include "helper/action.h"
-#include "shortcuts.h"
 #include "ui/interface.h"
+#include "shortcuts.h"
+#include "helper/action.h"
 
 static void sp_button_dispose(GObject *object);
 static void sp_button_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width);
diff --git a/src/widgets/calligraphy-toolbar.cpp b/src/widgets/calligraphy-toolbar.cpp
index b46ad842a..ed9779f1a 100644
--- a/src/widgets/calligraphy-toolbar.cpp
+++ b/src/widgets/calligraphy-toolbar.cpp
@@ -29,18 +29,18 @@
 #endif
 
 #include "ui/dialog/calligraphic-profile-rename.h"
-#include "calligraphy-toolbar.h"
 #include <glibmm/i18n.h>
+#include "calligraphy-toolbar.h"
 
 #include "desktop.h"
 #include "document-undo.h"
+#include "widgets/ege-adjustment-action.h"
+#include "widgets/ink-action.h"
+#include "widgets/ink-toggle-action.h"
 #include "toolbox.h"
 #include "ui/icon-names.h"
 #include "ui/uxmanager.h"
 #include "ui/widget/ink-select-one-action.h"
-#include "widgets/ege-adjustment-action.h"
-#include "widgets/ink-action.h"
-#include "widgets/ink-toggle-action.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/connector-toolbar.cpp b/src/widgets/connector-toolbar.cpp
index 64058886f..2030e7acb 100644
--- a/src/widgets/connector-toolbar.cpp
+++ b/src/widgets/connector-toolbar.cpp
@@ -30,8 +30,8 @@
 
 #include <glibmm/i18n.h>
 
-#include "conn-avoid-ref.h"
 #include "connector-toolbar.h"
+#include "conn-avoid-ref.h"
 
 #include "desktop.h"
 #include "document-undo.h"
diff --git a/src/widgets/dropper-toolbar.cpp b/src/widgets/dropper-toolbar.cpp
index c3f70ab39..7a9cf1779 100644
--- a/src/widgets/dropper-toolbar.cpp
+++ b/src/widgets/dropper-toolbar.cpp
@@ -30,11 +30,11 @@
 
 #include <glibmm/i18n.h>
 
-#include "document-undo.h"
 #include "dropper-toolbar.h"
+#include "document-undo.h"
+#include "widgets/ege-output-action.h"
 #include "ink-toggle-action.h"
 #include "preferences.h"
-#include "widgets/ege-output-action.h"
 #include "widgets/spinbutton-events.h"
 
 using Inkscape::DocumentUndo;
diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp
index bf69ad985..38d5173fa 100644
--- a/src/widgets/eek-preview.cpp
+++ b/src/widgets/eek-preview.cpp
@@ -40,9 +40,9 @@
 #include <algorithm>
 using std::min;
 
+#include <gtk/gtk.h>
 #include "eek-preview.h"
 #include "preferences.h"
-#include <gtk/gtk.h>
 
 #define PRIME_BUTTON_MAGIC_NUMBER 1
 
diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp
index 3e09c3d78..318e6ced2 100644
--- a/src/widgets/ege-adjustment-action.cpp
+++ b/src/widgets/ege-adjustment-action.cpp
@@ -39,19 +39,19 @@
 
 /* Note: this file should be kept compilable as both .cpp and .c */
 
-#include <algorithm>
 #include <cmath>
 #include <string.h>
 #include <vector>
+#include <algorithm>
 
-#include <gdk/gdkkeysyms.h>
-#include <gtkmm/adjustment.h>
 #include <gtkmm/container.h>
 #include <gtkmm/radiomenuitem.h>
+#include <gtkmm/adjustment.h>
+#include <gdk/gdkkeysyms.h>
 
+#include "widgets/ege-adjustment-action.h"
 #include "ui/icon-names.h"
 #include "ui/widget/ink-spinscale.h"
-#include "widgets/ege-adjustment-action.h"
 
 static void ege_adjustment_action_finalize( GObject* object );
 static void ege_adjustment_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec );
diff --git a/src/widgets/ege-paint-def.cpp b/src/widgets/ege-paint-def.cpp
index a7f65e739..8e0ec9352 100644
--- a/src/widgets/ege-paint-def.cpp
+++ b/src/widgets/ege-paint-def.cpp
@@ -38,14 +38,14 @@
 
 #include <libintl.h>
 
-#include <glibmm/i18n.h>
-#include <glibmm/stringutils.h>
-#include <iostream>
-#include <sstream>
 #include <stdint.h>
-#include <stdio.h>
 #include <string>
+#include <iostream>
+#include <sstream>
 #include <string.h>
+#include <stdio.h>
+#include <glibmm/i18n.h>
+#include <glibmm/stringutils.h>
 
 #if !defined(_)
 #define _(s) gettext(s)
diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp
index d187f0956..ddda02c59 100644
--- a/src/widgets/eraser-toolbar.cpp
+++ b/src/widgets/eraser-toolbar.cpp
@@ -36,14 +36,14 @@
 
 #include "desktop.h"
 #include "document-undo.h"
+#include "widgets/ege-adjustment-action.h"
 #include "ink-action.h"
 #include "ink-radio-action.h"
 #include "ink-toggle-action.h"
 #include "toolbox.h"
+#include "ui/widget/ink-select-one-action.h"
 #include "ui/icon-names.h"
 #include "ui/tools/eraser-tool.h"
-#include "ui/widget/ink-select-one-action.h"
-#include "widgets/ege-adjustment-action.h"
 
 using Inkscape::DocumentUndo;
 using Inkscape::UI::ToolboxFactory;
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index a1865f396..8b3a31516 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -22,8 +22,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
+#include <glibmm/i18n.h>
 
 #include "desktop-style.h"
 #include "desktop.h"
diff --git a/src/widgets/gimp/ruler.cpp b/src/widgets/gimp/ruler.cpp
index da25df3b4..8d73ada3b 100644
--- a/src/widgets/gimp/ruler.cpp
+++ b/src/widgets/gimp/ruler.cpp
@@ -29,14 +29,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
 #include <cmath>
 #include <cstdio>
-#include <cstring>
 #include <set>
 
 #include "ruler.h"
-#include "util/units.h"
 #include <glibmm/i18n.h>
+#include "util/units.h"
 
 #define ROUND(x) ((int) round(x))
 
diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index d02c19512..65b1a6733 100644
--- a/src/widgets/gradient-image.cpp
+++ b/src/widgets/gradient-image.cpp
@@ -12,8 +12,8 @@
 
 #include <sigc++/sigc++.h>
 
-#include <gdkmm/pixbuf.h>
 #include <glibmm/refptr.h>
+#include <gdkmm/pixbuf.h>
 
 #include <cairomm/surface.h>
 
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 7678cb6be..412f0b7e2 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -31,15 +31,15 @@
 
 
 
-#include "desktop.h"
 #include "document-private.h"
-#include "document-undo.h"
 #include "gradient-chemistry.h"
-#include "gradient-vector.h"
 #include "inkscape.h"
+#include "preferences.h"
+#include "desktop.h"
+#include "document-undo.h"
+#include "gradient-vector.h"
 #include "layer-manager.h"
 #include "macros.h"
-#include "preferences.h"
 #include "selection-chemistry.h"
 #include "verbs.h"
 
@@ -439,9 +439,9 @@ void SPGradientVectorSelector::setSwatched()
   ###                 Vector Editing Widget
   ##################################################################*/
 
-#include "svg/svg-color.h"
 #include "widgets/widget-sizes.h"
 #include "xml/node-event-vector.h"
+#include "svg/svg-color.h"
 
 #define PAD 4
 
diff --git a/src/widgets/ink-comboboxentry-action.cpp b/src/widgets/ink-comboboxentry-action.cpp
index 10d9e7422..2fecb06a4 100644
--- a/src/widgets/ink-comboboxentry-action.cpp
+++ b/src/widgets/ink-comboboxentry-action.cpp
@@ -23,15 +23,15 @@
  * we must keep track of things like active entry ourselves.
  */
 
-#include <glibmm/ustring.h>
 #include <iostream>
 #include <string.h>
+#include <glibmm/ustring.h>
 
-#include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 
-#include "ui/icon-names.h"
 #include "widgets/ink-comboboxentry-action.h"
+#include "ui/icon-names.h"
 
 // Must handle both tool and menu items!
 static GtkWidget* create_tool_item( GtkAction* action );
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index de0018115..991d81d4a 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -684,7 +684,7 @@ static void sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelec
     sp_paint_selector_set_style_buttons(psel, psel->solid);
     gtk_widget_set_sensitive(psel->style, TRUE);
 
-    if (psel->mode = SPPaintSelector::MODE_SOLID_COLOR) {
+    if ((psel->mode == SPPaintSelector::MODE_SOLID_COLOR)) {
         /* Already have color selector */
         // Do nothing
     } else {
diff --git a/src/widgets/paintbucket-toolbar.cpp b/src/widgets/paintbucket-toolbar.cpp
index e7d69b0cc..280cf0eb1 100644
--- a/src/widgets/paintbucket-toolbar.cpp
+++ b/src/widgets/paintbucket-toolbar.cpp
@@ -30,9 +30,9 @@
 
 #include <glibmm/i18n.h>
 
+#include "paintbucket-toolbar.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "paintbucket-toolbar.h"
 
 #include "ui/icon-names.h"
 #include "ui/tools/flood-tool.h"
@@ -40,8 +40,8 @@
 #include "ui/widget/ink-select-one-action.h"
 #include "ui/widget/unit-tracker.h"
 
-#include "widgets/ege-adjustment-action.h"
 #include "widgets/ink-action.h"
+#include "widgets/ege-adjustment-action.h"
 #include "widgets/toolbox.h"
 
 using Inkscape::UI::Widget::UnitTracker;
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index e6f085d8f..d2939c720 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -28,8 +28,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtkmm.h>
+#include <glibmm/i18n.h>
 
 #include "pencil-toolbar.h"
 
diff --git a/src/widgets/rect-toolbar.cpp b/src/widgets/rect-toolbar.cpp
index 50fde9ded..afa090ba7 100644
--- a/src/widgets/rect-toolbar.cpp
+++ b/src/widgets/rect-toolbar.cpp
@@ -28,8 +28,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtk/gtk.h>
+#include <glibmm/i18n.h>
 
 #include "rect-toolbar.h"
 
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index c296c1136..d89e6296c 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -18,9 +18,9 @@
 
 #include "sp-attribute-widget.h"
 
-#include "document-undo.h"
-#include "document.h"
 #include "macros.h"
+#include "document.h"
+#include "document-undo.h"
 #include "verbs.h"
 
 #include "object/sp-object.h"
diff --git a/src/widgets/sp-color-selector.cpp b/src/widgets/sp-color-selector.cpp
index 222a41b19..8a30b276b 100644
--- a/src/widgets/sp-color-selector.cpp
+++ b/src/widgets/sp-color-selector.cpp
@@ -7,10 +7,10 @@
 #include <config.h>
 #endif
 
-#include "sp-color-selector.h"
-#include <glibmm/i18n.h>
-#include <gtk/gtk.h>
 #include <math.h>
+#include <gtk/gtk.h>
+#include <glibmm/i18n.h>
+#include "sp-color-selector.h"
 
 enum {
     GRABBED,
diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp
index 8295aa017..707e62c12 100644
--- a/src/widgets/sp-widget.cpp
+++ b/src/widgets/sp-widget.cpp
@@ -14,9 +14,9 @@
  */
 
 #include "document.h"
-#include "helper/sp-marshal.h"
 #include "inkscape.h"
 #include "sp-widget.h"
+#include "helper/sp-marshal.h"
 
 using Inkscape::SPWidgetImpl;
 
diff --git a/src/widgets/sp-xmlview-attr-list.cpp b/src/widgets/sp-xmlview-attr-list.cpp
index 4d38cee8f..e99605b97 100644
--- a/src/widgets/sp-xmlview-attr-list.cpp
+++ b/src/widgets/sp-xmlview-attr-list.cpp
@@ -16,8 +16,8 @@
 #include <cstring>
 #include <glibmm/i18n.h>
 
-#include "../xml/node-event-vector.h"
 #include "helper/sp-marshal.h"
+#include "../xml/node-event-vector.h"
 #include "sp-xmlview-attr-list.h"
 
 static void sp_xmlview_attr_list_destroy(GtkWidget * object);
diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp
index 0da6cdb19..6e59ba3cd 100644
--- a/src/widgets/sp-xmlview-content.cpp
+++ b/src/widgets/sp-xmlview-content.cpp
@@ -13,13 +13,13 @@
 #include <cstring>
 #include <glibmm/i18n.h>
 
+#include "xml/node-event-vector.h"
+#include "sp-xmlview-content.h"
 #include "desktop.h"
 #include "document-private.h"
 #include "document-undo.h"
 #include "inkscape.h"
-#include "sp-xmlview-content.h"
 #include "verbs.h"
-#include "xml/node-event-vector.h"
 
 using Inkscape::DocumentUndo;
 
diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp
index 2f8eb9147..9666fc636 100644
--- a/src/widgets/spinbutton-events.cpp
+++ b/src/widgets/spinbutton-events.cpp
@@ -15,8 +15,8 @@
 #include <config.h>
 #endif
 
-#include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "ui/tools/tool-base.h"
 
diff --git a/src/widgets/spiral-toolbar.cpp b/src/widgets/spiral-toolbar.cpp
index 66eaeedc3..79ea30e8e 100644
--- a/src/widgets/spiral-toolbar.cpp
+++ b/src/widgets/spiral-toolbar.cpp
@@ -28,8 +28,8 @@
 #include <config.h>
 #endif
 
-#include <glibmm/i18n.h>
 #include <gtk/gtk.h>
+#include <glibmm/i18n.h>
 
 #include "spiral-toolbar.h"
 
diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index d930366fa..361364992 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -31,18 +31,18 @@
 
 #include <gtkmm.h>
 
+#include "spray-toolbar.h"
 #include "desktop.h"
+#include "inkscape.h"
+#include "widgets/ege-adjustment-action.h"
 #include "ink-radio-action.h"
 #include "ink-toggle-action.h"
-#include "inkscape.h"
-#include "spray-toolbar.h"
 #include "toolbox.h"
 #include "ui/dialog/clonetiler.h"
 #include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/panel-dialog.h"
-#include "ui/icon-names.h"
 #include "ui/widget/ink-select-one-action.h"
-#include "widgets/ege-adjustment-action.h"
+#include "ui/icon-names.h"
 
 #include <glibmm/i18n.h>
 
diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp
index cf717ae7c..992f1f6b7 100644
--- a/src/widgets/spw-utilities.cpp
+++ b/src/widgets/spw-utilities.cpp
@@ -18,8 +18,8 @@
 #include <string>
 
 #include <gtkmm/box.h>
-#include <gtkmm/grid.h>
 #include <gtkmm/label.h>
+#include <gtkmm/grid.h>
 
 #include "selection.h"
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 907cb5421..5894391ff 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -30,11 +30,11 @@
 #include "config.h"
 #endif
 
-#include <glibmm/i18n.h>
+#include <gtkmm/box.h>
 #include <gtkmm/action.h>
 #include <gtkmm/actiongroup.h>
-#include <gtkmm/box.h>
 #include <gtkmm/toolitem.h>
+#include <glibmm/i18n.h>
 
 #include "desktop-style.h"
 #include "desktop.h"
@@ -77,8 +77,8 @@
 #include "eraser-toolbar.h"
 #include "gradient-toolbar.h"
 #include "lpe-toolbar.h"
-#include "measure-toolbar.h"
 #include "mesh-toolbar.h"
+#include "measure-toolbar.h"
 #include "node-toolbar.h"
 #include "rect-toolbar.h"
 
@@ -88,11 +88,11 @@
 
 #include "pencil-toolbar.h"
 #include "select-toolbar.h"
-#include "spiral-toolbar.h"
 #include "spray-toolbar.h"
+#include "spiral-toolbar.h"
 #include "star-toolbar.h"
-#include "text-toolbar.h"
 #include "tweak-toolbar.h"
+#include "text-toolbar.h"
 #include "zoom-toolbar.h"
 
 #include "toolbox.h"