diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-02-26 09:07:16 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2018-02-26 09:07:16 +0900 |
| commit | 91cc0e8db0006beeb91b9e007cd21343984dfb6a (patch) | |
| tree | 7a79286d7c6e5a99644c3f7141e1cdc8e2459416 /events/event.h | |
| parent | e77a53946805649be99f8c0f6ee9c00702348132 (diff) | |
| parent | ec412621d71b1a7758b15d2b3c5cd5e7b2081ab1 (diff) | |
| download | libquotient-91cc0e8db0006beeb91b9e007cd21343984dfb6a.tar.gz libquotient-91cc0e8db0006beeb91b9e007cd21343984dfb6a.zip | |
Merge branch 'kitsune-account-data'
Diffstat (limited to 'events/event.h')
| -rw-r--r-- | events/event.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/events/event.h b/events/event.h index 1a1b994d..4bd08b55 100644 --- a/events/event.h +++ b/events/event.h @@ -45,7 +45,7 @@ namespace QMatrixClient enum class Type : quint16 { Unknown = 0, - Typing, Receipt, + Typing, Receipt, Tag, DirectChat, RoomEventBase = 0x1000, RoomMessage = RoomEventBase + 1, RoomEncryptedMessage, Redaction, @@ -63,6 +63,7 @@ namespace QMatrixClient virtual ~Event(); Type type() const { return _type; } + QString jsonType() const; bool isStateEvent() const { return (quint16(_type) & 0x1800) == 0x1800; @@ -76,7 +77,6 @@ namespace QMatrixClient // (and in most cases it will be a combination of other fields // instead of "content" field). - protected: const QJsonObject contentJson() const; private: |