From 423fa97d3699b133926aeaab01c216c69555ce6f Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Thu, 29 Sep 2022 15:16:45 +0200 Subject: Rename Encryption to EncryptionMethod to avoid conflicts with namespace There's QXmpp::Private::Encryption. This renames QXmpp::Encryption to QXmpp::EncryptionMethod to avoid conflicts. --- src/base/QXmppE2eeMetadata.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/base/QXmppE2eeMetadata.h') diff --git a/src/base/QXmppE2eeMetadata.h b/src/base/QXmppE2eeMetadata.h index e435ef13..cc6a3b9f 100644 --- a/src/base/QXmppE2eeMetadata.h +++ b/src/base/QXmppE2eeMetadata.h @@ -26,8 +26,8 @@ public: QXmppE2eeMetadata &operator=(const QXmppE2eeMetadata &other); QXmppE2eeMetadata &operator=(QXmppE2eeMetadata &&); - QXmpp::Encryption encryption() const; - void setEncryption(QXmpp::Encryption encryption); + QXmpp::EncryptionMethod encryption() const; + void setEncryption(QXmpp::EncryptionMethod encryption); QByteArray senderKey() const; void setSenderKey(const QByteArray &keyId); -- cgit v1.2.3