diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-05-04 16:45:37 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-05-04 16:45:37 +0000 |
| commit | 6031728e438feb9457596baae886c803883535e4 (patch) | |
| tree | 312bd8e46bc0cb2581287a72964d21a1eba5133b /src/extension/internal/pdfinput | |
| parent | Rename "Glyphs" dialog to "Unicode Characters" dialog to better reflect what ... (diff) | |
| download | inkscape-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/extension/internal/pdfinput')
| -rw-r--r-- | src/extension/internal/pdfinput/pdf-input.cpp | 14 | ||||
| -rw-r--r-- | src/extension/internal/pdfinput/pdf-parser.cpp | 30 | ||||
| -rw-r--r-- | src/extension/internal/pdfinput/svg-builder.cpp | 30 |
3 files changed, 37 insertions, 37 deletions
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index 1f37befaa..552051eed 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -18,17 +18,17 @@ #include "pdf-input.h" #ifdef HAVE_POPPLER -#include <poppler/Catalog.h> +#include <poppler/goo/GooString.h> #include <poppler/ErrorCodes.h> #include <poppler/GlobalParams.h> #include <poppler/PDFDoc.h> #include <poppler/Page.h> -#include <poppler/goo/GooString.h> +#include <poppler/Catalog.h> #ifdef HAVE_POPPLER_CAIRO +#include <poppler/glib/poppler.h> #include <poppler/glib/poppler-document.h> #include <poppler/glib/poppler-page.h> -#include <poppler/glib/poppler.h> #endif #include <gtkmm/checkbutton.h> @@ -39,18 +39,18 @@ #include <gtkmm/scale.h> #include <glibmm/convert.h> -#include <glibmm/i18n.h> #include <glibmm/miscutils.h> #include <gtk/gtk.h> +#include <glibmm/i18n.h> #include "ui/dialog-events.h" -#include "ui/widget/frame.h" #include "ui/widget/spinbutton.h" +#include "ui/widget/frame.h" -#include "extension/input.h" #include "extension/system.h" -#include "pdf-parser.h" +#include "extension/input.h" #include "svg-builder.h" +#include "pdf-parser.h" #include "document-private.h" #include "document-undo.h" diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp index 2bc7ada12..6c498f981 100644 --- a/src/extension/internal/pdfinput/pdf-parser.cpp +++ b/src/extension/internal/pdfinput/pdf-parser.cpp @@ -23,36 +23,36 @@ extern "C" { -#include <math.h> -#include <stddef.h> -#include <stdio.h> #include <stdlib.h> +#include <stdio.h> +#include <stddef.h> #include <string.h> +#include <math.h> } +#include "svg-builder.h" #include "Gfx.h" #include "pdf-parser.h" -#include "svg-builder.h" #include "util/units.h" -#include "Annot.h" -#include "Array.h" +#include "goo/gmem.h" +#include "goo/GooTimer.h" +#include "goo/GooHash.h" +#include "GlobalParams.h" #include "CharTypes.h" +#include "Object.h" +#include "Array.h" #include "Dict.h" -#include "Error.h" +#include "Stream.h" +#include "Lexer.h" +#include "Parser.h" #include "GfxFont.h" #include "GfxState.h" -#include "GlobalParams.h" -#include "Lexer.h" -#include "Object.h" #include "OutputDev.h" #include "Page.h" -#include "Parser.h" -#include "Stream.h" -#include "goo/GooHash.h" -#include "goo/GooTimer.h" -#include "goo/gmem.h" +#include "Annot.h" +#include "Error.h" // the MSVC math.h doesn't define this #ifndef M_PI diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp index 1f3c76b3a..8e5a5f639 100644 --- a/src/extension/internal/pdfinput/svg-builder.cpp +++ b/src/extension/internal/pdfinput/svg-builder.cpp @@ -19,34 +19,34 @@ #ifdef HAVE_POPPLER -#include "pdf-parser.h" #include "svg-builder.h" +#include "pdf-parser.h" #include <png.h> -#include "color.h" -#include "display/nr-filter-utils.h" #include "document-private.h" -#include "io/base64stream.h" -#include "io/stringstream.h" -#include "libnrtype/font-instance.h" -#include "object/sp-defs.h" -#include "svg/css-ostringstream.h" -#include "svg/path-string.h" -#include "svg/svg-color.h" -#include "svg/svg.h" -#include "util/units.h" #include "xml/document.h" #include "xml/node.h" #include "xml/repr.h" +#include "svg/svg.h" +#include "svg/path-string.h" +#include "svg/css-ostringstream.h" +#include "svg/svg-color.h" +#include "color.h" +#include "util/units.h" +#include "io/stringstream.h" +#include "io/base64stream.h" +#include "display/nr-filter-utils.h" +#include "libnrtype/font-instance.h" +#include "object/sp-defs.h" #include "Function.h" -#include "GfxFont.h" #include "GfxState.h" -#include "GlobalParams.h" -#include "Page.h" +#include "GfxFont.h" #include "Stream.h" +#include "Page.h" #include "UnicodeMap.h" +#include "GlobalParams.h" namespace Inkscape { namespace Extension { |
