aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2016-09-01 08:23:35 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2016-11-26 18:27:21 +0900
commit6c95d3787325fdb47e45275974a8edfb3555cfdb (patch)
tree687b2ee6537226fc3c40ca0831bc2b476cd73fa6
parent78cfe3c102b686c71a1da5cbe91a2ae42dc03825 (diff)
downloadlibquotient-6c95d3787325fdb47e45275974a8edfb3555cfdb.tar.gz
libquotient-6c95d3787325fdb47e45275974a8edfb3555cfdb.zip
Room: use std::deque for the timeline
-rw-r--r--room.cpp2
-rw-r--r--room.h4
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 <deque>
+
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<Events>;
+ using Timeline = Owning< std::deque<Event*> >;
Room(Connection* connection, QString id);
virtual ~Room();