Merge pull request #4 from KitsuneRal/user-room-names2

Render display names of users and rooms according to the spec - take 2

1 files changed, 15 insertions, 0 deletions

diff --git a/room.h b/room.h
index c4993f7a..831b5382 100644
--- a/room.h
+++ b/room.h
@@ -49,9 +49,16 @@ namespace QMatrixClient
             Q_INVOKABLE QString topic() const;
             Q_INVOKABLE JoinState joinState() const;
             Q_INVOKABLE QList<User*> usersTyping() const;
+            QList<User*> membersLeft() const;
 
             Q_INVOKABLE QList<User*> users() const;
 
+            /**
+             * @brief Produces a disambiguated name for a given user in
+             * the context of the room.
+             */
+            Q_INVOKABLE QString roomMembername(User* u) const;
+
             Q_INVOKABLE void addMessage( Event* event );
             Q_INVOKABLE void addInitialState( State* state );
             Q_INVOKABLE void updateData( const SyncRoomData& data );
@@ -67,13 +74,21 @@ namespace QMatrixClient
 
         public slots:
             void getPreviousContent();
+            void userRenamed(User* user, QString oldName);
 
         signals:
             void newMessage(Event* event);
+            /**
+             * Triggered when the room name, canonical alias or other aliases
+             * change. Not triggered when displayname changes.
+             */
             void namesChanged(Room* room);
+            /** Triggered only for changes in the room displayname. */
+            void displaynameChanged(Room* room);
             void topicChanged();
             void userAdded(User* user);
             void userRemoved(User* user);
+            void memberRenamed(User* user);
             void joinStateChanged(JoinState oldState, JoinState newState);
             void typingChanged();
             void highlightCountChanged(Room* room);