summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-01-12 12:35:15 +0200
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-01-12 12:35:15 +0200
commit396becbaa7e159b3472a0befe12d7ade36dcabad (patch)
tree42d11ad1111dc6930cf04aca467ccc7cab1834f8 /include
parentUse Q_NULLPTR to be compatible with qt5.7 (diff)
downloadnheko-396becbaa7e159b3472a0befe12d7ade36dcabad.tar.xz
Properly assign default value to QSharedPointer for Qt5.7
[ci skip]
Diffstat (limited to 'include')
-rw-r--r--include/timeline/TimelineView.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/timeline/TimelineView.h b/include/timeline/TimelineView.h

index 1ed84aaf..c120ed69 100644 --- a/include/timeline/TimelineView.h +++ b/include/timeline/TimelineView.h
@@ -87,9 +87,10 @@ public: void addUserMessage(mtx::events::MessageType ty, const QString &msg); template<class Widget, mtx::events::MessageType MsgType> - void addUserMessage(const QString &url, - const QString &filename, - const QSharedPointer<QIODevice> data = Q_NULLPTR); + void addUserMessage( + const QString &url, + const QString &filename, + const QSharedPointer<QIODevice> data = QSharedPointer<QIODevice>(nullptr)); void updatePendingMessage(int txn_id, QString event_id); void scrollDown(); void addDateSeparator(QDateTime datetime, int position);