1 files changed, 9 insertions, 3 deletions
diff --git a/include/AvatarProvider.h b/include/AvatarProvider.h
index a58ef0b7..906f2593 100644
--- a/include/AvatarProvider.h
+++ b/include/AvatarProvider.h
@@ -24,6 +24,12 @@
 class MatrixClient;
 class TimelineItem;
 
+struct AvatarData
+{
+        QImage img;
+        QUrl url;
+};
+
 class AvatarProvider : public QObject
 {
         Q_OBJECT
@@ -39,8 +45,8 @@ private:
         static void updateAvatar(const QString &uid, const QImage &img);
 
         static QSharedPointer<MatrixClient> client_;
-        static QMap<QString, QList<TimelineItem *>> toBeResolved_;
 
-        static QMap<QString, QImage> userAvatars_;
-        static QMap<QString, QUrl> avatarUrls_;
+        using UserID = QString;
+        static QMap<UserID, AvatarData> avatars_;
+        static QMap<UserID, QList<TimelineItem *>> toBeResolved_;
 };