summary refs log tree commit diff
path: root/include
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 /include
parentHandle surrogate pairs in avatars (diff)
downloadnheko-daabb40bede4691a9232274edbbad1e2bed76345.tar.xz
Use Q_NULLPTR to be compatible with qt5.7
fixes #199
Diffstat (limited to 'include')
-rw-r--r--include/timeline/TimelineView.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/timeline/TimelineView.h b/include/timeline/TimelineView.h

index bba40669..1ed84aaf 100644 --- a/include/timeline/TimelineView.h +++ b/include/timeline/TimelineView.h
@@ -88,8 +88,8 @@ public: template<class Widget, mtx::events::MessageType MsgType> void addUserMessage(const QString &url, - const QSharedPointer<QIODevice> data, - const QString &filename); + const QString &filename, + const QSharedPointer<QIODevice> data = Q_NULLPTR); void updatePendingMessage(int txn_id, QString event_id); void scrollDown(); void addDateSeparator(QDateTime datetime, int position); @@ -219,8 +219,8 @@ private: template<class Widget, mtx::events::MessageType MsgType> void TimelineView::addUserMessage(const QString &url, - const QSharedPointer<QIODevice> data, - const QString &filename) + const QString &filename, + const QSharedPointer<QIODevice> data) { auto with_sender = lastSender_ != local_user_;