[poppler] Branch 'qt5' - qt5/src

[Albert Astals Cid]

 qt5/src/poppler-converter-private.h    |    6 +++---
 qt5/src/poppler-embeddedfile-private.h |    2 +-
 qt5/src/poppler-form.cc                |    2 +-
 qt5/src/poppler-form.h                 |    6 +++---
 qt5/src/poppler-pdf-converter.cc       |    2 +-
 qt5/src/poppler-private.cc             |    4 ++--
 qt5/src/poppler-private.h              |    2 +-
 qt5/src/poppler-qt5.h                  |    2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 2e2ea27fe3dc688c87003d170b82451a6a872b0d
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Jun 17 00:22:18 2013 +0200

    Remove qt4 mentions

diff --git a/qt5/src/poppler-converter-private.h b/qt5/src/poppler-converter-private.h
index dc3e943..1340d35 100644
--- a/qt5/src/poppler-converter-private.h
+++ b/qt5/src/poppler-converter-private.h
@@ -1,4 +1,4 @@
-/* poppler-converter-private.h: Qt4 interface to poppler
+/* poppler-converter-private.h: Qt interface to poppler
  * Copyright (C) 2007, 2009, Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2008, Pino Toscano <pino at kde.org>
  *
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef POPPLER_QT4_CONVERTER_PRIVATE_H
-#define POPPLER_QT4_CONVERTER_PRIVATE_H
+#ifndef POPPLER_QT5_CONVERTER_PRIVATE_H
+#define POPPLER_QT5_CONVERTER_PRIVATE_H
 
 #include <QtCore/QString>
 
diff --git a/qt5/src/poppler-embeddedfile-private.h b/qt5/src/poppler-embeddedfile-private.h
index 83549da..ff1388e 100644
--- a/qt5/src/poppler-embeddedfile-private.h
+++ b/qt5/src/poppler-embeddedfile-private.h
@@ -1,4 +1,4 @@
-/* poppler-embeddedfile-private.h: Qt4 interface to poppler
+/* poppler-embeddedfile-private.h: Qt interface to poppler
  * Copyright (C) 2005, 2008, 2009, 2012, Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2005, Brad Hards <bradh at frogmouth.net>
  * Copyright (C) 2008, 2011, Pino Toscano <pino at kde.org>
diff --git a/qt5/src/poppler-form.cc b/qt5/src/poppler-form.cc
index 08d2eac..4be0482 100644
--- a/qt5/src/poppler-form.cc
+++ b/qt5/src/poppler-form.cc
@@ -1,4 +1,4 @@
-/* poppler-form.h: qt4 interface to poppler
+/* poppler-form.h: qt interface to poppler
  * Copyright (C) 2007-2008, 2011, Pino Toscano <pino at kde.org>
  * Copyright (C) 2008, 2011, 2012 Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2011 Carlos Garcia Campos <carlosgc at gnome.org>
diff --git a/qt5/src/poppler-form.h b/qt5/src/poppler-form.h
index dc0741a..3481ce7 100644
--- a/qt5/src/poppler-form.h
+++ b/qt5/src/poppler-form.h
@@ -1,4 +1,4 @@
-/* poppler-form.h: qt4 interface to poppler
+/* poppler-form.h: qt interface to poppler
  * Copyright (C) 2007-2008, Pino Toscano <pino at kde.org>
  * Copyright (C) 2008, 2011, Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2012, Adam Reichold <adamreichold at myopera.com>
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef _POPPLER_QT4_FORM_H_
-#define _POPPLER_QT4_FORM_H_
+#ifndef _POPPLER_QT5_FORM_H_
+#define _POPPLER_QT5_FORM_H_
 
 #include <QtCore/QRectF>
 #include <QtCore/QStringList>
diff --git a/qt5/src/poppler-pdf-converter.cc b/qt5/src/poppler-pdf-converter.cc
index 9eeea89..557a9f8 100644
--- a/qt5/src/poppler-pdf-converter.cc
+++ b/qt5/src/poppler-pdf-converter.cc
@@ -1,4 +1,4 @@
-/* poppler-pdf-converter.cc: qt4 interface to poppler
+/* poppler-pdf-converter.cc: qt interface to poppler
  * Copyright (C) 2008, Pino Toscano <pino at kde.org>
  * Copyright (C) 2008, 2009, Albert Astals Cid <aacid at kde.org>
  *
diff --git a/qt5/src/poppler-private.cc b/qt5/src/poppler-private.cc
index 40ae90b..1e47c6d 100644
--- a/qt5/src/poppler-private.cc
+++ b/qt5/src/poppler-private.cc
@@ -55,7 +55,7 @@ namespace Debug {
         Debug::debugClosure = closure;
     }
 
-    void qt4ErrorFunction(void * /*data*/, ErrorCategory /*category*/, Goffset pos, char *msg)
+    void qt5ErrorFunction(void * /*data*/, ErrorCategory /*category*/, Goffset pos, char *msg)
     {
         QString emsg;
 
@@ -250,7 +250,7 @@ namespace Debug {
         {
             utf8Map = 0;
             globalParams = new GlobalParams();
-            setErrorCallback(qt4ErrorFunction, NULL);
+            setErrorCallback(qt5ErrorFunction, NULL);
         }
         count ++;
     }
diff --git a/qt5/src/poppler-private.h b/qt5/src/poppler-private.h
index 17bb644..172c988 100644
--- a/qt5/src/poppler-private.h
+++ b/qt5/src/poppler-private.h
@@ -61,7 +61,7 @@ namespace Poppler {
 
     GooString *QStringToGooString(const QString &s);
 
-    void qt4ErrorFunction(int pos, char *msg, va_list args);
+    void qt5ErrorFunction(int pos, char *msg, va_list args);
 
     class LinkDestinationData
     {
diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h
index 65e91b8..9a9feba 100644
--- a/qt5/src/poppler-qt5.h
+++ b/qt5/src/poppler-qt5.h
@@ -824,7 +824,7 @@ delete it;
 	*/
 	enum RenderBackend {
 	    SplashBackend,   ///< Splash backend
-	    ArthurBackend   ///< Arthur (Qt4) backend
+	    ArthurBackend   ///< Arthur (Qt) backend
 	};
 
 	/**