aboutsummaryrefslogtreecommitdiffstats
path: root/libqpdf
diff options
context:
space:
mode:
authorm-holger <m-holger@kubitscheck.org>2023-05-20 13:22:32 +0200
committerm-holger <m-holger@kubitscheck.org>2023-05-20 16:41:25 +0200
commite28f4efb00d5040fa71532d76e63aa7ade105c99 (patch)
tree58cc2f9435a7bcc230858220574a9f08c431fc20 /libqpdf
parent7f043fe88ed8d7ce14a67cbfaf0c0b18015b8f9f (diff)
downloadqpdf-e28f4efb00d5040fa71532d76e63aa7ade105c99.tar.zst
Replace deprecated C++ includes
Diffstat (limited to 'libqpdf')
-rw-r--r--libqpdf/BufferInputSource.cc2
-rw-r--r--libqpdf/FileInputSource.cc2
-rw-r--r--libqpdf/InputSource.cc2
-rw-r--r--libqpdf/InsecureRandomDataProvider.cc2
-rw-r--r--libqpdf/MD5.cc2
-rw-r--r--libqpdf/Pl_ASCII85Decoder.cc2
-rw-r--r--libqpdf/Pl_ASCIIHexDecoder.cc2
-rw-r--r--libqpdf/Pl_Buffer.cc4
-rw-r--r--libqpdf/Pl_DCT.cc2
-rw-r--r--libqpdf/Pl_Flate.cc4
-rw-r--r--libqpdf/Pl_LZWDecoder.cc2
-rw-r--r--libqpdf/Pl_PNGFilter.cc4
-rw-r--r--libqpdf/Pl_StdioFile.cc2
-rw-r--r--libqpdf/Pl_TIFFPredictor.cc4
-rw-r--r--libqpdf/QPDF.cc4
-rw-r--r--libqpdf/QPDFFormFieldObjectHelper.cc2
-rw-r--r--libqpdf/QPDFJob.cc2
-rw-r--r--libqpdf/QPDFJob_argv.cc6
-rw-r--r--libqpdf/QPDFObjectHandle.cc6
-rw-r--r--libqpdf/QPDFSystemError.cc2
-rw-r--r--libqpdf/QPDFTokenizer.cc4
-rw-r--r--libqpdf/QPDFWriter.cc2
-rw-r--r--libqpdf/QPDF_encryption.cc2
-rw-r--r--libqpdf/QPDF_linearization.cc4
-rw-r--r--libqpdf/QTC.cc2
-rw-r--r--libqpdf/QUtil.cc10
-rw-r--r--libqpdf/qpdf/BitStream.hh2
-rw-r--r--libqpdf/qpdf/BitWriter.hh2
28 files changed, 43 insertions, 43 deletions
diff --git a/libqpdf/BufferInputSource.cc b/libqpdf/BufferInputSource.cc
index 005692ae..33ab44f6 100644
--- a/libqpdf/BufferInputSource.cc
+++ b/libqpdf/BufferInputSource.cc
@@ -3,7 +3,7 @@
#include <qpdf/QIntC.hh>
#include <algorithm>
#include <sstream>
-#include <string.h>
+#include <cstring>
BufferInputSource::BufferInputSource(
std::string const& description, Buffer* buf, bool own_memory) :
diff --git a/libqpdf/FileInputSource.cc b/libqpdf/FileInputSource.cc
index 7c4d6d42..a5f0f4f0 100644
--- a/libqpdf/FileInputSource.cc
+++ b/libqpdf/FileInputSource.cc
@@ -3,7 +3,7 @@
#include <qpdf/QPDFExc.hh>
#include <qpdf/QUtil.hh>
#include <algorithm>
-#include <string.h>
+#include <cstring>
FileInputSource::FileInputSource() :
close_file(false),
diff --git a/libqpdf/InputSource.cc b/libqpdf/InputSource.cc
index 33ab44d1..3a4bb88a 100644
--- a/libqpdf/InputSource.cc
+++ b/libqpdf/InputSource.cc
@@ -3,7 +3,7 @@
#include <qpdf/QIntC.hh>
#include <qpdf/QTC.hh>
#include <stdexcept>
-#include <string.h>
+#include <cstring>
void
InputSource::setLastOffset(qpdf_offset_t offset)
diff --git a/libqpdf/InsecureRandomDataProvider.cc b/libqpdf/InsecureRandomDataProvider.cc
index cb67cada..90a548ee 100644
--- a/libqpdf/InsecureRandomDataProvider.cc
+++ b/libqpdf/InsecureRandomDataProvider.cc
@@ -2,7 +2,7 @@
#include <qpdf/QUtil.hh>
#include <qpdf/qpdf-config.h>
-#include <stdlib.h>
+#include <cstdlib>
InsecureRandomDataProvider::InsecureRandomDataProvider() :
seeded_random(false)
diff --git a/libqpdf/MD5.cc b/libqpdf/MD5.cc
index 57419374..9668c982 100644
--- a/libqpdf/MD5.cc
+++ b/libqpdf/MD5.cc
@@ -4,7 +4,7 @@
#include <qpdf/QPDFCryptoProvider.hh>
#include <qpdf/QUtil.hh>
-#include <string.h>
+#include <cstring>
MD5::MD5()
{
diff --git a/libqpdf/Pl_ASCII85Decoder.cc b/libqpdf/Pl_ASCII85Decoder.cc
index 1e3d1b4f..e43b4a86 100644
--- a/libqpdf/Pl_ASCII85Decoder.cc
+++ b/libqpdf/Pl_ASCII85Decoder.cc
@@ -2,7 +2,7 @@
#include <qpdf/QTC.hh>
#include <stdexcept>
-#include <string.h>
+#include <cstring>
Pl_ASCII85Decoder::Pl_ASCII85Decoder(char const* identifier, Pipeline* next) :
Pipeline(identifier, next),
diff --git a/libqpdf/Pl_ASCIIHexDecoder.cc b/libqpdf/Pl_ASCIIHexDecoder.cc
index 48836f58..5590efba 100644
--- a/libqpdf/Pl_ASCIIHexDecoder.cc
+++ b/libqpdf/Pl_ASCIIHexDecoder.cc
@@ -1,7 +1,7 @@
#include <qpdf/Pl_ASCIIHexDecoder.hh>
#include <qpdf/QTC.hh>
-#include <ctype.h>
+#include <cctype>
#include <stdexcept>
Pl_ASCIIHexDecoder::Pl_ASCIIHexDecoder(char const* identifier, Pipeline* next) :
diff --git a/libqpdf/Pl_Buffer.cc b/libqpdf/Pl_Buffer.cc
index ca29ef60..d942465d 100644
--- a/libqpdf/Pl_Buffer.cc
+++ b/libqpdf/Pl_Buffer.cc
@@ -2,8 +2,8 @@
#include <algorithm>
#include <stdexcept>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
Pl_Buffer::Pl_Buffer(char const* identifier, Pipeline* next) :
Pipeline(identifier, next),
diff --git a/libqpdf/Pl_DCT.cc b/libqpdf/Pl_DCT.cc
index 35587875..c01398ad 100644
--- a/libqpdf/Pl_DCT.cc
+++ b/libqpdf/Pl_DCT.cc
@@ -3,7 +3,7 @@
#include <qpdf/QIntC.hh>
#include <qpdf/QTC.hh>
-#include <setjmp.h>
+#include <csetjmp>
#include <stdexcept>
#include <string>
diff --git a/libqpdf/Pl_Flate.cc b/libqpdf/Pl_Flate.cc
index 61873ffa..6bbcd1be 100644
--- a/libqpdf/Pl_Flate.cc
+++ b/libqpdf/Pl_Flate.cc
@@ -1,7 +1,7 @@
#include <qpdf/Pl_Flate.hh>
-#include <limits.h>
-#include <string.h>
+#include <climits>
+#include <cstring>
#include <zlib.h>
#include <qpdf/QIntC.hh>
diff --git a/libqpdf/Pl_LZWDecoder.cc b/libqpdf/Pl_LZWDecoder.cc
index 000fb64b..1c2d6807 100644
--- a/libqpdf/Pl_LZWDecoder.cc
+++ b/libqpdf/Pl_LZWDecoder.cc
@@ -4,7 +4,7 @@
#include <qpdf/QTC.hh>
#include <qpdf/QUtil.hh>
#include <stdexcept>
-#include <string.h>
+#include <cstring>
Pl_LZWDecoder::Pl_LZWDecoder(
char const* identifier, Pipeline* next, bool early_code_change) :
diff --git a/libqpdf/Pl_PNGFilter.cc b/libqpdf/Pl_PNGFilter.cc
index e2a9a0db..41088e1a 100644
--- a/libqpdf/Pl_PNGFilter.cc
+++ b/libqpdf/Pl_PNGFilter.cc
@@ -3,9 +3,9 @@
#include <qpdf/QTC.hh>
#include <qpdf/QUtil.hh>
-#include <limits.h>
+#include <climits>
#include <stdexcept>
-#include <string.h>
+#include <cstring>
static int
abs_diff(int a, int b)
diff --git a/libqpdf/Pl_StdioFile.cc b/libqpdf/Pl_StdioFile.cc
index dca16bf6..b83d0a9e 100644
--- a/libqpdf/Pl_StdioFile.cc
+++ b/libqpdf/Pl_StdioFile.cc
@@ -3,7 +3,7 @@
#include <qpdf/Pl_StdioFile.hh>
#include <qpdf/QUtil.hh>
-#include <errno.h>
+#include <cerrno>
#include <stdexcept>
Pl_StdioFile::Members::Members(FILE* f) :
diff --git a/libqpdf/Pl_TIFFPredictor.cc b/libqpdf/Pl_TIFFPredictor.cc
index c29396db..45b6d396 100644
--- a/libqpdf/Pl_TIFFPredictor.cc
+++ b/libqpdf/Pl_TIFFPredictor.cc
@@ -5,9 +5,9 @@
#include <qpdf/QTC.hh>
#include <qpdf/QUtil.hh>
-#include <limits.h>
+#include <climits>
#include <stdexcept>
-#include <string.h>
+#include <cstring>
#include <vector>
Pl_TIFFPredictor::Pl_TIFFPredictor(
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index c7cc1370..bc88b5d6 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -9,8 +9,8 @@
#include <memory.h>
#include <regex>
#include <sstream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
#include <vector>
#include <qpdf/BufferInputSource.hh>
diff --git a/libqpdf/QPDFFormFieldObjectHelper.cc b/libqpdf/QPDFFormFieldObjectHelper.cc
index e76e3121..93dc0e63 100644
--- a/libqpdf/QPDFFormFieldObjectHelper.cc
+++ b/libqpdf/QPDFFormFieldObjectHelper.cc
@@ -6,7 +6,7 @@
#include <qpdf/QPDFAnnotationObjectHelper.hh>
#include <qpdf/QTC.hh>
#include <qpdf/QUtil.hh>
-#include <stdlib.h>
+#include <cstdlib>
QPDFFormFieldObjectHelper::QPDFFormFieldObjectHelper(QPDFObjectHandle oh) :
QPDFObjectHelper(oh),
diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc
index fbaa53e5..14583104 100644
--- a/libqpdf/QPDFJob.cc
+++ b/libqpdf/QPDFJob.cc
@@ -3,7 +3,7 @@
#include <cstdio>
#include <cstdlib>
#include <cstring>
-#include <ctype.h>
+#include <cctype>
#include <fcntl.h>
#include <iostream>
#include <memory>
diff --git a/libqpdf/QPDFJob_argv.cc b/libqpdf/QPDFJob_argv.cc
index 55696f5d..5534cd39 100644
--- a/libqpdf/QPDFJob_argv.cc
+++ b/libqpdf/QPDFJob_argv.cc
@@ -3,12 +3,12 @@
// See "HOW TO ADD A COMMAND-LINE ARGUMENT" in README-maintainer.
#include <cstdio>
-#include <ctype.h>
+#include <cctype>
#include <iostream>
#include <memory>
#include <sstream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
#include <qpdf/QIntC.hh>
#include <qpdf/QPDFArgParser.hh>
diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index b3f208a5..e276bf4f 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -30,10 +30,10 @@
#include <algorithm>
#include <cstring>
-#include <ctype.h>
-#include <limits.h>
+#include <cctype>
+#include <climits>
#include <stdexcept>
-#include <stdlib.h>
+#include <cstdlib>
using namespace std::literals;
diff --git a/libqpdf/QPDFSystemError.cc b/libqpdf/QPDFSystemError.cc
index 65fa3121..ebd0d773 100644
--- a/libqpdf/QPDFSystemError.cc
+++ b/libqpdf/QPDFSystemError.cc
@@ -1,6 +1,6 @@
#include <qpdf/QPDFSystemError.hh>
-#include <string.h>
+#include <cstring>
QPDFSystemError::QPDFSystemError(
std::string const& description, int system_errno) :
diff --git a/libqpdf/QPDFTokenizer.cc b/libqpdf/QPDFTokenizer.cc
index d8d457ab..d83080b2 100644
--- a/libqpdf/QPDFTokenizer.cc
+++ b/libqpdf/QPDFTokenizer.cc
@@ -11,8 +11,8 @@
#include <qpdf/QUtil.hh>
#include <stdexcept>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
static inline bool
is_delimiter(char ch)
diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc
index de1aa45b..56b4e1ef 100644
--- a/libqpdf/QPDFWriter.cc
+++ b/libqpdf/QPDFWriter.cc
@@ -24,7 +24,7 @@
#include <algorithm>
#include <stdexcept>
-#include <stdlib.h>
+#include <cstdlib>
QPDFWriter::ProgressReporter::~ProgressReporter()
{
diff --git a/libqpdf/QPDF_encryption.cc b/libqpdf/QPDF_encryption.cc
index 2e5ddefb..64ca10f1 100644
--- a/libqpdf/QPDF_encryption.cc
+++ b/libqpdf/QPDF_encryption.cc
@@ -17,7 +17,7 @@
#include <qpdf/RC4.hh>
#include <algorithm>
-#include <string.h>
+#include <cstring>
static unsigned char const padding_string[] = {
0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41, 0x64, 0x00, 0x4e,
diff --git a/libqpdf/QPDF_linearization.cc b/libqpdf/QPDF_linearization.cc
index 5b72943a..eade317e 100644
--- a/libqpdf/QPDF_linearization.cc
+++ b/libqpdf/QPDF_linearization.cc
@@ -13,8 +13,8 @@
#include <qpdf/QUtil.hh>
#include <algorithm>
-#include <math.h>
-#include <string.h>
+#include <cmath>
+#include <cstring>
template <class T, class int_type>
static void
diff --git a/libqpdf/QTC.cc b/libqpdf/QTC.cc
index 8188846c..e537a0e1 100644
--- a/libqpdf/QTC.cc
+++ b/libqpdf/QTC.cc
@@ -3,7 +3,7 @@
#include <qpdf/QUtil.hh>
#include <map>
#include <set>
-#include <stdio.h>
+#include <cstdio>
static bool
tc_active(char const* const scope)
diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc
index 72b2a55f..4f9c1021 100644
--- a/libqpdf/QUtil.cc
+++ b/libqpdf/QUtil.cc
@@ -9,8 +9,8 @@
#include <qpdf/QPDFSystemError.hh>
#include <qpdf/QTC.hh>
-#include <ctype.h>
-#include <errno.h>
+#include <cctype>
+#include <cerrno>
#include <fcntl.h>
#include <fstream>
#include <iomanip>
@@ -21,9 +21,9 @@
#include <set>
#include <sstream>
#include <stdexcept>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
#ifndef QPDF_NO_WCHAR_T
# include <cwchar>
#endif
diff --git a/libqpdf/qpdf/BitStream.hh b/libqpdf/qpdf/BitStream.hh
index 14555c5d..b807f56c 100644
--- a/libqpdf/qpdf/BitStream.hh
+++ b/libqpdf/qpdf/BitStream.hh
@@ -3,7 +3,7 @@
#ifndef BITSTREAM_HH
#define BITSTREAM_HH
-#include <stddef.h>
+#include <cstddef>
class BitStream
{
diff --git a/libqpdf/qpdf/BitWriter.hh b/libqpdf/qpdf/BitWriter.hh
index ca237d47..33fdd8f4 100644
--- a/libqpdf/qpdf/BitWriter.hh
+++ b/libqpdf/qpdf/BitWriter.hh
@@ -3,7 +3,7 @@
#ifndef BITWRITER_HH
#define BITWRITER_HH
-#include <stddef.h>
+#include <cstddef>
class Pipeline;