From a0163f4c268fb162aac6510e762716bf780d6c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 8 Sep 2018 14:26:50 +0200 Subject: Add support for Poppler >= 0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../dependencies/poppler-tqt/poppler-private.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'tdefile-plugins/dependencies/poppler-tqt/poppler-private.h') diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h index 9e9e3292..56e7cf5e 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h @@ -34,24 +34,29 @@ #else class SplashOutputDev; #endif +#if defined(HAVE_POPPLER_064) +#define CONST_064 const +#else +#define CONST_064 +#endif namespace Poppler { class DocumentData; -TQString unicodeToTQString(Unicode* u, int len); +TQString unicodeToTQString(CONST_064 Unicode* u, int len); -TQString UnicodeParsedString(GooString *s1); +TQString UnicodeParsedString(CONST_064 GooString *s1); GooString *TQStringToGooString(const TQString &s); class LinkDestinationData { public: - LinkDestinationData( LinkDest *l, GooString *nd, Poppler::DocumentData *pdfdoc ) : ld(l), namedDest(nd), doc(pdfdoc) + LinkDestinationData( CONST_064 LinkDest *l, GooString *nd, Poppler::DocumentData *pdfdoc ) : ld(l), namedDest(nd), doc(pdfdoc) { } - - LinkDest *ld; + + CONST_064 LinkDest *ld; GooString *namedDest; Poppler::DocumentData *doc; }; @@ -84,7 +89,7 @@ class DocumentData { return m_outputDev; } - void addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, GooList * items ); + void addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, CONST_064 GooList * items ); class PDFDoc doc; bool locked; -- cgit v1.2.1