Attachment 71217 Details for Bug 57807 – Locally disable deprecation warnings

[patch] Locally disable deprecation warnings

disable_deprecation_warning_locally.diff (text/plain), 1.42 KB, created by Adam Reichold on 2012-12-08 20:40:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Reichold

Created: 2012-12-08 20:40:18 UTC

Size: 1.42 KB

patch

obsolete

>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;
>

Actions: View | Splinter Review

Attachments on bug 57807: 70930 | 71193 | 71211 | 71212 | 71217

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.