Stanza: Move E2eeMetadata into own header file

7 files changed, 51 insertions, 32 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e3583c84..3a73a6bf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,6 +34,7 @@ set(INSTALL_HEADER_FILES
     base/QXmppDataForm.h
     base/QXmppDataFormBase.h
     base/QXmppDiscoveryIq.h
+    base/QXmppE2eeMetadata.h
     base/QXmppElement.h
     base/QXmppEntityTimeIq.h
     base/QXmppExtension.h
diff --git a/src/base/QXmppE2eeMetadata.h b/src/base/QXmppE2eeMetadata.h
new file mode 100644
index 00000000..e435ef13
--- /dev/null
+++ b/src/base/QXmppE2eeMetadata.h
@@ -0,0 +1,45 @@
+// SPDX-FileCopyrightText: 2022 Linus Jahn <lnj@kaidan.im>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#ifndef QXMPPE2EEMETADATA_H
+#define QXMPPE2EEMETADATA_H
+
+#include "QXmppGlobal.h"
+
+#include <QSharedDataPointer>
+
+class QDateTime;
+class QXmppE2eeMetadataPrivate;
+
+class QXMPP_EXPORT QXmppE2eeMetadata
+{
+public:
+    QXmppE2eeMetadata();
+    /// \cond
+    QXmppE2eeMetadata(QSharedDataPointer<QXmppE2eeMetadataPrivate> d);
+    /// \endcond
+    QXmppE2eeMetadata(const QXmppE2eeMetadata &other);
+    QXmppE2eeMetadata(QXmppE2eeMetadata &&);
+    ~QXmppE2eeMetadata();
+
+    QXmppE2eeMetadata &operator=(const QXmppE2eeMetadata &other);
+    QXmppE2eeMetadata &operator=(QXmppE2eeMetadata &&);
+
+    QXmpp::Encryption encryption() const;
+    void setEncryption(QXmpp::Encryption encryption);
+
+    QByteArray senderKey() const;
+    void setSenderKey(const QByteArray &keyId);
+
+    // XEP-0420: Stanza Content Encryption
+    QDateTime sceTimestamp() const;
+    void setSceTimestamp(const QDateTime &timestamp);
+
+private:
+    friend class QXmppStanza;
+
+    QSharedDataPointer<QXmppE2eeMetadataPrivate> d;
+};
+
+#endif  // QXMPPE2EEMETADATA_H
diff --git a/src/base/QXmppStanza.cpp b/src/base/QXmppStanza.cpp
index e4192128..56ad5e4c 100644
--- a/src/base/QXmppStanza.cpp
+++ b/src/base/QXmppStanza.cpp
@@ -9,6 +9,7 @@
 #include "QXmppStanza.h"
 
 #include "QXmppConstants_p.h"
+#include "QXmppE2eeMetadata.h"
 #include "QXmppStanza_p.h"
 #include "QXmppUtils.h"
 
diff --git a/src/base/QXmppStanza.h b/src/base/QXmppStanza.h
index 2b35d63c..394bc6c6 100644
--- a/src/base/QXmppStanza.h
+++ b/src/base/QXmppStanza.h
@@ -23,6 +23,7 @@
 
 #include <QXmlStreamWriter>
 
+class QXmppE2eeMetadata;
 class QXmppExtendedAddressPrivate;
 
 ///
@@ -68,38 +69,6 @@ private:
     QSharedDataPointer<QXmppExtendedAddressPrivate> d;
 };
 
-class QXmppE2eeMetadataPrivate;
-
-class QXMPP_EXPORT QXmppE2eeMetadata
-{
-public:
-    QXmppE2eeMetadata();
-    /// \cond
-    QXmppE2eeMetadata(QSharedDataPointer<QXmppE2eeMetadataPrivate> d);
-    /// \endcond
-    QXmppE2eeMetadata(const QXmppE2eeMetadata &other);
-    QXmppE2eeMetadata(QXmppE2eeMetadata &&);
-    ~QXmppE2eeMetadata();
-
-    QXmppE2eeMetadata &operator=(const QXmppE2eeMetadata &other);
-    QXmppE2eeMetadata &operator=(QXmppE2eeMetadata &&);
-
-    QXmpp::Encryption encryption() const;
-    void setEncryption(QXmpp::Encryption encryption);
-
-    QByteArray senderKey() const;
-    void setSenderKey(const QByteArray &keyId);
-
-    // XEP-0420: Stanza Content Encryption
-    QDateTime sceTimestamp() const;
-    void setSceTimestamp(const QDateTime &timestamp);
-
-private:
-    friend class QXmppStanza;
-
-    QSharedDataPointer<QXmppE2eeMetadataPrivate> d;
-};
-
 class QXmppStanzaPrivate;
 class QXmppStanzaErrorPrivate;
 
diff --git a/src/client/QXmppAtmManager.cpp b/src/client/QXmppAtmManager.cpp
index 71c89b24..60c0ae9e 100644
--- a/src/client/QXmppAtmManager.cpp
+++ b/src/client/QXmppAtmManager.cpp
@@ -7,6 +7,7 @@
 #include "QXmppCarbonManager.h"
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
+#include "QXmppE2eeMetadata.h"
 #include "QXmppFutureUtils_p.h"
 #include "QXmppMessage.h"
 #include "QXmppTrustMessageElement.h"
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index bd6b9f08..b422842c 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -10,6 +10,7 @@
 #include "QXmppDiscoveryIq.h"
 #include "QXmppDiscoveryManager.h"
 #include "QXmppE2eeExtension.h"
+#include "QXmppE2eeMetadata.h"
 #include "QXmppEntityTimeManager.h"
 #include "QXmppFutureUtils_p.h"
 #include "QXmppLogger.h"
diff --git a/src/client/QXmppMessageReceiptManager.cpp b/src/client/QXmppMessageReceiptManager.cpp
index b8e5c90e..660964e7 100644
--- a/src/client/QXmppMessageReceiptManager.cpp
+++ b/src/client/QXmppMessageReceiptManager.cpp
@@ -7,6 +7,7 @@
 
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
+#include "QXmppE2eeMetadata.h"
 #include "QXmppMessage.h"
 #include "QXmppUtils.h"