Merge Link and AnnotLink code

Annotations now belong to the Page and are created only once on demand.
Annots are now ref counted and Links is a list of AnnotLink objects,
Link object has been removed. The AnnotLink API is mostly the same than
Link and frontends APIs are not affected.
Qt4 changes made by Pino Toscano.

1 files changed, 2 insertions, 2 deletions

diff --git a/poppler/OutputDev.h b/poppler/OutputDev.h
index 65cfa2da..31767d0c 100644
--- a/poppler/OutputDev.h
+++ b/poppler/OutputDev.h
@@ -55,7 +55,7 @@ class GfxGouraudTriangleShading;
 class GfxPatchMeshShading;
 class Stream;
 class Links;
-class Link;
+class AnnotLink;
 class Catalog;
 class Page;
 class Function;
@@ -304,7 +304,7 @@ public:
   virtual void clearSoftMask(GfxState * /*state*/) {}
 
   //----- links
-  virtual void processLink(Link * /*link*/, Catalog * /*catalog*/) {}
+  virtual void processLink(AnnotLink * /*link*/, Catalog * /*catalog*/) {}
 
 #if 1 //~tmp: turn off anti-aliasing temporarily
   virtual GBool getVectorAntialias() { return gFalse; }