aboutsummaryrefslogtreecommitdiff
path: root/lib/room.h
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2018-07-27 12:15:28 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2018-07-27 14:35:32 +0900
commit6559a63cdd245279d0adb02994ffc043a794733f (patch)
tree2cd1d962725c471067548a247b2e8d655a24d16f /lib/room.h
parenta2ebdd4baa81d21a570792e6895ed8384e43c9c4 (diff)
downloadlibquotient-6559a63cdd245279d0adb02994ffc043a794733f.tar.gz
libquotient-6559a63cdd245279d0adb02994ffc043a794733f.zip
Provide a way to match the echo against the synced event
This needed to split the container with the freshly arrived events into parts that don't have local echo and echo'ed events, and add them to the timeline emitting two different pairs of signals. Instead of being removed, pending events are now merged (effectively they are removed from unsyncedEvents container anyway but models can represent this as an echo event being "transformed" into a full-fledged one on a timeline).
Diffstat (limited to 'lib/room.h')
-rw-r--r--lib/room.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/room.h b/lib/room.h
index 01a7389c..d72f7c7e 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -390,8 +390,9 @@ namespace QMatrixClient
void addedMessages();
void pendingEventAboutToAdd();
void pendingEventAdded();
- void pendingEventAboutToRemove(int pendingEventIndex);
- void pendingEventRemoved();
+ void pendingEventAboutToMerge(RoomEvent* serverEvent,
+ int pendingEventIndex);
+ void pendingEventMerged();
void pendingEventChanged(int pendingEventIndex);
/**