Make GooList a template type

One more step towards getting rid of it completely.

3 files changed, 8 insertions, 7 deletions

diff --git a/cpp/poppler-font.cpp b/cpp/poppler-font.cpp
index d6daf394..4fceb300 100644
--- a/cpp/poppler-font.cpp
+++ b/cpp/poppler-font.cpp
@@ -217,7 +217,7 @@ std::vector<font_info> font_iterator::next()
 
     ++d->current_page;
 
-    GooList *items = d->font_info_scanner.scan(1);
+    GooList<FontInfo*> *items = d->font_info_scanner.scan(1);
     if (!items) {
         return std::vector<font_info>();
     }
@@ -225,7 +225,7 @@ std::vector<font_info> font_iterator::next()
     for (std::size_t i = 0; i < items->size(); ++i) {
         fonts[i] = font_info(*new font_info_private((FontInfo *)items->get(i)));
     }
-    deleteGooList<FontInfo>(items);
+    deleteGooList<FontInfo*>(items);
     return fonts;
 }
 
diff --git a/cpp/poppler-toc-private.h b/cpp/poppler-toc-private.h
index a8ea8630..8560ca36 100644
--- a/cpp/poppler-toc-private.h
+++ b/cpp/poppler-toc-private.h
@@ -25,7 +25,8 @@
 
 #include <vector>
 
-class GooList;
+#include "goo/GooList.h"
+
 class Outline;
 class OutlineItem;
 
@@ -54,7 +55,7 @@ public:
     toc_item_private& operator=(const toc_item_private &) = delete;
 
     void load(const OutlineItem *item);
-    void load_children(const GooList *items);
+    void load_children(const GooList<OutlineItem*> *items);
 
     std::vector<toc_item*> children;
     ustring title;
diff --git a/cpp/poppler-toc.cpp b/cpp/poppler-toc.cpp
index 666c650d..091b34cb 100644
--- a/cpp/poppler-toc.cpp
+++ b/cpp/poppler-toc.cpp
@@ -44,7 +44,7 @@ toc* toc_private::load_from_outline(Outline *outline)
         return nullptr;
     }
 
-    const GooList *items = outline->getItems();
+    const GooList<OutlineItem*> *items = outline->getItems();
     if (!items || items->size() < 1) {
         return nullptr;
     }
@@ -74,7 +74,7 @@ void toc_item_private::load(const OutlineItem *item)
     is_open = item->isOpen();
 }
 
-void toc_item_private::load_children(const GooList *items)
+void toc_item_private::load_children(const GooList<OutlineItem*> *items)
 {
     const int num_items = items->size();
     children.resize(num_items);
@@ -86,7 +86,7 @@ void toc_item_private::load_children(const GooList *items)
         children[i] = new_item;
 
         item->open();
-        const GooList *item_children = item->getKids();
+        const GooList<OutlineItem*> *item_children = item->getKids();
         if (item_children) {
             new_item->d->load_children(item_children);
         }