From daabb40bede4691a9232274edbbad1e2bed76345 Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Fri, 12 Jan 2018 11:27:24 +0200
Subject: Use Q_NULLPTR to be compatible with qt5.7

fixes #199
---
 include/timeline/TimelineView.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include')

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_;
 
-- 
cgit 1.5.1