Protect headers with compliant identifiers (fixes #233)

Jay Berkenbilt
1 parent 932799ba
Showing 69 changed files with 205 additions and 205 deletions
include/qpdf/Buffer.hh
include/qpdf/BufferInputSource.hh
include/qpdf/ClosedFileInputSource.hh
include/qpdf/Constants.h
include/qpdf/DLL.h
include/qpdf/FileInputSource.hh
include/qpdf/InputSource.hh
include/qpdf/Pipeline.hh
include/qpdf/Pl_Buffer.hh
include/qpdf/Pl_Concatenate.hh
include/qpdf/Pl_Count.hh
include/qpdf/Pl_DCT.hh
include/qpdf/Pl_Discard.hh
include/qpdf/Pl_Flate.hh
include/qpdf/Pl_QPDFTokenizer.hh
include/qpdf/Pl_RunLength.hh
include/qpdf/Pl_StdioFile.hh
include/qpdf/PointerHolder.hh
include/qpdf/QPDF.hh
include/qpdf/QPDFAcroFormDocumentHelper.hh
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __BUFFER_HH__
-#define __BUFFER_HH__
+#ifndef BUFFER_HH
+#define BUFFER_HH
 #include <qpdf/DLL.h>
 #include <cstring>              // for size_t
@@ -64,4 +64,4 @@ class Buffer
     unsigned char* buf;
 };
-#endif // __BUFFER_HH__
+#endif // BUFFER_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDF_BUFFERINPUTSOURCE_HH__
-#define __QPDF_BUFFERINPUTSOURCE_HH__
+#ifndef QPDF_BUFFERINPUTSOURCE_HH
+#define QPDF_BUFFERINPUTSOURCE_HH
 #include <qpdf/InputSource.hh>
 #include <qpdf/Buffer.hh>
@@ -60,4 +60,4 @@ class BufferInputSource: public InputSource
     qpdf_offset_t cur_offset;
 };
-#endif // __QPDF_BUFFERINPUTSOURCE_HH__
+#endif // QPDF_BUFFERINPUTSOURCE_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDF_CLOSEDFILEINPUTSOURCE_HH__
-#define __QPDF_CLOSEDFILEINPUTSOURCE_HH__
+#ifndef QPDF_CLOSEDFILEINPUTSOURCE_HH
+#define QPDF_CLOSEDFILEINPUTSOURCE_HH
 // This is an input source that reads from files, like
 // FileInputSource, except that it opens and close the file
@@ -88,4 +88,4 @@ class ClosedFileInputSource: public InputSource
     PointerHolder<Members> m;
 };
-#endif // __QPDF_CLOSEDFILEINPUTSOURCE_HH__
+#endif // QPDF_CLOSEDFILEINPUTSOURCE_HH
@@ -20,8 +20,8 @@
  * see the manual for additional information.
  */
-#ifndef __QPDFCONSTANTS_H__
-#define __QPDFCONSTANTS_H__
+#ifndef QPDFCONSTANTS_H
+#define QPDFCONSTANTS_H
 /* Keep this file 'C' compatible so it can be used from the C and C++
  * interfaces.
@@ -89,4 +89,4 @@ enum qpdf_r3_modify_e		/* Allowed changes: */
     qpdf_r3m_none		/* no modifications */
 };
-#endif /* __QPDFCONSTANTS_H__ */
+#endif /* QPDFCONSTANTS_H */
@@ -20,8 +20,8 @@
  * see the manual for additional information.
  */
-#ifndef __QPDF_DLL_HH__
-#define __QPDF_DLL_HH__
+#ifndef QPDF_DLL_HH
+#define QPDF_DLL_HH
 #if defined(_WIN32) && defined(DLL_EXPORT)
 # define QPDF_DLL __declspec(dllexport)
@@ -29,4 +29,4 @@
 # define QPDF_DLL
 #endif
-#endif /* __QPDF_DLL_HH__ */
+#endif /* QPDF_DLL_HH */
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDF_FILEINPUTSOURCE_HH__
-#define __QPDF_FILEINPUTSOURCE_HH__
+#ifndef QPDF_FILEINPUTSOURCE_HH
+#define QPDF_FILEINPUTSOURCE_HH
 #include <qpdf/InputSource.hh>
@@ -61,4 +61,4 @@ class FileInputSource: public InputSource
     FILE* file;
 };
