diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-07-06 23:08:24 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-07-06 23:08:24 +0900 |
| commit | 717f3bc6c91b14905f222e094e439b4cdcdab2c8 (patch) | |
| tree | f3e43f5427e8b124b8aec4b6f437017fca65356b /lib/connection.h | |
| parent | a4d1acb8e9e3f101c891f9089a07e214e5cc55f8 (diff) | |
| parent | f58819e4e930ee66e790eccaedf551f807956d72 (diff) | |
| download | libquotient-717f3bc6c91b14905f222e094e439b4cdcdab2c8.tar.gz libquotient-717f3bc6c91b14905f222e094e439b4cdcdab2c8.zip | |
Merge branch 'master' into e2ee-enc-mng
Diffstat (limited to 'lib/connection.h')
| -rw-r--r-- | lib/connection.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/connection.h b/lib/connection.h index cc2feed8..4ab8d5ba 100644 --- a/lib/connection.h +++ b/lib/connection.h @@ -122,7 +122,7 @@ namespace QMatrixClient explicit Connection(QObject* parent = nullptr); explicit Connection(const QUrl& server, QObject* parent = nullptr); - virtual ~Connection(); + ~Connection() override; /** Get all Invited and Joined rooms * \return a hashmap from a composite key - room name and whether @@ -250,11 +250,13 @@ namespace QMatrixClient Q_INVOKABLE Room* roomByAlias(const QString& roomAlias, JoinStates states = JoinState::Invite|JoinState::Join) const; /** Update the internal map of room aliases to IDs */ - /// This is used for internal bookkeeping of rooms. Do NOT use - /// it to try change aliases, use Room::setAliases instead + /// This is used to maintain the internal index of room aliases. + /// It does NOT change aliases on the server, + /// \sa Room::setLocalAliases void updateRoomAliases(const QString& roomId, - const QStringList& previousRoomAliases, - const QStringList& roomAliases); + const QString& aliasServer, + const QStringList& previousRoomAliases, + const QStringList& roomAliases); Q_INVOKABLE Room* invitation(const QString& roomId) const; Q_INVOKABLE User* user(const QString& userId); const User* user() const; @@ -265,8 +267,6 @@ namespace QMatrixClient Q_INVOKABLE SyncJob* syncJob() const; Q_INVOKABLE int millisToReconnect() const; - [[deprecated("Use accessToken() instead")]] - Q_INVOKABLE QString token() const; Q_INVOKABLE void getTurnServers(); struct SupportedRoomVersion |