From 6c95d3787325fdb47e45275974a8edfb3555cfdb Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 1 Sep 2016 08:23:35 +0900 Subject: Room: use std::deque for the timeline --- room.cpp | 2 -- room.h | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/room.cpp b/room.cpp index 325e81bc..7c19fba0 100644 --- a/room.cpp +++ b/room.cpp @@ -504,7 +504,6 @@ bool Room::Private::isEventNotable(const Event* e) const void Room::doAddNewMessageEvents(const Events& events) { - d->messageEvents.reserve(d->messageEvents.size() + events.size()); Timeline::size_type newUnreadMessages = 0; @@ -554,7 +553,6 @@ void Room::addHistoricalMessageEvents(const Events& events) void Room::doAddHistoricalMessageEvents(const Events& events) { // Historical messages arrive in newest-to-oldest order - d->messageEvents.reserve(d->messageEvents.size() + events.size()); std::copy(events.begin(), events.end(), std::front_inserter(d->messageEvents)); } diff --git a/room.h b/room.h index afa6f0ef..f42f6947 100644 --- a/room.h +++ b/room.h @@ -26,6 +26,8 @@ #include "jobs/syncjob.h" #include "joinstate.h" +#include + namespace QMatrixClient { class Event; @@ -38,7 +40,7 @@ namespace QMatrixClient Q_OBJECT Q_PROPERTY(QString readMarkerEventId READ readMarkerEventId WRITE markMessagesAsRead NOTIFY readMarkerPromoted) public: - using Timeline = Owning; + using Timeline = Owning< std::deque >; Room(Connection* connection, QString id); virtual ~Room(); -- cgit v1.2.3