-#endif // __QPDF_FILEINPUTSOURCE_HH__
+#endif // QPDF_FILEINPUTSOURCE_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDF_INPUTSOURCE_HH__
-#define __QPDF_INPUTSOURCE_HH__
+#ifndef QPDF_INPUTSOURCE_HH
+#define QPDF_INPUTSOURCE_HH
 #include <qpdf/DLL.h>
 #include <qpdf/Types.h>
@@ -88,4 +88,4 @@ class InputSource
     qpdf_offset_t last_offset;
 };
-#endif // __QPDF_INPUTSOURCE_HH__
+#endif // QPDF_INPUTSOURCE_HH
@@ -41,8 +41,8 @@
 // are not.  It is up to the caller to use a pipeline according to its
 // own restrictions.
-#ifndef __PIPELINE_HH__
-#define __PIPELINE_HH__
+#ifndef PIPELINE_HH
+#define PIPELINE_HH
 #include <qpdf/DLL.h>
 #include <string>
@@ -82,4 +82,4 @@ class Pipeline
     Pipeline* next;
 };
-#endif // __PIPELINE_HH__
+#endif // PIPELINE_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __PL_BUFFER_HH__
-#define __PL_BUFFER_HH__
+#ifndef PL_BUFFER_HH
+#define PL_BUFFER_HH
 // This pipeline accumulates the data passed to it into a memory
 // buffer.  Each subsequent use of this buffer appends to the data
@@ -62,4 +62,4 @@ class Pl_Buffer: public Pipeline
     size_t total_size;
 };
-#endif // __PL_BUFFER_HH__
+#endif // PL_BUFFER_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __PL_CONCATENATE_HH__
-#define __PL_CONCATENATE_HH__
+#ifndef PL_CONCATENATE_HH
+#define PL_CONCATENATE_HH
 // This pipeline will drop all regular finished calls rather than
 // passing them onto next.  To finish downstream streams, call
@@ -50,4 +50,4 @@ class Pl_Concatenate: public Pipeline
     void manualFinish();
 };
-#endif // __PL_CONCATENATE_HH__
+#endif // PL_CONCATENATE_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __PL_COUNT_HH__
-#define __PL_COUNT_HH__
+#ifndef PL_COUNT_HH
+#define PL_COUNT_HH
 // This pipeline is reusable; i.e., it is safe to call write() after
 // calling finish().
@@ -52,4 +52,4 @@ class Pl_Count: public Pipeline
     unsigned char last_char;
 };
-#endif // __PL_COUNT_HH__
+#endif // PL_COUNT_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __PL_DCT_HH__
-#define __PL_DCT_HH__
+#ifndef PL_DCT_HH
+#define PL_DCT_HH
 #include <qpdf/Pipeline.hh>
 #include <qpdf/Pl_Buffer.hh>
@@ -81,4 +81,4 @@ class Pl_DCT: public Pipeline
 };
-#endif // __PL_DCT_HH__
+#endif // PL_DCT_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __PL_DISCARD_HH__
-#define __PL_DISCARD_HH__
+#ifndef PL_DISCARD_HH
+#define PL_DISCARD_HH
 // This pipeline discards its output.  It is an end-of-line pipeline
 // (with no next).
@@ -43,4 +43,4 @@ class Pl_Discard: public Pipeline
     virtual void finish();
 };
-#endif // __PL_DISCARD_HH__
+#endif // PL_DISCARD_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __PL_FLATE_HH__
-#define __PL_FLATE_HH__
+#ifndef PL_FLATE_HH
+#define PL_FLATE_HH
 #include <qpdf/Pipeline.hh>
@@ -53,4 +53,4 @@ class Pl_Flate: public Pipeline
     void* zdata;
 };
-#endif // __PL_FLATE_HH__
+#endif // PL_FLATE_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __PL_QPDFTOKENIZER_HH__
-#define __PL_QPDFTOKENIZER_HH__
+#ifndef PL_QPDFTOKENIZER_HH
+#define PL_QPDFTOKENIZER_HH
 #include <qpdf/Pipeline.hh>
@@ -80,4 +80,4 @@ class Pl_QPDFTokenizer: public Pipeline
     PointerHolder<Members> m;
 };
-#endif // __PL_QPDFTOKENIZER_HH__
+#endif // PL_QPDFTOKENIZER_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __PL_RUNLENGTH_HH__
-#define __PL_RUNLENGTH_HH__
+#ifndef PL_RUNLENGTH_HH
+#define PL_RUNLENGTH_HH
 #include <qpdf/Pipeline.hh>
