octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-22 10:58:58 +00:00
Code Issues Releases Wiki Activity

Rename QPDFValueProxy.hh and QPDFValueProxy.cc

Browse Source 
Preparing to change the class name back to QPDFObject
This commit is contained in:
Jay Berkenbilt 2022-09-08 11:12:10 -04:00
parent c7a4967d10
commit 25ccc7eae4
8 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cSpell.json
View File

@ -425,7 +425,6 @@
"qpdftypes", "qpdftypes",
"qpdfusage", "qpdfusage",
"qpdfvalue", "qpdfvalue",
"qpdfvalueproxy",
"qpdfwriter", "qpdfwriter",
"qpdfx", "qpdfx",
"qpdfxrefentry", "qpdfxrefentry",

18
include/qpdf/QPDFObject.hh
View File

@ -19,14 +19,24 @@
// continue to consider qpdf to be licensed under those terms. Please // continue to consider qpdf to be licensed under those terms. Please
// see the manual for additional information. // see the manual for additional information.
#ifndef QPDFOBJECT_HH #ifndef QPDFOBJECT_OLD_HH
#define QPDFOBJECT_HH #define QPDFOBJECT_OLD_HH
// **********************************************************************
//
// This file is for backward compatibility. The header file for the
// internal QPDFObject class (not part of the public API) is in
// QPDFObject_private.hh (not installed).
//
// **********************************************************************
// ABI: in qpdf 12, leave this file in place and have it generate an // ABI: in qpdf 12, leave this file in place and have it generate an
// error. This is to prevent someone from being able to successfully // error. This is to prevent someone from being able to successfully
// include this file and get a copy from a previous installation // include this file and get a copy from a previous installation
// thereby accidentally creating sources depend on having an older // thereby accidentally creating sources depend on having an older
// version installed. // version installed. When enough time has passed, this file can be
// removed, and libqpdf/qpdf/QPDFObject_private.hh can be renamed to
// libqpdf/qpdf/QPDFObject.hh.
#ifndef QPDF_OBJECT_NOWARN #ifndef QPDF_OBJECT_NOWARN
// ABI: remove this file in qpdf 12 // ABI: remove this file in qpdf 12
@ -66,4 +76,4 @@ class QPDFObject
QPDFObject& operator=(QPDFObject const&) = delete; QPDFObject& operator=(QPDFObject const&) = delete;
}; };
#endif // QPDFOBJECT_HH #endif // QPDFOBJECT_OLD_HH

2
libqpdf/CMakeLists.txt
View File

@ -72,6 +72,7 @@ set(libqpdf_SOURCES
QPDFMatrix.cc QPDFMatrix.cc
QPDFNameTreeObjectHelper.cc QPDFNameTreeObjectHelper.cc
QPDFNumberTreeObjectHelper.cc QPDFNumberTreeObjectHelper.cc
QPDFObject.cc
QPDFObjectHandle.cc QPDFObjectHandle.cc
QPDFObjGen.cc QPDFObjGen.cc
QPDFOutlineDocumentHelper.cc QPDFOutlineDocumentHelper.cc
@ -85,7 +86,6 @@ set(libqpdf_SOURCES
QPDFTokenizer.cc QPDFTokenizer.cc
QPDFUsage.cc QPDFUsage.cc
QPDFValue.cc QPDFValue.cc
QPDFValueProxy.cc
QPDFWriter.cc QPDFWriter.cc
QPDFXRefEntry.cc QPDFXRefEntry.cc
QPDF_Array.cc QPDF_Array.cc

2
libqpdf/QPDF.cc
View File

@ -21,7 +21,7 @@
#include <qpdf/Pl_OStream.hh> #include <qpdf/Pl_OStream.hh>
#include <qpdf/QPDFExc.hh> #include <qpdf/QPDFExc.hh>
#include <qpdf/QPDFLogger.hh> #include <qpdf/QPDFLogger.hh>
#include <qpdf/QPDFValueProxy.hh> #include <qpdf/QPDFObject_private.hh>
#include <qpdf/QPDF_Array.hh> #include <qpdf/QPDF_Array.hh>
#include <qpdf/QPDF_Dictionary.hh> #include <qpdf/QPDF_Dictionary.hh>
#include <qpdf/QPDF_Null.hh> #include <qpdf/QPDF_Null.hh>

2
libqpdf/QPDFValueProxy.cc → libqpdf/QPDFObject.cc
View File

@ -1,4 +1,4 @@
#include <qpdf/QPDFValueProxy.hh> #include <qpdf/QPDFObject_private.hh>
#include <qpdf/QPDF.hh> #include <qpdf/QPDF.hh>
#include <qpdf/QPDF_Destroyed.hh> #include <qpdf/QPDF_Destroyed.hh>

2
libqpdf/QPDFObjectHandle.cc
View File

@ -7,9 +7,9 @@
#include <qpdf/QPDFExc.hh> #include <qpdf/QPDFExc.hh>
#include <qpdf/QPDFLogger.hh> #include <qpdf/QPDFLogger.hh>
#include <qpdf/QPDFMatrix.hh> #include <qpdf/QPDFMatrix.hh>
#include <qpdf/QPDFObject_private.hh>
#include <qpdf/QPDFPageObjectHelper.hh> #include <qpdf/QPDFPageObjectHelper.hh>
#include <qpdf/QPDFParser.hh> #include <qpdf/QPDFParser.hh>
#include <qpdf/QPDFValueProxy.hh>
#include <qpdf/QPDF_Array.hh> #include <qpdf/QPDF_Array.hh>
#include <qpdf/QPDF_Bool.hh> #include <qpdf/QPDF_Bool.hh>
#include <qpdf/QPDF_Dictionary.hh> #include <qpdf/QPDF_Dictionary.hh>

2
libqpdf/QPDFValue.cc
View File

@ -1,6 +1,6 @@
#include <qpdf/QPDFValue.hh> #include <qpdf/QPDFValue.hh>
#include <qpdf/QPDFValueProxy.hh> #include <qpdf/QPDFObject_private.hh>
std::shared_ptr<QPDFValueProxy> std::shared_ptr<QPDFValueProxy>
QPDFValue::do_create(QPDFValue* object) QPDFValue::do_create(QPDFValue* object)

10
libqpdf/qpdf/QPDFValueProxy.hh → libqpdf/qpdf/QPDFObject_private.hh
View File

@ -1,5 +1,9 @@
#ifndef QPDFVALUEPROXY_HH #ifndef QPDFOBJECT_HH
#define QPDFVALUEPROXY_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/Constants.h>
#include <qpdf/DLL.h> #include <qpdf/DLL.h>
@ -149,4 +153,4 @@ class QPDFValueProxy
std::shared_ptr<QPDFValue> value; std::shared_ptr<QPDFValue> value;
}; };
#endif // QPDFVALUEPROXY_HH #endif // QPDFOBJECT_HH