summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-01-12 11:27:24 +0200
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-01-12 11:27:24 +0200
commitdaabb40bede4691a9232274edbbad1e2bed76345 (patch)
tree2065cf25ba56776f435dfe62e856b8dece9048b2 /src
parentHandle surrogate pairs in avatars (diff)
downloadnheko-daabb40bede4691a9232274edbbad1e2bed76345.tar.xz
Use Q_NULLPTR to be compatible with qt5.7
fixes #199
Diffstat (limited to 'src')
-rw-r--r--src/timeline/TimelineViewManager.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/timeline/TimelineViewManager.cc b/src/timeline/TimelineViewManager.cc

index 65c9ac83..42145819 100644 --- a/src/timeline/TimelineViewManager.cc +++ b/src/timeline/TimelineViewManager.cc
@@ -96,7 +96,7 @@ TimelineViewManager::queueImageMessage(const QString &roomid, auto view = views_[roomid]; - view->addUserMessage<ImageItem, mtx::events::MessageType::Image>(url, data, filename); + view->addUserMessage<ImageItem, mtx::events::MessageType::Image>(url, filename, data); } void @@ -111,7 +111,7 @@ TimelineViewManager::queueFileMessage(const QString &roomid, auto view = views_[roomid]; - view->addUserMessage<FileItem, mtx::events::MessageType::File>(url, nullptr, filename); + view->addUserMessage<FileItem, mtx::events::MessageType::File>(url, filename); } void @@ -126,7 +126,7 @@ TimelineViewManager::queueAudioMessage(const QString &roomid, auto view = views_[roomid]; - view->addUserMessage<AudioItem, mtx::events::MessageType::Audio>(url, nullptr, filename); + view->addUserMessage<AudioItem, mtx::events::MessageType::Audio>(url, filename); } void