@@ -53,4 +53,4 @@ class Pl_RunLength: public Pipeline
     unsigned int length;
 };
-#endif // __PL_RUNLENGTH_HH__
+#endif // PL_RUNLENGTH_HH
@@ -21,8 +21,8 @@
 // End-of-line pipeline that simply writes its data to a stdio FILE* object.
-#ifndef __PL_STDIOFILE_HH__
-#define __PL_STDIOFILE_HH__
+#ifndef PL_STDIOFILE_HH
+#define PL_STDIOFILE_HH
 #include <qpdf/Pipeline.hh>
@@ -51,4 +51,4 @@ class Pl_StdioFile: public Pipeline
     FILE* file;
 };
-#endif // __PL_STDIOFILE_HH__
+#endif // PL_STDIOFILE_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __POINTERHOLDER_HH__
-#define __POINTERHOLDER_HH__
+#ifndef POINTERHOLDER_HH
+#define POINTERHOLDER_HH
 // This class is basically boost::shared_pointer but predates that by
 // several years.
@@ -182,4 +182,4 @@ class PointerHolder
     Data* data;
 };
-#endif // __POINTERHOLDER_HH__
+#endif // POINTERHOLDER_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDF_HH__
-#define __QPDF_HH__
+#ifndef QPDF_HH
+#define QPDF_HH
 #include <qpdf/DLL.h>
 #include <qpdf/Types.h>
@@ -1240,4 +1240,4 @@ class QPDF
     PointerHolder<Members> m;
 };
-#endif // __QPDF_HH__
+#endif // QPDF_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDFACROFORMDOCUMENTHELPER_HH__
-#define __QPDFACROFORMDOCUMENTHELPER_HH__
+#ifndef QPDFACROFORMDOCUMENTHELPER_HH
+#define QPDFACROFORMDOCUMENTHELPER_HH
 // This document helper is intended to help with operations on
 // interactive forms. Here are the key things to know:
@@ -181,4 +181,4 @@ class QPDFAcroFormDocumentHelper: public QPDFDocumentHelper
     PointerHolder<Members> m;
 };
-#endif // __QPDFACROFORMDOCUMENTHELPER_HH__
+#endif // QPDFACROFORMDOCUMENTHELPER_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDFANNOTATIONOBJECTHELPER_HH__
-#define __QPDFANNOTATIONOBJECTHELPER_HH__
+#ifndef QPDFANNOTATIONOBJECTHELPER_HH
+#define QPDFANNOTATIONOBJECTHELPER_HH
 #include <qpdf/QPDFObjectHelper.hh>
@@ -85,4 +85,4 @@ class QPDFAnnotationObjectHelper: public QPDFObjectHelper
     PointerHolder<Members> m;
 };
-#endif // __QPDFANNOTATIONOBJECTHELPER_HH__
+#endif // QPDFANNOTATIONOBJECTHELPER_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDFDOCUMENTHELPER_HH__
-#define __QPDFDOCUMENTHELPER_HH__
+#ifndef QPDFDOCUMENTHELPER_HH
+#define QPDFDOCUMENTHELPER_HH
 #include <qpdf/DLL.h>
 #include <qpdf/QPDF.hh>
@@ -63,4 +63,4 @@ class QPDFDocumentHelper
     QPDF& qpdf;
 };
-#endif // __QPDFDOCUMENTHELPER_HH__
+#endif // QPDFDOCUMENTHELPER_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDFEXC_HH__
-#define __QPDFEXC_HH__
+#ifndef QPDFEXC_HH
+#define QPDFEXC_HH
 #include <qpdf/DLL.h>
 #include <qpdf/Types.h>
@@ -75,4 +75,4 @@ class QPDFExc: public std::runtime_error
     std::string message;
 };
-#endif // __QPDFEXC_HH__
+#endif // QPDFEXC_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDFFORMFIELDOBJECTHELPER_HH__
-#define __QPDFFORMFIELDOBJECTHELPER_HH__
+#ifndef QPDFFORMFIELDOBJECTHELPER_HH
+#define QPDFFORMFIELDOBJECTHELPER_HH
 // This object helper helps with form fields for interactive forms.
 // Please see comments in QPDFAcroFormDocumentHelper.hh for additional
@@ -156,4 +156,4 @@ class QPDFFormFieldObjectHelper: public QPDFObjectHelper
     PointerHolder<Members> m;
 };
