aboutsummaryrefslogtreecommitdiff
path: root/events/event.h
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2017-10-08 11:23:41 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2017-10-08 11:23:41 +0900
commitc0953cf02f18d3ce6d514af1d22b54a4612bd139 (patch)
treeab5000146743da82e95d651f8d4128bd7355840c /events/event.h
parentce1bbe88509715c9a35bb7aeeb5f20f0d4918ec4 (diff)
parentc9dc5e12b835425f1ba5c447ddb3c3394ccac93e (diff)
downloadlibquotient-c0953cf02f18d3ce6d514af1d22b54a4612bd139.tar.gz
libquotient-c0953cf02f18d3ce6d514af1d22b54a4612bd139.zip
Merge branch 'master' into kitsune-gtad
Diffstat (limited to 'events/event.h')
-rw-r--r--events/event.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/events/event.h b/events/event.h
index 7db14100..ec993522 100644
--- a/events/event.h
+++ b/events/event.h
@@ -34,7 +34,8 @@ namespace QMatrixClient
enum class Type
{
RoomMessage, RoomName, RoomAliases, RoomCanonicalAlias,
- RoomMember, RoomTopic, Typing, Receipt, Unknown
+ RoomMember, RoomTopic, RoomEncryption, RoomEncryptedMessage,
+ Typing, Receipt, Unknown
};
explicit Event(Type type) : _type(type) { }
@@ -94,6 +95,7 @@ namespace QMatrixClient
return evs;
}
+ /** This class corresponds to m.room.* events */
class RoomEvent : public Event
{
Q_GADGET