From a7782e993d3ea3a0d2eced29b13dfe34bf26794b Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Mon, 18 Jun 2018 23:23:10 +0200
Subject: Update to trunk and styling fixes

---
 src/extension/internal/emf-inout.cpp | 20 ++++++++++----------
 src/object/sp-item.cpp               |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 045470b53..a22a33e40 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -32,22 +32,22 @@
 #include <cstdint>
 #include <3rdparty/libuemf/symbol_convert.h>
 
-#include "clear-n_.h"
-#include "display/drawing-item.h"
-#include "display/drawing.h"
 #include "document.h"
+#include "object/sp-root.h"
+#include "object/sp-path.h"
+#include "print.h"
+#include "extension/system.h"
+#include "extension/print.h"
 #include "extension/db.h"
 #include "extension/input.h"
 #include "extension/output.h"
-#include "extension/print.h"
-#include "extension/system.h"
-#include "inkscape.h" // even though it is included indirectly by emf-inout.h
-#include "object/sp-path.h"
-#include "object/sp-root.h"
-#include "print.h"
-#include "svg/css-ostringstream.h"
+#include "display/drawing.h"
+#include "display/drawing-item.h"
+#include "clear-n_.h"
 #include "svg/svg.h"
+#include "svg/css-ostringstream.h"
 #include "util/units.h" // even though it is included indirectly by emf-inout.h
+#include "inkscape.h"   // even though it is included indirectly by emf-inout.h
 
 #include "emf-print.h"
 #include "emf-inout.h"
diff --git a/src/object/sp-item.cpp b/src/object/sp-item.cpp
index 0853acc51..7d7edcc97 100644
--- a/src/object/sp-item.cpp
+++ b/src/object/sp-item.cpp
@@ -20,13 +20,13 @@
 
 #include <glibmm/i18n.h>
 
-#include "attributes.h"
 #include "bad-uri-exception.h"
+#include "svg/svg.h"
+#include "svg/css-ostringstream.h"
+#include "print.h"
 #include "display/drawing-item.h"
+#include "attributes.h"
 #include "document.h"
-#include "print.h"
-#include "svg/css-ostringstream.h"
-#include "svg/svg.h"
 
 #include "inkscape.h"
 #include "desktop.h"
-- 
cgit v1.2.3