Add operator ""_qpdf for creating QPDFObjectHandle literals

7 files changed, 13 insertions, 12 deletions

diff --git a/libqpdf/QPDFFormFieldObjectHelper.cc b/libqpdf/QPDFFormFieldObjectHelper.cc
index d6d8f562..2702ebcf 100644
--- a/libqpdf/QPDFFormFieldObjectHelper.cc
+++ b/libqpdf/QPDFFormFieldObjectHelper.cc
@@ -981,8 +981,7 @@ QPDFFormFieldObjectHelper::generateTextAppearance(
                 AS.getDict().replaceKey("/Resources", resources);
             }
             // Use mergeResources to force /Font to be local
-            resources.mergeResources(
-                QPDFObjectHandle::parse("<< /Font << >> >>"));
+            resources.mergeResources("<< /Font << >> >>"_qpdf);
             resources.getKey("/Font").replaceKey(font_name, font);
         }
 
diff --git a/libqpdf/QPDFJob.cc b/libqpdf/QPDFJob.cc
index 646692d5..362db7c2 100644
--- a/libqpdf/QPDFJob.cc
+++ b/libqpdf/QPDFJob.cc
@@ -2281,8 +2281,7 @@ QPDFJob::doUnderOverlayForPage(
             from_page, cm, dest_afdh, make_afdh(from_page));
         if (! new_content.empty())
         {
-            resources.mergeResources(
-                QPDFObjectHandle::parse("<< /XObject << >> >>"));
+            resources.mergeResources("<< /XObject << >> >>"_qpdf);
             auto xobject = resources.getKey("/XObject");
             if (xobject.isDictionary())
             {
diff --git a/libqpdf/QPDFNameTreeObjectHelper.cc b/libqpdf/QPDFNameTreeObjectHelper.cc
index d39a8d86..861e01aa 100644
--- a/libqpdf/QPDFNameTreeObjectHelper.cc
+++ b/libqpdf/QPDFNameTreeObjectHelper.cc
@@ -61,8 +61,7 @@ QPDFNameTreeObjectHelper
 QPDFNameTreeObjectHelper::newEmpty(QPDF& qpdf, bool auto_repair)
 {
     return QPDFNameTreeObjectHelper(
-        qpdf.makeIndirectObject(
-            QPDFObjectHandle::parse("<< /Names [] >>")), qpdf, auto_repair);
+        qpdf.makeIndirectObject("<< /Names [] >>"_qpdf), qpdf, auto_repair);
 }
 
 QPDFNameTreeObjectHelper::iterator::iterator(
diff --git a/libqpdf/QPDFNumberTreeObjectHelper.cc b/libqpdf/QPDFNumberTreeObjectHelper.cc
index a8dba0ef..0f61874d 100644
--- a/libqpdf/QPDFNumberTreeObjectHelper.cc
+++ b/libqpdf/QPDFNumberTreeObjectHelper.cc
@@ -58,8 +58,7 @@ QPDFNumberTreeObjectHelper
 QPDFNumberTreeObjectHelper::newEmpty(QPDF& qpdf, bool auto_repair)
 {
     return QPDFNumberTreeObjectHelper(
-        qpdf.makeIndirectObject(
-            QPDFObjectHandle::parse("<< /Nums [] >>")), qpdf, auto_repair);
+        qpdf.makeIndirectObject("<< /Nums [] >>"_qpdf), qpdf, auto_repair);
 }
 
 QPDFNumberTreeObjectHelper::iterator::iterator(
diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index d754448f..2e9bf48b 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -3666,3 +3666,10 @@ QPDFObjectHandle::QPDFArrayItems::end()
 {
     return iterator(oh, false);
 }
+
+QPDFObjectHandle
+operator ""_qpdf(char const* v, size_t len)
+{
+    return QPDFObjectHandle::parse(
+        std::string(v, len), "QPDFObjectHandle literal");
+}
diff --git a/libqpdf/QPDFPageDocumentHelper.cc b/libqpdf/QPDFPageDocumentHelper.cc
index ab9875a9..e76c874f 100644
--- a/libqpdf/QPDFPageDocumentHelper.cc
+++ b/libqpdf/QPDFPageDocumentHelper.cc
@@ -161,8 +161,7 @@ QPDFPageDocumentHelper::flattenAnnotationsForPage(
                 name, rotate, required_flags, forbidden_flags);
             if (! content.empty())
             {
-                resources.mergeResources(
-                    QPDFObjectHandle::parse("<< /XObject << >> >>"));
+                resources.mergeResources("<< /XObject << >> >>"_qpdf);
                 resources.getKey("/XObject").replaceKey(name, as);
                 ++next_fx;
             }
diff --git a/libqpdf/QPDFPageObjectHelper.cc b/libqpdf/QPDFPageObjectHelper.cc
index 0dd6d894..ab806c7f 100644
--- a/libqpdf/QPDFPageObjectHelper.cc
+++ b/libqpdf/QPDFPageObjectHelper.cc
@@ -500,8 +500,7 @@ QPDFPageObjectHelper::externalizeInlineImages(size_t min_size, bool shallow)
         QPDFObjectHandle resources = getAttribute("/Resources", true);
         // Calling mergeResources also ensures that /XObject becomes
         // direct and is not shared with other pages.
-        resources.mergeResources(
-            QPDFObjectHandle::parse("<< /XObject << >> >>"));
+        resources.mergeResources("<< /XObject << >> >>"_qpdf);
         InlineImageTracker iit(this->oh.getOwningQPDF(), min_size, resources);
         Pl_Buffer b("new page content");
         bool filtered = false;