Don't use shared pointers for cache

2 files changed, 6 insertions, 8 deletions

diff --git a/src/dialogs/MemberList.cpp b/src/dialogs/MemberList.cpp

index 2d435026..f0f61686 100644
--- a/src/dialogs/MemberList.cpp
+++ b/src/dialogs/MemberList.cpp
@@ -56,10 +56,9 @@ MemberItem::MemberItem(const RoomMember &member, QWidget *parent)
         topLayout_->addLayout(textLayout_, 1);
 }
 
-MemberList::MemberList(const QString &room_id, QSharedPointer<Cache> cache, QWidget *parent)
+MemberList::MemberList(const QString &room_id, QWidget *parent)
   : QFrame(parent)
   , room_id_{room_id}
-  , cache_{cache}
 {
         setMaximumSize(420, 380);
         setAttribute(Qt::WA_DeleteOnClose, true);
@@ -99,11 +98,11 @@ MemberList::MemberList(const QString &room_id, QSharedPointer<Cache> cache, QWid
                 const size_t numMembers = list_->count() - 1;
 
                 if (numMembers > 0)
-                        addUsers(cache_->getMembers(room_id_.toStdString(), numMembers));
+                        addUsers(cache::client()->getMembers(room_id_.toStdString(), numMembers));
         });
 
         try {
-                addUsers(cache_->getMembers(room_id_.toStdString()));
+                addUsers(cache::client()->getMembers(room_id_.toStdString()));
         } catch (const lmdb::error &e) {
                 qCritical() << e.what();
         }
diff --git a/src/dialogs/RoomSettings.cpp b/src/dialogs/RoomSettings.cpp

index b2c87c94..976d2acc 100644
--- a/src/dialogs/RoomSettings.cpp
+++ b/src/dialogs/RoomSettings.cpp
@@ -15,18 +15,17 @@
 
 using namespace dialogs;
 
-RoomSettings::RoomSettings(const QString &room_id, QSharedPointer<Cache> cache, QWidget *parent)
+RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
   : QFrame(parent)
-  , cache_{cache}
   , room_id_{std::move(room_id)}
 {
         setMaximumWidth(385);
 
         try {
-                auto res = cache_->getRoomInfo({room_id_.toStdString()});
+                auto res = cache::client()->getRoomInfo({room_id_.toStdString()});
                 info_    = res[room_id_];
 
-                setAvatar(QImage::fromData(cache_->image(info_.avatar_url)));
+                setAvatar(QImage::fromData(cache::client()->image(info_.avatar_url)));
         } catch (const lmdb::error &e) {
                 qWarning() << "failed to retrieve room info from cache" << room_id;
         }