From 72571909c4b0e95f1b5ab3865de2b25fe859b367 Mon Sep 17 00:00:00 2001 From: Melvin Keskin Date: Sat, 4 Mar 2023 01:09:23 +0100 Subject: Organize OMEMO includes --- src/base/QXmppOmemoElement_p.h | 2 +- src/omemo/QXmppOmemoData.cpp | 2 -- src/omemo/QXmppOmemoDeviceList_p.h | 2 +- src/omemo/QXmppOmemoManager.cpp | 3 --- 4 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src') 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 #include 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 #include 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 { 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" -- cgit v1.2.3