-#endif // __QPDFFORMFIELDOBJECTHELPER_HH__
+#endif // QPDFFORMFIELDOBJECTHELPER_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDFOBJGEN_HH__
-#define __QPDFOBJGEN_HH__
+#ifndef QPDFOBJGEN_HH
+#define QPDFOBJGEN_HH
 #include <qpdf/DLL.h>
@@ -48,4 +48,4 @@ class QPDFObjGen
     int gen;
 };
-#endif // __QPDFOBJGEN_HH__
+#endif // QPDFOBJGEN_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDFOBJECT_HH__
-#define __QPDFOBJECT_HH__
+#ifndef QPDFOBJECT_HH
+#define QPDFOBJECT_HH
 #include <qpdf/DLL.h>
 #include <qpdf/PointerHolder.hh>
@@ -110,4 +110,4 @@ class QPDFObject
     PointerHolder<Members> m;
 };
-#endif // __QPDFOBJECT_HH__
+#endif // QPDFOBJECT_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDFOBJECTHANDLE_HH__
-#define __QPDFOBJECTHANDLE_HH__
+#ifndef QPDFOBJECTHANDLE_HH
+#define QPDFOBJECTHANDLE_HH
 #include <qpdf/DLL.h>
 #include <qpdf/Types.h>
@@ -927,4 +927,4 @@ class QPDFObjectHandle
     PointerHolder<Members> m;
 };
-#endif // __QPDFOBJECTHANDLE_HH__
+#endif // QPDFOBJECTHANDLE_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDFOBJECTHELPER_HH__
-#define __QPDFOBJECTHELPER_HH__
+#ifndef QPDFOBJECTHELPER_HH
+#define QPDFOBJECTHELPER_HH
 #include <qpdf/DLL.h>
@@ -64,4 +64,4 @@ class QPDFObjectHelper
     QPDFObjectHandle oh;
 };
-#endif // __QPDFOBJECTHELPER_HH__
+#endif // QPDFOBJECTHELPER_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDFPAGEDOCUMENTHELPER_HH__
-#define __QPDFPAGEDOCUMENTHELPER_HH__
+#ifndef QPDFPAGEDOCUMENTHELPER_HH
+#define QPDFPAGEDOCUMENTHELPER_HH
 #include <qpdf/QPDFDocumentHelper.hh>
 #include <qpdf/QPDFPageObjectHelper.hh>
@@ -97,4 +97,4 @@ class QPDFPageDocumentHelper: public QPDFDocumentHelper
     PointerHolder<Members> m;
 };
-#endif // __QPDFPAGEDOCUMENTHELPER_HH__
+#endif // QPDFPAGEDOCUMENTHELPER_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDFPAGEOBJECTHELPER_HH__
-#define __QPDFPAGEOBJECTHELPER_HH__
+#ifndef QPDFPAGEOBJECTHELPER_HH
+#define QPDFPAGEOBJECTHELPER_HH
 #include <qpdf/QPDFObjectHelper.hh>
 #include <qpdf/QPDFAnnotationObjectHelper.hh>
@@ -153,4 +153,4 @@ class QPDFPageObjectHelper: public QPDFObjectHelper
     PointerHolder<Members> m;
 };
-#endif // __QPDFPAGEOBJECTHELPER_HH__
+#endif // QPDFPAGEOBJECTHELPER_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDFTOKENIZER_HH__
-#define __QPDFTOKENIZER_HH__
+#ifndef QPDFTOKENIZER_HH
+#define QPDFTOKENIZER_HH
 #include <qpdf/DLL.h>
@@ -234,4 +234,4 @@ class QPDFTokenizer
     PointerHolder<Members> m;
 };
-#endif // __QPDFTOKENIZER_HH__
+#endif // QPDFTOKENIZER_HH
@@ -23,8 +23,8 @@
 // new PDF files.  See comments through the header file for additional
 // details.
-#ifndef __QPDFWRITER_HH__
-#define __QPDFWRITER_HH__
+#ifndef QPDFWRITER_HH
+#define QPDFWRITER_HH
 #include <qpdf/DLL.h>
 #include <qpdf/Types.h>
@@ -617,4 +617,4 @@ class QPDFWriter
     PointerHolder<Members> m;
 };
