summaryrefslogtreecommitdiff
path: root/goo
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2019-11-29 17:20:10 +0100
committerAlbert Astals Cid <aacid@kde.org>2019-11-29 18:11:40 +0100
commit1c1d9a70013125f67518f398a2b5abf37ec43cdd (patch)
treee1ea16e1db7a4763828e6f230e99eda95cd34f77 /goo
parent5713d0da012b734a28234455dcf817d5be20a98f (diff)
Enable modernize-deprecated-headers
Diffstat (limited to 'goo')
-rw-r--r--goo/GooTimer.cc2
-rw-r--r--goo/ImgWriter.h2
-rw-r--r--goo/PNGWriter.cc4
-rw-r--r--goo/TiffWriter.cc2
-rw-r--r--goo/gbasename.cc4
-rw-r--r--goo/gfile.cc6
-rw-r--r--goo/gfile.h8
-rw-r--r--goo/glibc.h2
-rw-r--r--goo/glibc_strtok_r.cc2
-rw-r--r--goo/gstrtod.cc8
10 files changed, 20 insertions, 20 deletions
diff --git a/goo/GooTimer.cc b/goo/GooTimer.cc
index 42295a48..74e378d1 100644
--- a/goo/GooTimer.cc
+++ b/goo/GooTimer.cc
@@ -14,7 +14,7 @@
#include <config.h>
#include "GooTimer.h"
-#include <string.h>
+#include <cstring>
#define USEC_PER_SEC 1000000
diff --git a/goo/ImgWriter.h b/goo/ImgWriter.h
index 2ab97cdb..844aa1c8 100644
--- a/goo/ImgWriter.h
+++ b/goo/ImgWriter.h
@@ -15,7 +15,7 @@
#ifndef IMGWRITER_H
#define IMGWRITER_H
-#include <stdio.h>
+#include <cstdio>
class ImgWriter
{
diff --git a/goo/PNGWriter.cc b/goo/PNGWriter.cc
index f230fcaf..a39ffc61 100644
--- a/goo/PNGWriter.cc
+++ b/goo/PNGWriter.cc
@@ -19,8 +19,8 @@
#ifdef ENABLE_LIBPNG
#include <zlib.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
#include "poppler/Error.h"
#include "goo/gmem.h"
diff --git a/goo/TiffWriter.cc b/goo/TiffWriter.cc
index fd2eaa31..cbd6eef4 100644
--- a/goo/TiffWriter.cc
+++ b/goo/TiffWriter.cc
@@ -16,7 +16,7 @@
#ifdef ENABLE_LIBTIFF
-#include <string.h>
+#include <cstring>
#ifdef _WIN32
#include <io.h>
diff --git a/goo/gbasename.cc b/goo/gbasename.cc
index 830c1c80..e84276e0 100644
--- a/goo/gbasename.cc
+++ b/goo/gbasename.cc
@@ -43,8 +43,8 @@
#ifndef _MSC_VER
# include <libgen.h>
#endif
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
std::string gbasename(const char* filename)
{
diff --git a/goo/gfile.cc b/goo/gfile.cc
index eae51207..4acba84e 100644
--- a/goo/gfile.cc
+++ b/goo/gfile.cc
@@ -40,11 +40,11 @@
# include <sys/types.h>
# include <sys/stat.h>
# include <fcntl.h>
-# include <limits.h>
-# include <string.h>
+# include <climits>
+# include <cstring>
# include <pwd.h>
#endif // _WIN32
-#include <stdio.h>
+#include <cstdio>
#include <limits>
#include "GooString.h"
#include "gfile.h"
diff --git a/goo/gfile.h b/goo/gfile.h
index ace17be7..4643de5b 100644
--- a/goo/gfile.h
+++ b/goo/gfile.h
@@ -36,10 +36,10 @@
#define GFILE_H
#include "poppler-config.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <time.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstddef>
+#include <ctime>
extern "C" {
#if defined(_WIN32)
# include <sys/stat.h>
diff --git a/goo/glibc.h b/goo/glibc.h
index ccbd8736..5933ae01 100644
--- a/goo/glibc.h
+++ b/goo/glibc.h
@@ -16,7 +16,7 @@
#include "config.h"
-#include <time.h>
+#include <ctime>
#ifndef HAVE_GMTIME_R
struct tm *gmtime_r(const time_t *timep, struct tm *result);
diff --git a/goo/glibc_strtok_r.cc b/goo/glibc_strtok_r.cc
index e323bc21..95bd0724 100644
--- a/goo/glibc_strtok_r.cc
+++ b/goo/glibc_strtok_r.cc
@@ -61,7 +61,7 @@
#ifndef HAVE_STRTOK_R
-#include <string.h>
+#include <cstring>
#define __rawmemchr strchr
diff --git a/goo/gstrtod.cc b/goo/gstrtod.cc
index a1062821..7df52227 100644
--- a/goo/gstrtod.cc
+++ b/goo/gstrtod.cc
@@ -22,10 +22,10 @@
#include "gstrtod.h"
-#include <locale.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
+#include <clocale>
+#include <cerrno>
+#include <cstdlib>
+#include <cstring>
#define ascii_isspace(c) \
(c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v')