r17866 by craig - Change poppler includes to use poppler directory to avoid header name conflicts

[scribus-commit]

Author: craig
Date: Sat Nov 10 14:18:25 2012
New Revision: 17866

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17866
Log:
Change poppler includes to use poppler directory to avoid header name conflicts

Modified:
    trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
    trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h

Modified: trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17866&path=/trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt Sat Nov 10 14:18:25 2012
@@ -1,11 +1,7 @@
-INCLUDE_DIRECTORIES(
-BEFORE
-${POPPLER_INCLUDE_DIR}
-)
-
 INCLUDE_DIRECTORIES(
 ${CMAKE_SOURCE_DIR}
 ${CMAKE_SOURCE_DIR}/scribus
+${POPPLER_INCLUDE_DIR}
 )
 
 SET(IMPORTPDF_PLUGIN_MOC_CLASSES

Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17866&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp Sat Nov 10 14:18:25 2012
@@ -1,7 +1,7 @@
 #include "slaoutput.h"
-#include <GlobalParams.h>
-#include <poppler-config.h>
-#include <FileSpec.h>
+#include <poppler/GlobalParams.h>
+#include <poppler/poppler-config.h>
+#include <poppler/FileSpec.h>
 #include <QApplication>
 #include <QFile>
 #include "commonstrings.h"

Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17866&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.h Sat Nov 10 14:18:25 2012
@@ -26,29 +26,29 @@
 #include "selection.h"
 #include "vgradient.h"
 
-#include <goo/gtypes.h>
-#include <Object.h>
-#include <OutputDev.h>
-#include <Gfx.h>
-#include <GfxState.h>
-#include <Stream.h>
-#include <GfxFont.h>
-#include <Link.h>
-#include <PDFDoc.h>
-#include <Error.h>
-#include <Form.h>
-#include <Page.h>
-#include <Catalog.h>
-#include <CharCodeToUnicode.h>
-#include <FontEncodingTables.h>
-#include <fofi/FoFiTrueType.h>
-#include <splash/SplashFontFileID.h>
-#include <splash/SplashFontFile.h>
-#include <splash/SplashFontEngine.h>
-#include <splash/SplashFont.h>
-#include <splash/SplashMath.h>
-#include <splash/SplashPath.h>
-#include <splash/SplashGlyphBitmap.h>
+#include <poppler/goo/gtypes.h>
+#include <poppler/Object.h>
+#include <poppler/OutputDev.h>
+#include <poppler/Gfx.h>
+#include <poppler/GfxState.h>
+#include <poppler/Stream.h>
+#include <poppler/GfxFont.h>
+#include <poppler/Link.h>
+#include <poppler/PDFDoc.h>
+#include <poppler/Error.h>
+#include <poppler/Form.h>
+#include <poppler/Page.h>
+#include <poppler/Catalog.h>
+#include <poppler/CharCodeToUnicode.h>
+#include <poppler/FontEncodingTables.h>
+#include <poppler/fofi/FoFiTrueType.h>
+#include <poppler/splash/SplashFontFileID.h>
+#include <poppler/splash/SplashFontFile.h>
+#include <poppler/splash/SplashFontEngine.h>
+#include <poppler/splash/SplashFont.h>
+#include <poppler/splash/SplashMath.h>
+#include <poppler/splash/SplashPath.h>
+#include <poppler/splash/SplashGlyphBitmap.h>
 
 //------------------------------------------------------------------------
 // LinkSubmitData