[poppler] 3 commits - qt4/src

[Pino Toscano]

 qt4/src/CMakeLists.txt                       |    1 +
 qt4/src/Makefile.am                          |    1 +
 qt4/src/poppler-annotation-helper.h          |    1 -
 qt4/src/poppler-annotation-private.h         |    1 -
 qt4/src/poppler-converter-private.h          |    1 -
 qt4/src/poppler-export.h                     |    4 ++--
 qt4/src/poppler-link-extractor-private.h     |    1 -
 qt4/src/poppler-page-private.h               |    1 -
 qt4/src/poppler-private.h                    |    1 -
 qt4/src/poppler-qiodeviceoutstream-private.h |    1 -
 10 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 11b70bcda905e618c199a067db6b0246612e101d
Author: Pino Toscano <pino at kde.org>
Date:   Tue Feb 26 23:01:27 2008 +0100

    fixup the default export macro name (added by cmake); _WIN32 is defined only on win32 (remove a plethora of warnings)

diff --git a/qt4/src/poppler-export.h b/qt4/src/poppler-export.h
index fb92520..7661fe9 100644
--- a/qt4/src/poppler-export.h
+++ b/qt4/src/poppler-export.h
@@ -2,7 +2,7 @@
 * This file is used to set the poppler_qt4_EXPORT macros right.
 * This is needed for setting the visibility on windows, it will have no effect on other platforms.
 */
-#if _WIN32
+#if defined(_WIN32)
 # define LIB_EXPORT __declspec(dllexport)
 # define LIB_IMPORT __declspec(dllimport)
 #else
@@ -10,7 +10,7 @@
 # define LIB_IMPORT
 #endif
 
-#ifdef POPPLER_QT4_EXPORTS
+#ifdef poppler_qt4_EXPORTS
 # define POPPLER_QT4_EXPORT LIB_EXPORT
 #else
 # define POPPLER_QT4_EXPORT LIB_IMPORT
commit d4d6c14cd83d04c61daa6618c3148a0bb47dc292
Author: Pino Toscano <pino at kde.org>
Date:   Tue Feb 26 22:57:02 2008 +0100

    install the export header

diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt
index cd6014e..44ce5b9 100644
--- a/qt4/src/CMakeLists.txt
+++ b/qt4/src/CMakeLists.txt
@@ -42,6 +42,7 @@ install(FILES
   poppler-link.h
   poppler-annotation.h
   poppler-form.h
+  poppler-export.h
   ${CMAKE_SOURCE_DIR}/qt/poppler-page-transition.h
   DESTINATION include/poppler/qt4)
 
diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
index b85cab1..66f3009 100644
--- a/qt4/src/Makefile.am
+++ b/qt4/src/Makefile.am
@@ -12,6 +12,7 @@ poppler_include_HEADERS =			\
 	poppler-link.h				\
 	poppler-annotation.h			\
 	poppler-form.h				\
+	poppler-export.h			\
 	../../qt/poppler-page-transition.h
 
 lib_LTLIBRARIES = libpoppler-qt4.la
commit 4ba2e2d21710135656adbf93c5994cfb46502308
Author: Pino Toscano <pino at kde.org>
Date:   Tue Feb 26 22:55:30 2008 +0100

    no need to include the export header in private headers

diff --git a/qt4/src/poppler-annotation-helper.h b/qt4/src/poppler-annotation-helper.h
index 51ae087..0215729 100644
--- a/qt4/src/poppler-annotation-helper.h
+++ b/qt4/src/poppler-annotation-helper.h
@@ -19,7 +19,6 @@
  */
 
 #include <QtCore/QDebug>
-#include "poppler-export.h"
 
 class QColor;
 
diff --git a/qt4/src/poppler-annotation-private.h b/qt4/src/poppler-annotation-private.h
index b4d0ca0..b428347 100644
--- a/qt4/src/poppler-annotation-private.h
+++ b/qt4/src/poppler-annotation-private.h
@@ -20,7 +20,6 @@
 #define _POPPLER_ANNOTATION_PRIVATE_H_
 
 #include "poppler-annotation.h"
-#include "poppler-export.h"
 
 namespace Poppler
 {
diff --git a/qt4/src/poppler-converter-private.h b/qt4/src/poppler-converter-private.h
index e1cf080..051d9eb 100644
--- a/qt4/src/poppler-converter-private.h
+++ b/qt4/src/poppler-converter-private.h
@@ -21,7 +21,6 @@
 #define POPPLER_QT4_CONVERTER_PRIVATE_H
 
 #include <QtCore/QString>
-#include "poppler-export.h"
 
 class QIODevice;
 
diff --git a/qt4/src/poppler-link-extractor-private.h b/qt4/src/poppler-link-extractor-private.h
index 3cdb20a..03d93e0 100644
--- a/qt4/src/poppler-link-extractor-private.h
+++ b/qt4/src/poppler-link-extractor-private.h
@@ -23,7 +23,6 @@
 #include <OutputDev.h>
 
 #include <QtCore/QList>
-#include "poppler-export.h"
 
 namespace Poppler
 {
diff --git a/qt4/src/poppler-page-private.h b/qt4/src/poppler-page-private.h
index ef85527..dd79306 100644
--- a/qt4/src/poppler-page-private.h
+++ b/qt4/src/poppler-page-private.h
@@ -18,7 +18,6 @@
 
 #ifndef _POPPLER_PAGE_PRIVATE_H_
 #define _POPPLER_PAGE_PRIVATE_H_
-#include "poppler-export.h"
 
 class QRectF;
 
diff --git a/qt4/src/poppler-private.h b/qt4/src/poppler-private.h
index bd8c8ff..77cb431 100644
--- a/qt4/src/poppler-private.h
+++ b/qt4/src/poppler-private.h
@@ -38,7 +38,6 @@
 #if defined(HAVE_SPLASH)
 #include <SplashOutputDev.h>
 #endif
-#include "poppler-export.h"
 
 #include "poppler-qt4.h"
 
diff --git a/qt4/src/poppler-qiodeviceoutstream-private.h b/qt4/src/poppler-qiodeviceoutstream-private.h
index 0c24314..74b56ca 100644
--- a/qt4/src/poppler-qiodeviceoutstream-private.h
+++ b/qt4/src/poppler-qiodeviceoutstream-private.h
@@ -21,7 +21,6 @@
 
 #include "Object.h"
 #include "Stream.h"
-#include "poppler-export.h"
 
 class QIODevice;