-#endif // __QPDFWRITER_HH__
+#endif // QPDFWRITER_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QPDFXREFENTRY_HH__
-#define __QPDFXREFENTRY_HH__
+#ifndef QPDFXREFENTRY_HH
+#define QPDFXREFENTRY_HH
 #include <qpdf/DLL.h>
 #include <qpdf/Types.h>
@@ -54,4 +54,4 @@ class QPDFXRefEntry
     int field2;
 };
-#endif // __QPDFXREFENTRY_HH__
+#endif // QPDFXREFENTRY_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QTC_HH__
-#define __QTC_HH__
+#ifndef QTC_HH
+#define QTC_HH
 #include <qpdf/DLL.h>
@@ -30,4 +30,4 @@ namespace QTC
     void TC(char const* const scope, char const* const ccase, int n = 0);
 };
-#endif // __QTC_HH__
+#endif // QTC_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __QUTIL_HH__
-#define __QUTIL_HH__
+#ifndef QUTIL_HH
+#define QUTIL_HH
 #include <qpdf/DLL.h>
 #include <qpdf/Types.h>
@@ -217,4 +217,4 @@ namespace QUtil
     bool is_number(char const*);
 };
-#endif // __QUTIL_HH__
+#endif // QUTIL_HH
@@ -19,8 +19,8 @@
 // continue to consider qpdf to be licensed under those terms. Please
 // see the manual for additional information.
-#ifndef __RANDOMDATAPROVIDER_HH__
-#define __RANDOMDATAPROVIDER_HH__
+#ifndef RANDOMDATAPROVIDER_HH
+#define RANDOMDATAPROVIDER_HH
 #include <string.h> // for size_t
@@ -42,4 +42,4 @@ class RandomDataProvider
     RandomDataProvider& operator=(RandomDataProvider const&);
 };
-#endif // __RANDOMDATAPROVIDER_HH__
+#endif // RANDOMDATAPROVIDER_HH
@@ -20,8 +20,8 @@
  * see the manual for additional information.
  */
-#ifndef __QPDFTYPES_H__
-#define __QPDFTYPES_H__
+#ifndef QPDFTYPES_H
+#define QPDFTYPES_H
 /* Provide an offset type that should be as big as off_t on just about
  * any system.  If your compiler doesn't support C99 (or at least the
@@ -30,4 +30,4 @@
 typedef long long int qpdf_offset_t;
-#endif /* __QPDFTYPES_H__ */
+#endif /* QPDFTYPES_H */
@@ -20,8 +20,8 @@
  * see the manual for additional information.
  */
-#ifndef __QPDF_C_H__
-#define __QPDF_C_H__
+#ifndef QPDF_C_H
+#define QPDF_C_H
 /*
  * This file defines a basic "C" API for qpdf.  It provides access to
@@ -442,4 +442,4 @@ extern &quot;C&quot; {
 #endif
-#endif /* __QPDF_C_H__ */
+#endif /* QPDF_C_H */
 // Read bits from a bit stream.  See BitWriter for writing.
-#ifndef __BITSTREAM_HH__
-#define __BITSTREAM_HH__
+#ifndef BITSTREAM_HH
+#define BITSTREAM_HH
 #include <qpdf/DLL.h>
@@ -28,4 +28,4 @@ class BitStream
     unsigned int bits_available;
 };
-#endif // __BITSTREAM_HH__
+#endif // BITSTREAM_HH
 // Write bits into a bit stream.  See BitStream for reading.
-#ifndef __BITWRITER_HH__
-#define __BITWRITER_HH__
+#ifndef BITWRITER_HH
+#define BITWRITER_HH
 #include <qpdf/DLL.h>
@@ -28,4 +28,4 @@ class BitWriter
     unsigned int bit_offset;
 };
-#endif // __BITWRITER_HH__
+#endif // BITWRITER_HH
-#ifndef __CONTENTNORMALIZER_HH__
-#define __CONTENTNORMALIZER_HH__
+#ifndef CONTENTNORMALIZER_HH
+#define CONTENTNORMALIZER_HH
 #include <qpdf/QPDFObjectHandle.hh>
@@ -18,4 +18,4 @@ class ContentNormalizer: public QPDFObjectHandle::TokenFilter
     bool last_token_was_bad;
 };
