diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-05-08 19:08:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-08 19:08:57 +0200 |
| commit | 3458fdf7b416fe64b82ec9b99553c7b2aa299e4c (patch) | |
| tree | b3b1bce3ebf0631597aa6d8451e62d198a42c2be /lib/events/eventloader.h | |
| parent | 272cb01b05529971ea38e09bf75d8d8f194a9dd8 (diff) | |
| parent | c42d268db0b40cdba06381fc64a6966a72c90709 (diff) | |
| download | libquotient-3458fdf7b416fe64b82ec9b99553c7b2aa299e4c.tar.gz libquotient-3458fdf7b416fe64b82ec9b99553c7b2aa299e4c.zip | |
Merge #548: Streamline usage of event types, part 1
Diffstat (limited to 'lib/events/eventloader.h')
| -rw-r--r-- | lib/events/eventloader.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/events/eventloader.h b/lib/events/eventloader.h index fe624d70..c7b82e8e 100644 --- a/lib/events/eventloader.h +++ b/lib/events/eventloader.h @@ -29,7 +29,7 @@ template <typename BaseEventT> inline event_ptr_tt<BaseEventT> loadEvent(const QString& matrixType, const QJsonObject& content) { - return doLoadEvent<BaseEventT>(basicEventJson(matrixType, content), + return doLoadEvent<BaseEventT>(Event::basicJson(matrixType, content), matrixType); } @@ -44,7 +44,7 @@ inline StateEventPtr loadStateEvent(const QString& matrixType, const QString& stateKey = {}) { return doLoadEvent<StateEventBase>( - basicStateEventJson(matrixType, content, stateKey), matrixType); + StateEventBase::basicJson(matrixType, content, stateKey), matrixType); } template <typename EventT> |