Merge branch 'kitsune-gtad'

1 files changed, 10 insertions, 5 deletions

diff --git a/lib/room.h b/lib/room.h
index 288db5fb..0d629e20 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -32,10 +32,12 @@
 namespace QMatrixClient
 {
     class Event;
+    class RoomMemberEvent;
     class Connection;
     class User;
     class MemberSorter;
     class LeaveRoomJob;
+    class SetRoomStateWithKeyJob;
     class RedactEventJob;
 
     class TimelineItem
@@ -344,6 +346,8 @@ namespace QMatrixClient
 
             void inviteToRoom(const QString& memberId);
             LeaveRoomJob* leaveRoom();
+            SetRoomStateWithKeyJob* setMemberState(
+                    const QString& memberId, const RoomMemberEvent& event) const;
             void kickMember(const QString& memberId, const QString& reason = {});
             void ban(const QString& userId, const QString& reason = {});
             void unban(const QString& userId);
@@ -408,13 +412,14 @@ namespace QMatrixClient
             void fileTransferCancelled(QString id);
 
         protected:
-            virtual void processStateEvents(const RoomEvents& events);
+            /// Returns true if any of room names/aliases has changed
+            virtual bool processStateEvent(const RoomEvent& e);
             virtual void processEphemeralEvent(EventPtr&& event);
             virtual void processAccountDataEvent(EventPtr&& event);
-            virtual void onAddNewTimelineEvents(timeline_iter_t from) { }
-            virtual void onAddHistoricalTimelineEvents(rev_iter_t from) { }
-            virtual void onRedaction(const RoomEvent& prevEvent,
-                                     const RoomEvent& after) { }
+            virtual void onAddNewTimelineEvents(timeline_iter_t /*from*/) { }
+            virtual void onAddHistoricalTimelineEvents(rev_iter_t /*from*/) { }
+            virtual void onRedaction(const RoomEvent& /*prevEvent*/,
+                                     const RoomEvent& /*after*/) { }
 
         private:
             class Private;