-#endif // __CONTENTNORMALIZER_HH__
+#endif // CONTENTNORMALIZER_HH
-#ifndef __INSECURERANDOMDATAPROVIDER_HH__
-#define __INSECURERANDOMDATAPROVIDER_HH__
+#ifndef INSECURERANDOMDATAPROVIDER_HH
+#define INSECURERANDOMDATAPROVIDER_HH
 #include <qpdf/RandomDataProvider.hh>
 #include <qpdf/DLL.h>
@@ -24,4 +24,4 @@ class InsecureRandomDataProvider: public RandomDataProvider
     bool seeded_random;
 };
-#endif // __INSECURERANDOMDATAPROVIDER_HH__
+#endif // INSECURERANDOMDATAPROVIDER_HH
-#ifndef __MD5_HH__
-#define __MD5_HH__
+#ifndef MD5_HH
+#define MD5_HH
 #include <qpdf/DLL.h>
 #include <qpdf/qpdf-config.h>
@@ -89,4 +89,4 @@ class MD5
     Digest digest_val;
 };
-#endif // __MD5_HH__
+#endif // MD5_HH
-#ifndef __QPDF_OFFSETINPUTSOURCE_HH__
-#define __QPDF_OFFSETINPUTSOURCE_HH__
+#ifndef QPDF_OFFSETINPUTSOURCE_HH
+#define QPDF_OFFSETINPUTSOURCE_HH
 // This class implements an InputSource that proxies for an underlying
 // input source but offset a specific number of bytes.
@@ -26,4 +26,4 @@ class OffsetInputSource: public InputSource
     qpdf_offset_t global_offset;
 };
-#endif // __QPDF_OFFSETINPUTSOURCE_HH__
+#endif // QPDF_OFFSETINPUTSOURCE_HH
-#ifndef __PL_AES_PDF_HH__
-#define __PL_AES_PDF_HH__
+#ifndef PL_AES_PDF_HH
+#define PL_AES_PDF_HH
 #include <qpdf/Pipeline.hh>
 #include <qpdf/qpdf-config.h>
@@ -66,4 +66,4 @@ class Pl_AES_PDF: public Pipeline
     bool disable_padding;
 };
-#endif // __PL_AES_PDF_HH__
+#endif // PL_AES_PDF_HH
-#ifndef __PL_ASCII85DECODER_HH__
-#define __PL_ASCII85DECODER_HH__
+#ifndef PL_ASCII85DECODER_HH
+#define PL_ASCII85DECODER_HH
 #include <qpdf/Pipeline.hh>
@@ -23,4 +23,4 @@ class Pl_ASCII85Decoder: public Pipeline
     size_t eod;
 };
-#endif // __PL_ASCII85DECODER_HH__
+#endif // PL_ASCII85DECODER_HH
-#ifndef __PL_ASCIIHEXDECODER_HH__
-#define __PL_ASCIIHEXDECODER_HH__
+#ifndef PL_ASCIIHEXDECODER_HH
+#define PL_ASCIIHEXDECODER_HH
 #include <qpdf/Pipeline.hh>
@@ -23,4 +23,4 @@ class Pl_ASCIIHexDecoder: public Pipeline
     bool eod;
 };
-#endif // __PL_ASCIIHEXDECODER_HH__
+#endif // PL_ASCIIHEXDECODER_HH
-#ifndef __PL_LZWDECODER_HH__
-#define __PL_LZWDECODER_HH__
+#ifndef PL_LZWDECODER_HH
+#define PL_LZWDECODER_HH
 #include <qpdf/Pipeline.hh>
@@ -40,4 +40,4 @@ class Pl_LZWDecoder: public Pipeline
     int last_code;
 };
-#endif // __PL_LZWDECODER_HH__
+#endif // PL_LZWDECODER_HH
-#ifndef __PL_MD5_HH__
-#define __PL_MD5_HH__
+#ifndef PL_MD5_HH
+#define PL_MD5_HH
 // This pipeline sends its output to its successor unmodified.  After
 // calling finish, the MD5 checksum of the data that passed through
@@ -45,4 +45,4 @@ class Pl_MD5: public Pipeline
     bool persist_across_finish;
 };
-#endif // __PL_MD5_HH__
+#endif // PL_MD5_HH
-#ifndef __PL_PNGFILTER_HH__
-#define __PL_PNGFILTER_HH__
+#ifndef PL_PNGFILTER_HH
+#define PL_PNGFILTER_HH
 // This pipeline applies or reverses the application of a PNG filter
 // as described in the PNG specification.
@@ -49,4 +49,4 @@ class Pl_PNGFilter: public Pipeline
     size_t incoming;
 };
