Merge master and fix conflicts

4 files changed, 10 insertions, 10 deletions

diff --git a/src/popups/PopupItem.cpp b/src/popups/PopupItem.cpp

index 5513f942..b3784843 100644
--- a/src/popups/PopupItem.cpp
+++ b/src/popups/PopupItem.cpp
@@ -1,3 +1,4 @@
+#include <QLabel>
 #include <QPaintEvent>
 #include <QPainter>
 #include <QStyleOption>
diff --git a/src/popups/PopupItem.h b/src/popups/PopupItem.h

index 7a710fdb..17a4f6bc 100644
--- a/src/popups/PopupItem.h
+++ b/src/popups/PopupItem.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPoint>
 #include <QWidget>
 
 #include "../AvatarProvider.h"
@@ -10,6 +7,8 @@
 
 class Avatar;
 struct SearchResult;
+class QLabel;
+class QHBoxLayout;
 
 class PopupItem : public QWidget
 {
diff --git a/src/popups/SuggestionsPopup.h b/src/popups/SuggestionsPopup.h

index 63c44538..73bfe6f7 100644
--- a/src/popups/SuggestionsPopup.h
+++ b/src/popups/SuggestionsPopup.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPoint>
 #include <QWidget>
 
 #include "CacheStructs.h"
diff --git a/src/popups/UserMentions.cpp b/src/popups/UserMentions.cpp

index 2e70dbd3..23a679f1 100644
--- a/src/popups/UserMentions.cpp
+++ b/src/popups/UserMentions.cpp
@@ -8,9 +8,9 @@
 
 #include "Cache.h"
 #include "ChatPage.h"
+#include "EventAccessors.h"
 #include "Logging.h"
 #include "UserMentions.h"
-//#include "timeline/TimelineItem.h"
 
 using namespace popups;
 
@@ -75,12 +75,15 @@ UserMentions::initializeMentions(const QMap<QString, mtx::responses::Notificatio
 
         for (const auto &item : notifs) {
                 for (const auto &notif : item.notifications) {
-                        const auto event_id = QString::fromStdString(utils::event_id(notif.event));
+                        const auto event_id =
+                          QString::fromStdString(mtx::accessors::event_id(notif.event));
 
                         try {
                                 const auto room_id = QString::fromStdString(notif.room_id);
-                                const auto user_id = utils::event_sender(notif.event);
-                                const auto body    = utils::event_body(notif.event);
+                                const auto user_id =
+                                  QString::fromStdString(mtx::accessors::sender(notif.event));
+                                const auto body =
+                                  QString::fromStdString(mtx::accessors::body(notif.event));
 
                                 pushItem(event_id,
                                          user_id,