summary refs log tree commit diff
path: root/include/TimelineItem.h
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2017-09-10 13:13:02 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2017-09-10 13:13:02 +0300
commit29e21e2970c2786eb1f6910c9da99a3dbbf0a49d (patch)
tree6b981d9167ef70a408fa395a720afb09ce7b5e21 /include/TimelineItem.h
parentStyle change again (diff)
parentImplement image uploads (#24) (diff)
downloadnheko-29e21e2970c2786eb1f6910c9da99a3dbbf0a49d.tar.xz
Merge branch 'images'
Diffstat (limited to 'include/TimelineItem.h')
-rw-r--r--include/TimelineItem.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/TimelineItem.h b/include/TimelineItem.h

index edc15dab..0a0538f9 100644 --- a/include/TimelineItem.h +++ b/include/TimelineItem.h
@@ -50,11 +50,14 @@ public: QWidget *parent = 0); // For local messages. + // m.text & m.emote TimelineItem(events::MessageEventType ty, const QString &userid, QString body, bool withSender, QWidget *parent = 0); + // m.image + TimelineItem(ImageItem *item, const QString &userid, bool withSender, QWidget *parent = 0); TimelineItem(ImageItem *img, const events::MessageEvent<msgs::Image> &e,