diff --git a/qt4/src/poppler-annotation.cc b/qt4/src/poppler-annotation.cc index 5ecea80..7a0b713 100644 --- a/qt4/src/poppler-annotation.cc +++ b/qt4/src/poppler-annotation.cc @@ -785,6 +785,8 @@ void Annotation::Popup::setText( const QString &text ) d->text = text; } +BLOCK_DEPRECATION_WARNING + Annotation::Annotation( AnnotationPrivate &dd ) : d_ptr( &dd ) { @@ -942,6 +944,8 @@ Annotation::Annotation( AnnotationPrivate &dd, const QDomNode &annNode ) } } +RESET_DEPRECATION_WARNING + void Annotation::storeBaseAnnotationProperties( QDomNode & annNode, QDomDocument & document ) const { // create [base] element of the annotation node diff --git a/qt4/src/poppler-private.h b/qt4/src/poppler-private.h index 5a9e1b8..2272444 100644 --- a/qt4/src/poppler-private.h +++ b/qt4/src/poppler-private.h @@ -46,6 +46,23 @@ #include "poppler-qt4.h" #include "poppler-embeddedfile-private.h" +#if defined(__GNUC__) + +#define BLOCK_DEPRECATION_WARNING _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +#define RESET_DEPRECATION_WARNING _Pragma("GCC diagnostic pop") + +#elif defined(_MSC_VER) + +#define BLOCK_DEPRECATION_WARNING __pragma("warning(push)") __pragma("warning(disable: 4966)") +#define RESET_DEPRECATION_WARNING __pragma("warning(pop)") + +#else + +#define BLOCK_DEPRECATION_WARNING +#define RESET_DEPRECATION_WARNING + +#endif + class LinkDest; class FormWidget;