[poppler] Branch 'poppler-0.8' - qt4/src

[Albert Astals Cid]

 qt4/src/poppler-page.cc |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9aac60540cb1cc3786cf937e16e3d70edc92dcb6
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon May 26 22:13:38 2008 +0200

    Do not shadow a paramer with a local variable name

diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc
index 429702f..86b4c5c 100644
--- a/qt4/src/poppler-page.cc
+++ b/qt4/src/poppler-page.cc
@@ -410,14 +410,14 @@ Link *Page::action( PageAction act ) const
     Object o2;
     const char *key = act == Page::Opening ? "O" : "C";
     dict->lookup((char*)key, &o2);
-    ::LinkAction *act = ::LinkAction::parseAction(&o2, m_page->parentDoc->doc->getCatalog()->getBaseURI() );
+    ::LinkAction *lact = ::LinkAction::parseAction(&o2, m_page->parentDoc->doc->getCatalog()->getBaseURI() );
     o2.free();
     o.free();
     Link *popplerLink = NULL;
-    if (act != NULL)
+    if (lact != NULL)
     {
-      popplerLink = m_page->convertLinkActionToLink(act, QRectF());
-      delete act;
+      popplerLink = m_page->convertLinkActionToLink(lact, QRectF());
+      delete lact;
     }
     return popplerLink;
   }