Convert command-line and test suite to use page helper classes

This provides better test coverage and more useful code for people to
read and copy.

1 files changed, 5 insertions, 2 deletions

diff --git a/qpdf/test_tokenizer.cc b/qpdf/test_tokenizer.cc
index 955af1ec..9f65281b 100644
--- a/qpdf/test_tokenizer.cc
+++ b/qpdf/test_tokenizer.cc
@@ -1,4 +1,6 @@
 #include <qpdf/QPDFTokenizer.hh>
+#include <qpdf/QPDFPageDocumentHelper.hh>
+#include <qpdf/QPDFPageObjectHelper.hh>
 #include <qpdf/QUtil.hh>
 #include <qpdf/FileInputSource.hh>
 #include <qpdf/BufferInputSource.hh>
@@ -206,9 +208,10 @@ static void process(char const* filename, bool include_ignorable,
     // Tokenize content streams, skipping inline images
     QPDF qpdf;
     qpdf.processFile(filename);
-    std::vector<QPDFObjectHandle> pages = qpdf.getAllPages();
+    std::vector<QPDFPageObjectHelper> pages =
+        QPDFPageDocumentHelper(qpdf).getAllPages();
     int pageno = 0;
-    for (std::vector<QPDFObjectHandle>::iterator iter = pages.begin();
+    for (std::vector<QPDFPageObjectHelper>::iterator iter = pages.begin();
          iter != pages.end(); ++iter)
     {
         ++pageno;