Add separate FUTURE header file for QPDFObjectHandle

include/qpdf/QPDFObjectHandle.hh

@@ -22,23 +22,27 @@
 #ifndef QPDFOBJECTHANDLE_HH
 #define QPDFOBJECTHANDLE_HH
 
-#include <qpdf/Constants.h>
-#include <qpdf/DLL.h>
-#include <qpdf/Types.h>
+#ifdef QPDF_FUTURE
+# include <qpdf/QPDFObjectHandle_future.hh>
+#else
 
-#include <functional>
-#include <map>
-#include <memory>
-#include <set>
-#include <string>
-#include <vector>
+# include <qpdf/Constants.h>
+# include <qpdf/DLL.h>
+# include <qpdf/Types.h>
 
-#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>
+# include <functional>
+# include <map>
+# include <memory>
+# include <set>
+# include <string>
+# 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 QPDF;
@@ -291,13 +295,6 @@ class QPDFObjectHandle
     QPDF_DLL
     QPDFObjectHandle& operator=(QPDFObjectHandle const&) = default;
 
-#ifdef QPDF_FUTURE
-    QPDF_DLL
-    QPDFObjectHandle(QPDFObjectHandle&&) = default;
-    QPDF_DLL
-    QPDFObjectHandle& operator=(QPDFObjectHandle&&) = default;
-#endif
-
     QPDF_DLL
     inline bool isInitialized() const;
 
@@ -1399,7 +1396,7 @@ class QPDFObjectHandle
     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
 
 // auto oh = "<< /Key (value) >>"_qpdf;
@@ -1415,7 +1412,7 @@ QPDF_DLL
 QPDFObjectHandle operator ""_qpdf(char const* v, size_t len);
 /* clang-format on */
 
-#endif // QPDF_NO_QPDF_STRING
+# endif // QPDF_NO_QPDF_STRING
 
 class QPDFObjectHandle::QPDFDictItems
 {
@@ -1637,4 +1634,5 @@ QPDFObjectHandle::isInitialized() const
     return obj != nullptr;
 }
 
+#endif // QPDF_FUTURE
 #endif // QPDFOBJECTHANDLE_HH