summaryrefslogtreecommitdiffstats
path: root/src/util
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/util
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/util')
-rw-r--r--src/util/ege-tags.cpp2
-rw-r--r--src/util/units.cpp10
-rw-r--r--src/util/ziptool.cpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/util/ege-tags.cpp b/src/util/ege-tags.cpp
index 636d93b85..dcc28f370 100644
--- a/src/util/ege-tags.cpp
+++ b/src/util/ege-tags.cpp
@@ -44,9 +44,9 @@
#define _(s) gettext(s)
#endif // !defined(_)
+#include <set>
#include <algorithm>
#include <functional>
-#include <set>
#include "ege-tags.h"
diff --git a/src/util/units.cpp b/src/util/units.cpp
index e31f78c3b..cf4bfd146 100644
--- a/src/util/units.cpp
+++ b/src/util/units.cpp
@@ -13,20 +13,20 @@
# include <config.h>
#endif
-#include <cerrno>
#include <cmath>
+#include <cerrno>
+#include <iomanip>
+#include <iostream>
#include <glib.h>
+#include <glibmm/regex.h>
#include <glibmm/fileutils.h>
#include <glibmm/markup.h>
-#include <glibmm/regex.h>
-#include <iomanip>
-#include <iostream>
#include <2geom/coord.h>
+#include "util/units.h"
#include "path-prefix.h"
#include "streq.h"
-#include "util/units.h"
using Inkscape::Util::UNIT_TYPE_DIMENSIONLESS;
using Inkscape::Util::UNIT_TYPE_LINEAR;
diff --git a/src/util/ziptool.cpp b/src/util/ziptool.cpp
index d9d769e89..b8253627c 100644
--- a/src/util/ziptool.cpp
+++ b/src/util/ziptool.cpp
@@ -31,8 +31,8 @@
*/
-#include <stdarg.h>
#include <stdio.h>
+#include <stdarg.h>
#include <time.h>
#include <string>