Merge branch 'kitsune/deprecations'

28 files changed, 49 insertions, 183 deletions

diff --git a/gtad/operation.cpp.mustache b/gtad/operation.cpp.mustache
index f34c9280..7f692e4a 100644
--- a/gtad/operation.cpp.mustache
+++ b/gtad/operation.cpp.mustache
@@ -36,7 +36,7 @@ QUrl {{camelCaseOperationId}}Job::makeRequestUrl(QUrl baseUrl{{#allParams?}},
 {   {{#headerParams}}
     setRequestHeader("{{baseName}}", {{paramName}}.toLatin1());
     {{/headerParams}}{{#inlineBody}}{{^propertyMap}}{{^bodyParams?}}
-    setRequestData(Data({{#consumesNonJson?}}{{nameCamelCase}}{{/consumesNonJson?
+    setRequestData(RequestData({{#consumesNonJson?}}{{nameCamelCase}}{{/consumesNonJson?
     }}{{^consumesNonJson?}}toJson({{nameCamelCase}}){{/consumesNonJson?}}));
     {{/bodyParams?}}{{/propertyMap}}{{/inlineBody
     }}{{^consumesNonJson?}}{{#bodyParams?}}
diff --git a/lib/avatar.h b/lib/avatar.h
index 37e1eeef..d4634aea 100644
--- a/lib/avatar.h
+++ b/lib/avatar.h
@@ -42,5 +42,3 @@ private:
     std::unique_ptr<Private> d;
 };
 } // namespace Quotient
-/// \deprecated Use namespace Quotient instead
-namespace QMatrixClient = Quotient;
diff --git a/lib/connection.cpp b/lib/connection.cpp
index 7dd04aaa..222c3b71 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -314,8 +314,6 @@ void Connection::resolveServer(const QString& mxid)
             setHomeserver(maybeBaseUrl);
         }
         Q_ASSERT(d->loginFlowsJob != nullptr); // Ensured by setHomeserver()
-        connect(d->loginFlowsJob, &BaseJob::success, this,
-                &Connection::resolved);
         connect(d->loginFlowsJob, &BaseJob::failure, this, [this] {
             qCWarning(MAIN) << "Homeserver base URL sanity check failed";
             emit resolveError(tr("The homeserver doesn't seem to be working"));
@@ -795,11 +793,6 @@ void Connection::stopSync()
 
 QString Connection::nextBatchToken() const { return d->data->lastEvent(); }
 
-PostReceiptJob* Connection::postReceipt(Room* room, RoomEvent* event)
-{
-    return callApi<PostReceiptJob>(room->id(), "m.read", event->id());
-}
-
 JoinRoomJob* Connection::joinRoom(const QString& roomAlias,
                                   const QStringList& serverNames)
 {
@@ -1239,20 +1232,6 @@ int Connection::millisToReconnect() const
     return d->syncJob ? d->syncJob->millisToRetry() : 0;
 }
 
-QHash<QPair<QString, bool>, Room*> Connection::roomMap() const
-{
-    // Copy-on-write-and-remove-elements is faster than copying elements one by
-    // one.
-    QHash<QPair<QString, bool>, Room*> roomMap = d->roomMap;
-    for (auto it = roomMap.begin(); it != roomMap.end();) {
-        if (it.value()->joinState() == JoinState::Leave)
-            it = roomMap.erase(it);
-        else
-            ++it;
-    }
-    return roomMap;
-}
-
 QVector<Room*> Connection::allRooms() const
 {
     QVector<Room*> result;
diff --git a/lib/connection.h b/lib/connection.h
index a7a071f3..ecbb1a19 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -138,15 +138,6 @@ public:
     explicit Connection(const QUrl& server, QObject* parent = nullptr);
     ~Connection() override;
 
-    /// Get all Invited and Joined rooms
-    /*!
-     * \return a hashmap from a composite key - room name and whether
-     *         it's an Invite rather than Join - to room pointers
-     * \sa allRooms, rooms, roomsWithTag
-     */
-    [[deprecated("Use allRooms(), roomsWithTag() or rooms(joinStates) instead")]]
-    QHash<QPair<QString, bool>, Room*> roomMap() const;
-
     /// Get all rooms known within this Connection
     /*!
      * This includes Invite, Join and Leave rooms, in no particular order.
@@ -524,30 +515,12 @@ public Q_SLOTS:
      */
     void assumeIdentity(const QString& mxId, const QString& accessToken,
                         const QString& deviceId);
-    /*! \deprecated Use loginWithPassword instead */
-    void connectToServer(const QString& userId, const QString& password,
-                         const QString& initialDeviceName,
-                         const QString& deviceId = {})
-    {
-        loginWithPassword(userId, password, initialDeviceName, deviceId);
-    }
-    /*! \deprecated
-     * Use assumeIdentity() if you have an access token or
-     * loginWithToken() if you have a login token.
-     */
-    void connectWithToken(const QString& userId, const QString& accessToken,
-                          const QString& deviceId)
-    {
-        assumeIdentity(userId, accessToken, deviceId);
-    }
     /// Explicitly request capabilities from the server
     void reloadCapabilities();
 
     /// Find out if capabilites are still loading from the server
     bool loadingCapabilities() const;
 
-    /** @deprecated Use stopSync() instead */
-    void disconnectFromServer() { stopSync(); }
     void logout();
 
     void sync(int timeout = -1);
@@ -662,24 +635,7 @@ public Q_SLOTS:
     /** \deprecated Do not use this directly, use Room::leaveRoom() instead */
     virtual LeaveRoomJob* leaveRoom(Room* room);
 
-    // Old API that will be abolished any time soon. DO NOT USE.
-
-    /** @deprecated Use callApi<PostReceiptJob>() or Room::postReceipt() instead
-     */
-    virtual PostReceiptJob* postReceipt(Room* room, RoomEvent* event);
-
 Q_SIGNALS:
-    /**
-     * @deprecated
-     * This was a signal resulting from a successful resolveServer().
-     * Since Connection now provides setHomeserver(), the HS URL
-     * may change even without resolveServer() invocation. Use
-     * loginFLowsChanged() instead of resolved(). You can also use
-     * loginWith*() and assumeIdentity() without the HS URL set in
-     * advance (i.e. without calling resolveServer), as they trigger
-     * server name resolution from MXID if the server URL is not valid.
-     */
-    void resolved();
     void resolveError(QString error);
 
     void homeserverChanged(QUrl baseUrl);
@@ -687,7 +643,6 @@ Q_SIGNALS:
     void capabilitiesLoaded();
 
     void connected();
-    void reconnected(); //< \deprecated Use connected() instead
     void loggedOut();
     /** Login data or state have changed
      *
diff --git a/lib/connectiondata.cpp b/lib/connectiondata.cpp
index e54d909b..87ad4577 100644
--- a/lib/connectiondata.cpp
+++ b/lib/connectiondata.cpp
@@ -118,18 +118,6 @@ void ConnectionData::setToken(QByteArray token)
     d->accessToken = std::move(token);
 }
 
-void ConnectionData::setHost(QString host)
-{
-    d->baseUrl.setHost(host);
-    qCDebug(MAIN) << "updated baseUrl to" << d->baseUrl;
-}
-
-void ConnectionData::setPort(int port)
-{
-    d->baseUrl.setPort(port);
-    qCDebug(MAIN) << "updated baseUrl to" << d->baseUrl;
-}
-
 const QString& ConnectionData::deviceId() const { return d->deviceId; }
 
 const QString& ConnectionData::userId() const { return d->userId; }
diff --git a/lib/connectiondata.h b/lib/connectiondata.h
index 7dd96f26..e16a2dac 100644
--- a/lib/connectiondata.h
+++ b/lib/connectiondata.h
@@ -31,10 +31,6 @@ public:
 
     void setBaseUrl(QUrl baseUrl);
     void setToken(QByteArray accessToken);
-    [[deprecated("Use setBaseUrl() instead")]]
-    void setHost(QString host);
-    [[deprecated("Use setBaseUrl() instead")]]
-    void setPort(int port);
     void setDeviceId(const QString& deviceId);
     void setUserId(const QString& userId);
     void setNeedsToken(const QString& requestName);
diff --git a/lib/csapi/account-data.cpp b/lib/csapi/account-data.cpp
index 6a40e908..80deb8f1 100644
--- a/lib/csapi/account-data.cpp
+++ b/lib/csapi/account-data.cpp
@@ -14,7 +14,7 @@ SetAccountDataJob::SetAccountDataJob(const QString& userId, const QString& type,
               QStringLiteral("/_matrix/client/r0") % "/user/" % userId
                   % "/account_data/" % type)
 {
-    setRequestData(Data(toJson(content)));
+    setRequestData(RequestData(toJson(content)));
 }
 
 QUrl GetAccountDataJob::makeRequestUrl(QUrl baseUrl, const QString& userId,
@@ -39,7 +39,7 @@ SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId,
               QStringLiteral("/_matrix/client/r0") % "/user/" % userId
                   % "/rooms/" % roomId % "/account_data/" % type)
 {
-    setRequestData(Data(toJson(content)));
+    setRequestData(RequestData(toJson(content)));
 }
 
 QUrl GetAccountDataPerRoomJob::makeRequestUrl(QUrl baseUrl,
diff --git a/lib/csapi/administrative_contact.cpp b/lib/csapi/administrative_contact.cpp
index fa4f475a..04360299 100644
--- a/lib/csapi/administrative_contact.cpp
+++ b/lib/csapi/administrative_contact.cpp
@@ -89,7 +89,7 @@ RequestTokenTo3PIDEmailJob::RequestTokenTo3PIDEmailJob(
                   % "/account/3pid/email/requestToken",
               false)
 {
-    setRequestData(Data(toJson(body)));
+    setRequestData(RequestData(toJson(body)));
 }
 
 RequestTokenTo3PIDMSISDNJob::RequestTokenTo3PIDMSISDNJob(
@@ -99,5 +99,5 @@ RequestTokenTo3PIDMSISDNJob::RequestTokenTo3PIDMSISDNJob(
                   % "/account/3pid/msisdn/requestToken",
               false)
 {
-    setRequestData(Data(toJson(body)));
+    setRequestData(RequestData(toJson(body)));
 }
diff --git a/lib/csapi/content-repo.cpp b/lib/csapi/content-repo.cpp
index 00bc9706..2d82437b 100644
--- a/lib/csapi/content-repo.cpp
+++ b/lib/csapi/content-repo.cpp
@@ -22,7 +22,7 @@ UploadContentJob::UploadContentJob(QIODevice* content, const QString& filename,
               queryToUploadContent(filename))
 {
     setRequestHeader("Content-Type", contentType.toLatin1());
-    setRequestData(Data(content));
+    setRequestData(RequestData(content));
     addExpectedKey("content_uri");
 }
 
diff --git a/lib/csapi/cross_signing.cpp b/lib/csapi/cross_signing.cpp
index 9bfc026a..ed2b15c0 100644
--- a/lib/csapi/cross_signing.cpp
+++ b/lib/csapi/cross_signing.cpp
@@ -30,5 +30,5 @@ UploadCrossSigningSignaturesJob::UploadCrossSigningSignaturesJob(
     : BaseJob(HttpVerb::Post, QStringLiteral("UploadCrossSigningSignaturesJob"),
               QStringLiteral("/_matrix/client/r0") % "/keys/signatures/upload")
 {
-    setRequestData(Data(toJson(signatures)));
+    setRequestData(RequestData(toJson(signatures)));
 }
diff --git a/lib/csapi/filter.cpp b/lib/csapi/filter.cpp
index bb3a893f..6b8863cc 100644
--- a/lib/csapi/filter.cpp
+++ b/lib/csapi/filter.cpp
@@ -13,7 +13,7 @@ DefineFilterJob::DefineFilterJob(const QString& userId, const Filter& filter)
               QStringLiteral("/_matrix/client/r0") % "/user/" % userId
                   % "/filter")
 {
-    setRequestData(Data(toJson(filter)));
+    setRequestData(RequestData(toJson(filter)));
     addExpectedKey("filter_id");
 }
 
diff --git a/lib/csapi/openid.cpp b/lib/csapi/openid.cpp
index 3941e9c0..0447db79 100644
--- a/lib/csapi/openid.cpp
+++ b/lib/csapi/openid.cpp
@@ -14,5 +14,5 @@ RequestOpenIdTokenJob::RequestOpenIdTokenJob(const QString& userId,
               QStringLiteral("/_matrix/client/r0") % "/user/" % userId
                   % "/openid/request_token")
 {
-    setRequestData(Data(toJson(body)));
+    setRequestData(RequestData(toJson(body)));
 }
diff --git a/lib/csapi/receipts.cpp b/lib/csapi/receipts.cpp
index 00d1c28a..47b18174 100644
--- a/lib/csapi/receipts.cpp
+++ b/lib/csapi/receipts.cpp
@@ -15,5 +15,5 @@ PostReceiptJob::PostReceiptJob(const QString& roomId, const QString& receiptType
               QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
                   % "/receipt/" % receiptType % "/" % eventId)
 {
-    setRequestData(Data(toJson(receipt)));
+    setRequestData(RequestData(toJson(receipt)));
 }
diff --git a/lib/csapi/registration.cpp b/lib/csapi/registration.cpp
index 38649e63..c3617bfc 100644
--- a/lib/csapi/registration.cpp
+++ b/lib/csapi/registration.cpp
@@ -44,7 +44,7 @@ RequestTokenToRegisterEmailJob::RequestTokenToRegisterEmailJob(
                   % "/register/email/requestToken",
               false)
 {
-    setRequestData(Data(toJson(body)));
+    setRequestData(RequestData(toJson(body)));
 }
 
 RequestTokenToRegisterMSISDNJob::RequestTokenToRegisterMSISDNJob(
@@ -54,7 +54,7 @@ RequestTokenToRegisterMSISDNJob::RequestTokenToRegisterMSISDNJob(
                   % "/register/msisdn/requestToken",
               false)
 {
-    setRequestData(Data(toJson(body)));
+    setRequestData(RequestData(toJson(body)));
 }
 
 ChangePasswordJob::ChangePasswordJob(const QString& newPassword,
@@ -78,7 +78,7 @@ RequestTokenToResetPasswordEmailJob::RequestTokenToResetPasswordEmailJob(
                   % "/account/password/email/requestToken",
               false)
 {
-    setRequestData(Data(toJson(body)));
+    setRequestData(RequestData(toJson(body)));
 }
 
 RequestTokenToResetPasswordMSISDNJob::RequestTokenToResetPasswordMSISDNJob(
@@ -89,7 +89,7 @@ RequestTokenToResetPasswordMSISDNJob::RequestTokenToResetPasswordMSISDNJob(
                   % "/account/password/msisdn/requestToken",
               false)
 {
-    setRequestData(Data(toJson(body)));
+    setRequestData(RequestData(toJson(body)));
 }
 
 DeactivateAccountJob::DeactivateAccountJob(
diff --git a/lib/csapi/room_send.cpp b/lib/csapi/room_send.cpp
index 63986c56..9fd8cb96 100644
--- a/lib/csapi/room_send.cpp
+++ b/lib/csapi/room_send.cpp
@@ -14,6 +14,6 @@ SendMessageJob::SendMessageJob(const QString& roomId, const QString& eventType,
               QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
                   % "/send/" % eventType % "/" % txnId)
 {
-    setRequestData(Data(toJson(body)));
+    setRequestData(RequestData(toJson(body)));
     addExpectedKey("event_id");
 }
diff --git a/lib/csapi/room_state.cpp b/lib/csapi/room_state.cpp
index e18108ac..37e897fa 100644
--- a/lib/csapi/room_state.cpp
+++ b/lib/csapi/room_state.cpp
@@ -16,6 +16,6 @@ SetRoomStateWithKeyJob::SetRoomStateWithKeyJob(const QString& roomId,
               QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
                   % "/state/" % eventType % "/" % stateKey)
 {
-    setRequestData(Data(toJson(body)));
+    setRequestData(RequestData(toJson(body)));
     addExpectedKey("event_id");
 }
diff --git a/lib/events/roomevent.h b/lib/events/roomevent.h
index 3abd56c0..3174764f 100644
--- a/lib/events/roomevent.h
+++ b/lib/events/roomevent.h
@@ -14,7 +14,9 @@ class RedactionEvent;
 class RoomEvent : public Event {
     Q_GADGET
     Q_PROPERTY(QString id READ id)
-    Q_PROPERTY(QDateTime timestamp READ timestamp CONSTANT)
+    //! \deprecated Use originTimestamp instead
+    Q_PROPERTY(QDateTime timestamp READ originTimestamp CONSTANT)
+    Q_PROPERTY(QDateTime originTimestamp READ originTimestamp CONSTANT)
     Q_PROPERTY(QString roomId READ roomId CONSTANT)
     Q_PROPERTY(QString senderId READ senderId CONSTANT)
     Q_PROPERTY(QString redactionReason READ redactionReason)
@@ -32,9 +34,6 @@ public:
 
     QString id() const;
     QDateTime originTimestamp() const;
-    [[deprecated("Use originTimestamp()")]] QDateTime timestamp() const {
-        return originTimestamp();
-    }
     QString roomId() const;
     QString senderId() const;
     //! \brief Determine whether the event has been replaced
diff --git a/lib/events/stateevent.h b/lib/events/stateevent.h
index 1415f709..bc414a5f 100644
--- a/lib/events/stateevent.h
+++ b/lib/events/stateevent.h
@@ -100,10 +100,6 @@ public:
         visitor(_content);
         editJson()[ContentKeyL] = _content.toJson();
     }
-    [[deprecated("Use prevContent instead")]] const ContentT* prev_content() const
-    {
-        return prevContent();
-    }
     const ContentT* prevContent() const
     {
         return _prev ? &_prev->content : nullptr;
diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp
index 400a9243..239cef28 100644
--- a/lib/jobs/basejob.cpp
+++ b/lib/jobs/basejob.cpp
@@ -71,8 +71,8 @@ public:
 
     // Using an idiom from clang-tidy:
     // http://clang.llvm.org/extra/clang-tidy/checks/modernize-pass-by-value.html
-    Private(HttpVerb v, QString endpoint, const QUrlQuery& q, Data&& data,
-            bool nt)
+    Private(HttpVerb v, QString endpoint, const QUrlQuery& q,
+            RequestData&& data, bool nt)
         : verb(v)
         , apiEndpoint(std::move(endpoint))
         , requestQuery(q)
@@ -109,7 +109,7 @@ public:
     QString apiEndpoint;
     QHash<QByteArray, QByteArray> requestHeaders;
     QUrlQuery requestQuery;
-    Data requestData;
+    RequestData requestData;
     bool needsToken;
 
     bool inBackground = false;
@@ -168,11 +168,11 @@ public:
 
 BaseJob::BaseJob(HttpVerb verb, const QString& name, const QString& endpoint,
                  bool needsToken)
-    : BaseJob(verb, name, endpoint, QUrlQuery {}, Data {}, needsToken)
+    : BaseJob(verb, name, endpoint, QUrlQuery {}, RequestData {}, needsToken)
 {}
 
 BaseJob::BaseJob(HttpVerb verb, const QString& name, const QString& endpoint,
-                 const QUrlQuery &query, Data&& data, bool needsToken)
+                 const QUrlQuery& query, RequestData&& data, bool needsToken)
     : d(new Private(verb, endpoint, query, std::move(data), needsToken))
 {
     setObjectName(name);
@@ -224,9 +224,12 @@ void BaseJob::setRequestQuery(const QUrlQuery& query)
     d->requestQuery = query;
 }
 
-const BaseJob::Data& BaseJob::requestData() const { return d->requestData; }
+const RequestData& BaseJob::requestData() const { return d->requestData; }
 
-void BaseJob::setRequestData(Data&& data) { std::swap(d->requestData, data); }
+void BaseJob::setRequestData(RequestData&& data)
+{
+    std::swap(d->requestData, data);
+}
 
 const QByteArrayList& BaseJob::expectedContentTypes() const
 {
diff --git a/lib/jobs/basejob.h b/lib/jobs/basejob.h
index 7ce4b808..29443c53 100644
--- a/lib/jobs/basejob.h
+++ b/lib/jobs/basejob.h
@@ -52,8 +52,6 @@ public:
         IncorrectRequestError = IncorrectRequest,
         IncorrectResponse,
         IncorrectResponseError = IncorrectResponse,
-        JsonParseError //< \deprecated Use IncorrectResponse instead
-        = IncorrectResponse,
         TooManyRequests,
         TooManyRequestsError = TooManyRequests,
         RateLimited = TooManyRequests,
@@ -72,7 +70,11 @@ public:
     };
     Q_ENUM(StatusCode)
 
-    using Data = RequestData;
+    using Data
+#ifndef Q_CC_MSVC
+        Q_DECL_DEPRECATED_X("Use Quotient::RequestData instead")
+#endif
+        = RequestData;
 
     /*!
      * This structure stores the status of a server call job. The status
@@ -125,7 +127,8 @@ public:
     BaseJob(HttpVerb verb, const QString& name, const QString& endpoint,
             bool needsToken = true);
     BaseJob(HttpVerb verb, const QString& name, const QString& endpoint,
-            const QUrlQuery& query, Data&& data = {}, bool needsToken = true);
+            const QUrlQuery& query, RequestData&& data = {},
+            bool needsToken = true);
 
     QUrl requestUrl() const;
     bool isBackground() const;
@@ -330,8 +333,8 @@ protected:
     void setRequestHeaders(const headers_t& headers);
     const QUrlQuery& query() const;
     void setRequestQuery(const QUrlQuery& query);
-    const Data& requestData() const;
-    void setRequestData(Data&& data);
+    const RequestData& requestData() const;
+    void setRequestData(RequestData&& data);
     const QByteArrayList& expectedContentTypes() const;
     void addExpectedContentType(const QByteArray& contentType);
     void setExpectedContentTypes(const QByteArrayList& contentTypes);
diff --git a/lib/jobs/requestdata.h b/lib/jobs/requestdata.h
index 21657631..4f05e5ff 100644
--- a/lib/jobs/requestdata.h
+++ b/lib/jobs/requestdata.h
@@ -35,5 +35,3 @@ private:
     std::unique_ptr<QIODevice> _source;
 };
 } // namespace Quotient
-/// \deprecated Use namespace Quotient instead
-namespace QMatrixClient = Quotient;
diff --git a/lib/logging.h b/lib/logging.h
index 264215e1..1d1394e8 100644
--- a/lib/logging.h
+++ b/lib/logging.h
@@ -67,8 +67,6 @@ inline qint64 profilerMinNsecs()
         * 1000;
 }
 } // namespace Quotient
-/// \deprecated Use namespace Quotient instead
-namespace QMatrixClient = Quotient;
 
 inline QDebug operator<<(QDebug debug_object, const QElapsedTimer& et)
 {
diff --git a/lib/room.cpp b/lib/room.cpp
index 9fe70678..398b3ec8 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -1236,7 +1236,7 @@ QList<User*> Room::membersLeft() const { return d->membersLeft; }
 
 QList<User*> Room::users() const { return d->membersMap.values(); }
 
-[[deprecated]] QStringList Room::memberNames() const
+QStringList Room::memberNames() const
 {
     return safeMemberNames();
 }
@@ -1507,7 +1507,7 @@ QString Room::disambiguatedMemberName(const QString& mxId) const
 
 QString Room::safeMemberName(const QString& userId) const
 {
-    return sanitized(roomMembername(userId));
+    return sanitized(disambiguatedMemberName(userId));
 }
 
 QString Room::htmlSafeMemberName(const QString& userId) const
diff --git a/lib/room.h b/lib/room.h
index 52ba2eab..de0c7504 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -192,7 +192,7 @@ public:
     QList<User*> membersLeft() const;
 
     Q_INVOKABLE QList<Quotient::User*> users() const;
-    [[deprecated("Use safeMemberNames() or htmlSafeMemberNames() instead")]]
+    Q_DECL_DEPRECATED_X("Use safeMemberNames() or htmlSafeMemberNames() instead") //
     QStringList memberNames() const;
     QStringList safeMemberNames() const;
     QStringList htmlSafeMemberNames() const;
@@ -235,13 +235,12 @@ public:
     /**
      * \brief Check the join state of a given user in this room
      *
-     * \deprecated Use memberState and check against a mask
-     *
      * \note Banned and invited users are not tracked separately for now (Leave
      *       will be returned for them).
      *
      * \return Join if the user is a room member; Leave otherwise
      */
+    Q_DECL_DEPRECATED_X("Use memberState and check against the mask") //
     Q_INVOKABLE Quotient::JoinState memberJoinState(Quotient::User* user) const;
 
     //! \brief Check the join state of a given user in this room
@@ -254,18 +253,11 @@ public:
     //! \sa safeMemberName, htmlSafeMemberName
     Q_INVOKABLE QString memberName(const QString& mxId) const;
 
-    /*!
-     * \brief Get a disambiguated name for the given user in the room context
-     *
-     * \deprecated use safeMemberName() instead
-     */
+    //! \brief Get a disambiguated name for the given user in the room context
+    Q_DECL_DEPRECATED_X("Use safeMemberName() instead")
     Q_INVOKABLE QString roomMembername(const Quotient::User* u) const;
-    /*!
-     * \brief Get a disambiguated name for a user with this id in the room
-     * context
-     *
-     * \deprecated use safeMemberName() instead
-     */
+    //! \brief Get a disambiguated name for a user with this id in the room
+    Q_DECL_DEPRECATED_X("Use safeMemberName() instead")
     Q_INVOKABLE QString roomMembername(const QString& userId) const;
 
     /*!
@@ -552,7 +544,7 @@ public Q_SLOTS:
 
     QString postFile(const QString& plainText, EventContent::TypedBase* content);
 #if QT_VERSION_MAJOR < 6
-    /// \deprecated Use postFile(QString, MessageEventType, EventContent) instead
+    Q_DECL_DEPRECATED_X("Use postFile(QString, MessageEventType, EventContent)") //
     QString postFile(const QString& plainText, const QUrl& localPath,
                      bool asGenericFile = false);
 #endif
diff --git a/lib/settings.cpp b/lib/settings.cpp
index 1d36db27..ed9082b0 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -126,19 +126,6 @@ void AccountSettings::setHomeserver(const QUrl& url)
 
 QString AccountSettings::userId() const { return group().section('/', -1); }
 
-QString AccountSettings::accessToken() const
-{
-    return value(AccessTokenKey).toString();
-}
-
-void AccountSettings::setAccessToken(const QString& accessToken)
-{
-    qCWarning(MAIN) << "Saving access_token to QSettings is insecure."
-                       " Developers, do it manually or contribute to share "
-                       "QtKeychain logic to libQuotient.";
-    setValue(AccessTokenKey, accessToken);
-}
-
 void AccountSettings::clearAccessToken()
 {
     legacySettings.remove(AccessTokenKey);
diff --git a/lib/settings.h b/lib/settings.h
index 84c54802..3f4dc123 100644
--- a/lib/settings.h
+++ b/lib/settings.h
@@ -131,8 +131,6 @@ class AccountSettings : public SettingsGroup {
     QTNT_DECLARE_SETTING(QString, deviceId, setDeviceId)
     QTNT_DECLARE_SETTING(QString, deviceName, setDeviceName)
     QTNT_DECLARE_SETTING(bool, keepLoggedIn, setKeepLoggedIn)
-    /** \deprecated \sa setAccessToken */
-    Q_PROPERTY(QString accessToken READ accessToken WRITE setAccessToken)
     Q_PROPERTY(QByteArray encryptionAccountPickle READ encryptionAccountPickle
                    WRITE setEncryptionAccountPickle)
 public:
@@ -147,11 +145,7 @@ public:
     QUrl homeserver() const;
     void setHomeserver(const QUrl& url);
 
-    /** \deprecated \sa setToken */
-    QString accessToken() const;
-    /** \deprecated Storing accessToken in QSettings is unsafe,
-     * see quotient-im/Quaternion#181 */
-    void setAccessToken(const QString& accessToken);
+    Q_DECL_DEPRECATED_X("Access tokens are not stored in QSettings any more")
     Q_INVOKABLE void clearAccessToken();
 
     QByteArray encryptionAccountPickle();
diff --git a/lib/user.cpp b/lib/user.cpp
index 2706b2c0..88549e5d 100644
--- a/lib/user.cpp
+++ b/lib/user.cpp
@@ -93,8 +93,6 @@ QString User::name(const Room* room) const
     return room ? room->memberName(id()) : d->defaultName;
 }
 
-QString User::rawName(const Room* room) const { return name(room); }
-
 void User::rename(const QString& newName)
 {
     const auto actualNewName = sanitized(newName);
@@ -185,8 +183,6 @@ QString User::fullName(const Room* room) const
     return displayName.isEmpty() ? id() : (displayName % " (" % id() % ')');
 }
 
-QString User::bridged() const { return {}; }
-
 const Avatar& User::avatarObject(const Room* room) const
 {
     if (!room)
diff --git a/lib/user.h b/lib/user.h
index 4ff62951..78b72bf2 100644
--- a/lib/user.h
+++ b/lib/user.h
@@ -22,7 +22,6 @@ class User : public QObject {
     Q_PROPERTY(QString name READ name NOTIFY defaultNameChanged)
     Q_PROPERTY(QString displayName READ displayname NOTIFY defaultNameChanged STORED false)
     Q_PROPERTY(QString fullName READ fullName NOTIFY defaultNameChanged STORED false)
-    Q_PROPERTY(QString bridgeName READ bridged NOTIFY defaultNameChanged STORED false)
     Q_PROPERTY(QString avatarMediaId READ avatarMediaId NOTIFY defaultAvatarChanged STORED false)
     Q_PROPERTY(QUrl avatarUrl READ avatarUrl NOTIFY defaultAvatarChanged)
 public:
@@ -40,18 +39,10 @@ public:
      * This may be empty if the user didn't choose the name or cleared
      * it. If the user is bridged, the bridge postfix (such as '(IRC)')
      * is stripped out. No disambiguation for the room is done.
-     * \sa displayName, rawName
+     * \sa displayName
      */
     QString name(const Room* room = nullptr) const;
 
-    /** Get the user name along with the bridge postfix
-     * This function is similar to name() but appends the bridge postfix
-     * (such as '(IRC)') to the user name. No disambiguation is done.
-     * \sa name, displayName
-     */
-    [[deprecated("Bridge postfixes exist no more, use name() instead")]]
-    QString rawName(const Room* room = nullptr) const;
-
     /** Get the displayed user name
      * When \p room is null, this method returns result of name() if
      * the name is non-empty; otherwise it returns user id.
@@ -70,13 +61,6 @@ public:
      */
     QString fullName(const Room* room = nullptr) const;
 
-    /**
-     * Returns the name of bridge the user is connected from or empty.
-     */
-    [[deprecated("Bridged status is no more supported; this always returns"
-                 " an empty string")]]
-    QString bridged() const;
-
     /** Whether the user is a guest
      * As of now, the function relies on the convention used in Synapse
      * that guests and only guests have all-numeric IDs. This may or