summaryrefslogtreecommitdiffstats
path: root/src/ui/tool
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc.jeanmougin@telecom-paristech.fr>2018-04-29 22:12:42 +0000
committerMarc Jeanmougin <marc.jeanmougin@telecom-paristech.fr>2018-04-29 22:12:42 +0000
commitbba4ff6672494fab59286b50f6c645ad62a47e60 (patch)
treec357b8add3334ef1df340d4eb433404857c27e7d /src/ui/tool
parentFix test (diff)
downloadinkscape-bba4ff6672494fab59286b50f6c645ad62a47e60.tar.gz
inkscape-bba4ff6672494fab59286b50f6c645ad62a47e60.zip
Fix include order with clang-tidy check llvm-include-order
Diffstat (limited to 'src/ui/tool')
-rw-r--r--src/ui/tool/control-point-selection.cpp8
-rw-r--r--src/ui/tool/control-point.cpp4
-rw-r--r--src/ui/tool/curve-drag-point.cpp2
-rw-r--r--src/ui/tool/event-utils.cpp4
-rw-r--r--src/ui/tool/modifier-tracker.cpp4
-rw-r--r--src/ui/tool/multi-path-manipulator.cpp2
-rw-r--r--src/ui/tool/node.cpp10
-rw-r--r--src/ui/tool/path-manipulator.cpp12
-rw-r--r--src/ui/tool/selector.cpp2
-rw-r--r--src/ui/tool/transform-handle-set.cpp2
10 files changed, 25 insertions, 25 deletions
diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp
index a5611addc..fade7cf55 100644
--- a/src/ui/tool/control-point-selection.cpp
+++ b/src/ui/tool/control-point-selection.cpp
@@ -9,14 +9,14 @@
* Released under GNU GPL, read the file 'COPYING' for more information
*/
-#include <boost/none.hpp>
-#include "ui/tool/selectable-control-point.h"
-#include <2geom/transforms.h>
#include "desktop.h"
#include "ui/tool/control-point-selection.h"
#include "ui/tool/event-utils.h"
-#include "ui/tool/transform-handle-set.h"
#include "ui/tool/node.h"
+#include "ui/tool/selectable-control-point.h"
+#include "ui/tool/transform-handle-set.h"
+#include <2geom/transforms.h>
+#include <boost/none.hpp>
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index 005e60c62..aa897f1be 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -16,16 +16,16 @@
#include "desktop.h"
#include "message-context.h"
-#include "display/sp-canvas.h"
#include "display/snap-indicator.h"
+#include "display/sp-canvas.h"
#include "object/sp-namedview.h"
-#include "ui/tools/tool-base.h"
#include "ui/control-manager.h"
#include "ui/tool/control-point.h"
#include "ui/tool/event-utils.h"
#include "ui/tool/transform-handle-set.h"
+#include "ui/tools/tool-base.h"
namespace Inkscape {
namespace UI {
diff --git a/src/ui/tool/curve-drag-point.cpp b/src/ui/tool/curve-drag-point.cpp
index 685823aaa..78fdc8aba 100644
--- a/src/ui/tool/curve-drag-point.cpp
+++ b/src/ui/tool/curve-drag-point.cpp
@@ -7,12 +7,12 @@
*/
#include "ui/tool/curve-drag-point.h"
-#include <glib/gi18n.h>
#include "desktop.h"
#include "ui/tool/control-point-selection.h"
#include "ui/tool/event-utils.h"
#include "ui/tool/multi-path-manipulator.h"
#include "ui/tool/path-manipulator.h"
+#include <glib/gi18n.h>
#include "object/sp-namedview.h"
#include "object/sp-path.h"
diff --git a/src/ui/tool/event-utils.cpp b/src/ui/tool/event-utils.cpp
index 6b8d5f0dc..de2feb9e5 100644
--- a/src/ui/tool/event-utils.cpp
+++ b/src/ui/tool/event-utils.cpp
@@ -8,11 +8,11 @@
* Released under GNU GPL, read the file 'COPYING' for more information
*/
+#include "display/sp-canvas.h"
+#include "ui/tool/event-utils.h"
#include <cstring>
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
-#include "display/sp-canvas.h"
-#include "ui/tool/event-utils.h"
namespace Inkscape {
namespace UI {
diff --git a/src/ui/tool/modifier-tracker.cpp b/src/ui/tool/modifier-tracker.cpp
index f502acab2..196626006 100644
--- a/src/ui/tool/modifier-tracker.cpp
+++ b/src/ui/tool/modifier-tracker.cpp
@@ -8,10 +8,10 @@
* Released under GNU GPL, read the file 'COPYING' for more information
*/
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
#include "ui/tool/event-utils.h"
#include "ui/tool/modifier-tracker.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
namespace Inkscape {
namespace UI {
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index b982a622f..7bb0d58da 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -14,8 +14,8 @@
#include <glibmm/i18n.h>
#include "desktop.h"
-#include "document.h"
#include "document-undo.h"
+#include "document.h"
#include "message-stack.h"
#include "node.h"
#include "verbs.h"
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 94a80a882..ad7c07921 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -6,12 +6,12 @@
* Released under GNU GPL, read the file 'COPYING' for more information
*/
+#include <boost/utility.hpp>
#include <iostream>
#include <stdexcept>
-#include <boost/utility.hpp>
-#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
#include <2geom/bezier-utils.h>
@@ -19,16 +19,16 @@
#include "multi-path-manipulator.h"
#include "snap.h"
-#include "display/sp-ctrlline.h"
-#include "display/sp-canvas.h"
#include "display/sp-canvas-util.h"
+#include "display/sp-canvas.h"
+#include "display/sp-ctrlline.h"
#include "ui/control-manager.h"
#include "ui/tool/control-point-selection.h"
#include "ui/tool/event-utils.h"
#include "ui/tool/path-manipulator.h"
-#include "ui/tools/node-tool.h"
#include "ui/tools-switch.h"
+#include "ui/tools/node-tool.h"
namespace {
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 192a02fe2..4b253d327 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -13,17 +13,17 @@
#include <2geom/bezier-utils.h>
#include <2geom/path-sink.h>
-#include "display/sp-canvas.h"
-#include "display/sp-canvas-util.h"
-#include "display/curve.h"
#include "display/canvas-bpath.h"
+#include "display/curve.h"
+#include "display/sp-canvas-util.h"
+#include "display/sp-canvas.h"
#include "helper/geom.h"
-#include "live_effects/lpeobject.h"
-#include "live_effects/lpeobject-reference.h"
-#include "live_effects/lpe-powerstroke.h"
#include "live_effects/lpe-bspline.h"
+#include "live_effects/lpe-powerstroke.h"
+#include "live_effects/lpeobject-reference.h"
+#include "live_effects/lpeobject.h"
#include "live_effects/parameter/path.h"
#include "object/sp-path.h"
diff --git a/src/ui/tool/selector.cpp b/src/ui/tool/selector.cpp
index 84e96173d..cf14d8c6c 100644
--- a/src/ui/tool/selector.cpp
+++ b/src/ui/tool/selector.cpp
@@ -13,9 +13,9 @@
#include "desktop.h"
#include "display/sodipodi-ctrlrect.h"
-#include "ui/tools/tool-base.h"
#include "ui/tool/event-utils.h"
#include "ui/tool/selector.h"
+#include "ui/tools/tool-base.h"
#include <gdk/gdkkeysyms.h>
diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp
index 23cd6b79d..16258a16a 100644
--- a/src/ui/tool/transform-handle-set.cpp
+++ b/src/ui/tool/transform-handle-set.cpp
@@ -9,8 +9,8 @@
* Released under GNU GPL, read the file 'COPYING' for more information
*/
-#include <math.h>
#include <algorithm>
+#include <math.h>
#include <glib/gi18n.h>