From 7fe91fdccab9e61c4dbc12c1c83d2f06e3f266f4 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sun, 17 Jun 2018 21:40:31 +0200 Subject: =?UTF-8?q?Run=20clang-tidy=E2=80=99s=20modernize-deprecated-heade?= =?UTF-8?q?rs=20pass.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This renames most C <*.h> includes into C++ includes. --- src/extension/implementation/script.cpp | 2 +- src/extension/internal/cairo-render-context.cpp | 10 +++++----- src/extension/internal/cairo-renderer.cpp | 4 ++-- src/extension/internal/cdr-input.cpp | 2 +- src/extension/internal/emf-inout.cpp | 6 +++--- src/extension/internal/emf-print.cpp | 2 +- src/extension/internal/image-resolution.cpp | 2 +- src/extension/internal/javafx-out.cpp | 4 ++-- src/extension/internal/latex-pstricks.cpp | 4 ++-- src/extension/internal/latex-text-renderer.cpp | 4 ++-- src/extension/internal/metafile-inout.h | 6 +++--- src/extension/internal/odf.cpp | 8 ++++---- src/extension/internal/pdfinput/pdf-parser.cpp | 10 +++++----- src/extension/internal/pov-out.cpp | 4 ++-- src/extension/internal/vsd-input.cpp | 2 +- src/extension/internal/wmf-inout.cpp | 6 +++--- src/extension/internal/wmf-print.cpp | 2 +- src/extension/internal/wpg-input.cpp | 2 +- src/extension/loader.cpp | 2 +- src/extension/timer.h | 2 +- 20 files changed, 42 insertions(+), 42 deletions(-) (limited to 'src/extension') diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index 90269c557..72a015b57 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp index 36f73136b..969fff4f9 100644 --- a/src/extension/internal/cairo-render-context.cpp +++ b/src/extension/internal/cairo-render-context.cpp @@ -25,11 +25,11 @@ #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include <2geom/pathvector.h> #include diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index eca17966e..c7cd35eb2 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -25,8 +25,8 @@ #endif -#include -#include +#include +#include #include "libnrtype/Layout-TNG.h" #include <2geom/transforms.h> diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp index e1f67dc85..5f42c1a94 100644 --- a/src/extension/internal/cdr-input.cpp +++ b/src/extension/internal/cdr-input.cpp @@ -13,7 +13,7 @@ * */ -#include +#include #include "config.h" #include "cdr-input.h" diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp index f8cedcb50..549d4300e 100644 --- a/src/extension/internal/emf-inout.cpp +++ b/src/extension/internal/emf-inout.cpp @@ -27,9 +27,9 @@ # include "config.h" #endif -#include -#include -#include +#include +#include +#include #include <3rdparty/libuemf/symbol_convert.h> #include "document.h" diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp index ec4594eea..548caea95 100644 --- a/src/extension/internal/emf-print.cpp +++ b/src/extension/internal/emf-print.cpp @@ -26,7 +26,7 @@ # include "config.h" #endif -#include +#include #include #include <3rdparty/libuemf/symbol_convert.h> #include <2geom/sbasis-to-bezier.h> diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp index e5b1e4619..e16487f8e 100644 --- a/src/extension/internal/image-resolution.cpp +++ b/src/extension/internal/image-resolution.cpp @@ -27,7 +27,7 @@ #ifdef HAVE_JPEG #define IR_TRY_JFIF 1 #include -#include +#include #endif #ifdef WITH_IMAGE_MAGICK diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp index 5646eeefd..0185e07cd 100644 --- a/src/extension/internal/javafx-out.cpp +++ b/src/extension/internal/javafx-out.cpp @@ -43,8 +43,8 @@ #include "style.h" #include -#include -#include +#include +#include #include "extension/extension.h" diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp index aa90c4f59..226f915aa 100644 --- a/src/extension/internal/latex-pstricks.cpp +++ b/src/extension/internal/latex-pstricks.cpp @@ -18,8 +18,8 @@ #include <2geom/pathvector.h> #include <2geom/sbasis-to-bezier.h> #include <2geom/curves.h> -#include -#include +#include +#include #include "util/units.h" #include "helper/geom-curves.h" diff --git a/src/extension/internal/latex-text-renderer.cpp b/src/extension/internal/latex-text-renderer.cpp index c61a95922..fe9e78bf2 100644 --- a/src/extension/internal/latex-text-renderer.cpp +++ b/src/extension/internal/latex-text-renderer.cpp @@ -21,8 +21,8 @@ #include "latex-text-renderer.h" -#include -#include +#include +#include #include "libnrtype/Layout-TNG.h" #include <2geom/transforms.h> diff --git a/src/extension/internal/metafile-inout.h b/src/extension/internal/metafile-inout.h index d3e870a25..eaa8334ee 100644 --- a/src/extension/internal/metafile-inout.h +++ b/src/extension/internal/metafile-inout.h @@ -17,9 +17,9 @@ #define PNG_SKIP_SETJMP_CHECK // else any further png.h include blows up in the compiler #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index 2c25ea1f4..18092873e 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -44,10 +44,10 @@ #include "odf.h" //# System includes -#include -#include +#include +#include #include -#include +#include //# Inkscape includes #include "clear-n_.h" @@ -101,7 +101,7 @@ typedef Inkscape::IO::StringOutputStream StringOutputStream; //######################################################################## //# C L A S S SingularValueDecomposition //######################################################################## -#include +#include class SVDMatrix { diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp index fbcb708fe..fcefcd059 100644 --- a/src/extension/internal/pdfinput/pdf-parser.cpp +++ b/src/extension/internal/pdfinput/pdf-parser.cpp @@ -23,11 +23,11 @@ extern "C" { -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include } diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp index 2215fbb3e..0cfeeff94 100644 --- a/src/extension/internal/pov-out.cpp +++ b/src/extension/internal/pov-out.cpp @@ -38,8 +38,8 @@ #include "style.h" #include -#include -#include +#include +#include #include "document.h" #include "extension/extension.h" diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp index e4982a02c..46aa0245c 100644 --- a/src/extension/internal/vsd-input.cpp +++ b/src/extension/internal/vsd-input.cpp @@ -13,7 +13,7 @@ * */ -#include +#include #include "config.h" #include "vsd-input.h" diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp index 5941aaf1e..db7c9c9ce 100644 --- a/src/extension/internal/wmf-inout.cpp +++ b/src/extension/internal/wmf-inout.cpp @@ -28,9 +28,9 @@ #endif //#include //This must precede text_reassemble.h or it blows up in pngconf.h when compiling -#include -#include -#include +#include +#include +#include #include <3rdparty/libuemf/symbol_convert.h> #include "document.h" diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp index d98d28b09..6c431eba5 100644 --- a/src/extension/internal/wmf-print.cpp +++ b/src/extension/internal/wmf-print.cpp @@ -63,7 +63,7 @@ #include "wmf-print.h" -#include +#include #include <3rdparty/libuemf/symbol_convert.h> namespace Inkscape { diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp index 0953e5696..6a790ed4c 100644 --- a/src/extension/internal/wpg-input.cpp +++ b/src/extension/internal/wpg-input.cpp @@ -39,7 +39,7 @@ * Corel Corporation or Corel Corporation Limited." */ -#include +#include #include "config.h" #ifdef WITH_LIBWPG diff --git a/src/extension/loader.cpp b/src/extension/loader.cpp index 7761b79bd..9d8c52aea 100644 --- a/src/extension/loader.cpp +++ b/src/extension/loader.cpp @@ -14,7 +14,7 @@ #include #include "system.h" -#include +#include #include "dependency.h" #include "inkscape-version.h" diff --git a/src/extension/timer.h b/src/extension/timer.h index b257c770a..e00929013 100644 --- a/src/extension/timer.h +++ b/src/extension/timer.h @@ -13,7 +13,7 @@ #ifndef INKSCAPE_EXTENSION_TIMER_H__ #define INKSCAPE_EXTENSION_TIMER_H__ -#include +#include #include #include -- cgit v1.2.3