diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-08-09 23:02:17 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-08-09 23:02:17 +0900 |
| commit | 01570f70926c716441cdb62928231a35af72ebc3 (patch) | |
| tree | 832bbdc4c75247fb93ce18e76eed02c6674bf55c /lib/events/encryptionevent.cpp | |
| parent | b0f259c3aa4ca619a6998184d16f9ab2daf5b5f4 (diff) | |
| parent | 38f063e75757e97bfe1fda9655ab460454ba99db (diff) | |
| download | libquotient-01570f70926c716441cdb62928231a35af72ebc3.tar.gz libquotient-01570f70926c716441cdb62928231a35af72ebc3.zip | |
Merge branch 'renaming'
Diffstat (limited to 'lib/events/encryptionevent.cpp')
| -rw-r--r-- | lib/events/encryptionevent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/events/encryptionevent.cpp b/lib/events/encryptionevent.cpp index 0c732a51..945e6696 100644 --- a/lib/events/encryptionevent.cpp +++ b/lib/events/encryptionevent.cpp @@ -12,10 +12,10 @@ #include <array> static const std::array<QString, 1> encryptionStrings = { - { QMatrixClient::MegolmV1AesSha2AlgoKey } + { Quotient::MegolmV1AesSha2AlgoKey } }; -namespace QMatrixClient { +namespace Quotient { template <> struct JsonConverter<EncryptionType> { static EncryptionType load(const QJsonValue& jv) @@ -32,7 +32,7 @@ struct JsonConverter<EncryptionType> { }; } // namespace QMatrixClient -using namespace QMatrixClient; +using namespace Quotient; EncryptionEventContent::EncryptionEventContent(const QJsonObject& json) : encryption(fromJson<EncryptionType>(json["algorithm"_ls])) |