aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMelvin Keskin <melvo@olomono.de>2023-03-04 01:09:23 +0100
committerLinus Jahn <lnj@kaidan.im>2023-03-09 15:40:20 +0100
commit72571909c4b0e95f1b5ab3865de2b25fe859b367 (patch)
tree2d90d842a75790825607f98a80299d603b263d4f /src
parentdf2ddfe37aead0fc2819cdf3b649d76075897187 (diff)
downloadqxmpp-72571909c4b0e95f1b5ab3865de2b25fe859b367.tar.gz
Organize OMEMO includes
Diffstat (limited to 'src')
-rw-r--r--src/base/QXmppOmemoElement_p.h2
-rw-r--r--src/omemo/QXmppOmemoData.cpp2
-rw-r--r--src/omemo/QXmppOmemoDeviceList_p.h2
-rw-r--r--src/omemo/QXmppOmemoManager.cpp3
4 files changed, 2 insertions, 7 deletions
diff --git a/src/base/QXmppOmemoElement_p.h b/src/base/QXmppOmemoElement_p.h
index 1e160479..cd95ea00 100644
--- a/src/base/QXmppOmemoElement_p.h
+++ b/src/base/QXmppOmemoElement_p.h
@@ -7,13 +7,13 @@
#define QXMPPOMEMOELEMENT_H
#include "QXmppGlobal.h"
+#include "QXmppOmemoEnvelope_p.h"
#include <optional>
#include <QMultiMap>
class QDomElement;
-class QXmppOmemoEnvelope;
class QXmlStreamWriter;
class QXMPP_EXPORT QXmppOmemoElement
diff --git a/src/omemo/QXmppOmemoData.cpp b/src/omemo/QXmppOmemoData.cpp
index d1dd2a88..d457326a 100644
--- a/src/omemo/QXmppOmemoData.cpp
+++ b/src/omemo/QXmppOmemoData.cpp
@@ -8,10 +8,8 @@
#include "QXmppOmemoDeviceElement_p.h"
#include "QXmppOmemoDeviceList_p.h"
#include "QXmppOmemoElement_p.h"
-#include "QXmppOmemoEnvelope_p.h"
#include "QXmppOmemoIq_p.h"
#include "QXmppOmemoItems_p.h"
-#include "QXmppUtils.h"
#include <QDomElement>
#include <QHash>
diff --git a/src/omemo/QXmppOmemoDeviceList_p.h b/src/omemo/QXmppOmemoDeviceList_p.h
index 76bff435..46ac724d 100644
--- a/src/omemo/QXmppOmemoDeviceList_p.h
+++ b/src/omemo/QXmppOmemoDeviceList_p.h
@@ -7,12 +7,12 @@
#define QXMPPOMEMODEVICELIST_H
#include "QXmppGlobal.h"
+#include "QXmppOmemoDeviceElement_p.h"
#include "QList"
class QDomElement;
class QXmlStreamWriter;
-class QXmppOmemoDeviceElement;
class QXMPP_AUTOTEST_EXPORT QXmppOmemoDeviceList : public QList<QXmppOmemoDeviceElement>
{
diff --git a/src/omemo/QXmppOmemoManager.cpp b/src/omemo/QXmppOmemoManager.cpp
index 7b38c73e..f3137889 100644
--- a/src/omemo/QXmppOmemoManager.cpp
+++ b/src/omemo/QXmppOmemoManager.cpp
@@ -5,10 +5,7 @@
#include "QXmppClient.h"
#include "QXmppConstants_p.h"
-#include "QXmppOmemoDeviceElement_p.h"
-#include "QXmppOmemoDeviceList_p.h"
#include "QXmppOmemoElement_p.h"
-#include "QXmppOmemoEnvelope_p.h"
#include "QXmppOmemoIq_p.h"
#include "QXmppOmemoItems_p.h"
#include "QXmppOmemoManager_p.h"