diff options
Diffstat (limited to 'libqpdf')
-rw-r--r-- | libqpdf/CMakeLists.txt | 2 | ||||
-rw-r--r-- | libqpdf/QPDF.cc | 2 | ||||
-rw-r--r-- | libqpdf/QPDFObject.cc (renamed from libqpdf/QPDFValueProxy.cc) | 2 | ||||
-rw-r--r-- | libqpdf/QPDFObjectHandle.cc | 2 | ||||
-rw-r--r-- | libqpdf/QPDFValue.cc | 2 | ||||
-rw-r--r-- | libqpdf/qpdf/QPDFObject_private.hh (renamed from libqpdf/qpdf/QPDFValueProxy.hh) | 10 |
6 files changed, 12 insertions, 8 deletions
diff --git a/libqpdf/CMakeLists.txt b/libqpdf/CMakeLists.txt index 3084813d..1323e60c 100644 --- a/libqpdf/CMakeLists.txt +++ b/libqpdf/CMakeLists.txt @@ -72,6 +72,7 @@ set(libqpdf_SOURCES QPDFMatrix.cc QPDFNameTreeObjectHelper.cc QPDFNumberTreeObjectHelper.cc + QPDFObject.cc QPDFObjectHandle.cc QPDFObjGen.cc QPDFOutlineDocumentHelper.cc @@ -85,7 +86,6 @@ set(libqpdf_SOURCES QPDFTokenizer.cc QPDFUsage.cc QPDFValue.cc - QPDFValueProxy.cc QPDFWriter.cc QPDFXRefEntry.cc QPDF_Array.cc diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index 1b1ee784..d56fb29d 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -21,7 +21,7 @@ #include <qpdf/Pl_OStream.hh> #include <qpdf/QPDFExc.hh> #include <qpdf/QPDFLogger.hh> -#include <qpdf/QPDFValueProxy.hh> +#include <qpdf/QPDFObject_private.hh> #include <qpdf/QPDF_Array.hh> #include <qpdf/QPDF_Dictionary.hh> #include <qpdf/QPDF_Null.hh> diff --git a/libqpdf/QPDFValueProxy.cc b/libqpdf/QPDFObject.cc index c315128c..b5d073ab 100644 --- a/libqpdf/QPDFValueProxy.cc +++ b/libqpdf/QPDFObject.cc @@ -1,4 +1,4 @@ -#include <qpdf/QPDFValueProxy.hh> +#include <qpdf/QPDFObject_private.hh> #include <qpdf/QPDF.hh> #include <qpdf/QPDF_Destroyed.hh> diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc index d31af881..ab54b808 100644 --- a/libqpdf/QPDFObjectHandle.cc +++ b/libqpdf/QPDFObjectHandle.cc @@ -7,9 +7,9 @@ #include <qpdf/QPDFExc.hh> #include <qpdf/QPDFLogger.hh> #include <qpdf/QPDFMatrix.hh> +#include <qpdf/QPDFObject_private.hh> #include <qpdf/QPDFPageObjectHelper.hh> #include <qpdf/QPDFParser.hh> -#include <qpdf/QPDFValueProxy.hh> #include <qpdf/QPDF_Array.hh> #include <qpdf/QPDF_Bool.hh> #include <qpdf/QPDF_Dictionary.hh> diff --git a/libqpdf/QPDFValue.cc b/libqpdf/QPDFValue.cc index 957cc350..99fd77d7 100644 --- a/libqpdf/QPDFValue.cc +++ b/libqpdf/QPDFValue.cc @@ -1,6 +1,6 @@ #include <qpdf/QPDFValue.hh> -#include <qpdf/QPDFValueProxy.hh> +#include <qpdf/QPDFObject_private.hh> std::shared_ptr<QPDFValueProxy> QPDFValue::do_create(QPDFValue* object) diff --git a/libqpdf/qpdf/QPDFValueProxy.hh b/libqpdf/qpdf/QPDFObject_private.hh index ff3f80b6..84aaabe4 100644 --- a/libqpdf/qpdf/QPDFValueProxy.hh +++ b/libqpdf/qpdf/QPDFObject_private.hh @@ -1,5 +1,9 @@ -#ifndef QPDFVALUEPROXY_HH -#define QPDFVALUEPROXY_HH +#ifndef QPDFOBJECT_HH +#define QPDFOBJECT_HH + +// NOTE: This file is called QPDFObject_private.hh instead of +// QPDFObject.hh because of include/qpdf/QPDFObject.hh. See comments +// there for an explanation. #include <qpdf/Constants.h> #include <qpdf/DLL.h> @@ -149,4 +153,4 @@ class QPDFValueProxy std::shared_ptr<QPDFValue> value; }; -#endif // QPDFVALUEPROXY_HH +#endif // QPDFOBJECT_HH |