From 32ccc6358ba6433e6b870b238fba20ccf1862fe2 Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Sat, 18 Jun 2022 12:41:31 +0200
Subject: Move SecurityPolicy, TrustLevel intro extra headers

This avoids the need to include the whole TrustStorage in files like
SendStanzaParams.h.
---
 src/client/QXmppSendStanzaParams.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/client/QXmppSendStanzaParams.cpp')

diff --git a/src/client/QXmppSendStanzaParams.cpp b/src/client/QXmppSendStanzaParams.cpp
index 6c8b6ccc..9711750d 100644
--- a/src/client/QXmppSendStanzaParams.cpp
+++ b/src/client/QXmppSendStanzaParams.cpp
@@ -6,6 +6,8 @@
 
 #include <QVector>
 
+using namespace QXmpp;
+
 ///
 /// \class QXmppSendStanzaParams
 ///
@@ -17,8 +19,8 @@
 class QXmppSendStanzaParamsPrivate : public QSharedData
 {
 public:
+    TrustLevels acceptedTrustLevels;
     QVector<QString> encryptionJids;
-    QXmppTrustStorage::TrustLevels acceptedTrustLevels;
 };
 
 QXmppSendStanzaParams::QXmppSendStanzaParams()
@@ -65,7 +67,7 @@ void QXmppSendStanzaParams::setEncryptionJids(QVector<QString> encryptionJids)
 ///
 /// \return the trust levels of the keys used for encryption
 ///
-std::optional<QXmppTrustStorage::TrustLevels> QXmppSendStanzaParams::acceptedTrustLevels() const
+std::optional<TrustLevels> QXmppSendStanzaParams::acceptedTrustLevels() const
 {
     if (d->acceptedTrustLevels) {
         return d->acceptedTrustLevels;
@@ -80,7 +82,7 @@ std::optional<QXmppTrustStorage::TrustLevels> QXmppSendStanzaParams::acceptedTru
 ///
 /// \param trustLevels trust levels of the keys used for encryption
 ///
-void QXmppSendStanzaParams::setAcceptedTrustLevels(std::optional<QXmppTrustStorage::TrustLevels> trustLevels)
+void QXmppSendStanzaParams::setAcceptedTrustLevels(std::optional<TrustLevels> trustLevels)
 {
-    d->acceptedTrustLevels = trustLevels.value_or(QXmppTrustStorage::TrustLevels());
+    d->acceptedTrustLevels = trustLevels.value_or(QXmpp::TrustLevels());
 }
-- 
cgit v1.2.3