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/QXmppGlobal.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/base/QXmppGlobal.cpp') diff --git a/src/base/QXmppGlobal.cpp b/src/base/QXmppGlobal.cpp index ac5abea8..31a65ffa 100644 --- a/src/base/QXmppGlobal.cpp +++ b/src/base/QXmppGlobal.cpp @@ -30,21 +30,21 @@ static const QStringList ENCRYPTION_NAMES = { QStringLiteral("OMEMO 2") }; -std::optional QXmpp::Private::encryptionFromString(const QString &str) +std::optional QXmpp::Private::encryptionFromString(const QString &str) { int index = ENCRYPTION_NAMESPACES.indexOf(str); if (index < 0) { return {}; } - return QXmpp::Encryption(index); + return QXmpp::EncryptionMethod(index); } -QString QXmpp::Private::encryptionToString(Encryption encryption) +QString QXmpp::Private::encryptionToString(EncryptionMethod encryption) { return ENCRYPTION_NAMESPACES.at(int(encryption)); } -QString QXmpp::Private::encryptionToName(Encryption encryption) +QString QXmpp::Private::encryptionToName(EncryptionMethod encryption) { return ENCRYPTION_NAMES.at(int(encryption)); } -- cgit v1.2.3