diff options
author | Jay Berkenbilt <ejb@ql.org> | 2022-04-16 01:44:07 +0200 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2022-04-16 17:39:14 +0200 |
commit | cdd0b4fb7d48b32686d56364cf170569bdb0149d (patch) | |
tree | b094c966b33575eb9f2e441d1705990f45539bec /include | |
parent | 2a7d2b63c2a7284d1b1179eefbf64f5dd29aa510 (diff) | |
download | qpdf-cdd0b4fb7d48b32686d56364cf170569bdb0149d.tar.zst |
Use = default and = delete where possible in classes
Diffstat (limited to 'include')
39 files changed, 99 insertions, 153 deletions
diff --git a/include/qpdf/Buffer.hh b/include/qpdf/Buffer.hh index d725006a..fdb07ba7 100644 --- a/include/qpdf/Buffer.hh +++ b/include/qpdf/Buffer.hh @@ -66,7 +66,7 @@ class Buffer private: Members(size_t size, unsigned char* buf, bool own_memory); - Members(Members const&); + Members(Members const&) = delete; bool own_memory; size_t size; diff --git a/include/qpdf/BufferInputSource.hh b/include/qpdf/BufferInputSource.hh index 53c362a9..b965704f 100644 --- a/include/qpdf/BufferInputSource.hh +++ b/include/qpdf/BufferInputSource.hh @@ -60,11 +60,11 @@ class QPDF_DLL_CLASS BufferInputSource: public InputSource public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members(bool own_memory, std::string const& description, Buffer* buf); - Members(Members const&); + Members(Members const&) = delete; bool own_memory; std::string description; diff --git a/include/qpdf/ClosedFileInputSource.hh b/include/qpdf/ClosedFileInputSource.hh index e82c4410..c72a1df8 100644 --- a/include/qpdf/ClosedFileInputSource.hh +++ b/include/qpdf/ClosedFileInputSource.hh @@ -79,7 +79,7 @@ class QPDF_DLL_CLASS ClosedFileInputSource: public InputSource public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members(char const* filename); diff --git a/include/qpdf/FileInputSource.hh b/include/qpdf/FileInputSource.hh index c3b60265..1b4f5d6a 100644 --- a/include/qpdf/FileInputSource.hh +++ b/include/qpdf/FileInputSource.hh @@ -64,7 +64,7 @@ class QPDF_DLL_CLASS FileInputSource: public InputSource private: Members(bool close_file); - Members(Members const&); + Members(Members const&) = delete; bool close_file; std::string filename; diff --git a/include/qpdf/InputSource.hh b/include/qpdf/InputSource.hh index 94dec500..9feb8ec3 100644 --- a/include/qpdf/InputSource.hh +++ b/include/qpdf/InputSource.hh @@ -42,20 +42,13 @@ class QPDF_DLL_CLASS InputSource { } QPDF_DLL - virtual ~InputSource() - { - } + virtual ~InputSource() = default; class QPDF_DLL_CLASS Finder { public: - Finder() - { - } - virtual ~Finder() - { - } - + Finder() = default; + virtual ~Finder() = default; virtual bool check() = 0; }; @@ -110,11 +103,11 @@ class QPDF_DLL_CLASS InputSource public: QPDF_DLL - ~Members(); + ~Members() = default; private: - Members(); - Members(Members const&); + Members() = default; + Members(Members const&) = delete; }; std::shared_ptr<Members> m; diff --git a/include/qpdf/JSON.hh b/include/qpdf/JSON.hh index 2961d8a9..a2a0ea27 100644 --- a/include/qpdf/JSON.hh +++ b/include/qpdf/JSON.hh @@ -150,25 +150,25 @@ class JSON struct JSON_value { - virtual ~JSON_value(); + virtual ~JSON_value() = default; virtual std::string unparse(size_t depth) const = 0; }; struct JSON_dictionary: public JSON_value { - virtual ~JSON_dictionary(); + virtual ~JSON_dictionary() = default; virtual std::string unparse(size_t depth) const; std::map<std::string, std::shared_ptr<JSON_value>> members; }; struct JSON_array: public JSON_value { - virtual ~JSON_array(); + virtual ~JSON_array() = default; virtual std::string unparse(size_t depth) const; std::vector<std::shared_ptr<JSON_value>> elements; }; struct JSON_string: public JSON_value { JSON_string(std::string const& utf8); - virtual ~JSON_string(); + virtual ~JSON_string() = default; virtual std::string unparse(size_t depth) const; std::string utf8; std::string encoded; @@ -178,20 +178,20 @@ class JSON JSON_number(long long val); JSON_number(double val); JSON_number(std::string const& val); - virtual ~JSON_number(); + virtual ~JSON_number() = default; virtual std::string unparse(size_t depth) const; std::string encoded; }; struct JSON_bool: public JSON_value { JSON_bool(bool val); - virtual ~JSON_bool(); + virtual ~JSON_bool() = default; virtual std::string unparse(size_t depth) const; bool value; }; struct JSON_null: public JSON_value { - virtual ~JSON_null(); + virtual ~JSON_null() = default; virtual std::string unparse(size_t depth) const; }; @@ -210,11 +210,11 @@ class JSON public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members(std::shared_ptr<JSON_value>); - Members(Members const&); + Members(Members const&) = delete; std::shared_ptr<JSON_value> value; }; diff --git a/include/qpdf/Pipeline.hh b/include/qpdf/Pipeline.hh index 2a2f9d3c..09ec0925 100644 --- a/include/qpdf/Pipeline.hh +++ b/include/qpdf/Pipeline.hh @@ -59,7 +59,7 @@ class QPDF_DLL_CLASS Pipeline Pipeline(char const* identifier, Pipeline* next); QPDF_DLL - virtual ~Pipeline(); + virtual ~Pipeline() = default; // Subclasses should implement write and finish to do their jobs // and then, if they are not end-of-line pipelines, call diff --git a/include/qpdf/Pl_Buffer.hh b/include/qpdf/Pl_Buffer.hh index f72646f0..d9aec078 100644 --- a/include/qpdf/Pl_Buffer.hh +++ b/include/qpdf/Pl_Buffer.hh @@ -77,11 +77,11 @@ class QPDF_DLL_CLASS Pl_Buffer: public Pipeline public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members(); - Members(Members const&); + Members(Members const&) = delete; bool ready; std::shared_ptr<Buffer> data; diff --git a/include/qpdf/Pl_Concatenate.hh b/include/qpdf/Pl_Concatenate.hh index 702c48e4..1f4e2f40 100644 --- a/include/qpdf/Pl_Concatenate.hh +++ b/include/qpdf/Pl_Concatenate.hh @@ -56,11 +56,11 @@ class QPDF_DLL_CLASS Pl_Concatenate: public Pipeline public: QPDF_DLL - ~Members(); + ~Members() = default; private: - Members(); - Members(Members const&); + Members() = default; + Members(Members const&) = delete; }; std::shared_ptr<Members> m; diff --git a/include/qpdf/Pl_Count.hh b/include/qpdf/Pl_Count.hh index 8d9bc6b7..d0bf8cb3 100644 --- a/include/qpdf/Pl_Count.hh +++ b/include/qpdf/Pl_Count.hh @@ -54,11 +54,11 @@ class QPDF_DLL_CLASS Pl_Count: public Pipeline public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members(); - Members(Members const&); + Members(Members const&) = delete; // Must be qpdf_offset_t, not size_t, to handle writing more than // size_t can handle. diff --git a/include/qpdf/Pl_DCT.hh b/include/qpdf/Pl_DCT.hh index 0bbf302b..3503ac77 100644 --- a/include/qpdf/Pl_DCT.hh +++ b/include/qpdf/Pl_DCT.hh @@ -41,12 +41,8 @@ class QPDF_DLL_CLASS Pl_DCT: public Pipeline class QPDF_DLL_CLASS CompressConfig { public: - CompressConfig() - { - } - virtual ~CompressConfig() - { - } + CompressConfig() = default; + virtual ~CompressConfig() = default; virtual void apply(jpeg_compress_struct*) = 0; }; @@ -83,7 +79,7 @@ class QPDF_DLL_CLASS Pl_DCT: public Pipeline public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members( @@ -94,7 +90,7 @@ class QPDF_DLL_CLASS Pl_DCT: public Pipeline int components = 1, J_COLOR_SPACE color_space = JCS_GRAYSCALE, CompressConfig* config_callback = 0); - Members(Members const&); + Members(Members const&) = delete; action_e action; Pl_Buffer buf; diff --git a/include/qpdf/Pl_Discard.hh b/include/qpdf/Pl_Discard.hh index 051f9fe1..c58c162a 100644 --- a/include/qpdf/Pl_Discard.hh +++ b/include/qpdf/Pl_Discard.hh @@ -49,11 +49,11 @@ class QPDF_DLL_CLASS Pl_Discard: public Pipeline public: QPDF_DLL - ~Members(); + ~Members() = default; private: - Members(); - Members(Members const&); + Members() = default; + Members(Members const&) = delete; }; std::shared_ptr<Members> m; diff --git a/include/qpdf/Pl_Flate.hh b/include/qpdf/Pl_Flate.hh index 5cfe17f4..daf05836 100644 --- a/include/qpdf/Pl_Flate.hh +++ b/include/qpdf/Pl_Flate.hh @@ -80,7 +80,7 @@ class QPDF_DLL_CLASS Pl_Flate: public Pipeline private: Members(size_t out_bufsize, action_e action); - Members(Members const&); + Members(Members const&) = delete; std::shared_ptr<unsigned char> outbuf; size_t out_bufsize; diff --git a/include/qpdf/Pl_QPDFTokenizer.hh b/include/qpdf/Pl_QPDFTokenizer.hh index d5b531e2..20f36603 100644 --- a/include/qpdf/Pl_QPDFTokenizer.hh +++ b/include/qpdf/Pl_QPDFTokenizer.hh @@ -66,11 +66,11 @@ class QPDF_DLL_CLASS Pl_QPDFTokenizer: public Pipeline public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members(); - Members(Members const&); + Members(Members const&) = delete; QPDFObjectHandle::TokenFilter* filter; QPDFTokenizer tokenizer; diff --git a/include/qpdf/Pl_RunLength.hh b/include/qpdf/Pl_RunLength.hh index ce2b0e90..47c72d65 100644 --- a/include/qpdf/Pl_RunLength.hh +++ b/include/qpdf/Pl_RunLength.hh @@ -55,11 +55,11 @@ class QPDF_DLL_CLASS Pl_RunLength: public Pipeline public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members(action_e); - Members(Members const&); + Members(Members const&) = delete; action_e action; state_e state; diff --git a/include/qpdf/Pl_StdioFile.hh b/include/qpdf/Pl_StdioFile.hh index 64f4738d..1dfb6c99 100644 --- a/include/qpdf/Pl_StdioFile.hh +++ b/include/qpdf/Pl_StdioFile.hh @@ -54,11 +54,11 @@ class QPDF_DLL_CLASS Pl_StdioFile: public Pipeline public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members(FILE*); - Members(Members const&); + Members(Members const&) = delete; FILE* file; }; diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh index bc0096b7..e704c2f8 100644 --- a/include/qpdf/QPDF.hh +++ b/include/qpdf/QPDF.hh @@ -913,9 +913,7 @@ class QPDF { public: CopiedStreamDataProvider(QPDF& destination_qpdf); - virtual ~CopiedStreamDataProvider() - { - } + virtual ~CopiedStreamDataProvider() = default; virtual bool provideStreamData( int objid, int generation, @@ -940,9 +938,7 @@ class QPDF public: StringDecrypter(QPDF* qpdf, int objid, int gen); - virtual ~StringDecrypter() - { - } + virtual ~StringDecrypter() = default; virtual void decryptString(std::string& val); private: @@ -1381,9 +1377,7 @@ class QPDF checker(checker) { } - virtual ~PatternFinder() - { - } + virtual ~PatternFinder() = default; virtual bool check() { @@ -1509,11 +1503,11 @@ class QPDF public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members(); - Members(Members const&); + Members(Members const&) = delete; unsigned long long unique_id; QPDFTokenizer tokenizer; diff --git a/include/qpdf/QPDFAcroFormDocumentHelper.hh b/include/qpdf/QPDFAcroFormDocumentHelper.hh index 5347dcd9..690aecfd 100644 --- a/include/qpdf/QPDFAcroFormDocumentHelper.hh +++ b/include/qpdf/QPDFAcroFormDocumentHelper.hh @@ -85,9 +85,7 @@ class QPDFAcroFormDocumentHelper: public QPDFDocumentHelper QPDF_DLL QPDFAcroFormDocumentHelper(QPDF&); QPDF_DLL - virtual ~QPDFAcroFormDocumentHelper() - { - } + virtual ~QPDFAcroFormDocumentHelper() = default; // This class lazily creates an internal cache of the mapping // among form fields, annotations, and pages. Methods within this @@ -291,11 +289,11 @@ class QPDFAcroFormDocumentHelper: public QPDFDocumentHelper public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members(); - Members(Members const&); + Members(Members const&) = delete; bool cache_valid; std::map<QPDFObjGen, std::vector<QPDFAnnotationObjectHelper>> diff --git a/include/qpdf/QPDFAnnotationObjectHelper.hh b/include/qpdf/QPDFAnnotationObjectHelper.hh index de408abd..2f0bc6b9 100644 --- a/include/qpdf/QPDFAnnotationObjectHelper.hh +++ b/include/qpdf/QPDFAnnotationObjectHelper.hh @@ -33,9 +33,7 @@ class QPDFAnnotationObjectHelper: public QPDFObjectHelper QPDF_DLL QPDFAnnotationObjectHelper(QPDFObjectHandle); QPDF_DLL - virtual ~QPDFAnnotationObjectHelper() - { - } + virtual ~QPDFAnnotationObjectHelper() = default; // This class provides helper methods for annotations. More // functionality will likely be added in the future. @@ -108,11 +106,11 @@ class QPDFAnnotationObjectHelper: public QPDFObjectHelper public: QPDF_DLL - ~Members(); + ~Members() = default; private: - Members(); - Members(Members const&); + Members() = default; + Members(Members const&) = delete; }; std::shared_ptr<Members> m; diff --git a/include/qpdf/QPDFDocumentHelper.hh b/include/qpdf/QPDFDocumentHelper.hh index d33e90b8..55fe3c9c 100644 --- a/include/qpdf/QPDFDocumentHelper.hh +++ b/include/qpdf/QPDFDocumentHelper.hh @@ -45,9 +45,7 @@ class QPDFDocumentHelper { } QPDF_DLL - virtual ~QPDFDocumentHelper() - { - } + virtual ~QPDFDocumentHelper() = default; QPDF_DLL QPDF& getQPDF() diff --git a/include/qpdf/QPDFEFStreamObjectHelper.hh b/include/qpdf/QPDFEFStreamObjectHelper.hh index afcc5bd2..b39b6a7a 100644 --- a/include/qpdf/QPDFEFStreamObjectHelper.hh +++ b/include/qpdf/QPDFEFStreamObjectHelper.hh @@ -112,7 +112,7 @@ class QPDFEFStreamObjectHelper: public QPDFObjectHelper ~Members() = default; private: - Members(); + Members() = default; Members(Members const&) = delete; }; diff --git a/include/qpdf/QPDFEmbeddedFileDocumentHelper.hh b/include/qpdf/QPDFEmbeddedFileDocumentHelper.hh index f09e8c24..0243be4e 100644 --- a/include/qpdf/QPDFEmbeddedFileDocumentHelper.hh +++ b/include/qpdf/QPDFEmbeddedFileDocumentHelper.hh @@ -85,7 +85,7 @@ class QPDFEmbeddedFileDocumentHelper: public QPDFDocumentHelper ~Members() = default; private: - Members(); + Members() = default; Members(Members const&) = delete; std::shared_ptr<QPDFNameTreeObjectHelper> embedded_files; diff --git a/include/qpdf/QPDFExc.hh b/include/qpdf/QPDFExc.hh index d9d7312b..c596e072 100644 --- a/include/qpdf/QPDFExc.hh +++ b/include/qpdf/QPDFExc.hh @@ -40,9 +40,7 @@ class QPDF_DLL_CLASS QPDFExc: public std::runtime_error qpdf_offset_t offset, std::string const& message); QPDF_DLL - virtual ~QPDFExc() noexcept - { - } + virtual ~QPDFExc() noexcept = default; // To get a complete error string, call what(), provided by // std::exception. The accessors below return the original values diff --git a/include/qpdf/QPDFFileSpecObjectHelper.hh b/include/qpdf/QPDFFileSpecObjectHelper.hh index d0b4f185..30f4eed9 100644 --- a/include/qpdf/QPDFFileSpecObjectHelper.hh +++ b/include/qpdf/QPDFFileSpecObjectHelper.hh @@ -109,7 +109,7 @@ class QPDFFileSpecObjectHelper: public QPDFObjectHelper ~Members() = default; private: - Members(); + Members() = default; Members(Members const&) = delete; }; diff --git a/include/qpdf/QPDFFormFieldObjectHelper.hh b/include/qpdf/QPDFFormFieldObjectHelper.hh index e5ffeef2..4bad5d1e 100644 --- a/include/qpdf/QPDFFormFieldObjectHelper.hh +++ b/include/qpdf/QPDFFormFieldObjectHelper.hh @@ -41,9 +41,7 @@ class QPDFFormFieldObjectHelper: public QPDFObjectHelper QPDF_DLL QPDFFormFieldObjectHelper(QPDFObjectHandle); QPDF_DLL - virtual ~QPDFFormFieldObjectHelper() - { - } + virtual ~QPDFFormFieldObjectHelper() = default; QPDF_DLL bool isNull(); @@ -229,11 +227,11 @@ class QPDFFormFieldObjectHelper: public QPDFObjectHelper public: QPDF_DLL - ~Members(); + ~Members() = default; private: - Members(); - Members(Members const&); + Members() = default; + Members(Members const&) = delete; }; std::shared_ptr<Members> m; diff --git a/include/qpdf/QPDFNameTreeObjectHelper.hh b/include/qpdf/QPDFNameTreeObjectHelper.hh index 11d7b5a2..194fc926 100644 --- a/include/qpdf/QPDFNameTreeObjectHelper.hh +++ b/include/qpdf/QPDFNameTreeObjectHelper.hh @@ -62,7 +62,7 @@ class QPDFNameTreeObjectHelper: public QPDFObjectHelper static QPDFNameTreeObjectHelper newEmpty(QPDF&, bool auto_repair = true); QPDF_DLL - virtual ~QPDFNameTreeObjectHelper(); + virtual ~QPDFNameTreeObjectHelper() = default; // Return whether the number tree has an explicit entry for this // number. @@ -194,7 +194,7 @@ class QPDFNameTreeObjectHelper: public QPDFObjectHelper public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members(QPDFObjectHandle& oh, QPDF*, bool auto_repair); diff --git a/include/qpdf/QPDFNumberTreeObjectHelper.hh b/include/qpdf/QPDFNumberTreeObjectHelper.hh index bb34373c..4dbef98a 100644 --- a/include/qpdf/QPDFNumberTreeObjectHelper.hh +++ b/include/qpdf/QPDFNumberTreeObjectHelper.hh @@ -55,11 +55,8 @@ class QPDFNumberTreeObjectHelper: public QPDFObjectHelper [[deprecated("use constructor that takes QPDF&")]] QPDF_DLL QPDFNumberTreeObjectHelper(QPDFObjectHandle); - // ABI: = default QPDF_DLL - virtual ~QPDFNumberTreeObjectHelper() - { - } + virtual ~QPDFNumberTreeObjectHelper() = default; // Create an empty number tree QPDF_DLL @@ -217,7 +214,7 @@ class QPDFNumberTreeObjectHelper: public QPDFObjectHelper public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members(QPDFObjectHandle& oh, QPDF*, bool auto_repair); diff --git a/include/qpdf/QPDFObject.hh b/include/qpdf/QPDFObject.hh index 897a61dd..43146e53 100644 --- a/include/qpdf/QPDFObject.hh +++ b/include/qpdf/QPDFObject.hh @@ -62,9 +62,7 @@ class QPDFObject static constexpr object_type_e ot_operator = ::ot_operator; static constexpr object_type_e ot_inlineimage = ::ot_inlineimage; - virtual ~QPDFObject() - { - } + virtual ~QPDFObject() = default; virtual std::string unparse() = 0; virtual JSON getJSON() = 0; diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh index a09fd954..5b2a6764 100644 --- a/include/qpdf/QPDFObjectHandle.hh +++ b/include/qpdf/QPDFObjectHandle.hh @@ -64,9 +64,7 @@ class QPDFObjectHandle StreamDataProvider(bool supports_retry = false); QPDF_DLL - virtual ~StreamDataProvider() - { - } + virtual ~StreamDataProvider(); // The implementation of this function must write stream data // to the given pipeline. The stream data must conform to // whatever filters are explicitly associated with the stream. @@ -172,13 +170,9 @@ class QPDFObjectHandle { public: QPDF_DLL - TokenFilter() - { - } + TokenFilter() = default; QPDF_DLL - virtual ~TokenFilter() - { - } + virtual ~TokenFilter() = default; virtual void handleToken(QPDFTokenizer::Token const&) = 0; QPDF_DLL virtual void handleEOF(); @@ -216,9 +210,7 @@ class QPDFObjectHandle { public: QPDF_DLL - virtual ~StringDecrypter() - { - } + virtual ~StringDecrypter() = default; virtual void decryptString(std::string& val) = 0; }; @@ -229,9 +221,7 @@ class QPDFObjectHandle { public: QPDF_DLL - virtual ~ParserCallbacks() - { - } + virtual ~ParserCallbacks() = default; // One of the handleObject methods must be overridden. QPDF_DLL virtual void handleObject(QPDFObjectHandle); diff --git a/include/qpdf/QPDFObjectHelper.hh b/include/qpdf/QPDFObjectHelper.hh index 32577681..db3876ec 100644 --- a/include/qpdf/QPDFObjectHelper.hh +++ b/include/qpdf/QPDFObjectHelper.hh @@ -46,9 +46,7 @@ class QPDFObjectHelper { } QPDF_DLL - virtual ~QPDFObjectHelper() - { - } + virtual ~QPDFObjectHelper() = default; QPDF_DLL QPDFObjectHandle getObjectHandle() diff --git a/include/qpdf/QPDFOutlineDocumentHelper.hh b/include/qpdf/QPDFOutlineDocumentHelper.hh index 2049a072..28328c71 100644 --- a/include/qpdf/QPDFOutlineDocumentHelper.hh +++ b/include/qpdf/QPDFOutlineDocumentHelper.hh @@ -45,7 +45,7 @@ class QPDFOutlineDocumentHelper: public QPDFDocumentHelper QPDF_DLL QPDFOutlineDocumentHelper(QPDF&); QPDF_DLL - virtual ~QPDFOutlineDocumentHelper(); + virtual ~QPDFOutlineDocumentHelper() = default; QPDF_DLL bool hasOutlines(); @@ -88,11 +88,11 @@ class QPDFOutlineDocumentHelper: public QPDFDocumentHelper public: QPDF_DLL - ~Members(); + ~Members() = default; private: - Members(); - Members(Members const&); + Members() = default; + Members(Members const&) = delete; std::vector<QPDFOutlineObjectHelper> outlines; std::set<QPDFObjGen> seen; diff --git a/include/qpdf/QPDFOutlineObjectHelper.hh b/include/qpdf/QPDFOutlineObjectHelper.hh index ece5acf0..6c91909c 100644 --- a/include/qpdf/QPDFOutlineObjectHelper.hh +++ b/include/qpdf/QPDFOutlineObjectHelper.hh @@ -105,11 +105,11 @@ class QPDFOutlineObjectHelper: public QPDFObjectHelper public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members(QPDFOutlineDocumentHelper& dh); - Members(Members const&); + Members(Members const&) = delete; QPDFOutlineDocumentHelper& dh; std::shared_ptr<QPDFOutlineObjectHelper> parent; diff --git a/include/qpdf/QPDFPageDocumentHelper.hh b/include/qpdf/QPDFPageDocumentHelper.hh index 2ffa8dd1..f8b2ac7e 100644 --- a/include/qpdf/QPDFPageDocumentHelper.hh +++ b/include/qpdf/QPDFPageDocumentHelper.hh @@ -40,9 +40,7 @@ class QPDFPageDocumentHelper: public QPDFDocumentHelper QPDF_DLL QPDFPageDocumentHelper(QPDF&); QPDF_DLL - virtual ~QPDFPageDocumentHelper() - { - } + virtual ~QPDFPageDocumentHelper() = default; // Traverse page tree, and return all /Page objects wrapped in // QPDFPageObjectHelper objects. Unlike with @@ -144,11 +142,11 @@ class QPDFPageDocumentHelper: public QPDFDocumentHelper public: QPDF_DLL - ~Members(); + ~Members() = default; private: - Members(); - Members(Members const&); + Members() = default; + Members(Members const&) = delete; }; std::shared_ptr<Members> m; diff --git a/include/qpdf/QPDFPageLabelDocumentHelper.hh b/include/qpdf/QPDFPageLabelDocumentHelper.hh index eef2accc..76aade9c 100644 --- a/include/qpdf/QPDFPageLabelDocumentHelper.hh +++ b/include/qpdf/QPDFPageLabelDocumentHelper.hh @@ -50,9 +50,7 @@ class QPDFPageLabelDocumentHelper: public QPDFDocumentHelper QPDF_DLL QPDFPageLabelDocumentHelper(QPDF&); QPDF_DLL - virtual ~QPDFPageLabelDocumentHelper() - { - } + virtual ~QPDFPageLabelDocumentHelper() = default; QPDF_DLL bool hasPageLabels(); @@ -90,11 +88,11 @@ class QPDFPageLabelDocumentHelper: public QPDFDocumentHelper public: QPDF_DLL - ~Members(); + ~Members() = default; private: - Members(); - Members(Members const&); + Members() = default; + Members(Members const&) = delete; std::shared_ptr<QPDFNumberTreeObjectHelper> labels; }; diff --git a/include/qpdf/QPDFPageObjectHelper.hh b/include/qpdf/QPDFPageObjectHelper.hh index f35e4cf4..df4c7864 100644 --- a/include/qpdf/QPDFPageObjectHelper.hh +++ b/include/qpdf/QPDFPageObjectHelper.hh @@ -43,9 +43,7 @@ class QPDFPageObjectHelper: public QPDFObjectHelper QPDF_DLL QPDFPageObjectHelper(QPDFObjectHandle); QPDF_DLL - virtual ~QPDFPageObjectHelper() - { - } + virtual ~QPDFPageObjectHelper() = default; // Works with pages and form XObjects. Return the effective value // of this attribute for the page/form XObject. For pages, if the @@ -384,11 +382,11 @@ class QPDFPageObjectHelper: public QPDFObjectHelper public: QPDF_DLL - ~Members(); + ~Members() = default; private: - Members(); - Members(Members const&); + Members() = default; + Members(Members const&) = delete; }; std::shared_ptr<Members> m; diff --git a/include/qpdf/QPDFSystemError.hh b/include/qpdf/QPDFSystemError.hh index f6c62224..22fb3fc1 100644 --- a/include/qpdf/QPDFSystemError.hh +++ b/include/qpdf/QPDFSystemError.hh @@ -35,7 +35,7 @@ class QPDF_DLL_CLASS QPDFSystemError: public std::runtime_error QPDF_DLL QPDFSystemError(std::string const& description, int system_errno); QPDF_DLL - virtual ~QPDFSystemError() noexcept; + virtual ~QPDFSystemError() noexcept = default; // To get a complete error string, call what(), provided by // std::exception. The accessors below return the original values diff --git a/include/qpdf/QPDFTokenizer.hh b/include/qpdf/QPDFTokenizer.hh index 9cd51acc..2187f21e 100644 --- a/include/qpdf/QPDFTokenizer.hh +++ b/include/qpdf/QPDFTokenizer.hh @@ -217,11 +217,11 @@ class QPDFTokenizer public: QPDF_DLL - ~Members(); + ~Members() = default; private: Members(); - Members(Members const&); + Members(Members const&) = delete; void reset(); // Lexer state diff --git a/include/qpdf/QPDFWriter.hh b/include/qpdf/QPDFWriter.hh index c5e33fd2..5d3ad5df 100644 --- a/include/qpdf/QPDFWriter.hh +++ b/include/qpdf/QPDFWriter.hh @@ -75,14 +75,12 @@ class QPDFWriter QPDFWriter(QPDF& pdf, char const* description, FILE* file, bool close_file); QPDF_DLL - ~QPDFWriter(); + ~QPDFWriter() = default; class QPDF_DLL_CLASS ProgressReporter { public: - virtual ~ProgressReporter() - { - } + virtual ~ProgressReporter() = default; // This method is called with a value from 0 to 100 to // indicate approximate progress through the write process. @@ -718,7 +716,7 @@ class QPDFWriter private: Members(QPDF& pdf); - Members(Members const&); + Members(Members const&) = delete; QPDF& pdf; char const* filename; diff --git a/include/qpdf/RandomDataProvider.hh b/include/qpdf/RandomDataProvider.hh index 6b316ee1..023bf995 100644 --- a/include/qpdf/RandomDataProvider.hh +++ b/include/qpdf/RandomDataProvider.hh @@ -28,9 +28,7 @@ class QPDF_DLL_CLASS RandomDataProvider { public: - virtual ~RandomDataProvider() - { - } + virtual ~RandomDataProvider() = default; virtual void provideRandomData(unsigned char* data, size_t len) = 0; protected: |