diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2022-09-01 23:39:52 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2022-09-02 00:11:22 +0200 |
| commit | b66392653871f834d7b78aa423ca279e4828951a (patch) | |
| tree | eb3929bfa0936c67a7153b5585d69762c5be8b8e /qpdf | |
| parent | a47b99953f503ea028abc3bb48c72b006bb2289a (diff) | |
| download | qpdf-b66392653871f834d7b78aa423ca279e4828951a.tar.zst | |
Remove QPDFObject::object_type_e as alias for qpdf_object_type_e
Diffstat (limited to 'qpdf')
| -rw-r--r-- | qpdf/test_driver.cc | 4 | ||||
| -rw-r--r-- | qpdf/test_renumber.cc | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc index 5572e824..095543c1 100644 --- a/qpdf/test_driver.cc +++ b/qpdf/test_driver.cc @@ -103,7 +103,7 @@ ParserCallbacks::handleObject( << ", length=" << length << ": "; if (obj.isInlineImage()) { // Exercise getTypeCode - assert(obj.getTypeCode() == QPDFObject::ot_inlineimage); + assert(obj.getTypeCode() == ::ot_inlineimage); std::cout << QUtil::hex_encode(obj.getInlineImageValue()) << std::endl; } else { std::cout << obj.unparse() << std::endl; @@ -3296,7 +3296,7 @@ runtest(int n, char const* filename1, char const* arg2) assert(password == "1234567890123456789012(45678"); QPDFObjectHandle uninitialized; - assert(uninitialized.getTypeCode() == QPDFObject::ot_uninitialized); + assert(uninitialized.getTypeCode() == ::ot_uninitialized); assert(strcmp(uninitialized.getTypeName(), "uninitialized") == 0); } diff --git a/qpdf/test_renumber.cc b/qpdf/test_renumber.cc index 206ef49a..1ef519d6 100644 --- a/qpdf/test_renumber.cc +++ b/qpdf/test_renumber.cc @@ -40,37 +40,37 @@ compare(QPDFObjectHandle a, QPDFObjectHandle b) } switch (a.getTypeCode()) { - case QPDFObject::ot_boolean: + case ::ot_boolean: if (a.getBoolValue() != b.getBoolValue()) { std::cerr << "different boolean" << std::endl; return false; } break; - case QPDFObject::ot_integer: + case ::ot_integer: if (a.getIntValue() != b.getIntValue()) { std::cerr << "different integer" << std::endl; return false; } break; - case QPDFObject::ot_real: + case ::ot_real: if (a.getRealValue() != b.getRealValue()) { std::cerr << "different real" << std::endl; return false; } break; - case QPDFObject::ot_string: + case ::ot_string: if (a.getStringValue() != b.getStringValue()) { std::cerr << "different string" << std::endl; return false; } break; - case QPDFObject::ot_name: + case ::ot_name: if (a.getName() != b.getName()) { std::cerr << "different name" << std::endl; return false; } break; - case QPDFObject::ot_array: + case ::ot_array: { std::vector<QPDFObjectHandle> objs_a = a.getArrayAsVector(); std::vector<QPDFObjectHandle> objs_b = b.getArrayAsVector(); @@ -88,7 +88,7 @@ compare(QPDFObjectHandle a, QPDFObjectHandle b) } } break; - case QPDFObject::ot_dictionary: + case ::ot_dictionary: { std::set<std::string> keys_a = a.getKeys(); std::set<std::string> keys_b = b.getKeys(); @@ -105,9 +105,9 @@ compare(QPDFObjectHandle a, QPDFObjectHandle b) } } break; - case QPDFObject::ot_null: + case ::ot_null: break; - case QPDFObject::ot_stream: + case ::ot_stream: std::cout << "stream objects are not compared" << std::endl; break; default: |