Replace deprecated C++ includes

m-holger
1 parent 7f043fe8
Showing 73 changed files with 121 additions and 121 deletions
examples/pdf-bookmarks.cc
examples/pdf-count-strings.cc
examples/pdf-create.cc
examples/pdf-double-page-size.cc
examples/pdf-filter-tokens.cc
examples/pdf-invert-images.cc
examples/pdf-mod-info.cc
examples/pdf-npages.cc
examples/pdf-overlay-page.cc
examples/pdf-parse-content.cc
examples/pdf-set-form-values.cc
examples/pdf-split-pages.cc
include/qpdf/Buffer.hh
include/qpdf/InputSource.hh
include/qpdf/Pl_StdioFile.hh
include/qpdf/QPDF.hh
include/qpdf/QPDFTokenizer.hh
include/qpdf/QPDFWriter.hh
include/qpdf/QUtil.hh
include/qpdf/RandomDataProvider.hh
@@ -5,8 +5,8 @@
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
  
 // This program demonstrates extraction of bookmarks using the qpdf
 // outlines API. Note that all the information shown by this program
@@ -5,7 +5,7 @@
 //
  
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
  
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QPDF.hh>
@@ -16,7 +16,7 @@
 #include <qpdf/QUtil.hh>
 #include <iostream>
 #include <memory>
-#include <stdlib.h>
+#include <cstdlib>
  
 static char const* whoami = nullptr;
  
@@ -5,8 +5,8 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
  
 static char const* whoami = nullptr;
  
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <deque>
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
  
 #include <qpdf/QPDF.hh>
 #include <qpdf/QPDFObjectHandle.hh>
@@ -6,8 +6,8 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
  
 static char const* whoami = nullptr;
  
@@ -6,9 +6,9 @@
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
  
 static char const* version = "1.1";
 static char const* whoami = nullptr;
 #include <iostream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
  
 #include <qpdf/QPDF.hh>
 #include <qpdf/QUtil.hh>
@@ -4,7 +4,7 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
  
 // This program demonstrates use of form XObjects to overlay a page
 // from one file onto all pages of another file. The qpdf program's
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
  
 #include <qpdf/QIntC.hh>
 #include <qpdf/QPDF.hh>
@@ -4,7 +4,7 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
  
 static char const* whoami = nullptr;
  
@@ -12,7 +12,7 @@
  
 #include <cstring>
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
 #include <string>
  
 static bool static_id = false;
@@ -26,7 +26,7 @@
 #include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
  
 #include <memory>
-#include <stddef.h>
+#include <cstddef>
  
 class Buffer
 {
@@ -27,7 +27,7 @@
 #include <qpdf/Types.h>
  
 #include <memory>
-#include <stdio.h>
+#include <cstdio>
 #include <string>
  
 // Remember to use QPDF_DLL_CLASS on anything derived from InputSource
@@ -26,7 +26,7 @@
  
 #include <qpdf/Pipeline.hh>
  
-#include <stdio.h>
+#include <cstdio>
  
 //
 // This pipeline is reusable.
@@ -30,7 +30,7 @@
 #include <list>
 #include <map>
 #include <memory>
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -28,7 +28,7 @@
 #include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
  
 #include <memory>
-#include <stdio.h>
+#include <cstdio>
 #include <string>
  
 class QPDFTokenizer
@@ -34,7 +34,7 @@
 #include <map>
 #include <memory>
 #include <set>
-#include <stdio.h>
+#include <cstdio>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -30,9 +30,9 @@
 #include <list>
 #include <memory>
 #include <stdexcept>
-#include <stdio.h>
+#include <cstdio>
 #include <string>
-#include <time.h>
+#include <ctime>
 #include <vector>
  
 class RandomDataProvider;
@@ -23,7 +23,7 @@
 #define RANDOMDATAPROVIDER_HH
  
 #include <qpdf/DLL.h>
-#include <string.h> // for size_t
+#include <cstring> // for size_t
  
 class QPDF_DLL_CLASS RandomDataProvider
 {
@@ -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) :
@@ -3,7 +3,7 @@
 #include <qpdf/QPDFExc.hh>
 #include <qpdf/QUtil.hh>
 #include <algorithm>
-#include <string.h>
+#include <cstring>
  
 FileInputSource::FileInputSource() :
     close_file(false),
@@ -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)
@@ -2,7 +2,7 @@
  
 #include <qpdf/QUtil.hh>
 #include <qpdf/qpdf-config.h>
-#include <stdlib.h>
+#include <cstdlib>
  
 InsecureRandomDataProvider::InsecureRandomDataProvider() :
     seeded_random(false)
@@ -4,7 +4,7 @@
 #include <qpdf/QPDFCryptoProvider.hh>
 #include <qpdf/QUtil.hh>
  
-#include <string.h>
+#include <cstring>
  
 MD5::MD5()
 {
@@ -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),
 #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) :
@@ -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),
@@ -3,7 +3,7 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QTC.hh>
  
-#include <setjmp.h>
+#include <csetjmp>
 #include <stdexcept>
 #include <string>
  
 #include <qpdf/Pl_Flate.hh>
  
