From e146bacb8d3ce0e9941a6157bbd82f704dbfba00 Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Tue, 4 Aug 2020 17:59:25 +0200
Subject: Hide deprecation warnings caused by compatibility code

This makes the build log clean again.
---
 src/base/QXmppDataForm.cpp |  9 ++++++++-
 src/base/QXmppStanza_p.h   | 10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp
index 99848deb..40d2268b 100644
--- a/src/base/QXmppDataForm.cpp
+++ b/src/base/QXmppDataForm.cpp
@@ -337,14 +337,17 @@ void QXmppDataForm::Field::setLabel(const QString &label)
     d->label = label;
 }
 
+///
 /// Returns the field's media.
 ///
 /// \deprecated This method is deprecated since QXmpp 1.1. Use
 /// \c QXmppDataForm::Field::mediaSources() or
 /// \c QXmppDataForm::Field::mediaSize() instead.
-
+///
 QXmppDataForm::Media QXmppDataForm::Field::media() const
 {
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     Media media;
     QList<QPair<QString, QString>> pairUris;
     pairUris.reserve(d->mediaSources.size());
@@ -359,6 +362,7 @@ QXmppDataForm::Media QXmppDataForm::Field::media() const
     media.setWidth(d->mediaSize.width());
     media.setUris(pairUris);
     return media;
+    QT_WARNING_POP
 }
 
 /// Sets the field's \a media.
@@ -369,6 +373,8 @@ QXmppDataForm::Media QXmppDataForm::Field::media() const
 
 void QXmppDataForm::Field::setMedia(const QXmppDataForm::Media &media)
 {
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     const QList<QPair<QString, QString>> &uris = media.uris();
 
     QVector<QXmppDataForm::MediaSource> sources;
@@ -382,6 +388,7 @@ void QXmppDataForm::Field::setMedia(const QXmppDataForm::Media &media)
 
     d->mediaSources = sources;
     d->mediaSize = QSize(media.width(), media.height());
+    QT_WARNING_POP
 }
 
 /// Returns the field's options.
diff --git a/src/base/QXmppStanza_p.h b/src/base/QXmppStanza_p.h
index 03875639..8f20233a 100644
--- a/src/base/QXmppStanza_p.h
+++ b/src/base/QXmppStanza_p.h
@@ -63,7 +63,10 @@ static QString strFromCondition(const QXmppStanza::Error::Condition& condition)
         return "not-allowed";
     case QXmppStanza::Error::NotAuthorized:
         return "not-authorized";
+        QT_WARNING_PUSH
+        QT_WARNING_DISABLE_DEPRECATED
     case QXmppStanza::Error::PaymentRequired:
+        QT_WARNING_POP
         return "payment-required";
     case QXmppStanza::Error::PolicyViolation:
         return "policy-violation";
@@ -116,9 +119,12 @@ static QXmppStanza::Error::Condition conditionFromStr(const QString& string)
         return QXmppStanza::Error::NotAllowed;
     else if (string == "not-authorized")
         return QXmppStanza::Error::NotAuthorized;
-    else if (string == "payment-required")
+    else if (string == "payment-required") {
+        QT_WARNING_PUSH
+        QT_WARNING_DISABLE_DEPRECATED
         return QXmppStanza::Error::PaymentRequired;
-    else if (string == "policy-violation")
+        QT_WARNING_POP
+    } else if (string == "policy-violation")
         return QXmppStanza::Error::PolicyViolation;
     else if (string == "recipient-unavailable")
         return QXmppStanza::Error::RecipientUnavailable;
-- 
cgit v1.2.3