Convert remaining public classes to use Members pattern

Have classes contain only a single private member of type
PointerHolder<Members>. This makes it safe to change the structure of
the Members class without breaking binary compatibility. Many of the
classes already follow this pattern quite successfully. This brings in
the rest of the class that are part of the public API.

1 files changed, 20 insertions, 8 deletions

diff --git a/include/qpdf/Buffer.hh b/include/qpdf/Buffer.hh
index bb9a3eb9..8145f41a 100644
--- a/include/qpdf/Buffer.hh
+++ b/include/qpdf/Buffer.hh
@@ -23,7 +23,8 @@
 #define BUFFER_HH
 
 #include <qpdf/DLL.h>
-#include <cstring>              // for size_t
+#include <qpdf/PointerHolder.hh>
+#include <stddef.h>
 
 class Buffer
 {
@@ -46,8 +47,6 @@ class Buffer
     QPDF_DLL
     Buffer& operator=(Buffer const&);
     QPDF_DLL
-    ~Buffer();
-    QPDF_DLL
     size_t getSize() const;
     QPDF_DLL
     unsigned char const* getBuffer() const;
@@ -55,13 +54,26 @@ class Buffer
     unsigned char* getBuffer();
 
   private:
-    void init(size_t size, unsigned char* buf, bool own_memory);
+    class Members
+    {
+        friend class Buffer;
+
+      public:
+        QPDF_DLL
+        ~Members();
+
+      private:
+        Members(size_t size, unsigned char* buf, bool own_memory);
+        Members(Members const&);
+
+        bool own_memory;
+        size_t size;
+        unsigned char* buf;
+    };
+
     void copy(Buffer const&);
-    void destroy();
 
-    bool own_memory;
-    size_t size;
-    unsigned char* buf;
+    PointerHolder<Members> m;
 };
 
 #endif // BUFFER_HH