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/QXmppMessage.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/QXmppMessage.cpp')
| -rw-r--r-- | src/base/QXmppMessage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp index 2e53a223..7998598c 100644 --- a/src/base/QXmppMessage.cpp +++ b/src/base/QXmppMessage.cpp @@ -1012,7 +1012,7 @@ void QXmppMessage::setMixUserNick(const QString &mixUserNick) /// /// \since QXmpp 1.1 /// -QXmpp::Encryption QXmppMessage::encryptionMethod() const +QXmpp::EncryptionMethod QXmppMessage::encryptionMethod() const { if (d->encryptionMethod.isEmpty()) { return QXmpp::NoEncryption; @@ -1026,7 +1026,7 @@ QXmpp::Encryption QXmppMessage::encryptionMethod() const /// /// \since QXmpp 1.1 /// -void QXmppMessage::setEncryptionMethod(QXmpp::Encryption method) +void QXmppMessage::setEncryptionMethod(QXmpp::EncryptionMethod method) { d->encryptionMethod = QXmpp::Private::encryptionToString(method); } |