Merge pull request #2 from KitsuneRal/code-maintenance

Code maintenance

2 files changed, 19 insertions, 1 deletions

diff --git a/events/event.h b/events/event.h
index b25b1378..6a8d0e89 100644
--- a/events/event.h
+++ b/events/event.h
@@ -19,6 +19,8 @@
 #ifndef QMATRIXCLIENT_EVENT_H
 #define QMATRIXCLIENT_EVENT_H
 
+#include <algorithm>
+
 #include <QtCore/QString>
 #include <QtCore/QDateTime>
 #include <QtCore/QJsonObject>
@@ -53,6 +55,22 @@ namespace QMatrixClient
             class Private;
             Private* d;
     };
+
+    /**
+     * Finds a place in the timeline where a new event/message could be inserted.
+     * @return an iterator to an item with the earliest timestamp after
+     * the one of 'item'; or timeline.end(), if all events are earlier
+     */
+    template <class ItemT, template <typename> class ContT>
+    typename ContT<ItemT *>::iterator
+    findInsertionPos(ContT<ItemT *> & timeline, const ItemT *item)
+    {
+        return std::lower_bound (timeline.begin(), timeline.end(), item,
+            [](const ItemT * a, const ItemT * b) {
+                return a->timestamp() < b->timestamp();
+            }
+        );
+    }
 }
 
 #endif // QMATRIXCLIENT_EVENT_H
diff --git a/events/roomaliasesevent.cpp b/events/roomaliasesevent.cpp
index 6bbe0aff..54fb5682 100644
--- a/events/roomaliasesevent.cpp
+++ b/events/roomaliasesevent.cpp
@@ -64,7 +64,7 @@ QStringList RoomAliasesEvent::aliases() const
 
 RoomAliasesEvent* RoomAliasesEvent::fromJson(const QJsonObject& obj)
 {
-    qDebug() << "!!!!";
+    qDebug() << "RoomAliasesEvent::fromJson";
     RoomAliasesEvent* e = new RoomAliasesEvent();
     e->parseJson(obj);
     const QJsonObject contents = obj.value("content").toObject();