Merge branch 'master' into kitsune-gtad

1 files changed, 7 insertions, 9 deletions

diff --git a/room.h b/room.h
index d62d160f..2d0453bc 100644
--- a/room.h
+++ b/room.h
@@ -36,6 +36,7 @@ namespace QMatrixClient
     class Connection;
     class User;
     class MemberSorter;
+    class LeaveRoomJob;
 
     class TimelineItem
     {
@@ -150,21 +151,18 @@ namespace QMatrixClient
         public slots:
             void postMessage(const QString& plainText,
                              MessageEventType type = MessageEventType::Text);
-            void postMessage(RoomMessageEvent* event);
+            void postMessage(const RoomMessageEvent& event);
             /** @deprecated */
             void postMessage(const QString& type, const QString& plainText);
             void setTopic(const QString& newTopic);
 
             void getPreviousContent(int limit = 10);
 
-            void inviteToRoom(const QString& memberId) const;
-            void leaveRoom() const;
-            void kickMember(const QString& memberId,
-                            const QString& reason = {}) const;
-            void ban(const QString& userId, const QString& reason = {}) const;
-            void unban(const QString& userId) const;
-
-            void userRenamed(User* user, QString oldName);
+            void inviteToRoom(const QString& memberId);
+            LeaveRoomJob* leaveRoom();
+            void kickMember(const QString& memberId, const QString& reason = {});
+            void ban(const QString& userId, const QString& reason = {});
+            void unban(const QString& userId);
 
             /** Mark all messages in the room as read */
             void markAllMessagesAsRead();