From 6031728e438feb9457596baae886c803883535e4 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Fri, 4 May 2018 18:45:37 +0200
Subject: Revert "Fix include order with clang-tidy check llvm-include-order"

This reverts commit bba4ff6672494fab59286b50f6c645ad62a47e60.
---
 src/libnrtype/FontFactory.cpp        |  4 ++--
 src/libnrtype/FontInstance.cpp       |  4 ++--
 src/libnrtype/Layout-TNG-Compute.cpp |  6 +++---
 src/libnrtype/Layout-TNG-Input.cpp   |  4 ++--
 src/libnrtype/Layout-TNG-OutIter.cpp |  6 +++---
 src/libnrtype/Layout-TNG-Output.cpp  | 12 ++++++------
 src/libnrtype/font-lister.cpp        |  6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'src/libnrtype')

diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp
index 011cc94db..f09bd3df3 100644
--- a/src/libnrtype/FontFactory.cpp
+++ b/src/libnrtype/FontFactory.cpp
@@ -20,16 +20,16 @@
 
 #include <fontconfig/fontconfig.h>
 
-#include <pango/pango-ot.h>
 #include <pango/pangofc-fontmap.h>
 #include <pango/pangoft2.h>
+#include <pango/pango-ot.h>
 
 #include "io/sys.h"
 #include "util/unordered-containers.h"
 
 #include "libnrtype/FontFactory.h"
-#include "libnrtype/OpenTypeUtil.h"
 #include "libnrtype/font-instance.h"
+#include "libnrtype/OpenTypeUtil.h"
 
 typedef INK_UNORDERED_MAP<PangoFontDescription*, font_instance*, font_descr_hash, font_descr_equal> FaceMapType;
 
diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp
index 49d90e60a..47d4baa51 100644
--- a/src/libnrtype/FontInstance.cpp
+++ b/src/libnrtype/FontInstance.cpp
@@ -28,11 +28,11 @@
 
 #include <glibmm/regex.h>
 
+#include <2geom/pathvector.h>
+#include <2geom/path-sink.h>
 #include "libnrtype/font-glyph.h"
 #include "libnrtype/font-instance.h"
 #include "util/unordered-containers.h"
-#include <2geom/path-sink.h>
-#include <2geom/pathvector.h>
 
 
 #ifndef USE_PANGO_WIN32
diff --git a/src/libnrtype/Layout-TNG-Compute.cpp b/src/libnrtype/Layout-TNG-Compute.cpp
index d3b49436e..20b07d84b 100644
--- a/src/libnrtype/Layout-TNG-Compute.cpp
+++ b/src/libnrtype/Layout-TNG-Compute.cpp
@@ -9,11 +9,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include "Layout-TNG.h"
-#include "Layout-TNG-Scanline-Maker.h"
-#include "font-instance.h"
-#include "object/sp-object.h"
 #include "style.h"
+#include "font-instance.h"
 #include "svg/svg-length.h"
+#include "object/sp-object.h"
+#include "Layout-TNG-Scanline-Maker.h"
 #include <limits>
 
 namespace Inkscape {
diff --git a/src/libnrtype/Layout-TNG-Input.cpp b/src/libnrtype/Layout-TNG-Input.cpp
index 724fc2b17..6100fa262 100644
--- a/src/libnrtype/Layout-TNG-Input.cpp
+++ b/src/libnrtype/Layout-TNG-Input.cpp
@@ -17,11 +17,11 @@
 #define PANGO_ENABLE_ENGINE
 #endif
 
-#include "FontFactory.h"
+#include <gtk/gtk.h>
 #include "Layout-TNG.h"
 #include "style.h"
 #include "svg/svg-length.h"
-#include <gtk/gtk.h>
+#include "FontFactory.h"
 
 
 namespace Inkscape {
diff --git a/src/libnrtype/Layout-TNG-OutIter.cpp b/src/libnrtype/Layout-TNG-OutIter.cpp
index f649e5ddc..8c29b7dbc 100644
--- a/src/libnrtype/Layout-TNG-OutIter.cpp
+++ b/src/libnrtype/Layout-TNG-OutIter.cpp
@@ -9,12 +9,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include "Layout-TNG.h"
-#include "font-instance.h"
 #include "livarot/Path.h"
-#include "style.h"
+#include "font-instance.h"
 #include "svg/svg-length.h"
-#include <2geom/line.h>
 #include <2geom/transforms.h>
+#include <2geom/line.h>
+#include "style.h"
 
 namespace Inkscape {
 namespace Text {
diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp
index 717876317..884c1a319 100644
--- a/src/libnrtype/Layout-TNG-Output.cpp
+++ b/src/libnrtype/Layout-TNG-Output.cpp
@@ -8,19 +8,19 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
+#include <glib.h>
 #include "Layout-TNG.h"
-#include "display/curve.h"
 #include "display/drawing-text.h"
-#include "extension/internal/cairo-render-context.h"
+#include "style.h"
+#include "print.h"
 #include "extension/print.h"
-#include "font-instance.h"
 #include "livarot/Path.h"
-#include "print.h"
-#include "style.h"
+#include "font-instance.h"
 #include "svg/svg-length.h"
+#include "extension/internal/cairo-render-context.h"
+#include "display/curve.h"
 #include <2geom/pathvector.h>
 #include <3rdparty/libuemf/symbol_convert.h>
-#include <glib.h>
 
 
 namespace Inkscape {
diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp
index acef7318e..47a260714 100644
--- a/src/libnrtype/font-lister.cpp
+++ b/src/libnrtype/font-lister.cpp
@@ -8,18 +8,18 @@
 
 #include <libnrtype/font-instance.h>
 
-#include "FontFactory.h"
 #include "font-lister.h"
+#include "FontFactory.h"
 
-#include "desktop-style.h"
 #include "desktop.h"
+#include "desktop-style.h"
 #include "document.h"
 #include "inkscape.h"
 #include "preferences.h"
 
-#include "object/sp-namedview.h"
 #include "object/sp-object.h"
 #include "object/sp-root.h"
+#include "object/sp-namedview.h"
 
 #include "xml/repr.h"
 
-- 
cgit v1.2.3