From 6031728e438feb9457596baae886c803883535e4 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin 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/helper/action-context.cpp | 2 +- src/helper/action.cpp | 6 +++--- src/helper/geom-pathstroke.cpp | 6 +++--- src/helper/geom-pathvectorsatellites.cpp | 2 +- src/helper/geom-satellite.cpp | 6 +++--- src/helper/geom.cpp | 4 ++-- src/helper/gettext.cpp | 2 +- src/helper/pixbuf-ops.cpp | 8 ++++---- src/helper/png-write.cpp | 18 +++++++++--------- src/helper/stock-items.cpp | 8 ++++---- 10 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src/helper') diff --git a/src/helper/action-context.cpp b/src/helper/action-context.cpp index b8430902b..1ea12776b 100644 --- a/src/helper/action-context.cpp +++ b/src/helper/action-context.cpp @@ -11,9 +11,9 @@ #include "desktop.h" #include "document.h" -#include "helper/action-context.h" #include "layer-model.h" #include "selection.h" +#include "helper/action-context.h" namespace Inkscape { diff --git a/src/helper/action.cpp b/src/helper/action.cpp index 18e6433bf..e37575a9c 100644 --- a/src/helper/action.cpp +++ b/src/helper/action.cpp @@ -10,13 +10,13 @@ */ #include "debug/logger.h" -#include "debug/event-tracker.h" -#include "debug/simple-event.h" #include "debug/timestamp.h" +#include "debug/simple-event.h" +#include "debug/event-tracker.h" +#include "ui/view/view.h" #include "desktop.h" #include "document.h" #include "helper/action.h" -#include "ui/view/view.h" static void sp_action_finalize (GObject *object); diff --git a/src/helper/geom-pathstroke.cpp b/src/helper/geom-pathstroke.cpp index 55014323d..c3e4f8213 100644 --- a/src/helper/geom-pathstroke.cpp +++ b/src/helper/geom-pathstroke.cpp @@ -8,11 +8,11 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <2geom/circle.h> -#include <2geom/path-intersection.h> +#include #include <2geom/path-sink.h> #include <2geom/sbasis-to-bezier.h> // cubicbezierpath_from_sbasis -#include +#include <2geom/path-intersection.h> +#include <2geom/circle.h> #include "helper/geom-pathstroke.h" diff --git a/src/helper/geom-pathvectorsatellites.cpp b/src/helper/geom-pathvectorsatellites.cpp index 1ecd2e24c..85192bd75 100644 --- a/src/helper/geom-pathvectorsatellites.cpp +++ b/src/helper/geom-pathvectorsatellites.cpp @@ -14,8 +14,8 @@ * This code is in public domain */ -#include "util/units.h" #include +#include "util/units.h" Geom::PathVector PathVectorSatellites::getPathVector() const { diff --git a/src/helper/geom-satellite.cpp b/src/helper/geom-satellite.cpp index f01b6c6e1..b54738a38 100644 --- a/src/helper/geom-satellite.cpp +++ b/src/helper/geom-satellite.cpp @@ -8,19 +8,19 @@ * This code is in public domain */ +#include #include <2geom/curve.h> #include <2geom/nearest-time.h> #include <2geom/path-intersection.h> -#include <2geom/ray.h> #include <2geom/sbasis-to-bezier.h> +#include <2geom/ray.h> #include -#include //log cache #ifdef _WIN32 #include #else -#include #include +#include #endif ///@brief Satellite a per node holder of data. diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp index 8ac6236b8..e1f05c3ce 100644 --- a/src/helper/geom.cpp +++ b/src/helper/geom.cpp @@ -9,11 +9,11 @@ * Released under GNU GPL */ -#include "helper/geom-curves.h" +#include #include "helper/geom.h" +#include "helper/geom-curves.h" #include <2geom/curves.h> #include <2geom/sbasis-to-bezier.h> -#include using Geom::X; using Geom::Y; diff --git a/src/helper/gettext.cpp b/src/helper/gettext.cpp index 2be5df035..1942b373c 100644 --- a/src/helper/gettext.cpp +++ b/src/helper/gettext.cpp @@ -35,9 +35,9 @@ #include "prefix.h" #endif +#include #include #include -#include namespace Inkscape { diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp index 3fe022b2f..3b43735ad 100644 --- a/src/helper/pixbuf-ops.cpp +++ b/src/helper/pixbuf-ops.cpp @@ -17,15 +17,15 @@ #include <2geom/transforms.h> +#include "ui/interface.h" +#include "helper/png-write.h" #include "display/cairo-utils.h" -#include "display/drawing-context.h" #include "display/drawing.h" +#include "display/drawing-context.h" #include "document.h" -#include "helper/png-write.h" -#include "object/sp-defs.h" #include "object/sp-root.h" +#include "object/sp-defs.h" #include "object/sp-use.h" -#include "ui/interface.h" #include "util/units.h" #include "helper/pixbuf-ops.h" diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp index 4b9fd9fae..93b07d410 100644 --- a/src/helper/png-write.cpp +++ b/src/helper/png-write.cpp @@ -17,23 +17,23 @@ #include #endif -#include "display/cairo-utils.h" -#include "display/drawing-context.h" +#include +#include "ui/interface.h" +#include <2geom/rect.h> +#include <2geom/transforms.h> +#include "png-write.h" +#include "io/sys.h" #include "display/drawing.h" +#include "display/drawing-context.h" +#include "display/cairo-utils.h" #include "document.h" -#include "io/sys.h" -#include "png-write.h" #include "preferences.h" #include "rdf.h" -#include "ui/interface.h" #include "util/units.h" -#include <2geom/rect.h> -#include <2geom/transforms.h> -#include -#include "object/sp-defs.h" #include "object/sp-item.h" #include "object/sp-root.h" +#include "object/sp-defs.h" /* This is an example of how to use libpng to read and write PNG files. * The file libpng.txt is much more verbose then this. If you have not diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp index c985d716a..d33186344 100644 --- a/src/helper/stock-items.cpp +++ b/src/helper/stock-items.cpp @@ -24,18 +24,18 @@ #include "path-prefix.h" -#include "desktop.h" +#include #include "document-private.h" +#include "desktop.h" #include "inkscape.h" -#include #include "io/sys.h" #include "stock-items.h" -#include "object/sp-defs.h" #include "object/sp-gradient.h" -#include "object/sp-marker.h" #include "object/sp-pattern.h" +#include "object/sp-marker.h" +#include "object/sp-defs.h" static SPObject *sp_gradient_load_from_svg(gchar const *name, SPDocument *current_doc); static SPObject *sp_marker_load_from_svg(gchar const *name, SPDocument *current_doc); -- cgit v1.2.3