OpenSystemsDevelopment / qpdf

Commit 25ccc7eae4b78e90d0fe6400abeba22ca4cd648e

Authored by Jay Berkenbilt
1 parent c7a4967d

Rename QPDFValueProxy.hh and QPDFValueProxy.cc 

Preparing to change the class name back to QPDFObject
Inline Side-by-side
Showing 8 changed files with 26 additions and 13 deletions
cSpell.json
  View file @25ccc7e
... ... @@ -425,7 +425,6 @@
425 425 "qpdftypes",
426 426 "qpdfusage",
427 427 "qpdfvalue",
428   - "qpdfvalueproxy",
429 428 "qpdfwriter",
430 429 "qpdfx",
431 430 "qpdfxrefentry",
... ...
include/qpdf/QPDFObject.hh
  View file @25ccc7e
... ... @@ -19,14 +19,24 @@
19 19 // continue to consider qpdf to be licensed under those terms. Please
20 20 // see the manual for additional information.
21 21  
22   -#ifndef QPDFOBJECT_HH
23   -#define QPDFOBJECT_HH
  22 +#ifndef QPDFOBJECT_OLD_HH
  23 +#define QPDFOBJECT_OLD_HH
  24 +
  25 +// **********************************************************************
  26 +//
  27 +// This file is for backward compatibility. The header file for the
  28 +// internal QPDFObject class (not part of the public API) is in
  29 +// QPDFObject_private.hh (not installed).
  30 +//
  31 +// **********************************************************************
24 32  
25 33 // ABI: in qpdf 12, leave this file in place and have it generate an
26 34 // error. This is to prevent someone from being able to successfully
27 35 // include this file and get a copy from a previous installation
28 36 // thereby accidentally creating sources depend on having an older
29   -// version installed.
  37 +// version installed. When enough time has passed, this file can be
  38 +// removed, and libqpdf/qpdf/QPDFObject_private.hh can be renamed to
  39 +// libqpdf/qpdf/QPDFObject.hh.
30 40  
31 41 #ifndef QPDF_OBJECT_NOWARN
32 42 // ABI: remove this file in qpdf 12
... ... @@ -66,4 +76,4 @@ class QPDFObject
66 76 QPDFObject& operator=(QPDFObject const&) = delete;
67 77 };
68 78  
69   -#endif // QPDFOBJECT_HH
  79 +#endif // QPDFOBJECT_OLD_HH
... ...
libqpdf/CMakeLists.txt
  View file @25ccc7e
... ... @@ -72,6 +72,7 @@ set(libqpdf_SOURCES
72 72 QPDFMatrix.cc
73 73 QPDFNameTreeObjectHelper.cc
74 74 QPDFNumberTreeObjectHelper.cc
  75 + QPDFObject.cc
75 76 QPDFObjectHandle.cc
76 77 QPDFObjGen.cc
77 78 QPDFOutlineDocumentHelper.cc
... ... @@ -85,7 +86,6 @@ set(libqpdf_SOURCES
85 86 QPDFTokenizer.cc
86 87 QPDFUsage.cc
87 88 QPDFValue.cc
88   - QPDFValueProxy.cc
89 89 QPDFWriter.cc
90 90 QPDFXRefEntry.cc
91 91 QPDF_Array.cc
... ...
libqpdf/QPDF.cc
  View file @25ccc7e
... ... @@ -21,7 +21,7 @@
21 21 #include <qpdf/Pl_OStream.hh>
22 22 #include <qpdf/QPDFExc.hh>
23 23 #include <qpdf/QPDFLogger.hh>
24   -#include <qpdf/QPDFValueProxy.hh>
  24 +#include <qpdf/QPDFObject_private.hh>
25 25 #include <qpdf/QPDF_Array.hh>
26 26 #include <qpdf/QPDF_Dictionary.hh>
27 27 #include <qpdf/QPDF_Null.hh>
... ...
libqpdf/QPDFValueProxy.cc renamed to libqpdf/QPDFObject.cc
  View file @25ccc7e
1   -#include <qpdf/QPDFValueProxy.hh>
  1 +#include <qpdf/QPDFObject_private.hh>
2 2  
3 3 #include <qpdf/QPDF.hh>
4 4 #include <qpdf/QPDF_Destroyed.hh>
... ...
libqpdf/QPDFObjectHandle.cc
  View file @25ccc7e
... ... @@ -7,9 +7,9 @@
7 7 #include <qpdf/QPDFExc.hh>
8 8 #include <qpdf/QPDFLogger.hh>
9 9 #include <qpdf/QPDFMatrix.hh>
  10 +#include <qpdf/QPDFObject_private.hh>
10 11 #include <qpdf/QPDFPageObjectHelper.hh>
11 12 #include <qpdf/QPDFParser.hh>
12   -#include <qpdf/QPDFValueProxy.hh>
13 13 #include <qpdf/QPDF_Array.hh>
14 14 #include <qpdf/QPDF_Bool.hh>
15 15 #include <qpdf/QPDF_Dictionary.hh>
... ...
libqpdf/QPDFValue.cc
  View file @25ccc7e
1 1 #include <qpdf/QPDFValue.hh>
2 2  
3   -#include <qpdf/QPDFValueProxy.hh>
  3 +#include <qpdf/QPDFObject_private.hh>
4 4  
5 5 std::shared_ptr<QPDFValueProxy>
6 6 QPDFValue::do_create(QPDFValue* object)
... ...
libqpdf/qpdf/QPDFValueProxy.hh renamed to libqpdf/qpdf/QPDFObject_private.hh
  View file @25ccc7e
1   -#ifndef QPDFVALUEPROXY_HH
2   -#define QPDFVALUEPROXY_HH
  1 +#ifndef QPDFOBJECT_HH
  2 +#define QPDFOBJECT_HH
  3 +
  4 +// NOTE: This file is called QPDFObject_private.hh instead of
  5 +// QPDFObject.hh because of include/qpdf/QPDFObject.hh. See comments
  6 +// there for an explanation.
3 7  
4 8 #include <qpdf/Constants.h>
5 9 #include <qpdf/DLL.h>
... ... @@ -149,4 +153,4 @@ class QPDFValueProxy
149 153 std::shared_ptr<QPDFValue> value;
150 154 };
151 155  
152   -#endif // QPDFVALUEPROXY_HH
  156 +#endif // QPDFOBJECT_HH
... ...