diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-07-09 11:49:05 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-07-09 11:49:05 +0900 |
| commit | 31e28e2a99e6815da407d201e7287423a4956138 (patch) | |
| tree | 049f3b156ad2cca3f328d163c9267ae90d984485 /lib/connection.h | |
| parent | b5dd30189df0d7515116b2abac1f93fc0f8a1989 (diff) | |
| parent | 651478c1681ba6f93e22c20328a048dbbc263ffe (diff) | |
| download | libquotient-31e28e2a99e6815da407d201e7287423a4956138.tar.gz libquotient-31e28e2a99e6815da407d201e7287423a4956138.zip | |
Merge branch 'master' into use-clang-format
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 a13def10..ef6cc156 100644 --- a/lib/connection.h +++ b/lib/connection.h @@ -132,7 +132,7 @@ public: 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 @@ -261,9 +261,10 @@ public: 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 - void updateRoomAliases(const QString& roomId, + /// 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 QString& aliasServer, const QStringList& previousRoomAliases, const QStringList& roomAliases); Q_INVOKABLE Room* invitation(const QString& roomId) const; @@ -276,7 +277,6 @@ public: 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 @@ -422,8 +422,8 @@ public slots: /** Set the homeserver base URL */ void setHomeserver(const QUrl& baseUrl); - /** Determine and set the homeserver from domain or MXID */ - void resolveServer(const QString& mxidOrDomain); + /** Determine and set the homeserver from MXID */ + void resolveServer(const QString& mxid); void connectToServer(const QString& user, const QString& password, const QString& initialDeviceName, |