-#endif // __PL_PNGFILTER_HH__
+#endif // PL_PNGFILTER_HH
-#ifndef __PL_RC4_HH__
-#define __PL_RC4_HH__
+#ifndef PL_RC4_HH
+#define PL_RC4_HH
 #include <qpdf/Pipeline.hh>
@@ -29,4 +29,4 @@ class Pl_RC4: public Pipeline
     RC4 rc4;
 };
-#endif // __PL_RC4_HH__
+#endif // PL_RC4_HH
-#ifndef __PL_SHA2_HH__
-#define __PL_SHA2_HH__
+#ifndef PL_SHA2_HH
+#define PL_SHA2_HH
 // Bits must be a supported number of bits, currently only 256, 384,
 // or 512.  Passing 0 as bits leaves the pipeline uncommitted, in
@@ -47,4 +47,4 @@ class Pl_SHA2: public Pipeline
     unsigned char sha512sum[64];
 };
-#endif // __PL_SHA2_HH__
+#endif // PL_SHA2_HH
-#ifndef __PL_TIFFPREDICTOR_HH__
-#define __PL_TIFFPREDICTOR_HH__
+#ifndef PL_TIFFPREDICTOR_HH
+#define PL_TIFFPREDICTOR_HH
 // This pipeline reverses the application of a TIFF predictor as
 // described in the TIFF specification.
@@ -36,4 +36,4 @@ class Pl_TIFFPredictor: public Pipeline
     size_t pos;
 };
-#endif // __PL_TIFFPREDICTOR_HH__
+#endif // PL_TIFFPREDICTOR_HH
-#ifndef __QPDF_ARRAY_HH__
-#define __QPDF_ARRAY_HH__
+#ifndef QPDF_ARRAY_HH
+#define QPDF_ARRAY_HH
 #include <qpdf/QPDFObject.hh>
@@ -33,4 +33,4 @@ class QPDF_Array: public QPDFObject
     std::vector<QPDFObjectHandle> items;
 };
-#endif // __QPDF_ARRAY_HH__
+#endif // QPDF_ARRAY_HH
-#ifndef __QPDF_BOOL_HH__
-#define __QPDF_BOOL_HH__
+#ifndef QPDF_BOOL_HH
+#define QPDF_BOOL_HH
 #include <qpdf/QPDFObject.hh>
@@ -17,4 +17,4 @@ class QPDF_Bool: public QPDFObject
     bool val;
 };
-#endif // __QPDF_BOOL_HH__
+#endif // QPDF_BOOL_HH
-#ifndef __QPDF_DICTIONARY_HH__
-#define __QPDF_DICTIONARY_HH__
+#ifndef QPDF_DICTIONARY_HH
+#define QPDF_DICTIONARY_HH
 #include <qpdf/QPDFObject.hh>
@@ -40,4 +40,4 @@ class QPDF_Dictionary: public QPDFObject
     std::map<std::string, QPDFObjectHandle> items;
 };
-#endif // __QPDF_DICTIONARY_HH__
+#endif // QPDF_DICTIONARY_HH
-#ifndef __QPDF_INLINEIMAGE_HH__
-#define __QPDF_INLINEIMAGE_HH__
+#ifndef QPDF_INLINEIMAGE_HH
+#define QPDF_INLINEIMAGE_HH
 #include <qpdf/QPDFObject.hh>
@@ -17,4 +17,4 @@ class QPDF_InlineImage: public QPDFObject
     std::string val;
 };
-#endif // __QPDF_INLINEIMAGE_HH__
+#endif // QPDF_INLINEIMAGE_HH
-#ifndef __QPDF_INTEGER_HH__
-#define __QPDF_INTEGER_HH__
+#ifndef QPDF_INTEGER_HH
+#define QPDF_INTEGER_HH
 #include <qpdf/QPDFObject.hh>
@@ -17,4 +17,4 @@ class QPDF_Integer: public QPDFObject
     long long val;
 };
-#endif // __QPDF_INTEGER_HH__
+#endif // QPDF_INTEGER_HH
-#ifndef __QPDF_NAME_HH__
-#define __QPDF_NAME_HH__
+#ifndef QPDF_NAME_HH
+#define QPDF_NAME_HH
 #include <qpdf/QPDFObject.hh>
@@ -20,4 +20,4 @@ class QPDF_Name: public QPDFObject
     std::string name;
 };
