From bba4ff6672494fab59286b50f6c645ad62a47e60 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Mon, 30 Apr 2018 00:12:42 +0200 Subject: Fix include order with clang-tidy check llvm-include-order --- src/xml/composite-node-observer.cpp | 4 ++-- src/xml/croco-node-iface.cpp | 2 +- src/xml/event.cpp | 8 ++++---- src/xml/log-builder.cpp | 2 +- src/xml/node-fns.cpp | 8 ++++---- src/xml/repr-css.cpp | 2 +- src/xml/repr-io.cpp | 8 ++++---- src/xml/repr-sorting.cpp | 4 ++-- src/xml/repr-util.cpp | 8 ++++---- src/xml/repr.cpp | 4 ++-- src/xml/simple-document.cpp | 8 ++++---- src/xml/simple-document.h | 2 +- src/xml/simple-node.cpp | 6 +++--- src/xml/subtree.cpp | 2 +- 14 files changed, 34 insertions(+), 34 deletions(-) (limited to 'src/xml') diff --git a/src/xml/composite-node-observer.cpp b/src/xml/composite-node-observer.cpp index 581a4c226..e104d1ef3 100644 --- a/src/xml/composite-node-observer.cpp +++ b/src/xml/composite-node-observer.cpp @@ -15,11 +15,11 @@ #include #include +#include "debug/event-tracker.h" +#include "debug/simple-event.h" #include "util/find-if-before.h" #include "xml/composite-node-observer.h" #include "xml/node-event-vector.h" -#include "debug/event-tracker.h" -#include "debug/simple-event.h" namespace Inkscape { diff --git a/src/xml/croco-node-iface.cpp b/src/xml/croco-node-iface.cpp index 6bd5a6920..dd92e93d5 100644 --- a/src/xml/croco-node-iface.cpp +++ b/src/xml/croco-node-iface.cpp @@ -1,6 +1,6 @@ #include -#include #include +#include #include "xml/croco-node-iface.h" #include "xml/node.h" diff --git a/src/xml/event.cpp b/src/xml/event.cpp index 54f55d5c3..36ee93199 100644 --- a/src/xml/event.cpp +++ b/src/xml/event.cpp @@ -13,16 +13,16 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include // g_assert() #include +#include // g_assert() -#include "event.h" +#include "debug/event-tracker.h" +#include "debug/simple-event.h" #include "event-fns.h" +#include "event.h" #include "util/reverse-list.h" #include "xml/document.h" #include "xml/node-observer.h" -#include "debug/event-tracker.h" -#include "debug/simple-event.h" using Inkscape::Util::List; using Inkscape::Util::reverse_list; diff --git a/src/xml/log-builder.cpp b/src/xml/log-builder.cpp index 12577cf69..34f5bf0e3 100644 --- a/src/xml/log-builder.cpp +++ b/src/xml/log-builder.cpp @@ -14,8 +14,8 @@ */ #include "xml/log-builder.h" -#include "xml/event.h" #include "xml/event-fns.h" +#include "xml/event.h" namespace Inkscape { namespace XML { diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp index e1506e3f2..9ceafc593 100644 --- a/src/xml/node-fns.cpp +++ b/src/xml/node-fns.cpp @@ -1,14 +1,14 @@ #ifdef HAVE_CONFIG_H #endif -#include #include -#include #include // g_assert() +#include +#include -#include "xml/node-iterators.h" -#include "util/find-if-before.h" #include "node-fns.h" +#include "util/find-if-before.h" +#include "xml/node-iterators.h" namespace Inkscape { namespace XML { diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp index 63ad05e04..438585f25 100644 --- a/src/xml/repr-css.cpp +++ b/src/xml/repr-css.cpp @@ -19,8 +19,8 @@ #define SP_REPR_CSS_C #include -#include #include +#include #include diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp index 2ff9d4776..cbee11848 100644 --- a/src/xml/repr-io.cpp +++ b/src/xml/repr-io.cpp @@ -15,21 +15,21 @@ #endif #include -#include #include +#include #include -#include "xml/repr.h" #include "xml/attribute-record.h" #include "xml/rebase-hrefs.h" +#include "xml/repr.h" #include "xml/simple-document.h" #include "xml/text-node.h" +#include "io/gzipstream.h" +#include "io/stringstream.h" #include "io/sys.h" #include "io/uristream.h" -#include "io/stringstream.h" -#include "io/gzipstream.h" #include "extension/extension.h" diff --git a/src/xml/repr-sorting.cpp b/src/xml/repr-sorting.cpp index 09a39acb2..95094beb7 100644 --- a/src/xml/repr-sorting.cpp +++ b/src/xml/repr-sorting.cpp @@ -1,8 +1,8 @@ #include "util/longest-common-suffix.h" -#include "xml/repr.h" -#include "xml/node-iterators.h" #include "repr-sorting.h" +#include "xml/node-iterators.h" +#include "xml/repr.h" static bool same_repr(Inkscape::XML::Node const &a, Inkscape::XML::Node const &b) { diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp index 6da1233db..187e0a658 100644 --- a/src/xml/repr-util.cpp +++ b/src/xml/repr-util.cpp @@ -22,14 +22,14 @@ # include -#include -#include <2geom/point.h> -#include "svg/stringstream.h" #include "svg/css-ostringstream.h" +#include "svg/stringstream.h" #include "svg/svg-length.h" +#include <2geom/point.h> +#include -#include "xml/repr.h" #include "xml/repr-sorting.h" +#include "xml/repr.h" #define OSB_NS_URI "http://www.openswatchbook.org/uri/2009/osb" diff --git a/src/xml/repr.cpp b/src/xml/repr.cpp index 8ad1ac06b..09c3e3bec 100644 --- a/src/xml/repr.cpp +++ b/src/xml/repr.cpp @@ -23,10 +23,10 @@ #include #include "xml/repr.h" -#include "xml/text-node.h" -#include "xml/element-node.h" #include "xml/comment-node.h" +#include "xml/element-node.h" #include "xml/simple-document.h" +#include "xml/text-node.h" using Inkscape::Util::share_string; diff --git a/src/xml/simple-document.cpp b/src/xml/simple-document.cpp index cf7851897..0e1c7a3ad 100644 --- a/src/xml/simple-document.cpp +++ b/src/xml/simple-document.cpp @@ -13,14 +13,14 @@ * */ +#include "xml/simple-document.h" #include // g_assert() -#include "xml/simple-document.h" -#include "xml/event-fns.h" -#include "xml/element-node.h" -#include "xml/text-node.h" #include "xml/comment-node.h" +#include "xml/element-node.h" +#include "xml/event-fns.h" #include "xml/pi-node.h" +#include "xml/text-node.h" namespace Inkscape { diff --git a/src/xml/simple-document.h b/src/xml/simple-document.h index 01933076f..66f6b1381 100644 --- a/src/xml/simple-document.h +++ b/src/xml/simple-document.h @@ -16,9 +16,9 @@ #define SEEN_INKSCAPE_XML_SIMPLE_DOCUMENT_H #include "xml/document.h" -#include "xml/simple-node.h" #include "xml/node-observer.h" #include "xml/log-builder.h" +#include "xml/simple-node.h" namespace Inkscape { diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp index 78fc52a27..4d4efc668 100644 --- a/src/xml/simple-node.cpp +++ b/src/xml/simple-node.cpp @@ -21,12 +21,12 @@ #include "preferences.h" -#include "xml/simple-node.h" -#include "xml/node-event-vector.h" -#include "xml/node-fns.h" #include "debug/event-tracker.h" #include "debug/simple-event.h" #include "util/format.h" +#include "xml/node-event-vector.h" +#include "xml/node-fns.h" +#include "xml/simple-node.h" #include "attribute-rel-util.h" diff --git a/src/xml/subtree.cpp b/src/xml/subtree.cpp index 94c1436a9..52237340f 100644 --- a/src/xml/subtree.cpp +++ b/src/xml/subtree.cpp @@ -13,8 +13,8 @@ */ #include "xml/node.h" -#include "xml/subtree.h" #include "xml/node-iterators.h" +#include "xml/subtree.h" namespace Inkscape { namespace XML { -- cgit v1.2.3