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/QXmppE2eeMetadata.h | |
| 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/QXmppE2eeMetadata.h')
| -rw-r--r-- | src/base/QXmppE2eeMetadata.h | 4 |
1 files changed, 2 insertions, 2 deletions
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); |