Move QPDF_Name static methods to new class Name

m-holger
1 parent ab019a96
Showing 6 changed files with 33 additions and 25 deletions
libqpdf/ContentNormalizer.cc
libqpdf/QPDFWriter.cc
libqpdf/QPDF_Dictionary.cc
libqpdf/QPDF_Name.cc
libqpdf/qpdf/QPDFObjectHandle_private.hh
libqpdf/qpdf/QPDF_Name.hh
 #include <qpdf/ContentNormalizer.hh>
-#include <qpdf/QPDF_Name.hh>
+#include <qpdf/QPDFObjectHandle_private.hh>
 #include <qpdf/QUtil.hh>
+using namespace qpdf;
+
 ContentNormalizer::ContentNormalizer() :
     any_bad_tokens(false),
     last_token_was_bad(false)
@@ -55,7 +57,7 @@ ContentNormalizer::handleToken(QPDFTokenizer::Token const&amp; token)
         break;
     case QPDFTokenizer::tt_name:
-        write(QPDF_Name::normalizeName(token.getValue()));
+        write(Name::normalize(token.getValue()));
         break;
     default:
@@ -15,7 +15,7 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QIntC.hh>
 #include <qpdf/QPDF.hh>
-#include <qpdf/QPDFObjectHandle.hh>
+#include <qpdf/QPDFObjectHandle_private.hh>
 #include <qpdf/QPDF_Name.hh>
 #include <qpdf/QPDF_String.hh>
 #include <qpdf/QTC.hh>
@@ -27,6 +27,7 @@
 #include <stdexcept>
 using namespace std::literals;
+using namespace qpdf;
 QPDFWriter::ProgressReporter::~ProgressReporter() // NOLINT (modernize-use-equals-default)
 {
@@ -1176,7 +1177,7 @@ QPDFWriter::writeTrailer(
         for (auto const& key: trailer.getKeys()) {
             writeStringQDF("  ");
             writeStringNoQDF(" ");
-            writeString(QPDF_Name::normalizeName(key));
+            writeString(Name::normalize(key));
             writeString(" ");
             if (key == "/Size") {
                 writeString(std::to_string(size));
@@ -1503,7 +1504,7 @@ QPDFWriter::unparseObject(
                 auto const& key = item.first;
                 writeString(indent);
                 writeStringQDF("  ");
-                writeString(QPDF_Name::normalizeName(key));
+                writeString(Name::normalize(key));
                 writeString(" ");
                 if (key == "/Contents" && object.isDictionaryOfType("/Sig") &&
                     object.hasKey("/ByteRange")) {
@@ -63,7 +63,7 @@ QPDF_Dictionary::unparse()
     std::string result = "<< ";
     for (auto& iter: this->items) {
         if (!iter.second.isNull()) {
-            result += QPDF_Name::normalizeName(iter.first) + " " + iter.second.unparse() + " ";
+            result += Name::normalize(iter.first) + " " + iter.second.unparse() + " ";
         }
     }
     result += ">>";
@@ -78,17 +78,15 @@ QPDF_Dictionary::writeJSON(int json_version, JSON::Writer&amp; p)
         if (!iter.second.isNull()) {
             p.writeNext();
             if (json_version == 1) {
-                p << "\"" << JSON::Writer::encode_string(QPDF_Name::normalizeName(iter.first))
-                  << "\": ";
-            } else if (auto res = QPDF_Name::analyzeJSONEncoding(iter.first); res.first) {
+                p << "\"" << JSON::Writer::encode_string(Name::normalize(iter.first)) << "\": ";
+            } else if (auto res = Name::analyzeJSONEncoding(iter.first); res.first) {
                 if (res.second) {
                     p << "\"" << iter.first << "\": ";
                 } else {
                     p << "\"" << JSON::Writer::encode_string(iter.first) << "\": ";
                 }
             } else {
-                p << "\"n:" << JSON::Writer::encode_string(QPDF_Name::normalizeName(iter.first))
-                  << "\": ";
+                p << "\"n:" << JSON::Writer::encode_string(Name::normalize(iter.first)) << "\": ";
             }
             iter.second.writeJSON(json_version, p);
         }
 #include <qpdf/QPDF_Name.hh>
 #include <qpdf/JSON_writer.hh>
+#include <qpdf/QPDFObjectHandle_private.hh>
 #include <qpdf/QUtil.hh>
+using namespace qpdf;
+
 QPDF_Name::QPDF_Name(std::string const& name) :
     QPDFValue(::ot_name),
     name(name)
@@ -22,7 +25,7 @@ QPDF_Name::copy(bool shallow)
 }
 std::string
-QPDF_Name::normalizeName(std::string const& name)
+Name::normalize(std::string const& name)
 {
     if (name.empty()) {
         return name;
@@ -49,11 +52,11 @@ QPDF_Name::normalizeName(std::string const&amp; name)
 std::string
 QPDF_Name::unparse()
 {
-    return normalizeName(this->name);
+    return Name::normalize(name);
 }
 std::pair<bool, bool>
-QPDF_Name::analyzeJSONEncoding(const std::string& name)
+Name::analyzeJSONEncoding(const std::string& name)
 {
     int tail = 0;       // Number of continuation characters expected.
     bool tail2 = false; // Potential overlong 3 octet utf-8.
@@ -105,16 +108,16 @@ QPDF_Name::writeJSON(int json_version, JSON::Writer&amp; p)
     // For performance reasons this code is duplicated in QPDF_Dictionary::writeJSON. When updating
     // this method make sure QPDF_Dictionary is also update.
     if (json_version == 1) {
-        p << "\"" << JSON::Writer::encode_string(normalizeName(name)) << "\"";
+        p << "\"" << JSON::Writer::encode_string(Name::normalize(name)) << "\"";
     } else {
-        if (auto res = analyzeJSONEncoding(name); res.first) {
+        if (auto res = Name::analyzeJSONEncoding(name); res.first) {
             if (res.second) {
                 p << "\"" << name << "\"";
             } else {
                 p << "\"" << JSON::Writer::encode_string(name) << "\"";
             }
         } else {
-            p << "\"n:" << JSON::Writer::encode_string(normalizeName(name)) << "\"";
+            p << "\"n:" << JSON::Writer::encode_string(Name::normalize(name)) << "\"";
         }
     }
 }
@@ -81,6 +81,18 @@ namespace qpdf
         }
     };
+    class Name final: public BaseHandle
+    {
+      public:
+        // Put # into strings with characters unsuitable for name token
+        static std::string normalize(std::string const& name);
+
+        // Check whether name is valid utf-8 and whether it contains characters that require
+        // escaping. Return {false, false} if the name is not valid utf-8, otherwise return {true,
+        // true} if no characters require or {true, false} if escaping is required.
+        static std::pair<bool, bool> analyzeJSONEncoding(std::string const& name);
+    };
+
     class Stream final: public BaseHandle
     {
       public:
@@ -11,14 +11,6 @@ class QPDF_Name: public QPDFValue
     std::shared_ptr<QPDFObject> copy(bool shallow = false) override;
     std::string unparse() override;
     void writeJSON(int json_version, JSON::Writer& p) override;
-
-    // Put # into strings with characters unsuitable for name token
-    static std::string normalizeName(std::string const& name);
-
-    // Check whether name is valid utf-8 and whether it contains characters that require escaping.
-    // Return {false, false} if the name is not valid utf-8, otherwise return {true, true} if no
-    // characters require or {true, false} if escaping is required.
-    static std::pair<bool, bool> analyzeJSONEncoding(std::string const& name);
     std::string
     getStringValue() const override
     {