-#endif // __QPDF_NAME_HH__
+#endif // QPDF_NAME_HH
-#ifndef __QPDF_NULL_HH__
-#define __QPDF_NULL_HH__
+#ifndef QPDF_NULL_HH
+#define QPDF_NULL_HH
 #include <qpdf/QPDFObject.hh>
@@ -12,4 +12,4 @@ class QPDF_Null: public QPDFObject
     virtual char const* getTypeName() const;
 };
-#endif // __QPDF_NULL_HH__
+#endif // QPDF_NULL_HH
-#ifndef __QPDF_OPERATOR_HH__
-#define __QPDF_OPERATOR_HH__
+#ifndef QPDF_OPERATOR_HH
+#define QPDF_OPERATOR_HH
 #include <qpdf/QPDFObject.hh>
@@ -17,4 +17,4 @@ class QPDF_Operator: public QPDFObject
     std::string val;
 };
-#endif // __QPDF_OPERATOR_HH__
+#endif // QPDF_OPERATOR_HH
-#ifndef __QPDF_REAL_HH__
-#define __QPDF_REAL_HH__
+#ifndef QPDF_REAL_HH
+#define QPDF_REAL_HH
 #include <qpdf/QPDFObject.hh>
@@ -19,4 +19,4 @@ class QPDF_Real: public QPDFObject
     std::string val;
 };
-#endif // __QPDF_REAL_HH__
+#endif // QPDF_REAL_HH
-#ifndef __QPDF_RESERVED_HH__
-#define __QPDF_RESERVED_HH__
+#ifndef QPDF_RESERVED_HH
+#define QPDF_RESERVED_HH
 #include <qpdf/QPDFObject.hh>
@@ -12,4 +12,4 @@ class QPDF_Reserved: public QPDFObject
     virtual char const* getTypeName() const;
 };
-#endif // __QPDF_RESERVED_HH__
+#endif // QPDF_RESERVED_HH
-#ifndef __QPDF_STREAM_HH__
-#define __QPDF_STREAM_HH__
+#ifndef QPDF_STREAM_HH
+#define QPDF_STREAM_HH
 #include <qpdf/Types.h>
@@ -82,4 +82,4 @@ class QPDF_Stream: public QPDFObject
         PointerHolder<QPDFObjectHandle::TokenFilter> > token_filters;
 };
-#endif // __QPDF_STREAM_HH__
+#endif // QPDF_STREAM_HH
-#ifndef __QPDF_STRING_HH__
-#define __QPDF_STRING_HH__
+#ifndef QPDF_STRING_HH
+#define QPDF_STRING_HH
 #include <qpdf/QPDFObject.hh>
@@ -22,4 +22,4 @@ class QPDF_String: public QPDFObject
     std::string val;
 };
-#endif // __QPDF_STRING_HH__
+#endif // QPDF_STRING_HH
-#ifndef __RC4_HH__
-#define __RC4_HH__
+#ifndef RC4_HH
+#define RC4_HH
 class RC4
 {
@@ -22,4 +22,4 @@ class RC4
     RC4Key key;
 };
-#endif // __RC4_HH__
+#endif // RC4_HH
-#ifndef __SECURERANDOMDATAPROVIDER_HH__
-#define __SECURERANDOMDATAPROVIDER_HH__
+#ifndef SECURERANDOMDATAPROVIDER_HH
+#define SECURERANDOMDATAPROVIDER_HH
 #include <qpdf/RandomDataProvider.hh>
 #include <qpdf/DLL.h>
@@ -19,4 +19,4 @@ class SecureRandomDataProvider: public RandomDataProvider
     static RandomDataProvider* getInstance();
 };
-#endif // __SECURERANDOMDATAPROVIDER_HH__
+#endif // SECURERANDOMDATAPROVIDER_HH
@@ -37,8 +37,8 @@
  * @author   Thomas Pornin <thomas.pornin@cryptolog.com>
  */
-#ifndef SPH_SHA2_H__
-#define SPH_SHA2_H__
+#ifndef SPH_SHA2_H
+#define SPH_SHA2_H
 #ifdef __cplusplus
 extern "C" {
@@ -44,8 +44,8 @@
  * @author   Thomas Pornin <thomas.pornin@cryptolog.com>
  */
-#ifndef SPH_TYPES_H__
-#define SPH_TYPES_H__
+#ifndef SPH_TYPES_H
+#define SPH_TYPES_H
 #include <limits.h>