From 53397bf9701f84a0a3a60c0c876694c9e9631e4e Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Tue, 10 Nov 2020 19:52:22 +0100
Subject: [PATCH] fix some clazy warning and deprecations

---
 src/controller.h    | 4 ++--
 src/neochatroom.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/controller.h b/src/controller.h
index 160961fc9..a0bf3d945 100644
--- a/src/controller.h
+++ b/src/controller.h
@@ -47,7 +47,7 @@ public:
     Q_INVOKABLE void loginWithCredentials(QString, QString, QString, QString);
     Q_INVOKABLE void loginWithAccessToken(QString, QString, QString, QString);
 
-    Q_INVOKABLE void changePassword(Connection *connection, const QString &currentPassword, const QString &newPassword);
+    Q_INVOKABLE void changePassword(Quotient::Connection *connection, const QString &currentPassword, const QString &newPassword);
 
     int accountCount() const;
 
@@ -104,7 +104,7 @@ Q_SIGNALS:
     void connectionChanged();
     void isOnlineChanged();
     void aboutDataChanged();
-    void passwordStatus(PasswordStatus status);
+    void passwordStatus(Controller::PasswordStatus status);
 
 public Q_SLOTS:
     void logout(Quotient::Connection *conn);
diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index 5b103c357..6cbd9595c 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -297,15 +297,15 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                 }
                 QString text {};
                 if (e.isRename()) {
-                    if (e.displayName().isEmpty())
+                    if (e.newDisplayName()->isEmpty())
                         text = tr("cleared their display name");
                     else
-                        text = tr("changed their display name to %1").arg(e.displayName().toHtmlEscaped());
+                        text = tr("changed their display name to %1").arg(e.newDisplayName()->toHtmlEscaped());
                 }
                 if (e.isAvatarUpdate()) {
                     if (!text.isEmpty())
                         text += " and ";
-                    if (e.avatarUrl().isEmpty())
+                    if (e.newAvatarUrl()->isEmpty())
                         text += tr("cleared their avatar");
                     else if (e.prevContent()->avatarUrl->isEmpty())
                         text += tr("set an avatar");