diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-07-07 14:47:41 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-07 14:47:41 +0900 |
| commit | 6c9d895c03b9d0e7ffbf5bace3994536ff3215be (patch) | |
| tree | d80e9fe022e631d76fae641eddc264f7306996de /lib/events/simplestateevents.h | |
| parent | f58819e4e930ee66e790eccaedf551f807956d72 (diff) | |
| parent | d5b4e6440dae82eebc86657dd2f828edaf81b180 (diff) | |
| download | libquotient-6c9d895c03b9d0e7ffbf5bace3994536ff3215be.tar.gz libquotient-6c9d895c03b9d0e7ffbf5bace3994536ff3215be.zip | |
Merge pull request #329 from a-andreyev/aa13q-e2ee-enc-mng
E2EE: Introduce EncryptionManager with uploadIdentityKeys and uploadOneTimeKeys API.
Diffstat (limited to 'lib/events/simplestateevents.h')
| -rw-r--r-- | lib/events/simplestateevents.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/events/simplestateevents.h b/lib/events/simplestateevents.h index dc6a0868..ef56c7b2 100644 --- a/lib/events/simplestateevents.h +++ b/lib/events/simplestateevents.h @@ -81,8 +81,6 @@ namespace QMatrixClient DEFINE_EVENTTYPE_ALIAS(RoomCanonicalAlias, RoomCanonicalAliasEvent) DEFINE_SIMPLE_STATE_EVENT(RoomTopicEvent, "m.room.topic", QString, topic) DEFINE_EVENTTYPE_ALIAS(RoomTopic, RoomTopicEvent) - DEFINE_SIMPLE_STATE_EVENT(EncryptionEvent, "m.room.encryption", - QString, algorithm) DEFINE_EVENTTYPE_ALIAS(RoomEncryption, EncryptionEvent) class RoomAliasesEvent |