diff options
| author | Linus Jahn <lnj@kaidan.im> | 2022-09-29 15:16:45 +0200 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2022-09-29 15:16:45 +0200 |
| commit | 423fa97d3699b133926aeaab01c216c69555ce6f (patch) | |
| tree | 5de54bc0825d0742de0f0ddfcb1d911ecb5b3db1 /src/base/QXmppStanza.cpp | |
| parent | 187a57269387a509e7db34c1a7d51f37acc3ee08 (diff) | |
| download | qxmpp-423fa97d3699b133926aeaab01c216c69555ce6f.tar.gz | |
Rename Encryption to EncryptionMethod to avoid conflicts with namespace
There's QXmpp::Private::Encryption. This renames QXmpp::Encryption to
QXmpp::EncryptionMethod to avoid conflicts.
Diffstat (limited to 'src/base/QXmppStanza.cpp')
| -rw-r--r-- | src/base/QXmppStanza.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/base/QXmppStanza.cpp b/src/base/QXmppStanza.cpp index db969327..e7cb0208 100644 --- a/src/base/QXmppStanza.cpp +++ b/src/base/QXmppStanza.cpp @@ -716,7 +716,7 @@ void QXmppStanza::Error::toXml(QXmlStreamWriter *writer) const class QXmppE2eeMetadataPrivate : public QSharedData { public: - QXmpp::Encryption encryption; + QXmpp::EncryptionMethod encryption; QByteArray senderKey; // XEP-0420: Stanza Content Encryption @@ -753,7 +753,7 @@ QXmppE2eeMetadata &QXmppE2eeMetadata::operator=(QXmppE2eeMetadata &&) = default; /// /// \return the encryption protocol /// -QXmpp::Encryption QXmppE2eeMetadata::encryption() const +QXmpp::EncryptionMethod QXmppE2eeMetadata::encryption() const { return d->encryption; } @@ -763,7 +763,7 @@ QXmpp::Encryption QXmppE2eeMetadata::encryption() const /// /// \param encryption encryption protocol /// -void QXmppE2eeMetadata::setEncryption(QXmpp::Encryption encryption) +void QXmppE2eeMetadata::setEncryption(QXmpp::EncryptionMethod encryption) { d->encryption = encryption; } |