[poppler] 2 commits - qt4/src

[Albert Astals Cid]

 qt4/src/poppler-form.cc |   12 +++++++++++-
 qt4/src/poppler-form.h  |    8 +++++++-
 qt4/src/poppler-qt4.h   |    3 ++-
 3 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 7a7c932e09796b944dda69df1b339c889ee1d63a
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Aug 25 00:23:40 2011 +0200

    Add a way to get the fully qualified name

diff --git a/qt4/src/poppler-form.cc b/qt4/src/poppler-form.cc
index dffaed5..01716f4 100644
--- a/qt4/src/poppler-form.cc
+++ b/qt4/src/poppler-form.cc
@@ -1,6 +1,6 @@
 /* poppler-form.h: qt4 interface to poppler
  * Copyright (C) 2007-2008, 2011, Pino Toscano <pino at kde.org>
- * Copyright (C) 2008, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2008, 2011, Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2011 Carlos Garcia Campos <carlosgc at gnome.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -134,6 +134,16 @@ QString FormField::name() const
   return name;
 }
 
+QString FormField::fullyQualifiedName() const
+{
+  QString name;
+  if (GooString *goo = m_formData->fm->getFullyQualifiedName())
+  {
+    name = QString::fromLatin1(goo->getCString());
+  }
+  return name;
+}
+
 QString FormField::uiName() const
 {
   QString name;
diff --git a/qt4/src/poppler-form.h b/qt4/src/poppler-form.h
index 0412bab..9af367b 100644
--- a/qt4/src/poppler-form.h
+++ b/qt4/src/poppler-form.h
@@ -1,6 +1,6 @@
 /* poppler-form.h: qt4 interface to poppler
  * Copyright (C) 2007-2008, Pino Toscano <pino at kde.org>
- * Copyright (C) 2008, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2008, 2011, Albert Astals Cid <aacid at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -76,6 +76,12 @@ namespace Poppler {
 	  The internal name of the field.
 	 */
 	QString name() const;
+	
+	/**
+	  The internal fully qualified name of the field.
+	  \since 0.18
+	 */
+	QString fullyQualifiedName() const;
 
 	/**
 	  The name of the field to be used in user interface (eg messages to
commit e001871d927f9cc86b4327d64e4c66ad00172ad0
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Aug 24 23:44:18 2011 +0200

    Clarify ownership

diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h
index 515f34b..611450a 100644
--- a/qt4/src/poppler-qt4.h
+++ b/qt4/src/poppler-qt4.h
@@ -1,7 +1,7 @@
 /* poppler-qt.h: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
  * Copyright (C) 2005, 2007, Brad Hards <bradh at frogmouth.net>
- * Copyright (C) 2005-2010, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2005-2011, Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2005, Stefan Kebekus <stefan.kebekus at math.uni-koeln.de>
  * Copyright (C) 2006-2011, Pino Toscano <pino at kde.org>
  * Copyright (C) 2009 Shawn Rutledge <shawn.t.rutledge at gmail.com>
@@ -678,6 +678,7 @@ delete it;
 
 	/**
 	 Returns the form fields on the page
+	 The caller gets the ownership of the returned objects.
 
 	 \since 0.6
 	*/