summaryrefslogtreecommitdiffstats
path: root/src/extension
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-17 19:40:31 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2018-06-18 12:27:01 +0000
commit7fe91fdccab9e61c4dbc12c1c83d2f06e3f266f4 (patch)
treeab4f11dc730c386ce76fcbb9e219b233504955e7 /src/extension
parentRun clang-tidy’s modernize-use-equals-default pass. (diff)
downloadinkscape-7fe91fdccab9e61c4dbc12c1c83d2f06e3f266f4.tar.gz
inkscape-7fe91fdccab9e61c4dbc12c1c83d2f06e3f266f4.zip
Run clang-tidy’s modernize-deprecated-headers pass.
This renames most C <*.h> includes into C++ <c*> includes.
Diffstat (limited to 'src/extension')
-rw-r--r--src/extension/implementation/script.cpp2
-rw-r--r--src/extension/internal/cairo-render-context.cpp10
-rw-r--r--src/extension/internal/cairo-renderer.cpp4
-rw-r--r--src/extension/internal/cdr-input.cpp2
-rw-r--r--src/extension/internal/emf-inout.cpp6
-rw-r--r--src/extension/internal/emf-print.cpp2
-rw-r--r--src/extension/internal/image-resolution.cpp2
-rw-r--r--src/extension/internal/javafx-out.cpp4
-rw-r--r--src/extension/internal/latex-pstricks.cpp4
-rw-r--r--src/extension/internal/latex-text-renderer.cpp4
-rw-r--r--src/extension/internal/metafile-inout.h6
-rw-r--r--src/extension/internal/odf.cpp8
-rw-r--r--src/extension/internal/pdfinput/pdf-parser.cpp10
-rw-r--r--src/extension/internal/pov-out.cpp4
-rw-r--r--src/extension/internal/vsd-input.cpp2
-rw-r--r--src/extension/internal/wmf-inout.cpp6
-rw-r--r--src/extension/internal/wmf-print.cpp2
-rw-r--r--src/extension/internal/wpg-input.cpp2
-rw-r--r--src/extension/loader.cpp2
-rw-r--r--src/extension/timer.h2
20 files changed, 42 insertions, 42 deletions
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 <glibmm/convert.h>
#include <unistd.h>
-#include <errno.h>
+#include <cerrno>
#include <glib/gstdio.h>
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 <signal.h>
-#include <limits.h>
-#include <errno.h>
-#include <time.h>
-#include <stdlib.h>
+#include <csignal>
+#include <climits>
+#include <cerrno>
+#include <ctime>
+#include <cstdlib>
#include <2geom/pathvector.h>
#include <glib.h>
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 <signal.h>
-#include <errno.h>
+#include <csignal>
+#include <cerrno>
#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 <stdio.h>
+#include <cstdio>
#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 <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstdint>
#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 <string.h>
+#include <cstring>
#include <glibmm/miscutils.h>
#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 <jpeglib.h>
-#include <setjmp.h>
+#include <csetjmp>
#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 <string>
-#include <stdio.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdarg>
#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 <errno.h>
-#include <signal.h>
+#include <cerrno>
+#include <csignal>
#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 <signal.h>
-#include <errno.h>
+#include <csignal>
+#include <cerrno>
#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 <png.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstdint>
#include <map>
#include <stack>
#include <glibmm/ustring.h>
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 <stdio.h>
-#include <time.h>
+#include <cstdio>
+#include <ctime>
#include <vector>
-#include <math.h>
+#include <cmath>
//# Inkscape includes
#include "clear-n_.h"
@@ -101,7 +101,7 @@ typedef Inkscape::IO::StringOutputStream StringOutputStream;
//########################################################################
//# C L A S S SingularValueDecomposition
//########################################################################
-#include <math.h>
+#include <cmath>
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 <stdlib.h>
-#include <stdio.h>
-#include <stddef.h>
-#include <string.h>
-#include <math.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstddef>
+#include <cstring>
+#include <cmath>
}
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 <string>
-#include <stdio.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdarg>
#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 <stdio.h>
+#include <cstdio>
#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 <png.h> //This must precede text_reassemble.h or it blows up in pngconf.h when compiling
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstdint>
#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 <string.h>
+#include <cstring>
#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 <stdio.h>
+#include <cstdio>
#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 <gmodule.h>
#include "system.h"
-#include <string.h>
+#include <cstring>
#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 <stddef.h>
+#include <cstddef>
#include <sigc++/sigc++.h>
#include <glibmm/timeval.h>