OpenSystemsDevelopment / qpdf

Commit 0885a16020c8986c79b8abfde828d179ca581c5f

Authored by m-holger
1 parent d67ad8b7

Move `StreamCopier` to `QPDF::Doc` and update references 

Relocate `StreamCopier` to `QPDF::Doc` for improved encapsulation of stream copying functionality. Adjust all references to use the updated placement.
Inline Side-by-side
Showing 3 changed files with 15 additions and 15 deletions
include/qpdf/QPDF.hh
  View file @0885a16
... ... @@ -790,7 +790,6 @@ class QPDF
790 790 // End of the public API. The following classes and methods are for qpdf internal use only.
791 791  
792 792 class Doc;
793   - class StreamCopier;
794 793  
795 794 inline bool reconstructed_xref() const;
796 795 inline Doc& doc();
... ...
libqpdf/QPDFObjectHandle.cc
  View file @0885a16
... ... @@ -1949,7 +1949,7 @@ QPDFObjectHandle::copyStream()
1949 1949 dict.replaceKey(iter.first, iter.second.shallowCopy());
1950 1950 }
1951 1951 }
1952   - QPDF::StreamCopier::copyStreamData(getOwningQPDF(), result, *this);
  1952 + QPDF::Doc::StreamCopier::copyStreamData(getOwningQPDF(), result, *this);
1953 1953 return result;
1954 1954 }
1955 1955  
... ...
libqpdf/qpdf/QPDF_private.hh
  View file @0885a16
... ... @@ -13,19 +13,6 @@
13 13  
14 14 using namespace qpdf;
15 15  
16   -// StreamCopier class is restricted to QPDFObjectHandle so it can copy stream data.
17   -class QPDF::StreamCopier
18   -{
19   - friend class QPDFObjectHandle;
20   -
21   - private:
22   - static void
23   - copyStreamData(QPDF* qpdf, QPDFObjectHandle const& dest, QPDFObjectHandle const& src)
24   - {
25   - qpdf->copyStreamData(dest, src);
26   - }
27   -};
28   -
29 16 class QPDF::ObjCache
30 17 {
31 18 public:
... ... @@ -347,9 +334,23 @@ class QPDF::Doc
347 334 class JobSetter;
348 335 class ParseGuard;
349 336 class Resolver;
  337 + class StreamCopier;
350 338 class Streams;
351 339 class Writer;
352 340  
  341 + // StreamCopier class is restricted to QPDFObjectHandle so it can copy stream data.
  342 + class StreamCopier
  343 + {
  344 + friend class QPDFObjectHandle;
  345 +
  346 + private:
  347 + static void
  348 + copyStreamData(QPDF* qpdf, QPDFObjectHandle const& dest, QPDFObjectHandle const& src)
  349 + {
  350 + qpdf->copyStreamData(dest, src);
  351 + }
  352 + };
  353 +
353 354 Doc() = delete;
354 355 Doc(Doc const&) = delete;
355 356 Doc(Doc&&) = delete;
... ...