-#include <limits.h>
-#include <string.h>
+#include <climits>
+#include <cstring>
 #include <zlib.h>
  
 #include <qpdf/QIntC.hh>
@@ -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) :
@@ -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)
@@ -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) :
@@ -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(
@@ -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>
@@ -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),
@@ -3,7 +3,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <ctype.h>
+#include <cctype>
 #include <fcntl.h>
 #include <iostream>
 #include <memory>
@@ -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>
@@ -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;
  
 #include <qpdf/QPDFSystemError.hh>
  
-#include <string.h>
+#include <cstring>
  
 QPDFSystemError::QPDFSystemError(
     std::string const& description, int system_errno) :
@@ -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)
@@ -24,7 +24,7 @@
  
 #include <algorithm>
 #include <stdexcept>
-#include <stdlib.h>
+#include <cstdlib>
  
 QPDFWriter::ProgressReporter::~ProgressReporter()
 {
@@ -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,
@@ -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
@@ -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)
@@ -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
@@ -3,7 +3,7 @@
 #ifndef BITSTREAM_HH
 #define BITSTREAM_HH
  
-#include <stddef.h>
+#include <cstddef>
  
 class BitStream
 {
@@ -3,7 +3,7 @@
 #ifndef BITWRITER_HH
 #define BITWRITER_HH
  
-#include <stddef.h>
+#include <cstddef>
  
 class Pipeline;
  
@@ -4,9 +4,9 @@
 #include <qpdf/QUtil.hh>
  
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
  
 static void
 usage()
@@ -2,7 +2,7 @@
  
 #include <qpdf/Pl_StdioFile.hh>
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
  
 int
 main()
@@ -4,7 +4,7 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
  
 // See comments in bits_functions.hh
 #define BITS_TESTING 1
@@ -7,7 +7,7 @@
 #include <cstring>
 #include <iostream>
 #include <stdexcept>
-#include <stdlib.h>
+#include <cstdlib>
  
 static unsigned char*
 uc(char const* s)
@@ -2,7 +2,7 @@
 #include <qpdf/FileInputSource.hh>
  
 #include <iostream>
-#include <stdio.h>
+#include <cstdio>
  
 void
 check(std::string const& what, bool result)
@@ -3,9 +3,9 @@
 #include <qpdf/QUtil.hh>
  
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
  
 static void
 usage()
@@ -3,8 +3,8 @@
 #include <qpdf/QUtil.hh>
  
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
  
 int
 main(int argc, char* argv[])
@@ -5,7 +5,7 @@
 #include <qpdf/QUtil.hh>
  
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
  
 void
 run(char const* filename)
@@ -2,7 +2,7 @@
  
 #include <qpdf/Pl_StdioFile.hh>
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
  
 int
 main()
@@ -3,8 +3,8 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
  
 int
 main(int argc, char* argv[])
@@ -3,7 +3,7 @@
 #include <qpdf/Pl_MD5.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdio.h>
+#include <cstdio>
  
 static void
 test_string(char const* str)
@@ -7,8 +7,8 @@
 #include <qpdf/QUtil.hh>
  
 #include <iostream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
  
 void
 run(char const* filename,
 #include <qpdf/assert_test.h>
  
 #include <qpdf/QIntC.hh>
-#include <stdint.h>
+#include <cstdint>
  
 #define try_convert(exp_pass, fn, i) \
     try_convert_real(#fn "(" #i ")", exp_pass, fn, i)
@@ -5,9 +5,9 @@
 #include <qpdf/QUtil.hh>
 #include <fstream>
 #include <iostream>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
+#include <climits>
+#include <cstdio>
+#include <cstring>
  
 #ifdef _WIN32
 # include <io.h>
@@ -6,9 +6,9 @@
 #include <qpdf/QUtil.hh>
  
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
  
 static void
 other_tests()
@@ -3,9 +3,9 @@
 #include <qpdf/QUtil.hh>
  
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
  
 int
 main(int argc, char* argv[])
 #include <qpdf/Pl_SHA2.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <string.h>
+#include <cstring>
  
 static void
 test(
@@ -5,9 +5,9 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
  
 static char const* whoami = 0;
  
@@ -27,12 +27,12 @@
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <limits.h>
+#include <climits>
 #include <map>
 #include <sstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
  
 #define QPDF_OBJECT_NOWARN
 #include <qpdf/QPDFObject.hh>
@@ -13,8 +13,8 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
  
 // Run "test_large_file write small a.pdf" to get a PDF file that you
 // can look at in a reader.
 #include <qpdf/QPDFObjectHandle.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
  
 static char const* whoami = 0;
  
 #include <qpdf/QPDFObjectHandle.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
  
 static char const* whoami = 0;
  
@@ -7,9 +7,9 @@
 #include <qpdf/QPDFTokenizer.hh>
 #include <qpdf/QUtil.hh>
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
  
 static char const* whoami = 0;
  
@@ -6,8 +6,8 @@
 #endif
  
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
  
 static void
 do_copy(FILE* in, FILE* out)
@@ -5,9 +5,9 @@
  
 #include <fcntl.h>
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
  
 static char const* whoami = 0;