aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMelvin Keskin <melvo@olomono.de>2022-04-10 19:53:12 +0200
committerLinus Jahn <lnj@kaidan.im>2022-04-20 19:57:26 +0200
commit46bd707151cf42103748432e8d4433e444dbfef2 (patch)
tree684e175f56403d545e8d305ad3d1cd8de4b764cf
parentce1aef34b88b4d4f6666ee47e32d0a6ae78a1088 (diff)
Message: Apply clang-format
-rw-r--r--src/base/QXmppMessage.cpp2
-rw-r--r--src/base/QXmppMessage.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp
index cf4318f4..46b8c797 100644
--- a/src/base/QXmppMessage.cpp
+++ b/src/base/QXmppMessage.cpp
@@ -11,8 +11,8 @@
#include "QXmppConstants_p.h"
#include "QXmppGlobal_p.h"
#include "QXmppMixInvitation.h"
-#include "QXmppOmemoEnvelope_p.h"
#include "QXmppOmemoElement_p.h"
+#include "QXmppOmemoEnvelope_p.h"
#include "QXmppTrustMessageElement.h"
#include "QXmppUtils.h"
diff --git a/src/base/QXmppMessage.h b/src/base/QXmppMessage.h
index 1f0c81b5..d7f8e962 100644
--- a/src/base/QXmppMessage.h
+++ b/src/base/QXmppMessage.h
@@ -29,8 +29,8 @@ class QXmppTrustMessageElement;
class QXMPP_EXPORT QXmppMessage : public QXmppStanza
{
public:
-/// \cond
#if QXMPP_DEPRECATED_SINCE(1, 5)
+ /// \cond
using EncryptionMethod = QXmpp::Encryption;
static const EncryptionMethod NoEncryption = EncryptionMethod::NoEncryption;
@@ -39,8 +39,8 @@ public:
static const EncryptionMethod LegacyOpenPGP = EncryptionMethod::LegacyOpenPgp;
static const EncryptionMethod OX = EncryptionMethod::Ox;
static const EncryptionMethod OMEMO = EncryptionMethod::Omemo;
+ /// \endcond
#endif
-/// \endcond
/// This enum describes a message type.
enum Type {