2
1
mirror of https://github.com/qpdf/qpdf.git synced 2024-11-09 23:00:57 +00:00

Add separate FUTURE header file for QPDFObjectHandle

This commit is contained in:
m-holger 2024-06-17 13:57:21 +01:00
parent 9641626cae
commit f49f43fed1
2 changed files with 1659 additions and 24 deletions

View File

@ -22,23 +22,27 @@
#ifndef QPDFOBJECTHANDLE_HH #ifndef QPDFOBJECTHANDLE_HH
#define QPDFOBJECTHANDLE_HH #define QPDFOBJECTHANDLE_HH
#include <qpdf/Constants.h> #ifdef QPDF_FUTURE
#include <qpdf/DLL.h> # include <qpdf/QPDFObjectHandle_future.hh>
#include <qpdf/Types.h> #else
#include <functional> # include <qpdf/Constants.h>
#include <map> # include <qpdf/DLL.h>
#include <memory> # include <qpdf/Types.h>
#include <set>
#include <string>
#include <vector>
#include <qpdf/Buffer.hh> # include <functional>
#include <qpdf/InputSource.hh> # include <map>
#include <qpdf/JSON.hh> # include <memory>
#include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785) # include <set>
#include <qpdf/QPDFObjGen.hh> # include <string>
#include <qpdf/QPDFTokenizer.hh> # include <vector>
# include <qpdf/Buffer.hh>
# include <qpdf/InputSource.hh>
# include <qpdf/JSON.hh>
# include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
# include <qpdf/QPDFObjGen.hh>
# include <qpdf/QPDFTokenizer.hh>
class Pipeline; class Pipeline;
class QPDF; class QPDF;
@ -291,13 +295,6 @@ class QPDFObjectHandle
QPDF_DLL QPDF_DLL
QPDFObjectHandle& operator=(QPDFObjectHandle const&) = default; QPDFObjectHandle& operator=(QPDFObjectHandle const&) = default;
#ifdef QPDF_FUTURE
QPDF_DLL
QPDFObjectHandle(QPDFObjectHandle&&) = default;
QPDF_DLL
QPDFObjectHandle& operator=(QPDFObjectHandle&&) = default;
#endif
QPDF_DLL QPDF_DLL
inline bool isInitialized() const; inline bool isInitialized() const;
@ -1399,7 +1396,7 @@ class QPDFObjectHandle
std::shared_ptr<QPDFObject> obj; std::shared_ptr<QPDFObject> obj;
}; };
#ifndef QPDF_NO_QPDF_STRING # ifndef QPDF_NO_QPDF_STRING
// This is short for QPDFObjectHandle::parse, so you can do // This is short for QPDFObjectHandle::parse, so you can do
// auto oh = "<< /Key (value) >>"_qpdf; // auto oh = "<< /Key (value) >>"_qpdf;
@ -1415,7 +1412,7 @@ QPDF_DLL
QPDFObjectHandle operator ""_qpdf(char const* v, size_t len); QPDFObjectHandle operator ""_qpdf(char const* v, size_t len);
/* clang-format on */ /* clang-format on */
#endif // QPDF_NO_QPDF_STRING # endif // QPDF_NO_QPDF_STRING
class QPDFObjectHandle::QPDFDictItems class QPDFObjectHandle::QPDFDictItems
{ {
@ -1637,4 +1634,5 @@ QPDFObjectHandle::isInitialized() const
return obj != nullptr; return obj != nullptr;
} }
#endif // QPDF_FUTURE
#endif // QPDFOBJECTHANDLE_HH #endif // QPDFOBJECTHANDLE_HH

File diff suppressed because it is too large Load Diff