aboutsummaryrefslogtreecommitdiff
path: root/lib/jobs/generated
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2018-05-01 21:01:33 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2018-05-01 21:01:33 +0900
commit1e42eca5c3d864750609eacd4996794c901c6c37 (patch)
tree88a2ca014bfd38bdbd2c30cd3918fc49dd7a7255 /lib/jobs/generated
parent38934c2310b426be640988dc10f48de88a3d92bc (diff)
parent2a341e30ef2db74b331a8870ceb2f182af68f194 (diff)
downloadlibquotient-1e42eca5c3d864750609eacd4996794c901c6c37.tar.gz
libquotient-1e42eca5c3d864750609eacd4996794c901c6c37.zip
Merge branch 'master' into kitsune-gtad
Diffstat (limited to 'lib/jobs/generated')
-rw-r--r--lib/jobs/generated/notifications.cpp2
-rw-r--r--lib/jobs/generated/notifications.h4
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/jobs/generated/notifications.cpp b/lib/jobs/generated/notifications.cpp
index ffd17b8a..df6b10ba 100644
--- a/lib/jobs/generated/notifications.cpp
+++ b/lib/jobs/generated/notifications.cpp
@@ -21,7 +21,7 @@ namespace QMatrixClient
result.actions =
fromJson<QVector<QJsonObject>>(o.value("actions"));
result.event =
- fromJson<GetNotificationsJob::Event>(o.value("event"));
+ fromJson<EventPtr>(o.value("event"));
result.profileTag =
fromJson<QString>(o.value("profile_tag"));
result.read =
diff --git a/lib/jobs/generated/notifications.h b/lib/jobs/generated/notifications.h
index 72318f69..798b9576 100644
--- a/lib/jobs/generated/notifications.h
+++ b/lib/jobs/generated/notifications.h
@@ -22,12 +22,10 @@ namespace QMatrixClient
public:
// Inner data structures
- using Event = EventPtr;
-
struct Notification
{
QVector<QJsonObject> actions;
- Event event;
+ EventPtr event;
QString profileTag;
bool read;
QString roomId;