summaryrefslogtreecommitdiffstats
path: root/src/xml
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2018-05-04 16:45:37 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2018-05-04 16:45:37 +0000
commit6031728e438feb9457596baae886c803883535e4 (patch)
tree312bd8e46bc0cb2581287a72964d21a1eba5133b /src/xml
parentRename "Glyphs" dialog to "Unicode Characters" dialog to better reflect what ... (diff)
downloadinkscape-6031728e438feb9457596baae886c803883535e4.tar.gz
inkscape-6031728e438feb9457596baae886c803883535e4.zip
Revert "Fix include order with clang-tidy check llvm-include-order"
This reverts commit bba4ff6672494fab59286b50f6c645ad62a47e60.
Diffstat (limited to 'src/xml')
-rw-r--r--src/xml/composite-node-observer.cpp4
-rw-r--r--src/xml/croco-node-iface.cpp2
-rw-r--r--src/xml/event.cpp8
-rw-r--r--src/xml/log-builder.cpp2
-rw-r--r--src/xml/node-fns.cpp8
-rw-r--r--src/xml/repr-css.cpp2
-rw-r--r--src/xml/repr-io.cpp8
-rw-r--r--src/xml/repr-sorting.cpp4
-rw-r--r--src/xml/repr-util.cpp8
-rw-r--r--src/xml/repr.cpp4
-rw-r--r--src/xml/simple-document.cpp8
-rw-r--r--src/xml/simple-document.h2
-rw-r--r--src/xml/simple-node.cpp6
-rw-r--r--src/xml/subtree.cpp2
14 files changed, 34 insertions, 34 deletions
diff --git a/src/xml/composite-node-observer.cpp b/src/xml/composite-node-observer.cpp
index e104d1ef3..581a4c226 100644
--- a/src/xml/composite-node-observer.cpp
+++ b/src/xml/composite-node-observer.cpp
@@ -15,11 +15,11 @@
#include <cstring>
#include <glib.h>
-#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 dd92e93d5..6bd5a6920 100644
--- a/src/xml/croco-node-iface.cpp
+++ b/src/xml/croco-node-iface.cpp
@@ -1,6 +1,6 @@
#include <cstring>
-#include <glib.h>
#include <string>
+#include <glib.h>
#include "xml/croco-node-iface.h"
#include "xml/node.h"
diff --git a/src/xml/event.cpp b/src/xml/event.cpp
index 36ee93199..54f55d5c3 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 <cstdio>
#include <glib.h> // g_assert()
+#include <cstdio>
-#include "debug/event-tracker.h"
-#include "debug/simple-event.h"
-#include "event-fns.h"
#include "event.h"
+#include "event-fns.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 34f5bf0e3..12577cf69 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-fns.h"
#include "xml/event.h"
+#include "xml/event-fns.h"
namespace Inkscape {
namespace XML {
diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp
index 9ceafc593..e1506e3f2 100644
--- a/src/xml/node-fns.cpp
+++ b/src/xml/node-fns.cpp
@@ -1,14 +1,14 @@
#ifdef HAVE_CONFIG_H
#endif
-#include <cstring>
-#include <glib.h> // g_assert()
#include <map>
+#include <cstring>
#include <string>
+#include <glib.h> // g_assert()
-#include "node-fns.h"
-#include "util/find-if-before.h"
#include "xml/node-iterators.h"
+#include "util/find-if-before.h"
+#include "node-fns.h"
namespace Inkscape {
namespace XML {
diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index 438585f25..63ad05e04 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -19,8 +19,8 @@
#define SP_REPR_CSS_C
#include <cstring>
-#include <sstream>
#include <string>
+#include <sstream>
#include <glibmm/ustring.h>
diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp
index cbee11848..2ff9d4776 100644
--- a/src/xml/repr-io.cpp
+++ b/src/xml/repr-io.cpp
@@ -15,21 +15,21 @@
#endif
#include <cstring>
-#include <stdexcept>
#include <string>
+#include <stdexcept>
#include <libxml/parser.h>
+#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 95094beb7..09a39acb2 100644
--- a/src/xml/repr-sorting.cpp
+++ b/src/xml/repr-sorting.cpp
@@ -1,8 +1,8 @@
#include "util/longest-common-suffix.h"
-#include "repr-sorting.h"
-#include "xml/node-iterators.h"
#include "xml/repr.h"
+#include "xml/node-iterators.h"
+#include "repr-sorting.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 187e0a658..6da1233db 100644
--- a/src/xml/repr-util.cpp
+++ b/src/xml/repr-util.cpp
@@ -22,14 +22,14 @@
# include <cstdlib>
-#include "svg/css-ostringstream.h"
+#include <glib.h>
+#include <2geom/point.h>
#include "svg/stringstream.h"
+#include "svg/css-ostringstream.h"
#include "svg/svg-length.h"
-#include <2geom/point.h>
-#include <glib.h>
-#include "xml/repr-sorting.h"
#include "xml/repr.h"
+#include "xml/repr-sorting.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 09c3e3bec..8ad1ac06b 100644
--- a/src/xml/repr.cpp
+++ b/src/xml/repr.cpp
@@ -23,10 +23,10 @@
#include <cstring>
#include "xml/repr.h"
-#include "xml/comment-node.h"
+#include "xml/text-node.h"
#include "xml/element-node.h"
+#include "xml/comment-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 0e1c7a3ad..cf7851897 100644
--- a/src/xml/simple-document.cpp
+++ b/src/xml/simple-document.cpp
@@ -13,14 +13,14 @@
*
*/
-#include "xml/simple-document.h"
#include <glib.h> // g_assert()
-#include "xml/comment-node.h"
-#include "xml/element-node.h"
+#include "xml/simple-document.h"
#include "xml/event-fns.h"
-#include "xml/pi-node.h"
+#include "xml/element-node.h"
#include "xml/text-node.h"
+#include "xml/comment-node.h"
+#include "xml/pi-node.h"
namespace Inkscape {
diff --git a/src/xml/simple-document.h b/src/xml/simple-document.h
index 66f6b1381..01933076f 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 4d4efc668..78fc52a27 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 52237340f..94c1436a9 100644
--- a/src/xml/subtree.cpp
+++ b/src/xml/subtree.cpp
@@ -13,8 +13,8 @@
*/
#include "xml/node.h"
-#include "xml/node-iterators.h"
#include "xml/subtree.h"
+#include "xml/node-iterators.h"
namespace Inkscape {
namespace XML {